diff options
368 files changed, 27059 insertions, 18073 deletions
@@ -179,39 +179,6 @@ /gitweb/gitweb.cgi /gitweb/static/gitweb.js /gitweb/static/gitweb.min.* -/test-chmtime -/test-ctype -/test-config -/test-date -/test-delta -/test-dump-cache-tree -/test-dump-split-index -/test-dump-untracked-cache -/test-fake-ssh -/test-scrap-cache-tree -/test-genrandom -/test-hashmap -/test-index-version -/test-line-buffer -/test-match-trees -/test-mergesort -/test-mktemp -/test-parse-options -/test-path-utils -/test-prio-queue -/test-read-cache -/test-regex -/test-revision-walking -/test-run-command -/test-sha1 -/test-sha1-array -/test-sigchain -/test-string-list -/test-submodule-config -/test-subprocess -/test-svn-fe -/test-urlmatch-normalization -/test-wildmatch /common-cmds.h *.tar.gz *.dsc @@ -46,6 +46,7 @@ David D. Kilzer <ddkilzer@kilzer.net> David KΓ₯gedal <davidk@lysator.liu.se> David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)> David S. Miller <davem@davemloft.net> +David Turner <novalis@novalis.org> <dturner@twopensource.com> Deskin Miller <deskinm@umich.edu> Dirk SΓΌsserott <newsletter@dirk.my1.cc> Eric Blake <eblake@redhat.com> <ebb9@byu.net> diff --git a/.travis.yml b/.travis.yml index adab5b8..c2b76f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ addons: apt: packages: - language-pack-is + - git-svn env: global: @@ -81,6 +82,8 @@ before_install: brew tap homebrew/binary --quiet brew_force_set_latest_binary_hash perforce brew_force_set_latest_binary_hash perforce-server + # Uncomment this if you want to run perf tests: + # brew install gnu-time brew install git-lfs perforce-server perforce gettext brew link --force gettext ;; diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 0ddd368..7f4769a 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -526,12 +526,19 @@ Writing Documentation: modifying paragraphs or option/command explanations that contain options or commands: - Literal examples (e.g. use of command-line options, command names, and - configuration variables) are typeset in monospace, and if you can use - `backticks around word phrases`, do so. + Literal examples (e.g. use of command-line options, command names, + configuration and environment variables) must be typeset in monospace (i.e. + wrapped with backticks): `--pretty=oneline` `git rev-list` `remote.pushDefault` + `GIT_DIR` + + An environment variable must be prefixed with "$" only when referring to its + value and not when referring to the variable itself, in this case there is + nothing to add except the backticks: + `GIT_DIR` is specified + `$GIT_DIR/hooks/pre-receive` 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/Makefile b/Documentation/Makefile index 3e39e28..b43d66e 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -76,6 +76,7 @@ TECH_DOCS += technical/protocol-common TECH_DOCS += technical/racy-git TECH_DOCS += technical/send-pack-pipeline TECH_DOCS += technical/shallow +TECH_DOCS += technical/signature-format TECH_DOCS += technical/trivial-merge SP_ARTICLES += $(TECH_DOCS) SP_ARTICLES += technical/api-index @@ -146,7 +147,7 @@ else ASCIIDOC_EXTRA += -a git-asciidoc-no-roff endif endif -ifdef MAN_BOLD_LITERAL +ifndef NO_MAN_BOLD_LITERAL XMLTO_EXTRA += -m manpage-bold-literal.xsl endif ifdef DOCBOOK_SUPPRESS_SP @@ -204,6 +205,7 @@ ifndef V QUIET_DBLATEX = @echo ' ' DBLATEX $@; QUIET_XSLTPROC = @echo ' ' XSLTPROC $@; QUIET_GEN = @echo ' ' GEN $@; + QUIET_LINT = @echo ' ' LINT $@; QUIET_STDERR = 2> /dev/null QUIET_SUBDIR0 = +@subdir= QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ @@ -427,4 +429,7 @@ quick-install-html: require-htmlrepo print-man1: @for i in $(MAN1_TXT); do echo $$i; done +lint-docs:: + $(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl + .PHONY: FORCE diff --git a/Documentation/RelNotes/2.8.4.txt b/Documentation/RelNotes/2.8.4.txt index 8d484b1..f4e2552 100644 --- a/Documentation/RelNotes/2.8.4.txt +++ b/Documentation/RelNotes/2.8.4.txt @@ -52,4 +52,18 @@ Fixes since v2.8.3 result in a strange error message in a pathological corner case. This has been corrected to suggest "submodule deinit --all" instead. + * Many commands normalize command line arguments from NFD to NFC + variant of UTF-8 on OSX, but commands in the "diff" family did + not, causing "git diff $path" to complain that no such path is + known to Git. They have been taught to do the normalization. + + * A couple of bugs around core.autocrlf have been fixed. + + * "git difftool" learned to handle unmerged paths correctly in + dir-diff mode. + + * The "are we talking with TTY, doing an interactive session?" + detection has been updated to work better for "Git for Windows". + + Also contains other minor documentation updates and code clean-ups. diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt new file mode 100644 index 0000000..b61d367 --- /dev/null +++ b/Documentation/RelNotes/2.9.0.txt @@ -0,0 +1,512 @@ +Git 2.9 Release Notes +===================== + +Backward compatibility notes +---------------------------- + +The end-user facing Porcelain level commands in the "git diff" and +"git log" family by default enable the rename detection; you can still +use "diff.renames" configuration variable to disable this. + +Merging two branches that have no common ancestor with "git merge" is +by default forbidden now to prevent creating such an unusual merge by +mistake. + +The output formats of "git log" that indents the commit log message by +4 spaces now expands HT in the log message by default. You can use +the "--no-expand-tabs" option to disable this. + +"git commit-tree" plumbing command required the user to always sign +its result when the user sets the commit.gpgsign configuration +variable, which was an ancient mistake, which this release corrects. +A script that drives commit-tree, if it relies on this mistake, now +needs to read commit.gpgsign and pass the -S option as necessary. + + +Updates since v2.8 +------------------ + +UI, Workflows & Features + + * Comes with git-multimail 1.3.1 (in contrib/). + + * The end-user facing commands like "git diff" and "git log" + now enable the rename detection by default. + + * The credential.helper configuration variable is cumulative and + there is no good way to override it from the command line. As + a special case, giving an empty string as its value now serves + as the signal to clear the values specified in various files. + + * A new "interactive.diffFilter" configuration can be used to + customize the diff shown in "git add -i" sessions. + + * "git p4" now allows P4 author names to be mapped to Git author + names. + + * "git rebase -x" can be used without passing "-i" option. + + * "git -c credential.<var>=<value> submodule" can now be used to + propagate configuration variables related to credential helper + down to the submodules. + + * "git tag" can create an annotated tag without explicitly given an + "-a" (or "-s") option (i.e. when a tag message is given). A new + configuration variable, tag.forceSignAnnotated, can be used to tell + the command to create signed tag in such a situation. + + * "git merge" used to allow merging two branches that have no common + base by default, which led to a brand new history of an existing + project created and then get pulled by an unsuspecting maintainer, + which allowed an unnecessary parallel history merged into the + existing project. The command has been taught not to allow this by + default, with an escape hatch "--allow-unrelated-histories" option + to be used in a rare event that merges histories of two projects + that started their lives independently. + + * "git pull" has been taught to pass the "--allow-unrelated-histories" + option to underlying "git merge". + + * "git apply -v" learned to report paths in the patch that were + skipped via --include/--exclude mechanism or being outside the + current working directory. + + * Shell completion (in contrib/) updates. + + * The commit object name reported when "rebase -i" stops has been + shortened. + + * "git worktree add" can be given "--no-checkout" option to only + create an empty worktree without checking out the files. + + * "git mergetools" learned to drive ExamDiff. + + * "git pull --rebase" learned "--[no-]autostash" option, so that + the rebase.autostash configuration variable set to true can be + overridden from the command line. + + * When "git log" shows the log message indented by 4-spaces, the + remainder of a line after a HT does not align in the way the author + originally intended. The command now expands tabs by default to help + such a case, and allows the users to override it with a new option, + "--no-expand-tabs". + + * "git send-email" now uses a more readable timestamps when + formulating a message ID. + + * "git rerere" can encounter two or more files with the same conflict + signature that have to be resolved in different ways, but there was + no way to record these separate resolutions. + + * "git p4" learned to record P4 jobs in Git commit that imports from + the history in Perforce. + + * "git describe --contains" often made a hard-to-justify choice of + tag to name a given commit, because it tried to come up + with a name with smallest number of hops from a tag, causing an old + commit whose close descendant that is recently tagged were not + described with respect to an old tag but with a newer tag. It did + not help that its computation of "hop" count was further tweaked to + penalize being on a side branch of a merge. The logic has been + updated to favor using the tag with the oldest tagger date, which + is a lot easier to explain to the end users: "We describe a commit + in terms of the (chronologically) oldest tag that contains the + commit." + + * "git clone" learned the "--shallow-submodules" option. + + * HTTP transport clients learned to throw extra HTTP headers at the + server, specified via http.extraHeader configuration variable. + + * The "--compaction-heuristic" option to "git diff" family of + commands enables a heuristic to make the patch output more readable + by using a blank line as a strong hint that the contents before and + after it belong to logically separate units. It is still + experimental. + + * A new configuration variable core.hooksPath allows customizing + where the hook directory is. + + * An earlier addition of "sanitize_submodule_env" with 14111fc4 (git: + submodule honor -c credential.* from command line, 2016-02-29) + turned out to be a convoluted no-op; implement what it wanted to do + correctly, and stop filtering settings given via "git -c var=val". + + * "git commit --dry-run" reported "No, no, you cannot commit." in one + case where "git commit" would have allowed you to commit, and this + improves it a little bit ("git commit --dry-run --short" still does + not give you the correct answer, for example). This is a stop-gap + measure in that "commit --short --dry-run" still gives an incorrect + result. + + * The experimental "multiple worktree" feature gains more safety to + forbid operations on a branch that is checked out or being actively + worked on elsewhere, by noticing that e.g. it is being rebased. + + * "git format-patch" learned a new "--base" option to record what + (public, well-known) commit the original series was built on in + its output. + + * "git commit" learned to pay attention to the "commit.verbose" + configuration variable and act as if the "--verbose" option + was given from the command line. + + * Updated documentation gives hints to GMail users with two-factor + auth enabled that they need app-specific-password when using + "git send-email". + + * The manpage output of our documentation did not render well in + terminal; typeset literals in bold by default to make them stand + out more. + + * The mark-up in the top-level README.md file has been updated to + typeset CLI command names differently from the body text. + + +Performance, Internal Implementation, Development Support etc. + + * The embedded args argv-array in the child process is used to build + the command line to run pack-objects instead of using a separate + array of strings. + + * A test for tags has been restructured so that more parts of it can + easily be run on a platform without a working GnuPG. + + * The startup_info data, which records if we are working inside a + repository (among other things), are now uniformly available to Git + subcommand implementations, and Git avoids attempting to touch + references when we are not in a repository. + + * The command line argument parser for "receive-pack" has been + rewritten to use parse-options. + + * A major part of "git submodule update" has been ported to C to take + advantage of the recently added framework to run download tasks in + parallel. Other updates to "git submodule" that move pieces of + logic to C continues. + + * Rename bunch of tests on "git clone" for better organization. + + * The tests that involve running httpd leaked the system-wide + configuration in /etc/gitconfig to the tested environment. + + * Build updates for MSVC. + + * The repository set-up sequence has been streamlined (the biggest + change is that there is no longer git_config_early()), so that we + do not attempt to look into refs/* when we know we do not have a + Git repository. + + * Code restructuring around the "refs" API to prepare for pluggable + refs backends. + + * Sources to many test helper binaries and the generated helpers + have been moved to t/helper/ subdirectory to reduce clutter at the + top level of the tree. + + * Unify internal logic between "git tag -v" and "git verify-tag" + commands by making one directly call into the other. + + * "merge-recursive" strategy incorrectly checked if a path that is + involved in its internal merge exists in the working tree. + + * The test scripts for "git p4" (but not "git p4" implementation + itself) has been updated so that they would work even on a system + where the installed version of Python is python 3. + + * As nobody maintains our in-tree git.spec.in and distros use their + own spec file, we stopped pretending that we support "make rpm". + + * Move from "unsigned char[20]" to "struct object_id" continues. + + * The code for warning_errno/die_errno has been refactored and a new + error_errno() reporting helper is introduced. + (merge 1da045f nd/error-errno later to maint). + + * Running tests with '-x' option to trace the individual command + executions is a useful way to debug test scripts, but some tests + that capture the standard error stream and check what the command + said can be broken with the trace output mixed in. When running + our tests under "bash", however, we can redirect the trace output + to another file descriptor to keep the standard error of programs + being tested intact. + + * t0040 had too many unnecessary repetitions in its test data. Teach + test-parse-options program so that a caller can tell what it + expects in its output, so that these repetitions can be cleaned up. + + * Add perf test for "rebase -i". + + * Common mistakes when writing gitlink: in our documentation are + found by "make check-docs". + + * t9xxx series has been updated primarily for readability, while + fixing small bugs in it. A few scripted Porcelain commands have + also been updated to fix possible bugs around their use of + "test -z" and "test -n". + + * CI test was taught to run git-svn tests. + + * "git cat-file --batch-all" has been sped up, by taking advantage + of the fact that it does not have to read a list of objects, in two + ways. + + * test updates to make it more readable and maintainable. + (merge e6273f4 es/t1500-modernize later to maint). + + * "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in + config.mak didn't. + (merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint). + + * The way how "submodule--helper list" signals unmatch error to its + callers has been updated. + + * A bash-ism "local" has been removed from "git submodule" scripted + Porcelain. + + +Also contains various documentation updates and code clean-ups. + + +Fixes since v2.8 +---------------- + +Unless otherwise noted, all the fixes since v2.8 in the maintenance +track are contained in this release (see the maintenance releases' +notes for details). + + * "git config --get-urlmatch", unlike other variants of the "git + config --get" family, did not signal error with its exit status + when there was no matching configuration. + + * The "--local-env-vars" and "--resolve-git-dir" options of "git + rev-parse" failed to work outside a repository when the command's + option parsing was rewritten in 1.8.5 era. + + * "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work. + + * Fetching of history by naming a commit object name directly didn't + work across remote-curl transport. + + * A small memory leak in an error codepath has been plugged in xdiff + code. + + * strbuf_getwholeline() did not NUL-terminate the buffer on certain + corner cases in its error codepath. + + * "git mergetool" did not work well with conflicts that both sides + deleted. + + * "git send-email" had trouble parsing alias file in mailrc format + when lines in it had trailing whitespaces on them. + + * When "git merge --squash" stopped due to conflict, the concluding + "git commit" failed to read in the SQUASH_MSG that shows the log + messages from all the squashed commits. + + * "git merge FETCH_HEAD" dereferenced NULL pointer when merging + nothing into an unborn history (which is arguably unusual usage, + which perhaps was the reason why nobody noticed it). + + * When "git worktree" feature is in use, "git branch -d" allowed + deletion of a branch that is checked out in another worktree, + which was wrong. + + * When "git worktree" feature is in use, "git branch -m" renamed a + branch that is checked out in another worktree without adjusting + the HEAD symbolic ref for the worktree. + + * "git diff -M" used to work better when two originally identical + files A and B got renamed to X/A and X/B by pairing A to X/A and B + to X/B, but this was broken in the 2.0 timeframe. + + * "git send-pack --all <there>" was broken when its command line + option parsing was written in the 2.6 timeframe. + + * "git format-patch --help" showed `-s` and `--no-patch` as if these + are valid options to the command. We already hide `--patch` option + from the documentation, because format-patch is about showing the + diff, and the documentation now hides these options as well. + + * When running "git blame $path" with unnormalized data in the index + for the path, the data in the working tree was blamed, even though + "git add" would not have changed what is already in the index, due + to "safe crlf" that disables the line-end conversion. It has been + corrected. + + * A change back in version 2.7 to "git branch" broke display of a + symbolic ref in a non-standard place in the refs/ hierarchy (we + expect symbolic refs to appear in refs/remotes/*/HEAD to point at + the primary branch the remote has, and as .git/HEAD to point at the + branch we locally checked out). + + * A partial rewrite of "git submodule" in the 2.7 timeframe changed + the way the gitdir: pointer in the submodules point at the real + repository location to use absolute paths by accident. This has + been corrected. + + * "git commit" misbehaved in a few minor ways when an empty message + is given via -m '', all of which has been corrected. + + * Support for CRAM-MD5 authentication method in "git imap-send" did + not work well. + + * Upcoming OpenSSL 1.1.0 will break compilation by updating a few API + elements we use in imap-send, which has been adjusted for the change. + + * The socks5:// proxy support added back in 2.6.4 days was not aware + that socks5h:// proxies behave differently from socks5:// proxies. + + * "git config" had a codepath that tried to pass a NULL to + printf("%s"), which nobody seems to have noticed. + + * On Cygwin, object creation uses the "create a temporary and then + rename it to the final name" pattern, not "create a temporary, + hardlink it to the final name and then unlink the temporary" + pattern. + + This is necessary to use Git on Windows shared directories, and is + already enabled for the MinGW and plain Windows builds. It also + has been used in Cygwin packaged versions of Git for quite a while. + See http://thread.gmane.org/gmane.comp.version-control.git/291853 + + * "merge-octopus" strategy did not ensure that the index is clean + when merge begins. + + * When "git merge" notices that the merge can be resolved purely at + the tree level (without having to merge blobs) and the resulting + tree happens to already exist in the object store, it forgot to + update the index, which left an inconsistent state that would + break later operations. + + * "git submodule" reports the paths of submodules the command + recurses into, but these paths were incorrectly reported when + the command was not run from the root level of the superproject. + + * The "user.useConfigOnly" configuration variable makes it an error + if users do not explicitly set user.name and user.email. However, + its check was not done early enough and allowed another error to + trigger, reporting that the default value we guessed from the + system setting was unusable. This was a suboptimal end-user + experience as we want the users to set user.name/user.email without + relying on the auto-detection at all. + + * "git mv old new" did not adjust the path for a submodule that lives + as a subdirectory inside old/ directory correctly. + + * "git replace -e" did not honour "core.editor" configuration. + + * "git push" from a corrupt repository that attempts to push a large + number of refs deadlocked; the thread to relay rejection notices + for these ref updates blocked on writing them to the main thread, + after the main thread at the receiving end notices that the push + failed and decides not to read these notices and return a failure. + + * mmap emulation on Windows has been optimized and work better without + consuming paging store when not needed. + + * A question by "git send-email" to ask the identity of the sender + has been updated. + + * UI consistency improvements for "git mergetool". + + * "git rebase -m" could be asked to rebase an entire branch starting + from the root, but failed by assuming that there always is a parent + commit to the first commit on the branch. + + * Fix a broken "p4 lfs" test. + + * Recent update to Git LFS broke "git p4" by changing the output from + its "lfs pointer" subcommand. + + * "git fetch" test t5510 was flaky while running a (forced) automagic + garbage collection. + + * Documentation updates to help contributors setting up Travis CI + test for their patches. + + * Some multi-byte encoding can have a backslash byte as a later part + of one letter, which would confuse "highlight" filter used in + gitweb. + + * "git commit-tree" plumbing command required the user to always sign + its result when the user sets the commit.gpgsign configuration + variable, which was an ancient mistake. Rework "git rebase" that + relied on this mistake so that it reads commit.gpgsign and pass (or + not pass) the -S option to "git commit-tree" to keep the end-user + expectation the same, while teaching "git commit-tree" to ignore + the configuration variable. This will stop requiring the users to + sign commit objects used internally as an implementation detail of + "git stash". + + * "http.cookieFile" configuration variable clearly wants a pathname, + but we forgot to treat it as such by e.g. applying tilde expansion. + + * Consolidate description of tilde-expansion that is done to + configuration variables that take pathname to a single place. + + * Correct faulty recommendation to use "git submodule deinit ." when + de-initialising all submodules, which would result in a strange + error message in a pathological corner case. + + * Many 'linkgit:<git documentation page>' references were broken, + which are all fixed with this. + + * "git rerere" can get confused by conflict markers deliberately left + by the inner merge step, because they are indistinguishable from + the real conflict markers left by the outermost merge which are + what the end user and "rerere" need to look at. This was fixed by + making the conflict markers left by the inner merges a bit longer. + (merge 0f9fd5c jc/ll-merge-internal later to maint). + + * CI test was taught to build documentation pages. + + * "git fsck" learned to catch NUL byte in a commit object as + potential error and warn. + + * Portability enhancement for "rebase -i" to help platforms whose + shell does not like "for i in <empty>" (which is not POSIX-kosher). + + * On Windows, .git and optionally any files whose name starts with a + dot are now marked as hidden, with a core.hideDotFiles knob to + customize this behaviour. + + * Documentation for "git merge --verify-signatures" has been updated + to clarify that the signature of only the commit at the tip is + verified. Also the phrasing used for signature and key validity is + adjusted to align with that used by OpenPGP. + + * A couple of bugs around core.autocrlf have been fixed. + + * Many commands normalize command line arguments from NFD to NFC + variant of UTF-8 on OSX, but commands in the "diff" family did + not, causing "git diff $path" to complain that no such path is + known to Git. They have been taught to do the normalization. + + * "git difftool" learned to handle unmerged paths correctly in + dir-diff mode. + + * The "are we talking with TTY, doing an interactive session?" + detection has been updated to work better for "Git for Windows". + + * We forgot to add "git log --decorate=auto" to documentation when we + added the feature back in v2.1.0 timeframe. + (merge 462cbb4 rj/log-decorate-auto later to maint). + + * "git fast-import --export-marks" would overwrite the existing marks + file even when it makes a dump from its custom die routine. + Prevent it from doing so when we have an import-marks file but + haven't finished reading it. + (merge f4beed6 fc/fast-import-broken-marks-file later to maint). + + * "git rebase -i", after it fails to auto-resolve the conflict, had + an unnecessary call to "git rerere" from its very early days, which + was spotted recently; the call has been removed. + (merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint). + + * Other minor clean-ups and documentation updates + (merge cd82b7a pa/cherry-pick-doc-typo later to maint). + (merge 2bb73ae rs/patch-id-use-skip-prefix later to maint). + (merge aa20cbc rs/apply-name-terminate later to maint). + (merge fe17fc0 jc/t2300-setup later to maint). + (merge e256eec jk/shell-portability later to maint). diff --git a/Documentation/RelNotes/2.9.1.txt b/Documentation/RelNotes/2.9.1.txt new file mode 100644 index 0000000..369383b --- /dev/null +++ b/Documentation/RelNotes/2.9.1.txt @@ -0,0 +1,62 @@ +Git v2.9.1 Release Notes +======================== + +Fixes since v2.9 +---------------- + + * When "git daemon" is run without --[init-]timeout specified, a + connection from a client that silently goes offline can hang around + for a long time, wasting resources. The socket-level KEEPALIVE has + been enabled to allow the OS to notice such failed connections. + + * The commands in `git log` family take %C(auto) in a custom format + string. This unconditionally turned the color on, ignoring + --no-color or with --color=auto when the output is not connected to + a tty; this was corrected to make the format truly behave as + "auto". + + * "git rev-list --count" whose walk-length is limited with "-n" + option did not work well with the counting optimized to look at the + bitmap index. + + * "git show -W" (extend hunks to cover the entire function, delimited + by lines that match the "funcname" pattern) used to show the entire + file when a change added an entire function at the end of the file, + which has been fixed. + + * The documentation set has been updated so that literal commands, + configuration variables and environment variables are consistently + typeset in fixed-width font and bold in manpages. + + * "git svn propset" subcommand that was added in 2.3 days is + documented now. + + * The documentation tries to consistently spell "GPG"; when + referring to the specific program name, "gpg" is used. + + * "git reflog" stopped upon seeing an entry that denotes a branch + creation event (aka "unborn"), which made it appear as if the + reflog was truncated. + + * The git-prompt scriptlet (in contrib/) was not friendly with those + who uses "set -u", which has been fixed. + + * A codepath that used alloca(3) to place an unbounded amount of data + on the stack has been updated to avoid doing so. + + * "git update-index --add --chmod=+x file" may be usable as an escape + hatch, but not a friendly thing to force for people who do need to + use it regularly. "git add --chmod=+x file" can be used instead. + + * Build improvements for gnome-keyring (in contrib/) + + * "git status" used to say "working directory" when it meant "working + tree". + + * Comments about misbehaving FreeBSD shells have been clarified with + the version number (9.x and before are broken, newer ones are OK). + + * "git cherry-pick A" worked on an unborn branch, but "git + cherry-pick A..B" didn't. + +Also contains minor documentation updates and code clean-ups. diff --git a/Documentation/config.txt b/Documentation/config.txt index b945d67..4f41840 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -353,9 +353,9 @@ core.quotePath:: core.eol:: Sets the line ending type to use in the working directory for - files that have the `text` property set. Alternatives are - 'lf', 'crlf' and 'native', which uses the platform's native - line ending. The default value is `native`. See + files that have the `text` property set when core.autocrlf is false. + Alternatives are 'lf', 'crlf' and 'native', which uses the platform's + native line ending. The default value is `native`. See linkgit:gitattributes[5] for more information on end-of-line conversion. @@ -434,7 +434,7 @@ core.gitProxy:: may be set multiple times and is matched in the given order; the first match wins. + -Can be overridden by the 'GIT_PROXY_COMMAND' environment variable +Can be overridden by the `GIT_PROXY_COMMAND` environment variable (which always applies universally, without the special "for" handling). + @@ -478,9 +478,9 @@ 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 + 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 + 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 the .git directory, which is either specified by --git-dir @@ -545,7 +545,7 @@ 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:: An integer -1..9, indicating the compression level for objects that @@ -619,9 +619,9 @@ core.excludesFile:: 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' + via the value of this variable. Can be overridden by the `GIT_ASKPASS` environment variable. If not set, fall back to the value of the - 'SSH_ASKPASS' environment variable or, failing that, a simple password + `SSH_ASKPASS` environment variable or, failing that, a simple password prompt. The external program shall be given a suitable prompt as command-line argument and write the password on its STDOUT. @@ -633,6 +633,23 @@ core.attributesFile:: `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/attributes` is used instead. +core.hooksPath:: + By default Git will look for your hooks in the + '$GIT_DIR/hooks' directory. Set this to different path, + e.g. '/etc/git/hooks', and Git will try to find your hooks in + that directory, e.g. '/etc/git/hooks/pre-receive' instead of + in '$GIT_DIR/hooks/pre-receive'. ++ +The path can be either absolute or relative. A relative path is +taken as relative to the directory where the hooks are run (see +the "DESCRIPTION" section of linkgit:githooks[5]). ++ +This configuration variable is useful in cases where you'd like to +centrally configure your Git hooks instead of configuring them on a +per-repository basis, or as a more flexible and centralized +alternative to having an `init.templateDir` where you've changed +default hooks. + core.editor:: Commands such as `commit` and `tag` that lets you edit messages by launching an editor uses the value of this @@ -747,7 +764,7 @@ core.notesRef:: notes should be printed. + This setting defaults to "refs/notes/commits", and it can be overridden by -the 'GIT_NOTES_REF' environment variable. See linkgit:git-notes[1]. +the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]. core.sparseCheckout:: Enable "sparse checkout" feature. See section "Sparse checkout" in @@ -783,7 +800,7 @@ it will be treated as a shell command. For example, defining "gitk --all --not ORIG_HEAD". Note that shell commands will be executed from the top-level directory of a repository, which may not necessarily be the current directory. -'GIT_PREFIX' is set as returned by running 'git rev-parse --show-prefix' +`GIT_PREFIX` is set as returned by running 'git rev-parse --show-prefix' from the original current directory. See linkgit:git-rev-parse[1]. am.keepcr:: @@ -1124,11 +1141,16 @@ commit.template:: Specify the pathname of a file to use as the template for new commit messages. +commit.verbose:: + A boolean or int to specify the level of verbose with `git commit`. + See linkgit:git-commit[1]. + credential.helper:: Specify an external helper to be called when a username or password credential is needed; the helper may consult external - storage to avoid prompting the user for the credentials. See - linkgit:gitcredentials[7] for details. + storage to avoid prompting the user for the credentials. Note + that multiple helpers may be defined. See linkgit:gitcredentials[7] + for details. credential.useHttpPath:: When acquiring credentials, consider the "path" component of an http @@ -1272,6 +1294,10 @@ format.outputDirectory:: Set a custom directory to store the resulting files instead of the current working directory. +format.useAutoBase:: + A boolean value which lets you enable the `--base=auto` option of + format-patch by default. + filter.<driver>.clean:: The command which is used to convert the content of a worktree file to a blob upon checkin. See linkgit:gitattributes[5] for @@ -1400,18 +1426,18 @@ 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:: - This is used if 'gitcvs.usecrlfattr' does not resolve + 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 mode '-kb'. This causes the client to treat them as binary files, which suppresses any newline munging it otherwise might do. Alternatively, if it is set to "guess", then the contents of the file are examined to decide if - it is binary, similar to 'core.autocrlf'. + it is binary, similar to `core.autocrlf`. gitcvs.dbName:: Database used by git-cvsserver to cache revision information @@ -1430,7 +1456,7 @@ gitcvs.dbDriver:: See linkgit:git-cvsserver[1]. gitcvs.dbUser, gitcvs.dbPass:: - Database user and password. Only useful if setting 'gitcvs.dbDriver', + 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 linkgit:git-cvsserver[1] for details). @@ -1442,8 +1468,8 @@ gitcvs.dbTableNamePrefix:: linkgit:git-cvsserver[1] for details). Any non-alphabetic characters will be replaced with underscores. -All gitcvs variables except for 'gitcvs.usecrlfattr' and -'gitcvs.allBinary' can also be specified as +All gitcvs variables except for `gitcvs.usecrlfattr` and +`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. @@ -1476,7 +1502,7 @@ grep.patternType:: grep.extendedRegexp:: If set to true, enable '--extended-regexp' option by default. This - option is ignored when the 'grep.patternType' option is set to a value + option is ignored when the `grep.patternType` option is set to a value other than 'default'. grep.threads:: @@ -1561,7 +1587,7 @@ guitool.<name>.cmd:: of the linkgit:git-gui[1] `Tools` menu is invoked. This option is mandatory for every tool. The command is executed from the root of the working directory, and in the environment it receives the name of - the tool as 'GIT_GUITOOL', the name of the currently selected file as + the tool as `GIT_GUITOOL`, the name of the currently selected file as 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is empty). @@ -1582,7 +1608,7 @@ guitool.<name>.confirm:: guitool.<name>.argPrompt:: Request a string argument from the user, and pass it to the tool - through the 'ARGS' environment variable. Since requesting an + through the `ARGS` environment variable. Since requesting an argument implies confirmation, the 'confirm' option has no effect if this is enabled. If the option is set to 'true', 'yes', or '1', the dialog uses a built-in generic prompt; otherwise the exact @@ -1590,7 +1616,7 @@ guitool.<name>.argPrompt:: guitool.<name>.revPrompt:: Request a single valid revision from the user, and set the - 'REVISION' environment variable. In other aspects this option + `REVISION` environment variable. In other aspects this option is similar to 'argPrompt', and can be used together with it. guitool.<name>.revUnmerged:: @@ -1646,7 +1672,7 @@ http.proxyAuthMethod:: only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. - Both can be overridden by the 'GIT_HTTP_PROXY_AUTHMETHOD' environment + Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are: + -- @@ -1668,6 +1694,12 @@ http.emptyAuth:: a username in the URL, as libcurl normally requires a username for authentication. +http.extraHeader:: + Pass an additional HTTP header when communicating with a server. If + more than one such entry exists, all of them are added as extra + headers. To allow overriding the settings inherited from the system + config, an empty value will reset the extra headers to the empty list. + http.cookieFile:: The pathname of a file containing previously stored cookie lines, which should be used @@ -1699,9 +1731,9 @@ http.sslVersion:: - tlsv1.2 + -Can be overridden by the 'GIT_SSL_VERSION' environment variable. +Can be overridden by the `GIT_SSL_VERSION` environment variable. To force git to use libcurl's default ssl version and ignore any -explicit http.sslversion option, set 'GIT_SSL_VERSION' to the +explicit http.sslversion option, set `GIT_SSL_VERSION` to the empty string. http.sslCipherList:: @@ -1712,41 +1744,41 @@ http.sslCipherList:: 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. +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 +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 - over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment + over HTTPS. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable. http.sslCert:: File containing the SSL certificate when fetching or pushing - over HTTPS. Can be overridden by the 'GIT_SSL_CERT' environment + over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable. http.sslKey:: File containing the SSL private key when fetching or pushing - over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment + over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable. http.sslCertPasswordProtected:: Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the - 'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable. + `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable. http.sslCAInfo:: File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the - 'GIT_SSL_CAINFO' environment variable. + `GIT_SSL_CAINFO` environment variable. http.sslCAPath:: Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden - by the 'GIT_SSL_CAPATH' environment variable. + by the `GIT_SSL_CAPATH` environment variable. http.pinnedpubkey:: Public key of the https service. It may either be the filename of @@ -1766,7 +1798,7 @@ http.sslTry:: http.maxRequests:: How many HTTP requests to launch in parallel. Can be overridden - by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5. + by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5. http.minSessions:: The number of curl sessions (counted across slots) to be kept across @@ -1785,13 +1817,13 @@ http.postBuffer:: http.lowSpeedLimit, http.lowSpeedTime:: If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. - Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and - 'GIT_HTTP_LOW_SPEED_TIME' environment variables. + Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and + `GIT_HTTP_LOW_SPEED_TIME` environment variables. http.noEPSV:: A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don't - support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV' + support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV). http.userAgent:: @@ -1801,7 +1833,7 @@ http.userAgent:: such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). - Can be overridden by the 'GIT_HTTP_USER_AGENT' environment variable. + Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable. http.<url>.*:: Any of the http.* options above can be applied selectively to some URLs. @@ -1901,6 +1933,14 @@ interactive.singleKey:: setting is silently ignored if portable keystroke input is not available; requires the Perl module Term::ReadKey. +interactive.diffFilter:: + When an interactive command (such as `git add --patch`) shows + a colorized diff, git will pipe the diff through the shell + command defined by this configuration variable. The command may + mark up the diff further for human consumption, provided that it + retains a one-to-one correspondence with the lines in the + original diff. Defaults to disabled (no filtering). + log.abbrevCommit:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may @@ -1916,7 +1956,10 @@ log.decorate:: command. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. - This is the same as the log commands '--decorate' option. + If 'auto' is specified, then if the output is going to a terminal, + the ref names are shown as if 'short' were given, otherwise no ref + names are shown. This is the same as the '--decorate' option + of the `git log`. log.follow:: If `true`, `git log` will act as if the `--follow` option was used when @@ -2587,7 +2630,7 @@ sendemail.identity:: A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is - the value of 'sendemail.identity'. + the value of `sendemail.identity`. sendemail.smtpEncryption:: See linkgit:git-send-email[1] for description. Note that this @@ -2604,7 +2647,7 @@ sendemail.<identity>.*:: Identity-specific versions of the 'sendemail.*' parameters found below, taking precedence over those when the this identity is selected, through command-line or - 'sendemail.identity'. + `sendemail.identity`. sendemail.aliasesFile:: sendemail.aliasFileType:: @@ -2634,7 +2677,7 @@ sendemail.xmailer:: See linkgit:git-send-email[1] for description. sendemail.signedoffcc (deprecated):: - Deprecated alias for 'sendemail.signedoffbycc'. + Deprecated alias for `sendemail.signedoffbycc`. showbranch.default:: The default set of branches for linkgit:git-show-branch[1]. @@ -2748,6 +2791,17 @@ submodule.<name>.ignore:: "--ignore-submodules" option. The 'git submodule' commands are not affected by this setting. +submodule.fetchJobs:: + Specifies how many submodules are fetched/cloned at the same time. + A positive integer allows up to that number of submodules fetched + in parallel. A value of 0 will give some reasonable default. + If unset, it defaults to 1. + +tag.forceSignAnnotated:: + A boolean to specify whether annotated tags created should be GPG signed. + If `--annotate` is specified on the command line, it takes + precedence over this option. + tag.sort:: This variable controls the sort ordering of tags when displayed by linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the @@ -2855,17 +2909,17 @@ url.<base>.pushInsteadOf:: user.email:: Your email address to be recorded in any newly created commits. - Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and - 'EMAIL' environment variables. See linkgit:git-commit-tree[1]. + Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and + `EMAIL` environment variables. See linkgit:git-commit-tree[1]. user.name:: Your full name to be recorded in any newly created commits. - Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' + Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` environment variables. See linkgit:git-commit-tree[1]. user.useConfigOnly:: - Instruct Git to avoid trying to guess defaults for 'user.email' - and 'user.name', and instead retrieve the values only from the + Instruct Git to avoid trying to guess defaults for `user.email` + and `user.name`, and instead retrieve the values only from the configuration. For example, if you have multiple email addresses and would like to use a different one for each repository, then with this configuration option set to `true` in the global config diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt index ccd1fc8..35e8da2 100644 --- a/Documentation/date-formats.txt +++ b/Documentation/date-formats.txt @@ -1,7 +1,7 @@ DATE FORMATS ------------ -The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables +The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables ifdef::git-commit[] and the `--date` option endif::git-commit[] diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 6eaa452..f1101c7 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -75,7 +75,7 @@ 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. @@ -108,9 +108,13 @@ diff.renameLimit:: detection; equivalent to the 'git diff' option '-l'. diff.renames:: - Tells Git to detect renames. If set to any boolean value, it - will enable basic rename detection. If set to "copies" or - "copy", it will detect copies, as well. + Whether and how Git detects renames. If set to "false", + rename detection is disabled. If set to "true", basic rename + detection is enabled. If set to "copies" or "copy", Git will + detect copies, as well. Defaults to true. Note that this + affects only 'git diff' Porcelain like linkgit:git-diff[1] and + linkgit:git-log[1], and not lower level commands such as + linkgit:git-diff-files[1]. diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space @@ -166,6 +170,11 @@ diff.tool:: include::mergetools-diff.txt[] +diff.compactionHeuristic:: + Set this option to `true` to enable an experimental heuristic that + shifts the hunk boundary in an attempt to make the resulting + patch easier to read. + diff.algorithm:: Choose a diff algorithm. The variants are as follows: + diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index bcf54da..c91afee 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -6,7 +6,7 @@ with a '-p' option, "git diff" without the '--raw' option, or "git log" with the "-p" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the -GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. +`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables. What the -p option produces is slightly different from the traditional diff format: diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 3cb3015..d9ae681 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -63,6 +63,13 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] +--compaction-heuristic:: +--no-compaction-heuristic:: + These are to help debugging and tuning an experimental + heuristic (which is off by default) that shifts the hunk + boundary in an attempt to make the resulting patch easier + to read. + --minimal:: Spend extra time to make sure the smallest possible diff is produced. diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 036edfb..b05a834 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -52,7 +52,7 @@ ifndef::git-pull[] -p:: --prune:: - After fetching, remove any remote-tracking references that no + Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt index c06efbd..e015f5b 100644 --- a/Documentation/git-bisect-lk2009.txt +++ b/Documentation/git-bisect-lk2009.txt @@ -366,7 +366,7 @@ skip" to do the same thing. (In fact the special exit code 125 makes Or if you want more control, you can inspect the current state using for example "git bisect visualize". It will launch gitk (or "git log" -if the DISPLAY environment variable is not set) to help you find a +if the `DISPLAY` environment variable is not set) to help you find a better bisection point. Either way, if you have a string of untestable commits, it might diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 7e79aae..d9f960b 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -205,7 +205,7 @@ $ git bisect visualize `view` may also be used as a synonym for `visualize`. -If the 'DISPLAY' environment variable is not set, 'git log' is used +If the `DISPLAY` environment variable is not set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`. diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 6154e57..c104a59 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -128,7 +128,7 @@ effect to your index in a row. --allow-empty-message:: By default, cherry-picking a commit with an empty message will fail. - This option overrides that behaviour, allowing commits with empty + This option overrides that behavior, allowing commits with empty messages to be cherry picked. --keep-redundant-commits:: diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index b7c467a..ec41d3d 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -14,8 +14,8 @@ SYNOPSIS [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>] [--dissociate] [--separate-git-dir <git dir>] [--depth <depth>] [--[no-]single-branch] - [--recursive | --recurse-submodules] [--] <repository> - [<directory>] + [--recursive | --recurse-submodules] [--[no-]shallow-submodules] + [--jobs <n>] [--] <repository> [<directory>] DESCRIPTION ----------- @@ -191,7 +191,8 @@ objects from the source repository into a pack in the cloned repository. Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the - tips of all branches. + tips of all branches. If you want to clone submodules shallowly, + also pass `--shallow-submodules`. --[no-]single-branch:: Clone only the history leading to the tip of a single branch, @@ -212,6 +213,9 @@ objects from the source repository into a pack in the cloned repository. repository does not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given) +--[no-]shallow-submodules:: + All submodules which are cloned will be shallow with a depth of 1. + --separate-git-dir=<git dir>:: Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, @@ -219,6 +223,10 @@ objects from the source repository into a pack in the cloned repository. The result is Git repository can be separated from working tree. +-j <n>:: +--jobs <n>:: + The number of submodules fetched at the same time. + Defaults to the `submodule.fetchJobs` option. <repository>:: The (possibly remote) repository to clone from. See the diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 48c33d7..cb69faa 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -61,8 +61,8 @@ OPTIONS stuck to the option without a space. --no-gpg-sign:: - Countermand `commit.gpgSign` configuration variable that is - set to force each and every commit to be signed. + Do not GPG-sign commit, to countermand a `--gpg-sign` option + given earlier on the command line. Commit Information diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 9ec6b3c..e704953 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -201,7 +201,7 @@ default:: Otherwise `whitespace`. -- + -The default can be changed by the 'commit.cleanup' configuration +The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1]). -e:: @@ -290,7 +290,8 @@ configuration variable documented in linkgit:git-config[1]. 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. + of the commit message. See the `commit.verbose` configuration + variable in linkgit:git-config[1]. + If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged @@ -449,8 +450,8 @@ include::i18n.txt[] ENVIRONMENT AND CONFIGURATION VARIABLES --------------------------------------- The editor used to edit the commit log message will be chosen from the -GIT_EDITOR environment variable, the core.editor configuration variable, the -VISUAL environment variable, or the EDITOR environment variable (in that +`GIT_EDITOR` environment variable, the core.editor configuration variable, the +`VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details. HOOKS diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 6843114..a89c304 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -269,7 +269,7 @@ and '--unset'. *'git config' will only ever change one file at a time*. You can override these rules either by command-line options or by environment variables. The '--global' and the '--system' options will limit the file used -to the global or system-wide file respectively. The GIT_CONFIG environment +to the global or system-wide file respectively. The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want. diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index a69b361..dc20275 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -188,7 +188,7 @@ Git configuration files in that directory are readable by `<user>`. arguments. The external command can decide to decline the service by exiting with a non-zero status (or to allow it by exiting with a zero status). It can also look at the $REMOTE_ADDR - and $REMOTE_PORT environment variables to learn about the + and `$REMOTE_PORT` environment variables to learn about the requestor when making this decision. + The external command can optionally write a single line to its diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 003731f..bd560d3 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -61,7 +61,7 @@ Filters The filters are applied in the order as listed below. The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). -Prior to that, the $GIT_COMMIT environment variable will be set to contain +Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 6821441..9624c84 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -58,7 +58,7 @@ output, unless the `--stdout` option is specified. If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path -can be set with the 'format.outputDirectory' configuration option. +can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. @@ -146,9 +146,9 @@ series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one. + -The default is `--no-thread`, unless the 'format.thread' configuration +The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the -style specified by 'format.thread' if any, or else `shallow`. +style specified by `format.thread` if any, or else `shallow`. + Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you @@ -265,6 +265,11 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`. Output an all-zero hash in each patch's From header instead of the hash of the commit. +--base=<commit>:: + Record the base tree information to identify the state the + patch series applies to. See the BASE TREE INFORMATION section + below for details. + --root:: Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a @@ -520,6 +525,61 @@ This should help you to submit patches inline using KMail. 5. Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send. +BASE TREE INFORMATION +--------------------- + +The base tree information block is used for maintainers or third party +testers to know the exact state the patch series applies to. It consists +of the 'base commit', which is a well-known commit that is part of the +stable part of the project history everybody else works off of, and zero +or more 'prerequisite patches', which are well-known patches in flight +that is not yet part of the 'base commit' that need to be applied on top +of 'base commit' in topological order before the patches can be applied. + +The 'base commit' is shown as "base-commit: " followed by the 40-hex of +the commit object name. A 'prerequisite patch' is shown as +"prerequisite-patch-id: " followed by the 40-hex 'patch id', which can +be obtained by passing the patch through the `git patch-id --stable` +command. + +Imagine that on top of the public commit P, you applied well-known +patches X, Y and Z from somebody else, and then built your three-patch +series A, B, C, the history would be like: + +................................................ +---P---X---Y---Z---A---B---C +................................................ + +With `git format-patch --base=P -3 C` (or variants thereof, e.g. with +`--cover-letter` of using `Z..C` instead of `-3 C` to specify the +range), the base tree information block is shown at the end of the +first message the command outputs (either the first patch, or the +cover letter), like this: + +------------ +base-commit: P +prerequisite-patch-id: X +prerequisite-patch-id: Y +prerequisite-patch-id: Z +------------ + +For non-linear topology, such as + +................................................ +---P---X---A---M---C + \ / + Y---Z---B +................................................ + +You can also use `git format-patch --base=P -3 C` to generate patches +for A, B and C, and the identifiers for P, X, Y, Z are appended at the +end of the first message. + +If set `--base=auto` in cmdline, it will track base commit automatically, +the base commit will be the merge base of tip commit of the remote-tracking +branch and revision-range specified in cmdline. +For a local branch, you need to track a remote branch by `git branch +--set-upstream-to` before using this option. EXAMPLES -------- diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index fa15104..bed60f4 100644 --- a/Documentation/git-gc.txt +++ b/Documentation/git-gc.txt @@ -82,13 +82,13 @@ automatic consolidation of packs. Configuration ------------- -The optional configuration variable 'gc.reflogExpire' can be +The optional configuration variable `gc.reflogExpire` can be set to indicate how long historical entries within each branch's reflog should remain available in this repository. The setting is expressed as a length of time, for example '90 days' or '3 months'. It defaults to '90 days'. -The optional configuration variable 'gc.reflogExpireUnreachable' +The optional configuration variable `gc.reflogExpireUnreachable` can be set to indicate how long historical reflog entries which are not part of the current branch should remain available in this repository. These types of entries are generally created as @@ -107,30 +107,30 @@ branches: 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. -The optional configuration variable 'gc.aggressiveWindow' controls how +The optional configuration variable `gc.aggressiveWindow` controls how much time is spent optimizing the delta compression of the objects in the repository when the --aggressive option is specified. The larger the value, the more time is spent optimizing the delta compression. See the documentation for the --window' option in linkgit:git-repack[1] for more details. This defaults to 250. -Similarly, the optional configuration variable 'gc.aggressiveDepth' +Similarly, the optional configuration variable `gc.aggressiveDepth` controls --depth option in linkgit:git-repack[1]. This defaults to 250. -The optional configuration variable 'gc.pruneExpire' controls how old +The optional configuration variable `gc.pruneExpire` controls how old the unreferenced loose objects have to be before they are pruned. The default is "2 weeks ago". diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index cb0f6cf..40cfe37 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -51,7 +51,7 @@ grep.patternType:: grep.extendedRegexp:: If set to true, enable '--extended-regexp' option by default. This - option is ignored when the 'grep.patternType' option is set to a value + option is ignored when the `grep.patternType` option is set to a value other than 'default'. grep.threads:: diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index 3956525..338b8d6 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -57,10 +57,10 @@ OPTIONS --man:: Display manual page for the command in the 'man' format. This option may be used to override a value set in the - 'help.format' configuration variable. + `help.format` configuration variable. + By default the 'man' program will be used to display the manual page, -but the 'man.viewer' configuration variable may be used to choose +but the `man.viewer` configuration variable may be used to choose other display programs (see below). -w:: @@ -69,7 +69,7 @@ other display programs (see below). format. A web browser will be used for that purpose. + The web browser can be specified using the configuration variable -'help.browser', or 'web.browser' if the former is not set. If none of +`help.browser`, or `web.browser` if the former is not set. If none of these config variables is set, the 'git web{litdd}browse' helper script (called by 'git help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for more information about this. @@ -80,7 +80,7 @@ CONFIGURATION VARIABLES help.format ~~~~~~~~~~~ -If no command-line option is passed, the 'help.format' configuration +If no command-line option is passed, the `help.format` configuration variable will be checked. The following values are supported for this variable; they make 'git help' behave as their corresponding command- line option: @@ -92,7 +92,7 @@ line option: help.browser, web.browser and browser.<tool>.path ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also +The `help.browser`, `web.browser` and `browser.<tool>.path` will also be checked if the 'web' format is chosen (either by command-line option or configuration variable). See '-w|--web' in the OPTIONS section above and linkgit:git-web{litdd}browse[1]. @@ -100,7 +100,7 @@ section above and linkgit:git-web{litdd}browse[1]. man.viewer ~~~~~~~~~~ -The 'man.viewer' configuration variable will be checked if the 'man' +The `man.viewer` configuration variable will be checked if the 'man' format is chosen. The following values are currently supported: * "man": use the 'man' program as usual, @@ -110,9 +110,9 @@ format is chosen. The following values are currently supported: tab (see 'Note about konqueror' below). Values for other tools can be used if there is a corresponding -'man.<tool>.cmd' configuration entry (see below). +`man.<tool>.cmd` configuration entry (see below). -Multiple values may be given to the 'man.viewer' configuration +Multiple values may be given to the `man.viewer` configuration variable. Their corresponding programs will be tried in the order listed in the configuration file. @@ -128,14 +128,14 @@ will try to use konqueror first. But this may fail (for example, if DISPLAY is not set) and in that case emacs' woman mode will be tried. If everything fails, or if no viewer is configured, the viewer specified -in the GIT_MAN_VIEWER environment variable will be tried. If that +in the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too, the 'man' program will be tried anyway. man.<tool>.path ~~~~~~~~~~~~~~~ You can explicitly provide a full path to your preferred man viewer by -setting the configuration variable 'man.<tool>.path'. For example, you +setting the configuration variable `man.<tool>.path`. For example, you can configure the absolute path to konqueror by setting 'man.konqueror.path'. Otherwise, 'git help' assumes the tool is available in PATH. @@ -143,9 +143,9 @@ available in PATH. man.<tool>.cmd ~~~~~~~~~~~~~~ -When the man viewer, specified by the 'man.viewer' configuration +When the man viewer, specified by the `man.viewer` configuration variables, is not among the supported ones, then the corresponding -'man.<tool>.cmd' configuration variable will be looked up. If this +`man.<tool>.cmd` configuration variable will be looked up. If this variable exists then the specified tool will be treated as a custom command and a shell eval will be used to run the command with the man page passed as arguments. @@ -153,7 +153,7 @@ page passed as arguments. Note about konqueror ~~~~~~~~~~~~~~~~~~~~ -When 'konqueror' is specified in the 'man.viewer' configuration +When 'konqueror' is specified in the `man.viewer` configuration variable, we launch 'kfmclient' to try to open the man page on an already opened konqueror in a new tab if possible. diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt index 9268fb6..bb0db19 100644 --- a/Documentation/git-http-backend.txt +++ b/Documentation/git-http-backend.txt @@ -21,7 +21,7 @@ pushing using the smart HTTP protocol. It verifies that the directory has the magic file "git-daemon-export-ok", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the -GIT_HTTP_EXPORT_ALL environmental variable is set). +`GIT_HTTP_EXPORT_ALL` environmental variable is set). By default, only the `upload-pack` service is enabled, which serves 'git fetch-pack' and 'git ls-remote' clients, which are invoked from @@ -241,7 +241,7 @@ $HTTP["url"] =~ "^/git/private" { ENVIRONMENT ----------- -'git http-backend' relies upon the CGI environment variables set +'git http-backend' relies upon the `CGI` environment variables set by the invoking web server, including: * PATH_INFO (if GIT_PROJECT_ROOT is set, otherwise PATH_TRANSLATED) @@ -251,7 +251,7 @@ by the invoking web server, including: * QUERY_STRING * REQUEST_METHOD -The GIT_HTTP_EXPORT_ALL environmental variable may be passed to +The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to 'git-http-backend' to bypass the check for the "git-daemon-export-ok" file in each repository before allowing export of that repository. @@ -269,7 +269,7 @@ GIT_COMMITTER_EMAIL to '$\{REMOTE_USER}@http.$\{REMOTE_ADDR\}', ensuring that any reflogs created by 'git-receive-pack' contain some identifying information of the remote user who performed the push. -All CGI environment variables are available to each of the hooks +All `CGI` environment variables are available to each of the hooks invoked by the 'git-receive-pack'. GIT diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 8174d27..9d27197 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -47,7 +47,7 @@ Only print error and warning messages; all other output will be suppressed. --bare:: -Create a bare repository. If GIT_DIR environment is not set, it is set to the +Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory. --template=<template_directory>:: @@ -130,7 +130,12 @@ The template directory will be one of the following (in order): - the default template directory: `/usr/share/git-core/templates`. The default template directory includes some directory structure, suggested -"exclude patterns" (see linkgit:gitignore[5]), and sample hook files (see linkgit:githooks[5]). +"exclude patterns" (see linkgit:gitignore[5]), and sample hook files. + +The sample hooks are all disabled by default, To enable one of the +sample hooks rename it by removing its `.sample` suffix. + +See linkgit:githooks[5] for more general info on hook execution. EXAMPLES -------- diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt index cc75b25..e8ecdbf 100644 --- a/Documentation/git-instaweb.txt +++ b/Documentation/git-instaweb.txt @@ -80,8 +80,8 @@ You may specify configuration in your .git/config ----------------------------------------------------------------------- -If the configuration variable 'instaweb.browser' is not set, -'web.browser' will be used instead if it is defined. See +If the configuration variable `instaweb.browser` is not set, +`web.browser` will be used instead if it is defined. See linkgit:git-web{litdd}browse[1] for more information about this. SEE ALSO diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 03f9580..4a6c47f 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -29,12 +29,14 @@ OPTIONS (works only for a single file). --no-decorate:: ---decorate[=short|full|no]:: +--decorate[=short|full|auto|no]:: Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the - full ref name (including prefix) will be printed. The default option - is 'short'. + full ref name (including prefix) will be printed. If 'auto' is + specified, then if the output is going to a terminal, the ref names + are shown as if 'short' were given, otherwise no ref names are + shown. The default option is 'short'. --source:: Print out the ref name given on the command line by which each @@ -201,7 +203,7 @@ mailmap.*:: notes.displayRef:: Which refs, in addition to the default set by `core.notesRef` - or 'GIT_NOTES_REF', to read notes from when showing commit + or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands. See linkgit:git-notes[1]. + @@ -210,7 +212,7 @@ multiple times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored. + This setting can be disabled by the `--no-notes` option, -overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable, +overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--notes=<ref>` option. GIT diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 07f7295..b758d55 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -11,6 +11,7 @@ SYNOPSIS [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] + [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] 'git merge' <msg> HEAD <commit>... 'git merge' --abort diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 9c4fd68..02a10bc 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt @@ -161,7 +161,7 @@ OPTIONS --ref <ref>:: Manipulate the notes tree in <ref>. This overrides - 'GIT_NOTES_REF' and the "core.notesRef" configuration. The ref + `GIT_NOTES_REF` and the "core.notesRef" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref. @@ -333,10 +333,10 @@ notes.<name>.mergeStrategy:: notes.displayRef:: Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or - 'GIT_NOTES_REF', to read notes from when showing commit + `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the - 'GIT_NOTES_DISPLAY_REF' environment variable. + `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]. notes.rewrite.<command>:: @@ -345,7 +345,7 @@ notes.rewrite.<command>:: notes from the original to the rewritten commit. Defaults to `true`. See also "`notes.rewriteRef`" below. + -This setting can be overridden by the 'GIT_NOTES_REWRITE_REF' +This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable. notes.rewriteMode:: @@ -366,33 +366,33 @@ notes.rewriteRef:: Does not have a default value; you must configure this variable to enable note rewriting. + -Can be overridden with the 'GIT_NOTES_REWRITE_REF' environment variable. +Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable. ENVIRONMENT ----------- -'GIT_NOTES_REF':: +`GIT_NOTES_REF`:: Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting. -'GIT_NOTES_DISPLAY_REF':: +`GIT_NOTES_DISPLAY_REF`:: Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or - 'GIT_NOTES_REF', to read notes from when showing commit + `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting. + A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored. -'GIT_NOTES_REWRITE_MODE':: +`GIT_NOTES_REWRITE_MODE`:: When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting. -'GIT_NOTES_REWRITE_REF':: +`GIT_NOTES_REWRITE_REF`:: When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs. diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 35e3170..9d4f151 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -134,7 +134,7 @@ Submit ~~~~~~ Submitting changes from a Git repository back to the p4 repository requires a separate p4 client workspace. This should be specified -using the 'P4CLIENT' environment variable or the Git configuration +using the `P4CLIENT` environment variable or the Git configuration variable 'git-p4.client'. The p4 client must exist, but the client root will be created and populated if it does not already exist. @@ -166,7 +166,7 @@ General options All commands except clone accept these options. --git-dir <dir>:: - Set the 'GIT_DIR' environment variable. See linkgit:git[1]. + Set the `GIT_DIR` environment variable. See linkgit:git[1]. -v:: --verbose:: @@ -551,6 +551,17 @@ git-p4.keepEmptyCommits:: A changelist that contains only excluded files will be imported as an empty commit if this boolean option is set to true. +git-p4.mapUser:: + Map a P4 user to a name and email address in Git. Use a string + with the following format to create a mapping: ++ +------------- +git config --add git-p4.mapUser "p4user = First Last <mail@address.com>" +------------- ++ +A mapping will override any user information from P4. Mappings for +multiple P4 user can be defined. + Submit variables ~~~~~~~~~~~~~~~~ git-p4.detectRenames:: diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index a62a2a6..d033b25 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -128,6 +128,15 @@ unless you have read linkgit:git-rebase[1] carefully. --no-rebase:: Override earlier --rebase. +--autostash:: +--no-autostash:: + Before starting rebase, stash local modifications away (see + linkgit:git-stash[1]) if needed, and apply the stash when + done. `--no-autostash` is useful to override the `rebase.autoStash` + configuration variable (see linkgit:git-config[1]). ++ +This option is only valid when "--rebase" is used. + Options related to fetching ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index cf6ee4a..19f46b6 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -137,8 +137,8 @@ already exists on the remote side. 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. This can also be specified - with configuration variable 'push.followTags'. For more - information, see 'push.followTags' in linkgit:git-config[1]. + with configuration variable `push.followTags`. For more + information, see `push.followTags` in linkgit:git-config[1]. --[no-]signed:: --sign=(true|false|if-asked):: @@ -240,7 +240,7 @@ origin +master` to force a push to the `master` branch). See the For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, - see 'branch.<name>.merge' in linkgit:git-config[1]. + see `branch.<name>.merge` in linkgit:git-config[1]. --[no-]thin:: These options are passed to linkgit:git-send-pack[1]. A thin transfer diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt index ff633b0..8cf952b 100644 --- a/Documentation/git-quiltimport.txt +++ b/Documentation/git-quiltimport.txt @@ -46,14 +46,14 @@ OPTIONS The directory to find the quilt patches. + The default for the patch directory is patches -or the value of the $QUILT_PATCHES environment +or the value of the `$QUILT_PATCHES` environment variable. --series <file>:: The quilt series file. + The default for the series file is <patches>/series -or the value of the $QUILT_SERIES environment +or the value of the `$QUILT_SERIES` environment variable. GIT diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6ed610a..0387b40 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -391,9 +391,6 @@ idea unless you know what you are doing (see BUGS below). final history. <cmd> will be interpreted as one or more shell commands. + -This option can only be used with the `--interactive` option -(see INTERACTIVE MODE below). -+ You may execute several commands by either using one instance of `--exec` with several commands: + @@ -406,6 +403,9 @@ or by giving more than one `--exec`: If `--autosquash` is used, "exec" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series. ++ +This uses the `--interactive` machinery internally, but it can be run +without an explicit `--interactive`. --root:: Rebase all commits reachable from <branch>, instead of diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 8fff598..e5c57ae 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -51,7 +51,7 @@ $ git cat-file commit foo shows information about commit 'bar'. -The 'GIT_NO_REPLACE_OBJECTS' environment variable can be set to +The `GIT_NO_REPLACE_OBJECTS` environment variable can be set to achieve the same effect as the `--no-replace-objects` option. OPTIONS diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 771a7b5..d0b38b4 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -47,18 +47,18 @@ 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'. + of `sendemail.annotate`. See the CONFIGURATION section for + `sendemail.multiEdit`. --bcc=<address>,...:: Specify a "Bcc:" value for each email. Default is the value of - 'sendemail.bcc'. + `sendemail.bcc`. + This option may be specified multiple times. --cc=<address>,...:: Specify a starting "Cc:" value for each email. - Default is the value of 'sendemail.cc'. + Default is the value of `sendemail.cc`. + This option may be specified multiple times. @@ -74,12 +74,12 @@ 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, - the value of the 'sendemail.from' configuration option is used. If - neither the command-line option nor 'sendemail.from' are set, then the + the value of the `sendemail.from` configuration option is used. If + neither the command-line option nor `sendemail.from` are set, then the user will be prompted for the value. The default for the prompt will be the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by "git var -l". @@ -114,7 +114,7 @@ is not set, this will be prompted for. --to=<address>,...:: Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. Default is the - value of the 'sendemail.to' configuration value; if that is unspecified, + value of the `sendemail.to` configuration value; if that is unspecified, and --to-cmd is not specified, this will be prompted for. + This option may be specified multiple times. @@ -138,7 +138,7 @@ Note that no attempts whatsoever are made to validate the encoding. can be useful when the repository contains files that contain carriage returns, but makes the raw patch email file (as saved from a MUA) much harder to inspect manually. base64 is even more fool proof, but also - even more opaque. Default is the value of the 'sendemail.transferEncoding' + even more opaque. Default is the value of the `sendemail.transferEncoding` configuration value; if that is unspecified, git will use 8bit and not add a Content-Transfer-Encoding header. @@ -157,20 +157,20 @@ 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-auth=<mechanisms>:: Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting @@ -188,13 +188,13 @@ is specified, all mechanisms supported by the SASL library can be used. --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>:: @@ -202,7 +202,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. @@ -213,11 +213,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 @@ -234,13 +234,13 @@ must be used for each option. certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the - 'sendemail.smtpsslcertpath' configuration variable, if set, or the + `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should 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:: @@ -261,25 +261,25 @@ 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>:: A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is - the value of 'sendemail.identity'. + the value of `sendemail.identity`. --[no-]signed-off-by-cc:: If this is set, add emails found in Signed-off-by: or Cc: lines to the - cc list. Default is the value of 'sendemail.signedoffbycc' configuration + cc list. Default is the value of `sendemail.signedoffbycc` configuration value; if that is unspecified, default to --signed-off-by-cc. --[no-]cc-cover:: @@ -312,13 +312,13 @@ Automating - 'all' will suppress all auto cc values. -- + -Default is the value of 'sendemail.suppresscc' configuration value; if +Default is the value of `sendemail.suppresscc` configuration value; if that is unspecified, default to 'self' if --suppress-from is 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:: @@ -330,7 +330,7 @@ specified, as well as 'body' if --no-signed-off-cc is specified. + If disabled with "--no-thread", those headers will not be added (unless specified with --in-reply-to). Default is the value of the -'sendemail.thread' configuration value; if that is unspecified, +`sendemail.thread` configuration value; if that is unspecified, default to --thread. + It is up to the user to ensure that no In-Reply-To header already @@ -355,7 +355,7 @@ Administering - 'auto' is equivalent to 'cc' + 'compose' -- + -Default is the value of 'sendemail.confirm' configuration value; if that +Default is the value of `sendemail.confirm` configuration value; if that is unspecified, default to 'auto' unless any of the suppress options have been specified, in which case default to 'compose'. @@ -381,7 +381,7 @@ have been specified, in which case default to 'compose'. is due to SMTP limits as described by http://www.ietf.org/rfc/rfc2821.txt. -- + -Default is the value of 'sendemail.validate'; if this is not set, +Default is the value of `sendemail.validate`; if this is not set, default to '--validate'. --force:: @@ -403,7 +403,7 @@ CONFIGURATION 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 @@ -450,6 +450,19 @@ edit ~/.gitconfig to specify your account settings: smtpUser = yourname@gmail.com smtpServerPort = 587 +If you have multifactor authentication setup on your gmail account, you will +need to generate an app-specific password for use with 'git send-email'. Visit +https://security.google.com/settings/security/apppasswords to setup an +app-specific password. Once setup, you can store it with the credentials +helper: + + $ git credential fill + protocol=smtp + host=smtp.gmail.com + username=youname@gmail.com + password=app-password + + Once your commits are ready to be sent to the mailing list, run the following commands: diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt index 4f67c4c..8632612 100644 --- a/Documentation/git-sh-setup.txt +++ b/Documentation/git-sh-setup.txt @@ -41,7 +41,7 @@ usage:: die with the usage message. set_reflog_action:: - Set GIT_REFLOG_ACTION environment to a given string (typically + Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of the program) unless it is already set. Whenever the script runs a `git` command that updates refs, a reflog entry is created using the value of this string to leave the diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index ad85183..9226c43 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -16,7 +16,7 @@ SYNOPSIS 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...) 'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--rebase|--merge] [--reference <repository>] - [--depth <depth>] [--recursive] [--] [<path>...] + [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...] 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...] 'git submodule' [--quiet] foreach [--recursive] <command> @@ -384,6 +384,11 @@ for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully. clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1] +-j <n>:: +--jobs <n>:: + This option is only valid for the update command. + Clone new submodules in parallel with as many jobs. + Defaults to the `submodule.fetchJobs` option. <path>...:: Paths to submodule(s). When specified this will restrict the command diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index fb23a98..698a668 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -459,6 +459,20 @@ Any other arguments are passed directly to 'git log' Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision. +'propset':: + Sets the Subversion property given as the first argument, to the + value given as the second argument for the file given as the + third argument. ++ +Example: ++ +------------------------------------------------------------------------ +git svn propset svn:keywords "FreeBSD=%H" devel/py-tipper/Makefile +------------------------------------------------------------------------ ++ +This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file +'devel/py-tipper/Makefile'. + 'show-externals':: Shows the Subversion externals. Use -r/--revision to specify a specific revision. @@ -748,7 +762,7 @@ svn-remote.<name>.rewriteUUID:: svn-remote.<name>.pushurl:: - Similar to Git's 'remote.<name>.pushurl', this key is designed + Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in cases where 'url' points to an SVN repository via a read-only transport, to provide an alternate read/write transport. It is assumed that both keys point to the same diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index abab481..6b89393 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -78,7 +78,7 @@ OPTIONS -v:: --verify:: - Verify the gpg signature of the given tag names. + Verify the GPG signature of the given tag names. -n<num>:: <num> specifies how many lines from the annotation, if any, @@ -104,7 +104,7 @@ OPTIONS order can also be affected by the "versionsort.prereleaseSuffix" configuration variable. The keys supported are the same as those in `git for-each-ref`. - Sort order defaults to the value configured for the 'tag.sort' + Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]. diff --git a/Documentation/git-verify-commit.txt b/Documentation/git-verify-commit.txt index ecf4da1..92097f6 100644 --- a/Documentation/git-verify-commit.txt +++ b/Documentation/git-verify-commit.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -Validates the gpg signature created by 'git commit -S'. +Validates the GPG signature created by 'git commit -S'. OPTIONS ------- diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt index 16ede5b..7daa28f 100644 --- a/Documentation/git-web--browse.txt +++ b/Documentation/git-web--browse.txt @@ -62,14 +62,14 @@ CONF.VAR (from -c option) and web.browser ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The web browser can be specified using a configuration variable passed -with the -c (or --config) command-line option, or the 'web.browser' +with the -c (or --config) command-line option, or the `web.browser` configuration variable if the former is not used. browser.<tool>.path ~~~~~~~~~~~~~~~~~~~ You can explicitly provide a full path to your preferred browser by -setting the configuration variable 'browser.<tool>.path'. For example, +setting the configuration variable `browser.<tool>.path`. For example, you can configure the absolute path to firefox by setting 'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool is available in PATH. @@ -79,7 +79,7 @@ browser.<tool>.cmd When the browser, specified by options or configuration variables, is not among the supported ones, then the corresponding -'browser.<tool>.cmd' configuration variable will be looked up. If this +`browser.<tool>.cmd` configuration variable will be looked up. If this variable exists then 'git web{litdd}browse' will treat the specified tool as a custom command and will use a shell eval to run the command with the URLs passed as arguments. diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 62c76c1..c622345 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -9,7 +9,7 @@ git-worktree - Manage multiple working trees SYNOPSIS -------- [verse] -'git worktree add' [-f] [--detach] [-b <new-branch>] <path> [<branch>] +'git worktree add' [-f] [--detach] [--checkout] [-b <new-branch>] <path> [<branch>] 'git worktree prune' [-n] [-v] [--expire <expire>] 'git worktree list' [--porcelain] @@ -87,6 +87,12 @@ OPTIONS With `add`, detach HEAD in the new working tree. See "DETACHED HEAD" in linkgit:git-checkout[1]. +--[no-]checkout:: + By default, `add` checks out `<branch>`, however, `--no-checkout` can + be used to suppress checkout in order to make customizations, + such as configuring sparse-checkout. See "Sparse checkout" + in linkgit:git-read-tree[1]. + -n:: --dry-run:: With `prune`, do not remove anything; just report what it would diff --git a/Documentation/git.txt b/Documentation/git.txt index dd6dbf7..494115a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -31,8 +31,8 @@ page to learn what commands Git offers. You can learn more about individual Git commands with "git help command". linkgit:gitcli[7] manual page gives you an overview of the command-line command syntax. -Formatted and hyperlinked version of the latest Git documentation -can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`. +A formatted and hyperlinked copy of the latest Git documentation +can be viewed at `https://git.github.io/htmldocs/git.html`. ifdef::stalenotes[] [NOTE] @@ -43,9 +43,15 @@ 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.8.3/git.html[documentation for release 2.8.3] +* link:v2.9.0/git.html[documentation for release 2.9] * release notes for + link:RelNotes/2.9.0.txt[2.9]. + +* link:v2.8.4/git.html[documentation for release 2.8.4] + +* release notes for + link:RelNotes/2.8.4.txt[2.8.4], link:RelNotes/2.8.3.txt[2.8.3], link:RelNotes/2.8.2.txt[2.8.2], link:RelNotes/2.8.1.txt[2.8.1], @@ -571,7 +577,7 @@ foo.bar= ...`) sets `foo.bar` to the empty string. --git-dir=<path>:: Set the path to the repository. This can also be controlled by - setting the GIT_DIR environment variable. It can be an absolute + setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory. --work-tree=<path>:: @@ -821,46 +827,46 @@ These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end. -'GIT_INDEX_FILE':: +`GIT_INDEX_FILE`:: This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used. -'GIT_INDEX_VERSION':: +`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 2 or 3 is used. See linkgit:git-update-index[1] for more information. -'GIT_OBJECT_DIRECTORY':: +`GIT_OBJECT_DIRECTORY`:: If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used. -'GIT_ALTERNATE_OBJECT_DIRECTORIES':: +`GIT_ALTERNATE_OBJECT_DIRECTORIES`:: Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a ":" separated (on Windows ";" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories. -'GIT_DIR':: - If the 'GIT_DIR' environment variable is set then it +`GIT_DIR`:: + If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The '--git-dir' command-line option also sets this value. -'GIT_WORK_TREE':: +`GIT_WORK_TREE`:: Set the path to the root of the working tree. This can also be controlled by the '--work-tree' command-line option and the core.worktree configuration variable. -'GIT_NAMESPACE':: +`GIT_NAMESPACE`:: Set the Git namespace; see linkgit:gitnamespaces[7] for details. The '--namespace' command-line option also sets this value. -'GIT_CEILING_DIRECTORIES':: +`GIT_CEILING_DIRECTORIES`:: This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for @@ -873,19 +879,19 @@ Git so take care if using a foreign front-end. can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., - 'GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink'. + `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`. -'GIT_DISCOVERY_ACROSS_FILESYSTEM':: +`GIT_DISCOVERY_ACROSS_FILESYSTEM`:: When run in a directory that does not have ".git" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem - boundaries. Like 'GIT_CEILING_DIRECTORIES', this will not affect - an explicit repository directory set via 'GIT_DIR' or on the + boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect + an explicit repository directory set via `GIT_DIR` or on the command line. -'GIT_COMMON_DIR':: +`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 @@ -896,28 +902,28 @@ Git so take care if using a foreign front-end. Git Commits ~~~~~~~~~~~ -'GIT_AUTHOR_NAME':: -'GIT_AUTHOR_EMAIL':: -'GIT_AUTHOR_DATE':: -'GIT_COMMITTER_NAME':: -'GIT_COMMITTER_EMAIL':: -'GIT_COMMITTER_DATE':: +`GIT_AUTHOR_NAME`:: +`GIT_AUTHOR_EMAIL`:: +`GIT_AUTHOR_DATE`:: +`GIT_COMMITTER_NAME`:: +`GIT_COMMITTER_EMAIL`:: +`GIT_COMMITTER_DATE`:: 'EMAIL':: see linkgit:git-commit-tree[1] Git Diffs ~~~~~~~~~ -'GIT_DIFF_OPTS':: +`GIT_DIFF_OPTS`:: Only valid setting is "--unified=??" or "-u??" to set the number of context lines shown when a unified diff is created. This takes precedence over any "-U" or "--unified" option value passed on the Git diff command line. -'GIT_EXTERNAL_DIFF':: - When the environment variable 'GIT_EXTERNAL_DIFF' is set, the +`GIT_EXTERNAL_DIFF`:: + When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, - 'GIT_EXTERNAL_DIFF' is called with 7 parameters: + `GIT_EXTERNAL_DIFF` is called with 7 parameters: path old-file old-hex old-mode new-file new-hex new-mode + @@ -931,42 +937,42 @@ where: The file parameters can point at the user's working file (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the -index). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the -temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits. +index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the +temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits. + -For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 +For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>. + -For each path 'GIT_EXTERNAL_DIFF' is called, two environment variables, -'GIT_DIFF_PATH_COUNTER' and 'GIT_DIFF_PATH_TOTAL' are set. +For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, +`GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set. -'GIT_DIFF_PATH_COUNTER':: +`GIT_DIFF_PATH_COUNTER`:: A 1-based counter incremented by one for every path. -'GIT_DIFF_PATH_TOTAL':: +`GIT_DIFF_PATH_TOTAL`:: The total number of paths. other ~~~~~ -'GIT_MERGE_VERBOSITY':: +`GIT_MERGE_VERBOSITY`:: A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1] -'GIT_PAGER':: +`GIT_PAGER`:: This environment variable overrides `$PAGER`. If it is set to an empty string or to the value "cat", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]. -'GIT_EDITOR':: +`GIT_EDITOR`:: This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]. -'GIT_SSH':: -'GIT_SSH_COMMAND':: +`GIT_SSH`:: +`GIT_SSH_COMMAND`:: If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. @@ -986,18 +992,18 @@ Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details. -'GIT_ASKPASS':: +`GIT_ASKPASS`:: 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':: +`GIT_TERMINAL_PROMPT`:: If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication). -'GIT_CONFIG_NOSYSTEM':: +`GIT_CONFIG_NOSYSTEM`:: Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a @@ -1005,7 +1011,7 @@ for further details. temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it. -'GIT_FLUSH':: +`GIT_FLUSH`:: If this environment variable is set to "1", then commands such as 'git blame' (in incremental mode), 'git rev-list', 'git log', 'git check-attr' and 'git check-ignore' will @@ -1016,7 +1022,7 @@ for further details. not set, Git will choose buffered or record-oriented flushing based on whether stdout appears to be redirected to a file or not. -'GIT_TRACE':: +`GIT_TRACE`:: Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution. + @@ -1037,21 +1043,21 @@ into it. Unsetting the variable, or setting it to empty, "0" or "false" (case insensitive) disables trace messages. -'GIT_TRACE_PACK_ACCESS':: +`GIT_TRACE_PACK_ACCESS`:: Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. - See 'GIT_TRACE' for available trace output options. + See `GIT_TRACE` for available trace output options. -'GIT_TRACE_PACKET':: +`GIT_TRACE_PACKET`:: Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet - starting with "PACK" (but see 'GIT_TRACE_PACKFILE' below). - See 'GIT_TRACE' for available trace output options. + starting with "PACK" (but see `GIT_TRACE_PACKFILE` below). + See `GIT_TRACE` for available trace output options. -'GIT_TRACE_PACKFILE':: +`GIT_TRACE_PACKFILE`:: Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost @@ -1062,22 +1068,22 @@ Unsetting the variable, or setting it to empty, "0" or Note that this is currently only implemented for the client side of clones and fetches. -'GIT_TRACE_PERFORMANCE':: +`GIT_TRACE_PERFORMANCE`:: Enables performance related trace messages, e.g. total execution time of each Git command. - See 'GIT_TRACE' for available trace output options. + See `GIT_TRACE` for available trace output options. -'GIT_TRACE_SETUP':: +`GIT_TRACE_SETUP`:: Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. - See 'GIT_TRACE' for available trace output options. + See `GIT_TRACE` for available trace output options. -'GIT_TRACE_SHALLOW':: +`GIT_TRACE_SHALLOW`:: Enables trace messages that can help debugging fetching / cloning of shallow repositories. - See 'GIT_TRACE' for available trace output options. + See `GIT_TRACE` for available trace output options. -'GIT_LITERAL_PATHSPECS':: +`GIT_LITERAL_PATHSPECS`:: Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search @@ -1086,19 +1092,19 @@ of clones and fetches. literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc). -'GIT_GLOB_PATHSPECS':: +`GIT_GLOB_PATHSPECS`:: Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka "glob" magic). -'GIT_NOGLOB_PATHSPECS':: +`GIT_NOGLOB_PATHSPECS`:: Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka "literal" magic). -'GIT_ICASE_PATHSPECS':: +`GIT_ICASE_PATHSPECS`:: Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive. -'GIT_REFLOG_ACTION':: +`GIT_REFLOG_ACTION`:: When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated @@ -1108,7 +1114,7 @@ of clones and fetches. 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':: +`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 @@ -1119,7 +1125,7 @@ of clones and fetches. an operation has touched every ref (e.g., because you are cloning a repository to make a backup). -'GIT_ALLOW_PROTOCOL':: +`GIT_ALLOW_PROTOCOL`:: If set, provide a colon-separated list of protocols which are allowed to be used with fetch/push/clone. This is useful to restrict recursive submodule initialization from an untrusted diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt index 1c75be0..f3a75d1 100644 --- a/Documentation/gitcredentials.txt +++ b/Documentation/gitcredentials.txt @@ -106,6 +106,11 @@ variable, each helper will be tried in turn, and may provide a username, password, or nothing. Once Git has acquired both a username and a password, no more helpers will be tried. +If `credential.helper` is configured to the empty string, this resets +the helper list to empty (so you may override a helper set by a +lower-priority config file by configuring the empty-string helper, +followed by whatever set of helpers you would like). + CREDENTIAL CONTEXTS ------------------- diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index a2f59b1..d82e912 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -7,24 +7,35 @@ githooks - Hooks used by Git SYNOPSIS -------- -$GIT_DIR/hooks/* +$GIT_DIR/hooks/* (or \`git config core.hooksPath`/*) DESCRIPTION ----------- -Hooks are little scripts you can place in `$GIT_DIR/hooks` -directory to trigger action at certain points. When -'git init' is run, a handful of example hooks are copied into the -`hooks` directory of the new repository, but by default they are -all disabled. To enable a hook, rename it by removing its `.sample` -suffix. +Hooks are programs you can place in a hooks directory to trigger +actions at certain points in git's execution. Hooks that don't have +the executable bit set are ignored. -NOTE: It is also a requirement for a given hook to be executable. -However - in a freshly initialized repository - the `.sample` files are -executable by default. +By default the hooks directory is `$GIT_DIR/hooks`, but that can be +changed via the `core.hooksPath` configuration variable (see +linkgit:git-config[1]). -This document describes the currently defined hooks. +Before Git invokes a hook, it changes its working directory to either +the root of the working tree in a non-bare repository, or to the +$GIT_DIR in a bare repository. + +Hooks can get their arguments via the environment, command-line +arguments, and stdin. See the documentation for each hook below for +details. + +'git init' may copy hooks to the new repository, depending on its +configuration. See the "TEMPLATE DIRECTORY" section in +linkgit:git-init[1] for details. When the rest of this document refers +to "default hooks" it's talking about the default template shipped +with Git. + +The currently supported hooks are described below. HOOKS ----- @@ -32,15 +43,15 @@ HOOKS applypatch-msg ~~~~~~~~~~~~~~ -This hook is invoked by 'git am' script. It takes a single +This hook is invoked by 'git am'. It takes a single parameter, the name of the file that holds the proposed commit -log message. Exiting with non-zero status causes -'git am' to abort before applying the patch. +log message. Exiting with a non-zero status causes 'git am' to abort +before applying the patch. The hook is allowed to edit the message file in place, and can be used to normalize the message into some project standard -format (if the project has one). It can also be used to refuse -the commit after inspecting the message file. +format. It can also be used to refuse the commit after inspecting +the message file. The default 'applypatch-msg' hook, when enabled, runs the 'commit-msg' hook, if the latter is enabled. @@ -73,10 +84,10 @@ pre-commit ~~~~~~~~~~ This hook is invoked by 'git commit', and can be bypassed -with `--no-verify` option. It takes no parameter, and is +with the `--no-verify` option. It takes no parameters, and is invoked before obtaining the proposed commit log message and -making a commit. Exiting with non-zero status from this script -causes the 'git commit' to abort. +making a commit. Exiting with a non-zero status from this script +causes the 'git commit' command to abort before creating a commit. The default 'pre-commit' hook, when enabled, catches introduction of lines with trailing whitespaces and aborts the commit when @@ -115,15 +126,15 @@ commit-msg ~~~~~~~~~~ This hook is invoked by 'git commit', and can be bypassed -with `--no-verify` option. It takes a single parameter, the +with the `--no-verify` option. It takes a single parameter, the name of the file that holds the proposed commit log message. -Exiting with non-zero status causes the 'git commit' to +Exiting with a non-zero status causes the 'git commit' to abort. -The hook is allowed to edit the message file in place, and can -be used to normalize the message into some project standard -format (if the project has one). It can also be used to refuse -the commit after inspecting the message file. +The hook is allowed to edit the message file in place, and can be used +to normalize the message into some project standard format. It +can also be used to refuse the commit after inspecting the message +file. The default 'commit-msg' hook, when enabled, detects duplicate "Signed-off-by" lines, and aborts the commit if one is found. @@ -131,8 +142,8 @@ The default 'commit-msg' hook, when enabled, detects duplicate post-commit ~~~~~~~~~~~ -This hook is invoked by 'git commit'. It takes no -parameter, and is invoked after a commit is made. +This hook is invoked by 'git commit'. It takes no parameters, and is +invoked after a commit is made. This hook is meant primarily for notification, and cannot affect the outcome of 'git commit'. @@ -267,9 +278,11 @@ does not know the entire set of branches, so it would end up firing one e-mail per ref when used naively, though. The <<post-receive,'post-receive'>> hook is more suited to that. -Another use suggested on the mailing list is to use this hook to -implement access control which is finer grained than the one -based on filesystem group. +In an environment that restricts the users' access only to git +commands over the wire, this hook can be used to implement access +control without relying on filesystem ownership and group +membership. See linkgit:git-shell[1] for how you might use the login +shell to restrict the user's access to only git commands. Both standard output and standard error output are forwarded to 'git send-pack' on the other end, so you can simply `echo` messages diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 473623d..63260f0 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. diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt index 78e0b27..1e86594 100644 --- a/Documentation/gitremote-helpers.txt +++ b/Documentation/gitremote-helpers.txt @@ -43,7 +43,7 @@ arguments. The first argument specifies a remote repository as in Git; it is either the name of a configured remote or a URL. The second argument specifies a URL; it is usually of the form '<transport>://<address>', but any arbitrary string is possible. -The 'GIT_DIR' environment variable is set up for the remote helper +The `GIT_DIR` environment variable is set up for the remote helper and can be used to determine where to store additional data or from which directory to invoke auxiliary Git commands. @@ -61,10 +61,10 @@ argument. If such a URL is encountered directly on the command line, the first argument is '<address>', and if it is encountered in a configured remote, the first argument is the name of that remote. -Additionally, when a configured remote has 'remote.<name>.vcs' set to +Additionally, when a configured remote has `remote.<name>.vcs` set to '<transport>', Git explicitly invokes 'git remote-<transport>' with '<name>' as the first argument. If set, the second argument is -'remote.<name>.url'; otherwise, the second argument is omitted. +`remote.<name>.url`; otherwise, the second argument is omitted. INPUT FORMAT ------------ diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index 8a42270..a79e350 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt @@ -376,7 +376,7 @@ $site_name:: Name of your site or organization, to appear in page titles. Set it to something descriptive for clearer bookmarks etc. If this variable is not set or is, then gitweb uses the value of the `SERVER_NAME` - CGI environment variable, setting site name to "$SERVER_NAME Git", + `CGI` environment variable, setting site name to "$SERVER_NAME Git", or "Untitled Git" if this variable is not set (e.g. if running gitweb as standalone script). + diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt index cd9c895..96156e5 100644 --- a/Documentation/gitweb.txt +++ b/Documentation/gitweb.txt @@ -206,8 +206,8 @@ $export_auth_hook = sub { Per-repository gitweb configuration ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can configure individual repositories shown in gitweb by creating file -in the 'GIT_DIR' of Git repository, or by setting some repo configuration -variable (in 'GIT_DIR/config', see linkgit:git-config[1]). +in the `GIT_DIR` of Git repository, or by setting some repo configuration +variable (in `GIT_DIR/config`, see linkgit:git-config[1]). You can use the following files in repository: diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl new file mode 100755 index 0000000..476cc30 --- /dev/null +++ b/Documentation/lint-gitlink.perl @@ -0,0 +1,71 @@ +#!/usr/bin/perl + +use File::Find; +use Getopt::Long; + +my $basedir = "."; +GetOptions("basedir=s" => \$basedir) + or die("Cannot parse command line arguments\n"); + +my $found_errors = 0; + +sub report { + my ($where, $what, $error) = @_; + print "$where: $error: $what\n"; + $found_errors = 1; +} + +sub grab_section { + my ($page) = @_; + open my $fh, "<", "$basedir/$page.txt"; + my $firstline = <$fh>; + chomp $firstline; + close $fh; + my ($section) = ($firstline =~ /.*\((\d)\)$/); + return $section; +} + +sub lint { + my ($file) = @_; + open my $fh, "<", $file + or return; + while (<$fh>) { + my $where = "$file:$."; + while (s/linkgit:((.*?)\[(\d)\])//) { + my ($target, $page, $section) = ($1, $2, $3); + + # De-AsciiDoc + $page =~ s/{litdd}/--/g; + + if ($page !~ /^git/) { + report($where, $target, "nongit link"); + next; + } + if (! -f "$basedir/$page.txt") { + report($where, $target, "no such source"); + next; + } + $real_section = grab_section($page); + if ($real_section != $section) { + report($where, $target, + "wrong section (should be $real_section)"); + next; + } + } + } + close $fh; +} + +sub lint_it { + lint($File::Find::name) if -f && /\.txt$/; +} + +if (!@ARGV) { + find({ wanted => \&lint_it, no_chdir => 1 }, $basedir); +} else { + for (@ARGV) { + lint($_); + } +} + +exit $found_errors; diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 002ca58..df3ea37 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -61,7 +61,7 @@ merge.verbosity:: message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. - Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable. + Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable. merge.<driver>.name:: Defines a human-readable name for a custom low-level diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 30808a0..5b4a62e 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -117,3 +117,11 @@ ifndef::git-pull[] reporting. endif::git-pull[] + +--allow-unrelated-histories:: + By default, `git merge` command refuses to merge histories + that do not share a common ancestor. This option can be + used to override this safety when merging histories of two + projects that started their lives independently. As that is + a very rare occasion, no configuration variable to enable + this by default exists and will not be added. diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 54b88b6..e44fc8f 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -26,7 +26,7 @@ people using 80-column terminals. --no-abbrev-commit:: Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit` and those options which imply it such as - "--oneline". It also overrides the 'log.abbrevCommit' variable. + "--oneline". It also overrides the `log.abbrevCommit` variable. --oneline:: This is a shorthand for "--pretty=oneline --abbrev-commit" @@ -42,6 +42,20 @@ people using 80-column terminals. verbatim; this means that invalid sequences in the original commit may be copied to the output. +--expand-tabs=<n>:: +--expand-tabs:: +--no-expand-tabs:: + Perform a tab expansion (replace each tab with enough spaces + to fill to the next display column that is multiple of '<n>') + in the log message before showing it in the output. + `--expand-tabs` is a short-hand for `--expand-tabs=8`, and + `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, + which disables tab expansion. ++ +By default, tabs are expanded in pretty formats that indent the log +message by 4 spaces (i.e. 'medium', which is the default, 'full', +and 'fuller'). + ifndef::git-rev-list[] --notes[=<treeish>]:: Show the notes (see linkgit:git-notes[1]) that annotate the @@ -51,7 +65,7 @@ ifndef::git-rev-list[] on the command line. + By default, the notes shown are from the notes refs listed in the -'core.notesRef' and 'notes.displayRef' variables (or corresponding +`core.notesRef` and `notes.displayRef` variables (or corresponding environment overrides). See linkgit:git-config[1] for more details. + With an optional '<treeish>' argument, use the treeish to find the notes diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt index 695bd4b..27bd701 100644 --- a/Documentation/technical/api-parse-options.txt +++ b/Documentation/technical/api-parse-options.txt @@ -144,8 +144,12 @@ There are some macros to easily define options: `OPT_COUNTUP(short, long, &int_var, description)`:: Introduce a count-up option. - `int_var` is incremented on each use of `--option`, and - reset to zero with `--no-option`. + Each use of `--option` increments `int_var`, starting from zero + (even if initially negative), and `--no-option` resets it to + zero. To determine if `--option` or `--no-option` was encountered at + all, initialize `int_var` to a negative value, and if it is still + negative after parse_options(), then neither `--option` nor + `--no-option` was seen. `OPT_BIT(short, long, &int_var, description, mask)`:: Introduce a boolean option. diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt new file mode 100644 index 0000000..2c9406a --- /dev/null +++ b/Documentation/technical/signature-format.txt @@ -0,0 +1,186 @@ +Git signature format +==================== + +== Overview + +Git uses cryptographic signatures in various places, currently objects (tags, +commits, mergetags) and transactions (pushes). In every case, the command which +is about to create an object or transaction determines a payload from that, +calls gpg to obtain a detached signature for the payload (`gpg -bsa`) and +embeds the signature into the object or transaction. + +Signatures always begin with `-----BEGIN PGP SIGNATURE-----` +and end with `-----END PGP SIGNATURE-----`, unless gpg is told to +produce RFC1991 signatures which use `MESSAGE` instead of `SIGNATURE`. + +The signed payload and the way the signature is embedded depends +on the type of the object resp. transaction. + +== Tag signatures + +- created by: `git tag -s` +- payload: annotated tag object +- embedding: append the signature to the unsigned tag object +- example: tag `signedtag` with subject `signed tag` + +---- +object 04b871796dc0420f8e7561a895b52484b701d51a +type commit +tag signedtag +tagger C O Mitter <committer@example.com> 1465981006 +0000 + +signed tag + +signed tag message body +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn +rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh +8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods +q8FWEqPPUbSJXoMbRPw04S5jrLtZSsUWbRYjmJCHzlhSfFWW4eFd37uquIaLUBS0 +rkC3Jrx7420jkIpgFcTI2s60uhSQLzgcCwdA2ukSYIRnjg/zDkj8+3h/GaROJ72x +lZyI6HWixKJkWw8lE9aAOD9TmTW9sFJwcVAzmAuFX2kUreDUKMZduGcoRYGpD7E= +=jpXa +-----END PGP SIGNATURE----- +---- + +- verify with: `git verify-tag [-v]` or `git tag -v` + +---- +gpg: Signature made Wed Jun 15 10:56:46 2016 CEST using RSA key ID B7227189 +gpg: Good signature from "Eris Discordia <discord@example.net>" +gpg: WARNING: This key is not certified with a trusted signature! +gpg: There is no indication that the signature belongs to the owner. +Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA 29A4 6109 2E85 B722 7189 +object 04b871796dc0420f8e7561a895b52484b701d51a +type commit +tag signedtag +tagger C O Mitter <committer@example.com> 1465981006 +0000 + +signed tag + +signed tag message body +---- + +== Commit signatures + +- created by: `git commit -S` +- payload: commit object +- embedding: header entry `gpgsig` + (content is preceded by a space) +- example: commit with subject `signed commit` + +---- +tree eebfed94e75e7760540d1485c740902590a00332 +parent 04b871796dc0420f8e7561a895b52484b701d51a +author A U Thor <author@example.com> 1465981137 +0000 +committer C O Mitter <committer@example.com> 1465981137 +0000 +gpgsig -----BEGIN PGP SIGNATURE----- + Version: GnuPG v1 + + iQEcBAABAgAGBQJXYRjRAAoJEGEJLoW3InGJ3IwIAIY4SA6GxY3BjL60YyvsJPh/ + HRCJwH+w7wt3Yc/9/bW2F+gF72kdHOOs2jfv+OZhq0q4OAN6fvVSczISY/82LpS7 + DVdMQj2/YcHDT4xrDNBnXnviDO9G7am/9OE77kEbXrp7QPxvhjkicHNwy2rEflAA + zn075rtEERDHr8nRYiDh8eVrefSO7D+bdQ7gv+7GsYMsd2auJWi1dHOSfTr9HIF4 + HJhWXT9d2f8W+diRYXGh4X0wYiGg6na/soXc+vdtDYBzIxanRqjg8jCAeo1eOTk1 + EdTwhcTZlI0x5pvJ3H0+4hA2jtldVtmPM4OTB0cTrEWBad7XV6YgiyuII73Ve3I= + =jKHM + -----END PGP SIGNATURE----- + +signed commit + +signed commit message body +---- + +- verify with: `git verify-commit [-v]` (or `git show --show-signature`) + +---- +gpg: Signature made Wed Jun 15 10:58:57 2016 CEST using RSA key ID B7227189 +gpg: Good signature from "Eris Discordia <discord@example.net>" +gpg: WARNING: This key is not certified with a trusted signature! +gpg: There is no indication that the signature belongs to the owner. +Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA 29A4 6109 2E85 B722 7189 +tree eebfed94e75e7760540d1485c740902590a00332 +parent 04b871796dc0420f8e7561a895b52484b701d51a +author A U Thor <author@example.com> 1465981137 +0000 +committer C O Mitter <committer@example.com> 1465981137 +0000 + +signed commit + +signed commit message body +---- + +== Mergetag signatures + +- created by: `git merge` on signed tag +- payload/embedding: the whole signed tag object is embedded into + the (merge) commit object as header entry `mergetag` +- example: merge of the signed tag `signedtag` as above + +---- +tree c7b1cff039a93f3600a1d18b82d26688668c7dea +parent c33429be94b5f2d3ee9b0adad223f877f174b05d +parent 04b871796dc0420f8e7561a895b52484b701d51a +author A U Thor <author@example.com> 1465982009 +0000 +committer C O Mitter <committer@example.com> 1465982009 +0000 +mergetag object 04b871796dc0420f8e7561a895b52484b701d51a + type commit + tag signedtag + tagger C O Mitter <committer@example.com> 1465981006 +0000 + + signed tag + + signed tag message body + -----BEGIN PGP SIGNATURE----- + Version: GnuPG v1 + + iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn + rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh + 8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods + q8FWEqPPUbSJXoMbRPw04S5jrLtZSsUWbRYjmJCHzlhSfFWW4eFd37uquIaLUBS0 + rkC3Jrx7420jkIpgFcTI2s60uhSQLzgcCwdA2ukSYIRnjg/zDkj8+3h/GaROJ72x + lZyI6HWixKJkWw8lE9aAOD9TmTW9sFJwcVAzmAuFX2kUreDUKMZduGcoRYGpD7E= + =jpXa + -----END PGP SIGNATURE----- + +Merge tag 'signedtag' into downstream + +signed tag + +signed tag message body + +# gpg: Signature made Wed Jun 15 08:56:46 2016 UTC using RSA key ID B7227189 +# gpg: Good signature from "Eris Discordia <discord@example.net>" +# gpg: WARNING: This key is not certified with a trusted signature! +# gpg: There is no indication that the signature belongs to the owner. +# Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA 29A4 6109 2E85 B722 7189 +---- + +- verify with: verification is embedded in merge commit message by default, + alternatively with `git show --show-signature`: + +---- +commit 9863f0c76ff78712b6800e199a46aa56afbcbd49 +merged tag 'signedtag' +gpg: Signature made Wed Jun 15 10:56:46 2016 CEST using RSA key ID B7227189 +gpg: Good signature from "Eris Discordia <discord@example.net>" +gpg: WARNING: This key is not certified with a trusted signature! +gpg: There is no indication that the signature belongs to the owner. +Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA 29A4 6109 2E85 B722 7189 +Merge: c33429b 04b8717 +Author: A U Thor <author@example.com> +Date: Wed Jun 15 09:13:29 2016 +0000 + + Merge tag 'signedtag' into downstream + + signed tag + + signed tag message body + + # gpg: Signature made Wed Jun 15 08:56:46 2016 UTC using RSA key ID B7227189 + # gpg: Good signature from "Eris Discordia <discord@example.net>" + # gpg: WARNING: This key is not certified with a trusted signature! + # gpg: There is no indication that the signature belongs to the owner. + # Primary key fingerprint: D4BE 2231 1AD3 131E 5EDA 29A4 6109 2E85 B722 7189 +---- diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 596965a..ae4f560 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.8.3 +DEF_VER=v2.9.0 LF=' ' @@ -375,13 +375,7 @@ GIT-VERSION-FILE: FORCE # CFLAGS and LDFLAGS are for the users to override from the command line. CFLAGS = -g -O2 -Wall -LDFLAGS = -ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) -ALL_LDFLAGS = $(LDFLAGS) -STRIP ?= strip - -ifdef DEVELOPER -CFLAGS += -Werror \ +DEVELOPER_CFLAGS = -Werror \ -Wdeclaration-after-statement \ -Wno-format-zero-length \ -Wold-style-definition \ @@ -390,7 +384,10 @@ CFLAGS += -Werror \ -Wstrict-prototypes \ -Wunused \ -Wvla -endif +LDFLAGS = +ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) +ALL_LDFLAGS = $(LDFLAGS) +STRIP ?= strip # Create as necessary, replace existing, make ranlib unneeded. ARFLAGS = rcs @@ -440,7 +437,6 @@ DIFF = diff TAR = tar FIND = find INSTALL = install -RPMBUILD = rpmbuild TCL_PATH = tclsh TCLTK_PATH = wish XGETTEXT = xgettext @@ -621,7 +617,7 @@ TEST_PROGRAMS_NEED_X += test-svn-fe TEST_PROGRAMS_NEED_X += test-urlmatch-normalization TEST_PROGRAMS_NEED_X += test-wildmatch -TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X)) +TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X)) # List built-in command $C whose implementation cmd_$C() is not in # builtin/$C.o but is linked in as part of some other command. @@ -952,6 +948,10 @@ include config.mak.uname -include config.mak.autogen -include config.mak +ifdef DEVELOPER +CFLAGS += $(DEVELOPER_CFLAGS) +endif + ifndef sysconfdir ifeq ($(prefix),/usr) sysconfdir = /etc @@ -1898,7 +1898,7 @@ VCSSVN_OBJS += vcs-svn/fast_export.o VCSSVN_OBJS += vcs-svn/svndiff.o VCSSVN_OBJS += vcs-svn/svndump.o -TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS)) +TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \ $(XDIFF_OBJS) \ $(VCSSVN_OBJS) \ @@ -2205,7 +2205,7 @@ bin-wrappers/%: wrap-for-bin.sh @mkdir -p bin-wrappers $(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@BUILD_DIR@@|$(shell pwd)|' \ - -e 's|@@PROG@@|$(@F)|' < $< > $@ && \ + -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \ chmod +x $@ # GNU make supports exporting all variables by "export" without parameters. @@ -2225,25 +2225,25 @@ perf: all .PHONY: test perf -test-ctype$X: ctype.o +t/helper/test-ctype$X: ctype.o -test-date$X: date.o ctype.o +t/helper/test-date$X: date.o ctype.o -test-delta$X: diff-delta.o patch-delta.o +t/helper/test-delta$X: diff-delta.o patch-delta.o -test-line-buffer$X: vcs-svn/lib.a +t/helper/test-line-buffer$X: vcs-svn/lib.a -test-parse-options$X: parse-options.o parse-options-cb.o +t/helper/test-parse-options$X: parse-options.o parse-options-cb.o -test-svn-fe$X: vcs-svn/lib.a +t/helper/test-svn-fe$X: vcs-svn/lib.a .PRECIOUS: $(TEST_OBJS) -test-%$X: test-%.o GIT-LDFLAGS $(GITLIBS) +t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS) -check-sha1:: test-sha1$X - ./test-sha1.sh +check-sha1:: t/helper/test-sha1$X + t/helper/test-sha1.sh SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ)) @@ -2390,31 +2390,25 @@ quick-install-html: ### Maintainer's dist rules -git.spec: git.spec.in GIT-VERSION-FILE - sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+ - mv $@+ $@ - GIT_TARNAME = git-$(GIT_VERSION) -dist: git.spec git-archive$(X) configure +dist: git-archive$(X) configure ./git-archive --format=tar \ --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar @mkdir -p $(GIT_TARNAME) - @cp git.spec configure $(GIT_TARNAME) + @cp configure $(GIT_TARNAME) @echo $(GIT_VERSION) > $(GIT_TARNAME)/version @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version $(TAR) rf $(GIT_TARNAME).tar \ - $(GIT_TARNAME)/git.spec \ $(GIT_TARNAME)/configure \ $(GIT_TARNAME)/version \ $(GIT_TARNAME)/git-gui/version @$(RM) -r $(GIT_TARNAME) gzip -f -9 $(GIT_TARNAME).tar -rpm: dist - $(RPMBUILD) \ - --define "_source_filedigest_algorithm md5" \ - --define "_binary_filedigest_algorithm md5" \ - -ta $(GIT_TARNAME).tar.gz +rpm:: + @echo >&2 "Use distro packaged sources to run rpmbuild" + @false +.PHONY: rpm htmldocs = git-htmldocs-$(GIT_VERSION) manpages = git-manpages-$(GIT_VERSION) @@ -2450,8 +2444,8 @@ profile-clean: $(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs))) clean: profile-clean coverage-clean - $(RM) *.o *.res refs/*.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o - $(RM) xdiff/*.o vcs-svn/*.o ewah/*.o builtin/*.o + $(RM) *.res + $(RM) $(OBJECTS) $(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB) $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X $(RM) $(TEST_PROGRAMS) $(NO_INSTALL) @@ -2490,6 +2484,7 @@ ALL_COMMANDS += git-gui git-citool .PHONY: check-docs check-docs:: + $(MAKE) -C Documentation lint-docs @(for v in $(ALL_COMMANDS); \ do \ case "$$v" in \ @@ -17,14 +17,14 @@ including full documentation and Git related tools. See [Documentation/gittutorial.txt][] to get started, then see [Documentation/giteveryday.txt][] for a useful minimum set of commands, and -[Documentation/git-commandname.txt][] for documentation of each command. +Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be -read with "man gittutorial" or "git help tutorial", and the -documentation of each command with "man git-commandname" or "git help -commandname". +read with `man gittutorial` or `git help tutorial`, and the +documentation of each command with `man git-<commandname>` or `git help +<commandname>`. CVS users may also want to read [Documentation/gitcvs-migration.txt][] -("man gitcvs-migration" or "git help cvs-migration" if git is +(`man gitcvs-migration` or `git help cvs-migration` if git is installed). The user discussion and development of Git take place on the Git @@ -57,6 +57,5 @@ and the name as (depending on your mood): [INSTALL]: INSTALL [Documentation/gittutorial.txt]: Documentation/gittutorial.txt [Documentation/giteveryday.txt]: Documentation/giteveryday.txt -[Documentation/git-commandname.txt]: Documentation/git-commandname.txt [Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt [Documentation/SubmittingPatches]: Documentation/SubmittingPatches @@ -1 +1 @@ -Documentation/RelNotes/2.8.3.txt
\ No newline at end of file +Documentation/RelNotes/2.9.1.txt
\ No newline at end of file @@ -860,8 +860,8 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout) /* Create file BISECT_ANCESTORS_OK. */ fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600); if (fd < 0) - warning("could not create file '%s': %s", - filename, strerror(errno)); + warning_errno("could not create file '%s'", + filename); else close(fd); done: @@ -890,6 +890,7 @@ static void show_diff_tree(const char *prefix, struct commit *commit) if (!opt.diffopt.output_format) opt.diffopt.output_format = DIFF_FORMAT_RAW; + setup_revisions(0, NULL, &opt, NULL); log_tree_commit(&opt, commit); } @@ -910,8 +911,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good) *read_good = "good"; return; } else { - die("could not read file '%s': %s", filename, - strerror(errno)); + die_errno("could not read file '%s'", filename); } } else { strbuf_getline_lf(&str, fp); @@ -334,15 +334,16 @@ void remove_branch_state(void) unlink(git_path_squash_msg()); } -void die_if_checked_out(const char *branch) +void die_if_checked_out(const char *branch, int ignore_current_worktree) { - char *existing; + const struct worktree *wt; - existing = find_shared_symref("HEAD", branch); - if (existing) { - skip_prefix(branch, "refs/heads/", &branch); - die(_("'%s' is already checked out at '%s'"), branch, existing); - } + wt = find_shared_symref("HEAD", branch); + if (!wt || (ignore_current_worktree && wt->is_current)) + return; + skip_prefix(branch, "refs/heads/", &branch); + die(_("'%s' is already checked out at '%s'"), + branch, wt->path); } int replace_each_worktree_head_symref(const char *oldref, const char *newref) @@ -357,7 +358,8 @@ int replace_each_worktree_head_symref(const char *oldref, const char *newref) if (strcmp(oldref, worktrees[i]->head_ref)) continue; - if (set_worktree_head_symref(worktrees[i]->git_dir, newref)) { + if (set_worktree_head_symref(get_worktree_git_dir(worktrees[i]), + newref)) { ret = -1; error(_("HEAD of working tree %s is not updated"), worktrees[i]->path); @@ -58,7 +58,7 @@ extern int read_branch_desc(struct strbuf *, const char *branch_name); * worktree and die (with a message describing its checkout location) if * it is. */ -extern void die_if_checked_out(const char *branch); +extern void die_if_checked_out(const char *branch, int ignore_current_worktree); /* * Update all per-worktree HEADs pointing at the old ref to point the new ref. diff --git a/builtin/add.c b/builtin/add.c index 145f06e..b1dddb4 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -26,7 +26,7 @@ static int patch_interactive, add_interactive, edit_interactive; static int take_worktree_changes; struct update_callback_data { - int flags; + int flags, force_mode; int add_errors; }; @@ -65,7 +65,8 @@ static void update_callback(struct diff_queue_struct *q, die(_("unexpected diff status %c"), p->status); case DIFF_STATUS_MODIFIED: case DIFF_STATUS_TYPE_CHANGED: - if (add_file_to_index(&the_index, path, data->flags)) { + if (add_file_to_index(&the_index, path, + data->flags, data->force_mode)) { if (!(data->flags & ADD_CACHE_IGNORE_ERRORS)) die(_("updating files failed")); data->add_errors++; @@ -83,14 +84,15 @@ static void update_callback(struct diff_queue_struct *q, } } -int add_files_to_cache(const char *prefix, - const struct pathspec *pathspec, int flags) +int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, + int flags, int force_mode) { struct update_callback_data data; struct rev_info rev; memset(&data, 0, sizeof(data)); data.flags = flags; + data.force_mode = force_mode; init_revisions(&rev, prefix); setup_revisions(0, NULL, &rev, NULL); @@ -238,6 +240,8 @@ static int ignore_add_errors, intent_to_add, ignore_missing; static int addremove = ADDREMOVE_DEFAULT; static int addremove_explicit = -1; /* unspecified */ +static char *chmod_arg; + static int ignore_removal_cb(const struct option *opt, const char *arg, int unset) { /* if we are told to ignore, we are not adding removals */ @@ -263,6 +267,7 @@ static struct option builtin_add_options[] = { OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")), OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")), OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")), + OPT_STRING( 0 , "chmod", &chmod_arg, N_("(+/-)x"), N_("override the executable bit of the listed files")), OPT_END(), }; @@ -276,7 +281,7 @@ static int add_config(const char *var, const char *value, void *cb) return git_default_config(var, value, cb); } -static int add_files(struct dir_struct *dir, int flags) +static int add_files(struct dir_struct *dir, int flags, int force_mode) { int i, exit_status = 0; @@ -289,7 +294,8 @@ static int add_files(struct dir_struct *dir, int flags) } for (i = 0; i < dir->nr; i++) - if (add_file_to_cache(dir->entries[i]->name, flags)) { + if (add_file_to_index(&the_index, dir->entries[i]->name, + flags, force_mode)) { if (!ignore_add_errors) die(_("adding files failed")); exit_status = 1; @@ -302,7 +308,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) int exit_status = 0; struct pathspec pathspec; struct dir_struct dir; - int flags; + int flags, force_mode; int add_new_files; int require_pathspec; char *seen = NULL; @@ -336,6 +342,15 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (!show_only && ignore_missing) die(_("Option --ignore-missing can only be used together with --dry-run")); + if (!chmod_arg) + force_mode = 0; + else if (!strcmp(chmod_arg, "-x")) + force_mode = 0666; + else if (!strcmp(chmod_arg, "+x")) + force_mode = 0777; + else + die(_("--chmod param '%s' must be either -x or +x"), chmod_arg); + add_new_files = !take_worktree_changes && !refresh_only; require_pathspec = !(take_worktree_changes || (0 < addremove_explicit)); @@ -426,10 +441,10 @@ int cmd_add(int argc, const char **argv, const char *prefix) plug_bulk_checkin(); - exit_status |= add_files_to_cache(prefix, &pathspec, flags); + exit_status |= add_files_to_cache(prefix, &pathspec, flags, force_mode); if (add_new_files) - exit_status |= add_files(&dir, flags); + exit_status |= add_files(&dir, flags, force_mode); unplug_bulk_checkin(); diff --git a/builtin/am.c b/builtin/am.c index d003939..3dfe70b 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -769,15 +769,15 @@ static int split_mail_conv(mail_conv_fn fn, struct am_state *state, in = fopen(*paths, "r"); if (!in) - return error(_("could not open '%s' for reading: %s"), - *paths, strerror(errno)); + return error_errno(_("could not open '%s' for reading"), + *paths); mail = mkpath("%s/%0*d", state->dir, state->prec, i + 1); out = fopen(mail, "w"); if (!out) - return error(_("could not open '%s' for writing: %s"), - mail, strerror(errno)); + return error_errno(_("could not open '%s' for writing"), + mail); ret = fn(out, in, keep_cr); @@ -857,8 +857,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths, fp = fopen(*paths, "r"); if (!fp) - return error(_("could not open '%s' for reading: %s"), *paths, - strerror(errno)); + return error_errno(_("could not open '%s' for reading"), *paths); while (!strbuf_getline_lf(&sb, fp)) { if (*sb.buf == '#') diff --git a/builtin/apply.c b/builtin/apply.c index ce3b778..c770d7d 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -442,7 +442,7 @@ static int is_dev_null(const char *str) #define TERM_SPACE 1 #define TERM_TAB 2 -static int name_terminate(const char *name, int namelen, int c, int terminate) +static int name_terminate(int c, int terminate) { if (c == ' ' && !(terminate & TERM_SPACE)) return 0; @@ -671,7 +671,7 @@ static char *find_name_common(const char *line, const char *def, if (!end && isspace(c)) { if (c == '\n') break; - if (name_terminate(start, line-start, c, terminate)) + if (name_terminate(c, terminate)) break; } line++; @@ -4383,6 +4383,8 @@ static int apply_patch(int fd, const char *filename, int options) listp = &patch->next; } else { + if (apply_verbosely) + say_patch_name(stderr, _("Skipped patch '%s'."), patch); free_patch(patch); skipped_patch++; } diff --git a/builtin/blame.c b/builtin/blame.c index 21f42b0..7417edf 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2425,8 +2425,7 @@ static struct commit *find_single_final(struct rev_info *revs, struct object *obj = revs->pending.objects[i].item; if (obj->flags & UNINTERESTING) continue; - while (obj->type == OBJ_TAG) - obj = deref_tag(obj, NULL, 0); + obj = deref_tag(obj, NULL, 0); if (obj->type != OBJ_COMMIT) die("Non commit %s?", revs->pending.objects[i].name); if (found) @@ -2461,8 +2460,7 @@ static char *prepare_initial(struct scoreboard *sb) struct object *obj = revs->pending.objects[i].item; if (!(obj->flags & UNINTERESTING)) continue; - while (obj->type == OBJ_TAG) - obj = deref_tag(obj, NULL, 0); + obj = deref_tag(obj, NULL, 0); if (obj->type != OBJ_COMMIT) die("Non commit %s?", revs->pending.objects[i].name); if (sb->final) diff --git a/builtin/branch.c b/builtin/branch.c index 37af771..2ecde53 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -220,12 +220,12 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, name = mkpathdup(fmt, bname.buf); if (kinds == FILTER_REFS_BRANCHES) { - char *worktree = find_shared_symref("HEAD", name); - if (worktree) { + const struct worktree *wt = + find_shared_symref("HEAD", name); + if (wt) { error(_("Cannot delete branch '%s' " "checked out at '%s'"), - bname.buf, worktree); - free(worktree); + bname.buf, wt->path); ret = 1; continue; } @@ -526,6 +526,29 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin ref_array_clear(&array); } +static void reject_rebase_or_bisect_branch(const char *target) +{ + struct worktree **worktrees = get_worktrees(); + int i; + + for (i = 0; worktrees[i]; i++) { + struct worktree *wt = worktrees[i]; + + if (!wt->is_detached) + continue; + + if (is_worktree_being_rebased(wt, target)) + die(_("Branch %s is being rebased at %s"), + target, wt->path); + + if (is_worktree_being_bisected(wt, target)) + die(_("Branch %s is being bisected at %s"), + target, wt->path); + } + + free_worktrees(worktrees); +} + static void rename_branch(const char *oldname, const char *newname, int force) { struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; @@ -555,6 +578,8 @@ static void rename_branch(const char *oldname, const char *newname, int force) validate_new_branchname(newname, &newref, force, clobber_head_ok); + reject_rebase_or_bisect_branch(oldref.buf); + strbuf_addf(&logmsg, "Branch: renamed %s to %s", oldref.buf, newref.buf); @@ -595,8 +620,7 @@ static int edit_branch_description(const char *branch_name) branch_name, comment_line_char); if (write_file_gently(git_path(edit_description), "%s", buf.buf)) { strbuf_release(&buf); - return error(_("could not write branch description template: %s"), - strerror(errno)); + return error_errno(_("could not write branch description template")); } strbuf_reset(&buf); if (launch_editor(git_path(edit_description), &buf, NULL)) { diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 54db118..618103f 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -154,6 +154,13 @@ struct expand_data { * elements above, so you can retrieve the response from there. */ struct object_info info; + + /* + * This flag will be true if the requested batch format and options + * don't require us to call sha1_object_info, which can then be + * optimized out. + */ + unsigned skip_object_info : 1; }; static int is_atom(const char *atom, const char *s, int slen) @@ -258,7 +265,8 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt, { struct strbuf buf = STRBUF_INIT; - if (sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) { + if (!data->skip_object_info && + sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) { printf("%s missing\n", obj_name ? obj_name : sha1_to_hex(data->sha1)); fflush(stdout); return; @@ -369,6 +377,13 @@ static int batch_objects(struct batch_options *opt) strbuf_expand(&buf, opt->format, expand_format, &data); data.mark_query = 0; + if (opt->all_objects) { + struct object_info empty; + memset(&empty, 0, sizeof(empty)); + if (!memcmp(&data.info, &empty, sizeof(empty))) + data.skip_object_info = 1; + } + /* * If we are printing out the object, then always fill in the type, * since we will want to decide whether or not to stream. @@ -489,6 +504,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) git_config(git_cat_file_config, NULL); + batch.buffer_output = -1; argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0); if (opt) { @@ -512,6 +528,9 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) usage_with_options(cat_file_usage, options); } + if (batch.buffer_output < 0) + batch.buffer_output = batch.all_objects; + if (batch.enabled) return batch_objects(&batch); diff --git a/builtin/checkout.c b/builtin/checkout.c index efcbd8f..c3486bd 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -242,7 +242,6 @@ static int checkout_paths(const struct checkout_opts *opts, struct checkout state; static char *ps_matched; unsigned char rev[20]; - int flag; struct commit *head; int errs = 0; struct lock_file *lock_file; @@ -375,7 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts, if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) die(_("unable to write new index file")); - read_ref_full("HEAD", 0, rev, &flag); + read_ref_full("HEAD", 0, rev, NULL); head = lookup_commit_reference_gently(rev, 1); errs |= post_checkout_hook(head, head, 0); @@ -549,7 +548,7 @@ static int merge_working_tree(const struct checkout_opts *opts, * entries in the index. */ - add_files_to_cache(NULL, NULL, 0); + add_files_to_cache(NULL, NULL, 0, 0); /* * NEEDSWORK: carrying over local changes * when branches have different end-of-line @@ -1111,7 +1110,7 @@ static int checkout_branch(struct checkout_opts *opts, char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag); if (head_ref && (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path))) - die_if_checked_out(new->path); + die_if_checked_out(new->path, 1); free(head_ref); } diff --git a/builtin/clone.c b/builtin/clone.c index 6616392..8f7db98 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -40,6 +40,7 @@ static const char * const builtin_clone_usage[] = { static int option_no_checkout, option_bare, option_mirror, option_single_branch = -1; static int option_local = -1, option_no_hardlinks, option_shared, option_recursive; +static int option_shallow_submodules; static char *option_template, *option_depth; static char *option_origin = NULL; static char *option_branch = NULL; @@ -51,6 +52,7 @@ static enum transport_family family; static struct string_list option_config; static struct string_list option_reference; static int option_dissociate; +static int max_jobs = -1; static struct option builtin_clone_options[] = { OPT__VERBOSITY(&option_verbosity), @@ -73,6 +75,8 @@ static struct option builtin_clone_options[] = { N_("initialize submodules in the clone")), OPT_BOOL(0, "recurse-submodules", &option_recursive, N_("initialize submodules in the clone")), + OPT_INTEGER('j', "jobs", &max_jobs, + N_("number of submodules cloned in parallel")), OPT_STRING(0, "template", &option_template, N_("template-directory"), N_("directory from which templates will be used")), OPT_STRING_LIST(0, "reference", &option_reference, N_("repo"), @@ -89,6 +93,8 @@ static struct option builtin_clone_options[] = { N_("create a shallow clone of that depth")), OPT_BOOL(0, "single-branch", &option_single_branch, N_("clone only one branch, HEAD or --branch")), + OPT_BOOL(0, "shallow-submodules", &option_shallow_submodules, + N_("any cloned submodules will be shallow")), OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"), N_("separate git dir from working tree")), OPT_STRING_LIST('c', "config", &option_config, N_("key=value"), @@ -100,10 +106,6 @@ static struct option builtin_clone_options[] = { OPT_END() }; -static const char *argv_submodule[] = { - "submodule", "update", "--init", "--recursive", NULL -}; - static const char *get_repo_path_1(struct strbuf *path, int *is_bundle) { static char *suffix[] = { "/.git", "", ".git/.git", ".git" }; @@ -732,8 +734,19 @@ static int checkout(void) err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1), sha1_to_hex(sha1), "1", NULL); - if (!err && option_recursive) - err = run_command_v_opt(argv_submodule, RUN_GIT_CMD); + if (!err && option_recursive) { + struct argv_array args = ARGV_ARRAY_INIT; + argv_array_pushl(&args, "submodule", "update", "--init", "--recursive", NULL); + + if (option_shallow_submodules == 1) + argv_array_push(&args, "--depth=1"); + + if (max_jobs != -1) + argv_array_pushf(&args, "--jobs=%d", max_jobs); + + err = run_command_v_opt(args.argv, RUN_GIT_CMD); + argv_array_clear(&args); + } return err; } diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index 3feeffe..8a674bc 100644 --- a/builtin/commit-tree.c +++ b/builtin/commit-tree.c @@ -33,10 +33,6 @@ static int commit_tree_config(const char *var, const char *value, void *cb) int status = git_gpg_config(var, value, NULL); if (status) return status; - if (!strcmp(var, "commit.gpgsign")) { - sign_commit = git_config_bool(var, value) ? "" : NULL; - return 0; - } return git_default_config(var, value, cb); } diff --git a/builtin/commit.c b/builtin/commit.c index e133037..163dbca 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -114,6 +114,7 @@ static char *fixup_message, *squash_message; static int all, also, interactive, patch_interactive, only, amend, signoff; static int edit_flag = -1; /* unspecified */ static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship; +static int config_commit_verbose = -1; /* unspecified */ static int no_post_rewrite, allow_empty_message; static char *untracked_files_arg, *force_date, *ignore_submodule_arg; static char *sign_commit; @@ -186,6 +187,7 @@ static void status_init_config(struct wt_status *s, config_fn_t fn) gitmodules_config(); git_config(fn, s); determine_whence(s); + init_diff_ui_defaults(); s->hints = advice_status_hints; /* must come after git_config() */ } @@ -384,7 +386,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix */ if (all || (also && pathspec.nr)) { hold_locked_index(&index_lock, 1); - add_files_to_cache(also ? prefix : NULL, &pathspec, 0); + add_files_to_cache(also ? prefix : NULL, &pathspec, 0, 0); refresh_cache_or_die(refresh_flags); update_main_cache_tree(WRITE_TREE_SILENT); if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK)) @@ -1514,6 +1516,11 @@ static int git_commit_config(const char *k, const char *v, void *cb) sign_commit = git_config_bool(k, v) ? "" : NULL; return 0; } + if (!strcmp(k, "commit.verbose")) { + int is_bool; + config_commit_verbose = git_config_bool_or_int(k, v, &is_bool); + return 0; + } status = git_gpg_config(k, v, NULL); if (status) @@ -1660,9 +1667,13 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (parse_commit(current_head)) die(_("could not parse HEAD commit")); } + verbose = -1; /* unspecified */ argc = parse_and_validate_options(argc, argv, builtin_commit_options, builtin_commit_usage, prefix, current_head, &s); + if (verbose == -1) + verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose; + if (dry_run) return dry_run_commit(argc, argv, prefix, current_head, &s); index_file = prepare_index(argc, argv, prefix, current_head, 0); diff --git a/builtin/diff-files.c b/builtin/diff-files.c index 8ed2eb8..15c61fd 100644 --- a/builtin/diff-files.c +++ b/builtin/diff-files.c @@ -24,6 +24,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) gitmodules_config(); git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ rev.abbrev = 0; + precompose_argv(argc, argv); argc = setup_revisions(argc, argv, &rev, NULL); while (1 < argc && argv[1][0] == '-') { diff --git a/builtin/diff-index.c b/builtin/diff-index.c index d979824..1af373d 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -21,6 +21,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) gitmodules_config(); git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ rev.abbrev = 0; + precompose_argv(argc, argv); argc = setup_revisions(argc, argv, &rev, NULL); for (i = 1; i < argc; i++) { diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 2a12b81..806dd7a 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -114,6 +114,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) opt->disable_stdin = 1; memset(&s_r_opt, 0, sizeof(s_r_opt)); s_r_opt.tweak = diff_tree_tweak_rev; + + precompose_argv(argc, argv); argc = setup_revisions(argc, argv, opt, &s_r_opt); while (--argc > 0) { diff --git a/builtin/diff.c b/builtin/diff.c index 52c98a9..b7a9405 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -318,7 +318,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix) if (!no_index) gitmodules_config(); + init_diff_ui_defaults(); git_config(git_diff_ui_config, NULL); + precompose_argv(argc, argv); init_revisions(&rev, prefix); diff --git a/builtin/fetch.c b/builtin/fetch.c index e4639d8..f896aa1 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -37,7 +37,7 @@ static int prune = -1; /* unspecified */ static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity; static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; static int tags = TAGS_DEFAULT, unshallow, update_shallow; -static int max_children = 1; +static int max_children = -1; static enum transport_family family; static const char *depth; static const char *upload_pack; @@ -607,7 +607,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, fp = fopen(filename, "a"); if (!fp) - return error(_("cannot open %s: %s\n"), filename, strerror(errno)); + return error_errno(_("cannot open %s"), filename); if (raw_url) url = transport_anonymize_url(raw_url); @@ -848,7 +848,7 @@ static int truncate_fetch_head(void) FILE *fp = fopen_for_writing(filename); if (!fp) - return error(_("cannot open %s: %s\n"), filename, strerror(errno)); + return error_errno(_("cannot open %s"), filename); fclose(fp); return 0; } @@ -1005,7 +1005,7 @@ static int get_remote_group(const char *key, const char *value, void *priv) size_t wordlen = strcspn(value, " \t\n"); if (wordlen >= 1) - string_list_append(g->list, + string_list_append_nodup(g->list, xstrndup(value, wordlen)); value += wordlen + (value[wordlen] != '\0'); } @@ -1143,7 +1143,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv) int cmd_fetch(int argc, const char **argv, const char *prefix) { int i; - struct string_list list = STRING_LIST_INIT_NODUP; + struct string_list list = STRING_LIST_INIT_DUP; struct remote *remote; int result = 0; struct argv_array argv_gc_auto = ARGV_ARRAY_INIT; @@ -1226,8 +1226,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) argv_array_clear(&options); } - /* All names were strdup()ed or strndup()ed */ - list.strdup_strings = 1; string_list_clear(&list, 0); close_all_packs(); diff --git a/builtin/fsck.c b/builtin/fsck.c index 55eac75..3f27456 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -493,13 +493,12 @@ static void fsck_object_dir(const char *path) static int fsck_head_link(void) { - int flag; int null_is_error = 0; if (verbose) fprintf(stderr, "Checking HEAD link\n"); - head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, &flag); + head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, NULL); if (!head_points_at) { errors_found |= ERROR_REFS; return error("Invalid HEAD"); diff --git a/builtin/grep.c b/builtin/grep.c index 111b6f6..462e607 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -438,7 +438,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, strbuf_add(base, entry.path, te_len); if (S_ISREG(entry.mode)) { - hit |= grep_sha1(opt, entry.sha1, base->buf, tn_len, + hit |= grep_sha1(opt, entry.oid->hash, base->buf, tn_len, check_attr ? base->buf + tn_len : NULL); } else if (S_ISDIR(entry.mode)) { @@ -447,10 +447,10 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, void *data; unsigned long size; - data = lock_and_read_sha1_file(entry.sha1, &type, &size); + data = lock_and_read_sha1_file(entry.oid->hash, &type, &size); if (!data) die(_("unable to read tree (%s)"), - sha1_to_hex(entry.sha1)); + oid_to_hex(entry.oid)); strbuf_addch(base, '/'); init_tree_desc(&sub, data, size); diff --git a/builtin/help.c b/builtin/help.c index 3c55ce4..8848013 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -127,7 +127,7 @@ static void exec_woman_emacs(const char *path, const char *page) path = "emacsclient"; strbuf_addf(&man_page, "(woman \"%s\")", page); execlp(path, "emacsclient", "-e", man_page.buf, (char *)NULL); - warning(_("failed to exec '%s': %s"), path, strerror(errno)); + warning_errno(_("failed to exec '%s'"), path); } } @@ -148,7 +148,7 @@ static void exec_man_konqueror(const char *path, const char *page) path = "kfmclient"; strbuf_addf(&man_page, "man:%s(1)", page); execlp(path, filename, "newTab", man_page.buf, (char *)NULL); - warning(_("failed to exec '%s': %s"), path, strerror(errno)); + warning_errno(_("failed to exec '%s'"), path); } } @@ -157,7 +157,7 @@ static void exec_man_man(const char *path, const char *page) if (!path) path = "man"; execlp(path, "man", page, (char *)NULL); - warning(_("failed to exec '%s': %s"), path, strerror(errno)); + warning_errno(_("failed to exec '%s'"), path); } static void exec_man_cmd(const char *cmd, const char *page) @@ -165,7 +165,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(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL); - warning(_("failed to exec '%s': %s"), cmd, strerror(errno)); + warning(_("failed to exec '%s'"), cmd); } static void add_man_viewer(const char *name) diff --git a/builtin/log.c b/builtin/log.c index 0d738d6..099f4f7 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -100,6 +100,12 @@ static int log_line_range_callback(const struct option *option, const char *arg, return 0; } +static void init_log_defaults(void) +{ + init_grep_defaults(); + init_diff_ui_defaults(); +} + static void cmd_log_init_defaults(struct rev_info *rev) { if (fmt_pretty) @@ -416,7 +422,7 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix) struct rev_info rev; struct setup_revision_opt opt; - init_grep_defaults(); + init_log_defaults(); git_config(git_log_config, NULL); init_revisions(&rev, prefix); @@ -527,7 +533,7 @@ int cmd_show(int argc, const char **argv, const char *prefix) struct pathspec match_all; int i, count, ret = 0; - init_grep_defaults(); + init_log_defaults(); git_config(git_log_config, NULL); memset(&match_all, 0, sizeof(match_all)); @@ -608,7 +614,7 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix) struct rev_info rev; struct setup_revision_opt opt; - init_grep_defaults(); + init_log_defaults(); git_config(git_log_config, NULL); init_revisions(&rev, prefix); @@ -647,7 +653,7 @@ int cmd_log(int argc, const char **argv, const char *prefix) struct rev_info rev; struct setup_revision_opt opt; - init_grep_defaults(); + init_log_defaults(); git_config(git_log_config, NULL); init_revisions(&rev, prefix); @@ -696,6 +702,7 @@ static void add_header(const char *value) #define THREAD_DEEP 2 static int thread; static int do_signoff; +static int base_auto; static const char *signature = git_version_string; static const char *signature_file; static int config_cover_letter; @@ -780,6 +787,10 @@ static int git_format_config(const char *var, const char *value, void *cb) } if (!strcmp(var, "format.outputdirectory")) return git_config_string(&config_output_directory, var, value); + if (!strcmp(var, "format.useautobase")) { + base_auto = git_config_bool(var, value); + return 0; + } return git_log_config(var, value, cb); } @@ -1185,6 +1196,155 @@ static int from_callback(const struct option *opt, const char *arg, int unset) return 0; } +struct base_tree_info { + struct object_id base_commit; + int nr_patch_id, alloc_patch_id; + struct object_id *patch_id; +}; + +static struct commit *get_base_commit(const char *base_commit, + struct commit **list, + int total) +{ + struct commit *base = NULL; + struct commit **rev; + int i = 0, rev_nr = 0; + + if (base_commit && strcmp(base_commit, "auto")) { + base = lookup_commit_reference_by_name(base_commit); + if (!base) + die(_("Unknown commit %s"), base_commit); + } else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) { + struct branch *curr_branch = branch_get(NULL); + const char *upstream = branch_get_upstream(curr_branch, NULL); + if (upstream) { + struct commit_list *base_list; + struct commit *commit; + unsigned char sha1[20]; + + if (get_sha1(upstream, sha1)) + die(_("Failed to resolve '%s' as a valid ref."), upstream); + commit = lookup_commit_or_die(sha1, "upstream base"); + base_list = get_merge_bases_many(commit, total, list); + /* There should be one and only one merge base. */ + if (!base_list || base_list->next) + die(_("Could not find exact merge base.")); + base = base_list->item; + free_commit_list(base_list); + } else { + die(_("Failed to get upstream, if you want to record base commit automatically,\n" + "please use git branch --set-upstream-to to track a remote branch.\n" + "Or you could specify base commit by --base=<base-commit-id> manually.")); + } + } + + ALLOC_ARRAY(rev, total); + for (i = 0; i < total; i++) + rev[i] = list[i]; + + rev_nr = total; + /* + * Get merge base through pair-wise computations + * and store it in rev[0]. + */ + while (rev_nr > 1) { + for (i = 0; i < rev_nr / 2; i++) { + struct commit_list *merge_base; + merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]); + if (!merge_base || merge_base->next) + die(_("Failed to find exact merge base")); + + rev[i] = merge_base->item; + } + + if (rev_nr % 2) + rev[i] = rev[2 * i]; + rev_nr = (rev_nr + 1) / 2; + } + + if (!in_merge_bases(base, rev[0])) + die(_("base commit should be the ancestor of revision list")); + + for (i = 0; i < total; i++) { + if (base == list[i]) + die(_("base commit shouldn't be in revision list")); + } + + free(rev); + return base; +} + +static void prepare_bases(struct base_tree_info *bases, + struct commit *base, + struct commit **list, + int total) +{ + struct commit *commit; + struct rev_info revs; + struct diff_options diffopt; + int i; + + if (!base) + return; + + diff_setup(&diffopt); + DIFF_OPT_SET(&diffopt, RECURSIVE); + diff_setup_done(&diffopt); + + oidcpy(&bases->base_commit, &base->object.oid); + + init_revisions(&revs, NULL); + revs.max_parents = 1; + revs.topo_order = 1; + for (i = 0; i < total; i++) { + list[i]->object.flags &= ~UNINTERESTING; + add_pending_object(&revs, &list[i]->object, "rev_list"); + list[i]->util = (void *)1; + } + base->object.flags |= UNINTERESTING; + add_pending_object(&revs, &base->object, "base"); + + if (prepare_revision_walk(&revs)) + die(_("revision walk setup failed")); + /* + * Traverse the commits list, get prerequisite patch ids + * and stuff them in bases structure. + */ + while ((commit = get_revision(&revs)) != NULL) { + unsigned char sha1[20]; + struct object_id *patch_id; + if (commit->util) + continue; + if (commit_patch_id(commit, &diffopt, sha1)) + die(_("cannot get patch id")); + ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id); + patch_id = bases->patch_id + bases->nr_patch_id; + hashcpy(patch_id->hash, sha1); + bases->nr_patch_id++; + } +} + +static void print_bases(struct base_tree_info *bases) +{ + int i; + + /* Only do this once, either for the cover or for the first one */ + if (is_null_oid(&bases->base_commit)) + return; + + /* Show the base commit */ + printf("base-commit: %s\n", oid_to_hex(&bases->base_commit)); + + /* Show the prerequisite patches */ + for (i = bases->nr_patch_id - 1; i >= 0; i--) + printf("prerequisite-patch-id: %s\n", oid_to_hex(&bases->patch_id[i])); + + free(bases->patch_id); + bases->nr_patch_id = 0; + bases->alloc_patch_id = 0; + oidclr(&bases->base_commit); +} + int cmd_format_patch(int argc, const char **argv, const char *prefix) { struct commit *commit; @@ -1209,6 +1369,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) int reroll_count = -1; char *branch_name = NULL; char *from = NULL; + char *base_commit = NULL; + struct base_tree_info bases; + const struct option builtin_format_patch_options[] = { { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL, N_("use [PATCH n/m] even with a single patch"), @@ -1271,6 +1434,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) PARSE_OPT_OPTARG, thread_callback }, OPT_STRING(0, "signature", &signature, N_("signature"), N_("add a signature")), + OPT_STRING(0, "base", &base_commit, N_("base-commit"), + N_("add prerequisite tree info to the patch series")), OPT_FILENAME(0, "signature-file", &signature_file, N_("add a signature from a file")), OPT__QUIET(&quiet, N_("don't print the patch filenames")), @@ -1280,10 +1445,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) extra_hdr.strdup_strings = 1; extra_to.strdup_strings = 1; extra_cc.strdup_strings = 1; - init_grep_defaults(); + init_log_defaults(); git_config(git_format_config, NULL); init_revisions(&rev, prefix); rev.commit_format = CMIT_FMT_EMAIL; + rev.expand_tabs_in_log_default = 0; rev.verbose_header = 1; rev.diff = 1; rev.max_parents = 1; @@ -1507,6 +1673,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) signature = strbuf_detach(&buf, NULL); } + memset(&bases, 0, sizeof(bases)); + if (base_commit || base_auto) { + struct commit *base = get_base_commit(base_commit, list, nr); + reset_revision_walk(); + prepare_bases(&bases, base, list, nr); + } + if (in_reply_to || thread || cover_letter) rev.ref_message_ids = xcalloc(1, sizeof(struct string_list)); if (in_reply_to) { @@ -1520,6 +1693,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) gen_message_id(&rev, "cover"); make_cover_letter(&rev, use_stdout, origin, nr, list, branch_name, quiet); + print_bases(&bases); total++; start_number--; } @@ -1585,6 +1759,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.mime_boundary); else print_signature(); + print_bases(&bases); } if (!use_stdout) fclose(stdout); diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c index 104277a..4859ede 100644 --- a/builtin/mailsplit.c +++ b/builtin/mailsplit.c @@ -109,7 +109,7 @@ static int populate_maildir_list(struct string_list *list, const char *path) if ((dir = opendir(name)) == NULL) { if (errno == ENOENT) continue; - error("cannot opendir %s (%s)", name, strerror(errno)); + error_errno("cannot opendir %s", name); goto out; } @@ -174,12 +174,12 @@ static int split_maildir(const char *maildir, const char *dir, f = fopen(file, "r"); if (!f) { - error("cannot open mail %s (%s)", file, strerror(errno)); + error_errno("cannot open mail %s", file); goto out; } if (strbuf_getwholeline(&buf, f, '\n')) { - error("cannot read mail %s (%s)", file, strerror(errno)); + error_errno("cannot read mail %s", file); goto out; } @@ -210,7 +210,7 @@ static int split_mbox(const char *file, const char *dir, int allow_bare, int file_done = 0; if (!f) { - error("cannot open mbox %s", file); + error_errno("cannot open mbox %s", file); goto out; } @@ -318,7 +318,7 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix) } if (stat(arg, &argstat) == -1) { - error("cannot stat %s (%s)", arg, strerror(errno)); + error_errno("cannot stat %s", arg); return 1; } diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 5544705..13e22a2 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -62,8 +62,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) usage_with_options(merge_file_usage, options); if (quiet) { if (!freopen("/dev/null", "w", stderr)) - return error("failed to redirect stderr to /dev/null: " - "%s", strerror(errno)); + return error_errno("failed to redirect stderr to /dev/null"); } if (prefix) @@ -95,12 +94,13 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) FILE *f = to_stdout ? stdout : fopen(fpath, "wb"); if (!f) - ret = error("Could not open %s for writing", filename); + ret = error_errno("Could not open %s for writing", + filename); else if (result.size && fwrite(result.ptr, result.size, 1, f) != 1) - ret = error("Could not write to %s", filename); + ret = error_errno("Could not write to %s", filename); else if (fclose(f)) - ret = error("Could not close %s", filename); + ret = error_errno("Could not close %s", filename); free(result.ptr); } diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index ca57004..5b7ab9b 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -150,15 +150,15 @@ static void show_result(void) /* An empty entry never compares same, not even to another empty entry */ static int same_entry(struct name_entry *a, struct name_entry *b) { - return a->sha1 && - b->sha1 && - !hashcmp(a->sha1, b->sha1) && + return a->oid && + b->oid && + !oidcmp(a->oid, b->oid) && a->mode == b->mode; } static int both_empty(struct name_entry *a, struct name_entry *b) { - return !(a->sha1 || b->sha1); + return !(a->oid || b->oid); } static struct merge_list *create_entry(unsigned stage, unsigned mode, const unsigned char *sha1, const char *path) @@ -188,8 +188,8 @@ static void resolve(const struct traverse_info *info, struct name_entry *ours, s return; path = traverse_path(info, result); - orig = create_entry(2, ours->mode, ours->sha1, path); - final = create_entry(0, result->mode, result->sha1, path); + orig = create_entry(2, ours->mode, ours->oid->hash, path); + final = create_entry(0, result->mode, result->oid->hash, path); final->link = orig; @@ -213,7 +213,7 @@ static void unresolved_directory(const struct traverse_info *info, newbase = traverse_path(info, p); -#define ENTRY_SHA1(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->sha1 : NULL) +#define ENTRY_SHA1(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->oid->hash : NULL) buf0 = fill_tree_descriptor(t+0, ENTRY_SHA1(n + 0)); buf1 = fill_tree_descriptor(t+1, ENTRY_SHA1(n + 1)); buf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2)); @@ -239,7 +239,7 @@ static struct merge_list *link_entry(unsigned stage, const struct traverse_info path = entry->path; else path = traverse_path(info, n); - link = create_entry(stage, n->mode, n->sha1, path); + link = create_entry(stage, n->mode, n->oid->hash, path); link->link = entry; return link; } @@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, s } if (same_entry(entry+0, entry+1)) { - if (entry[2].sha1 && !S_ISDIR(entry[2].mode)) { + if (entry[2].oid && !S_ISDIR(entry[2].mode)) { /* We did not touch, they modified -- take theirs */ resolve(info, entry+1, entry+2); return mask; diff --git a/builtin/merge.c b/builtin/merge.c index bf2f261..b555a1b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -64,6 +64,7 @@ static int option_renormalize; static int verbosity; static int allow_rerere_auto; static int abort_current_merge; +static int allow_unrelated_histories; static int show_progress = -1; static int default_to_upstream = 1; static const char *sign_commit; @@ -221,6 +222,8 @@ static struct option builtin_merge_options[] = { OPT__VERBOSITY(&verbosity), OPT_BOOL(0, "abort", &abort_current_merge, N_("abort the current in-progress merge")), + OPT_BOOL(0, "allow-unrelated-histories", &allow_unrelated_histories, + N_("allow merging unrelated histories")), OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1), { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"), N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, @@ -819,6 +822,14 @@ static int merge_trivial(struct commit *head, struct commit_list *remoteheads) { unsigned char result_tree[20], result_commit[20]; struct commit_list *parents, **pptr = &parents; + static struct lock_file lock; + + hold_locked_index(&lock, 1); + refresh_cache(REFRESH_QUIET); + if (active_cache_changed && + write_locked_index(&the_index, &lock, COMMIT_LOCK)) + return error(_("Unable to write index.")); + rollback_lock_file(&lock); write_tree_trivial(result_tree); printf(_("Wonderful.\n")); @@ -1165,7 +1176,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) struct commit *head_commit; struct strbuf buf = STRBUF_INIT; const char *head_arg; - int flag, i, ret = 0, head_subsumed; + int i, ret = 0, head_subsumed; int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0; struct commit_list *common = NULL; const char *best_strategy = NULL, *wt_strategy = NULL; @@ -1179,7 +1190,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * Check if we are _not_ on a detached HEAD, i.e. if there is a * current branch. */ - branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, &flag); + branch = branch_to_free = resolve_refdup("HEAD", 0, head_sha1, NULL); if (branch && starts_with(branch, "refs/heads/")) branch += 11; if (!branch || is_null_sha1(head_sha1)) @@ -1187,6 +1198,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) else head_commit = lookup_commit_or_die(head_sha1, "HEAD"); + init_diff_ui_defaults(); git_config(git_merge_config, NULL); if (branch_mergeoptions) @@ -1397,9 +1409,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix) update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit->object.oid.hash, NULL, 0, UPDATE_REFS_DIE_ON_ERR); - if (remoteheads && !common) - ; /* No common ancestors found. We need a real merge. */ - else if (!remoteheads || + if (remoteheads && !common) { + /* No common ancestors found. */ + if (!allow_unrelated_histories) + die(_("refusing to merge unrelated histories")); + /* otherwise, we need a real merge. */ + } else if (!remoteheads || (!remoteheads->next && !common->next && common->item == remoteheads->item)) { /* diff --git a/builtin/notes.c b/builtin/notes.c index 6fd058d..c65b59a 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -847,15 +847,15 @@ static int merge(int argc, const char **argv, const char *prefix) update_ref(msg.buf, default_notes_ref(), result_sha1, NULL, 0, UPDATE_REFS_DIE_ON_ERR); else { /* Merge has unresolved conflicts */ - char *existing; + const struct worktree *wt; /* Update .git/NOTES_MERGE_PARTIAL with partial merge result */ update_ref(msg.buf, "NOTES_MERGE_PARTIAL", result_sha1, NULL, 0, UPDATE_REFS_DIE_ON_ERR); /* Store ref-to-be-updated into .git/NOTES_MERGE_REF */ - existing = find_shared_symref("NOTES_MERGE_REF", default_notes_ref()); - if (existing) + wt = find_shared_symref("NOTES_MERGE_REF", default_notes_ref()); + if (wt) die(_("A notes merge into %s is already in-progress at %s"), - default_notes_ref(), existing); + default_notes_ref(), wt->path); if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL)) die("Failed to store link to current notes ref (%s)", default_notes_ref()); diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index b6664ce..8f5e358 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -835,8 +835,7 @@ static void write_pack_file(void) * to preserve this property. */ if (stat(pack_tmp_name, &st) < 0) { - warning("failed to stat %s: %s", - pack_tmp_name, strerror(errno)); + warning_errno("failed to stat %s", pack_tmp_name); } else if (!last_mtime) { last_mtime = st.st_mtime; } else { @@ -844,8 +843,7 @@ static void write_pack_file(void) utb.actime = st.st_atime; utb.modtime = --last_mtime; if (utime(pack_tmp_name, &utb) < 0) - warning("failed utime() on %s: %s", - pack_tmp_name, strerror(errno)); + warning_errno("failed utime() on %s", pack_tmp_name); } strbuf_addf(&tmpname, "%s-", base_name); @@ -1193,7 +1191,7 @@ static void add_pbase_object(struct tree_desc *tree, if (cmp < 0) return; if (name[cmplen] != '/') { - add_object_entry(entry.sha1, + add_object_entry(entry.oid->hash, object_type(entry.mode), fullname, 1); return; @@ -1204,7 +1202,7 @@ static void add_pbase_object(struct tree_desc *tree, const char *down = name+cmplen+1; int downlen = name_cmp_len(down); - tree = pbase_tree_get(entry.sha1); + tree = pbase_tree_get(entry.oid->hash); if (!tree) return; init_tree_desc(&sub, tree->tree_data, tree->tree_size); diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 366ce5a..a84d000 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -81,16 +81,13 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result, while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) { char *line = line_buf->buf; - char *p = line; + const char *p = line; int len; - if (!memcmp(line, "diff-tree ", 10)) - p += 10; - else if (!memcmp(line, "commit ", 7)) - p += 7; - else if (!memcmp(line, "From ", 5)) - p += 5; - else if (!memcmp(line, "\\ ", 2) && 12 < strlen(line)) + if (!skip_prefix(line, "diff-tree ", &p) && + !skip_prefix(line, "commit ", &p) && + !skip_prefix(line, "From ", &p) && + starts_with(line, "\\ ") && 12 < strlen(line)) continue; if (!get_oid_hex(p, next_oid)) { @@ -99,14 +96,14 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result, } /* Ignore commit comments */ - if (!patchlen && memcmp(line, "diff ", 5)) + if (!patchlen && !starts_with(line, "diff ")) continue; /* Parsing diff header? */ if (before == -1) { - if (!memcmp(line, "index ", 6)) + if (starts_with(line, "index ")) continue; - else if (!memcmp(line, "--- ", 4)) + else if (starts_with(line, "--- ")) before = after = 1; else if (!isalpha(line[0])) break; @@ -114,14 +111,14 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result, /* Looking for a valid hunk header? */ if (before == 0 && after == 0) { - if (!memcmp(line, "@@ -", 4)) { + if (starts_with(line, "@@ -")) { /* Parse next hunk, but ignore line numbers. */ scan_hunk_header(line, &before, &after); continue; } /* Split at the end of the patch. */ - if (memcmp(line, "diff ", 5)) + if (!starts_with(line, "diff ")) break; /* Else we're parsing another header. */ diff --git a/builtin/pull.c b/builtin/pull.c index 6214af9..1d7333c 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -86,9 +86,12 @@ static char *opt_commit; static char *opt_edit; static char *opt_ff; static char *opt_verify_signatures; +static int opt_autostash = -1; +static int config_autostash; static struct argv_array opt_strategies = ARGV_ARRAY_INIT; static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT; static char *opt_gpg_sign; +static int opt_allow_unrelated_histories; /* Options passed to git-fetch */ static char *opt_all; @@ -149,6 +152,8 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL, N_("verify that the named commit has a valid GPG signature"), PARSE_OPT_NOARG), + OPT_BOOL(0, "autostash", &opt_autostash, + N_("automatically stash/stash pop before and after rebase")), OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"), N_("merge strategy to use"), 0), @@ -159,6 +164,9 @@ static struct option pull_options[] = { OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign, N_("key-id"), N_("GPG sign commit"), PARSE_OPT_OPTARG), + OPT_SET_INT(0, "allow-unrelated-histories", + &opt_allow_unrelated_histories, + N_("allow merging unrelated histories"), 1), /* Options passed to git-fetch */ OPT_GROUP(N_("Options related to fetching")), @@ -306,6 +314,18 @@ static enum rebase_type config_get_rebase(void) } /** + * Read config variables. + */ +static int git_pull_config(const char *var, const char *value, void *cb) +{ + if (!strcmp(var, "rebase.autostash")) { + config_autostash = git_config_bool(var, value); + return 0; + } + return git_default_config(var, value, cb); +} + +/** * Returns 1 if there are unstaged changes, 0 otherwise. */ static int has_unstaged_changes(const char *prefix) @@ -612,6 +632,8 @@ static int run_merge(void) argv_array_pushv(&args, opt_strategy_opts.argv); if (opt_gpg_sign) argv_array_push(&args, opt_gpg_sign); + if (opt_allow_unrelated_histories > 0) + argv_array_push(&args, "--allow-unrelated-histories"); argv_array_push(&args, "FETCH_HEAD"); ret = run_command_v_opt(args.argv, RUN_GIT_CMD); @@ -789,6 +811,10 @@ static int run_rebase(const unsigned char *curr_head, argv_array_pushv(&args, opt_strategy_opts.argv); if (opt_gpg_sign) argv_array_push(&args, opt_gpg_sign); + if (opt_autostash == 0) + argv_array_push(&args, "--no-autostash"); + else if (opt_autostash == 1) + argv_array_push(&args, "--autostash"); argv_array_push(&args, "--onto"); argv_array_push(&args, sha1_to_hex(merge_head)); @@ -823,7 +849,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (opt_rebase < 0) opt_rebase = config_get_rebase(); - git_config(git_default_config, NULL); + git_config(git_pull_config, NULL); if (read_cache_unmerged()) die_resolve_conflict("Pull"); @@ -834,13 +860,17 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (get_sha1("HEAD", orig_head)) hashclr(orig_head); + if (!opt_rebase && opt_autostash != -1) + die(_("--[no-]autostash option is only valid with --rebase.")); + if (opt_rebase) { - int autostash = 0; + int autostash = config_autostash; + if (opt_autostash != -1) + autostash = opt_autostash; if (is_null_sha1(orig_head) && !is_cache_unborn()) die(_("Updating an unborn branch with changes added to the index.")); - git_config_get_bool("rebase.autostash", &autostash); if (!autostash) die_on_unclean_work_tree(prefix); diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index c8e32b2..a744437 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -21,7 +21,10 @@ #include "sigchain.h" #include "fsck.h" -static const char receive_pack_usage[] = "git receive-pack <git-dir>"; +static const char * const receive_pack_usage[] = { + N_("git receive-pack <git-dir>"), + NULL +}; enum deny_action { DENY_UNCONFIGURED, @@ -49,7 +52,7 @@ static int quiet; static int prefer_ofs_delta = 1; static int auto_update_server_info; static int auto_gc = 1; -static int fix_thin = 1; +static int reject_thin; static int stateless_rpc; static const char *service_dir; static const char *head_name; @@ -1081,13 +1084,13 @@ static void check_aliased_update(struct command *cmd, struct string_list *list) if (!(flag & REF_ISSYMREF)) return; - dst_name = strip_namespace(dst_name); if (!dst_name) { rp_error("refusing update to broken symref '%s'", cmd->ref_name); cmd->skip_update = 1; cmd->error_string = "broken symref"; return; } + dst_name = strip_namespace(dst_name); if ((item = string_list_lookup(list, dst_name)) == NULL) return; @@ -1548,7 +1551,7 @@ static const char *unpack(int err_fd, struct shallow_info *si) if (fsck_objects) argv_array_pushf(&child.args, "--strict%s", fsck_msg_types.buf); - if (fix_thin) + if (!reject_thin) argv_array_push(&child.args, "--fix-thin"); child.out = -1; child.err = err_fd; @@ -1707,45 +1710,29 @@ static int delete_only(struct command *commands) int cmd_receive_pack(int argc, const char **argv, const char *prefix) { int advertise_refs = 0; - int i; struct command *commands; struct sha1_array shallow = SHA1_ARRAY_INIT; struct sha1_array ref = SHA1_ARRAY_INIT; struct shallow_info si; - packet_trace_identity("receive-pack"); + struct option options[] = { + OPT__QUIET(&quiet, N_("quiet")), + OPT_HIDDEN_BOOL(0, "stateless-rpc", &stateless_rpc, NULL), + OPT_HIDDEN_BOOL(0, "advertise-refs", &advertise_refs, NULL), + OPT_HIDDEN_BOOL(0, "reject-thin-pack-for-testing", &reject_thin, NULL), + OPT_END() + }; - argv++; - for (i = 1; i < argc; i++) { - const char *arg = *argv++; + packet_trace_identity("receive-pack"); - if (*arg == '-') { - if (!strcmp(arg, "--quiet")) { - quiet = 1; - continue; - } + argc = parse_options(argc, argv, prefix, options, receive_pack_usage, 0); - if (!strcmp(arg, "--advertise-refs")) { - advertise_refs = 1; - continue; - } - if (!strcmp(arg, "--stateless-rpc")) { - stateless_rpc = 1; - continue; - } - if (!strcmp(arg, "--reject-thin-pack-for-testing")) { - fix_thin = 0; - continue; - } + if (argc > 1) + usage_msg_opt(_("Too many arguments."), receive_pack_usage, options); + if (argc == 0) + usage_msg_opt(_("You must specify a directory."), receive_pack_usage, options); - usage(receive_pack_usage); - } - if (service_dir) - usage(receive_pack_usage); - service_dir = arg; - } - if (!service_dir) - usage(receive_pack_usage); + service_dir = argv[0]; setup_path(); diff --git a/builtin/reflog.c b/builtin/reflog.c index 2d46b64..7a7136e 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -84,8 +84,8 @@ static int tree_is_complete(const unsigned char *sha1) init_tree_desc(&desc, tree->buffer, tree->size); complete = 1; while (tree_entry(&desc, &entry)) { - if (!has_sha1_file(entry.sha1) || - (S_ISDIR(entry.mode) && !tree_is_complete(entry.sha1))) { + if (!has_sha1_file(entry.oid->hash) || + (S_ISDIR(entry.mode) && !tree_is_complete(entry.oid->hash))) { tree->object.flags |= INCOMPLETE; complete = 0; } diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 275da0d..b82bcc3 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -358,12 +358,16 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (use_bitmap_index && !revs.prune) { if (revs.count && !revs.left_right && !revs.cherry_mark) { uint32_t commit_count; + int max_count = revs.max_count; if (!prepare_bitmap_walk(&revs)) { count_bitmap_commit_list(&commit_count, NULL, NULL, NULL); + if (max_count >= 0 && max_count < commit_count) + commit_count = max_count; printf("%d\n", commit_count); return 0; } - } else if (revs.tag_objects && revs.tree_objects && revs.blob_objects) { + } else if (revs.max_count < 0 && + revs.tag_objects && revs.tree_objects && revs.blob_objects) { if (!prepare_bitmap_walk(&revs)) { traverse_bitmap_commit_list(&show_object_fast); return 0; diff --git a/builtin/rm.c b/builtin/rm.c index be83c43..8abb020 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -152,7 +152,7 @@ static int check_local_mod(unsigned char *head, int index_only) if (lstat(ce->name, &st) < 0) { if (errno != ENOENT && errno != ENOTDIR) - warning("'%s': %s", ce->name, strerror(errno)); + warning_errno(_("failed to stat '%s'"), ce->name); /* It already vanished from the working tree */ continue; } diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 3bea3aa..926d205 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -9,6 +9,211 @@ #include "submodule-config.h" #include "string-list.h" #include "run-command.h" +#include "remote.h" +#include "refs.h" +#include "connect.h" + +static char *get_default_remote(void) +{ + char *dest = NULL, *ret; + unsigned char sha1[20]; + struct strbuf sb = STRBUF_INIT; + const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL); + + if (!refname) + die(_("No such ref: %s"), "HEAD"); + + /* detached HEAD */ + if (!strcmp(refname, "HEAD")) + return xstrdup("origin"); + + if (!skip_prefix(refname, "refs/heads/", &refname)) + die(_("Expecting a full ref name, got %s"), refname); + + strbuf_addf(&sb, "branch.%s.remote", refname); + if (git_config_get_string(sb.buf, &dest)) + ret = xstrdup("origin"); + else + ret = dest; + + strbuf_release(&sb); + return ret; +} + +static int starts_with_dot_slash(const char *str) +{ + return str[0] == '.' && is_dir_sep(str[1]); +} + +static int starts_with_dot_dot_slash(const char *str) +{ + return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]); +} + +/* + * Returns 1 if it was the last chop before ':'. + */ +static int chop_last_dir(char **remoteurl, int is_relative) +{ + char *rfind = find_last_dir_sep(*remoteurl); + if (rfind) { + *rfind = '\0'; + return 0; + } + + rfind = strrchr(*remoteurl, ':'); + if (rfind) { + *rfind = '\0'; + return 1; + } + + if (is_relative || !strcmp(".", *remoteurl)) + die(_("cannot strip one component off url '%s'"), + *remoteurl); + + free(*remoteurl); + *remoteurl = xstrdup("."); + return 0; +} + +/* + * The `url` argument is the URL that navigates to the submodule origin + * repo. When relative, this URL is relative to the superproject origin + * URL repo. The `up_path` argument, if specified, is the relative + * path that navigates from the submodule working tree to the superproject + * working tree. Returns the origin URL of the submodule. + * + * Return either an absolute URL or filesystem path (if the superproject + * origin URL is an absolute URL or filesystem path, respectively) or a + * relative file system path (if the superproject origin URL is a relative + * file system path). + * + * When the output is a relative file system path, the path is either + * relative to the submodule working tree, if up_path is specified, or to + * the superproject working tree otherwise. + * + * NEEDSWORK: This works incorrectly on the domain and protocol part. + * remote_url url outcome expectation + * http://a.com/b ../c http://a.com/c as is + * http://a.com/b ../../c http://c error out + * http://a.com/b ../../../c http:/c error out + * http://a.com/b ../../../../c http:c error out + * http://a.com/b ../../../../../c .:c error out + * NEEDSWORK: Given how chop_last_dir() works, this function is broken + * when a local part has a colon in its path component, too. + */ +static char *relative_url(const char *remote_url, + const char *url, + const char *up_path) +{ + int is_relative = 0; + int colonsep = 0; + char *out; + char *remoteurl = xstrdup(remote_url); + struct strbuf sb = STRBUF_INIT; + size_t len = strlen(remoteurl); + + if (is_dir_sep(remoteurl[len])) + remoteurl[len] = '\0'; + + if (!url_is_local_not_ssh(remoteurl) || is_absolute_path(remoteurl)) + is_relative = 0; + else { + is_relative = 1; + /* + * Prepend a './' to ensure all relative + * remoteurls start with './' or '../' + */ + if (!starts_with_dot_slash(remoteurl) && + !starts_with_dot_dot_slash(remoteurl)) { + strbuf_reset(&sb); + strbuf_addf(&sb, "./%s", remoteurl); + free(remoteurl); + remoteurl = strbuf_detach(&sb, NULL); + } + } + /* + * When the url starts with '../', remove that and the + * last directory in remoteurl. + */ + while (url) { + if (starts_with_dot_dot_slash(url)) { + url += 3; + colonsep |= chop_last_dir(&remoteurl, is_relative); + } else if (starts_with_dot_slash(url)) + url += 2; + else + break; + } + strbuf_reset(&sb); + strbuf_addf(&sb, "%s%s%s", remoteurl, colonsep ? ":" : "/", url); + free(remoteurl); + + if (starts_with_dot_slash(sb.buf)) + out = xstrdup(sb.buf + 2); + else + out = xstrdup(sb.buf); + strbuf_reset(&sb); + + if (!up_path || !is_relative) + return out; + + strbuf_addf(&sb, "%s%s", up_path, out); + free(out); + return strbuf_detach(&sb, NULL); +} + +static int resolve_relative_url(int argc, const char **argv, const char *prefix) +{ + char *remoteurl = NULL; + char *remote = get_default_remote(); + const char *up_path = NULL; + char *res; + const char *url; + struct strbuf sb = STRBUF_INIT; + + if (argc != 2 && argc != 3) + die("resolve-relative-url only accepts one or two arguments"); + + url = argv[1]; + strbuf_addf(&sb, "remote.%s.url", remote); + free(remote); + + if (git_config_get_string(sb.buf, &remoteurl)) + /* the repository is its own authoritative upstream */ + remoteurl = xgetcwd(); + + if (argc == 3) + up_path = argv[2]; + + res = relative_url(remoteurl, url, up_path); + puts(res); + free(res); + free(remoteurl); + return 0; +} + +static int resolve_relative_url_test(int argc, const char **argv, const char *prefix) +{ + char *remoteurl, *res; + const char *up_path, *url; + + if (argc != 4) + die("resolve-relative-url-test only accepts three arguments: <up_path> <remoteurl> <url>"); + + up_path = argv[1]; + remoteurl = xstrdup(argv[2]); + url = argv[3]; + + if (!strcmp(up_path, "(null)")) + up_path = NULL; + + res = relative_url(remoteurl, url, up_path); + puts(res); + free(res); + free(remoteurl); + return 0; +} struct module_list { const struct cache_entry **entries; @@ -82,10 +287,8 @@ static int module_list(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, module_list_options, git_submodule_helper_usage, 0); - if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0) { - printf("#unmatched\n"); + if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0) return 1; - } for (i = 0; i < list.nr; i++) { const struct cache_entry *ce = list.entries[i]; @@ -100,6 +303,125 @@ static int module_list(int argc, const char **argv, const char *prefix) return 0; } +static void init_submodule(const char *path, const char *prefix, int quiet) +{ + const struct submodule *sub; + struct strbuf sb = STRBUF_INIT; + char *upd = NULL, *url = NULL, *displaypath; + + /* Only loads from .gitmodules, no overlay with .git/config */ + gitmodules_config(); + + if (prefix) { + strbuf_addf(&sb, "%s%s", prefix, path); + displaypath = strbuf_detach(&sb, NULL); + } else + displaypath = xstrdup(path); + + sub = submodule_from_path(null_sha1, path); + + if (!sub) + die(_("No url found for submodule path '%s' in .gitmodules"), + displaypath); + + /* + * Copy url setting when it is not set yet. + * To look up the url in .git/config, we must not fall back to + * .gitmodules, so look it up directly. + */ + strbuf_reset(&sb); + strbuf_addf(&sb, "submodule.%s.url", sub->name); + if (git_config_get_string(sb.buf, &url)) { + url = xstrdup(sub->url); + + if (!url) + die(_("No url found for submodule path '%s' in .gitmodules"), + displaypath); + + /* Possibly a url relative to parent */ + if (starts_with_dot_dot_slash(url) || + starts_with_dot_slash(url)) { + char *remoteurl, *relurl; + char *remote = get_default_remote(); + struct strbuf remotesb = STRBUF_INIT; + strbuf_addf(&remotesb, "remote.%s.url", remote); + free(remote); + + if (git_config_get_string(remotesb.buf, &remoteurl)) + /* + * The repository is its own + * authoritative upstream + */ + remoteurl = xgetcwd(); + relurl = relative_url(remoteurl, url, NULL); + strbuf_release(&remotesb); + free(remoteurl); + free(url); + url = relurl; + } + + if (git_config_set_gently(sb.buf, url)) + die(_("Failed to register url for submodule path '%s'"), + displaypath); + if (!quiet) + fprintf(stderr, + _("Submodule '%s' (%s) registered for path '%s'\n"), + sub->name, url, displaypath); + } + + /* Copy "update" setting when it is not set yet */ + strbuf_reset(&sb); + strbuf_addf(&sb, "submodule.%s.update", sub->name); + if (git_config_get_string(sb.buf, &upd) && + sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) { + if (sub->update_strategy.type == SM_UPDATE_COMMAND) { + fprintf(stderr, _("warning: command update mode suggested for submodule '%s'\n"), + sub->name); + upd = xstrdup("none"); + } else + upd = xstrdup(submodule_strategy_to_string(&sub->update_strategy)); + + if (git_config_set_gently(sb.buf, upd)) + die(_("Failed to register update mode for submodule path '%s'"), displaypath); + } + strbuf_release(&sb); + free(displaypath); + free(url); + free(upd); +} + +static int module_init(int argc, const char **argv, const char *prefix) +{ + struct pathspec pathspec; + struct module_list list = MODULE_LIST_INIT; + int quiet = 0; + int i; + + struct option module_init_options[] = { + OPT_STRING(0, "prefix", &prefix, + N_("path"), + N_("alternative anchor for relative paths")), + OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")), + OPT_END() + }; + + const char *const git_submodule_helper_usage[] = { + N_("git submodule--helper init [<path>]"), + NULL + }; + + argc = parse_options(argc, argv, prefix, module_init_options, + git_submodule_helper_usage, 0); + + if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0) + return 1; + + for (i = 0; i < list.nr; i++) + init_submodule(list.entries[i]->name, prefix, quiet); + + return 0; +} + static int module_name(int argc, const char **argv, const char *prefix) { const struct submodule *sub; @@ -118,6 +440,7 @@ static int module_name(int argc, const char **argv, const char *prefix) return 0; } + static int clone_submodule(const char *path, const char *gitdir, const char *url, const char *depth, const char *reference, int quiet) { @@ -139,7 +462,7 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url argv_array_push(&cp.args, path); cp.git_cmd = 1; - cp.env = local_repo_env; + prepare_submodule_repo_env(&cp.env_array); cp.no_stdin = 1; return run_command(&cp); @@ -180,16 +503,17 @@ static int module_clone(int argc, const char **argv, const char *prefix) const char *const git_submodule_helper_usage[] = { N_("git submodule--helper clone [--prefix=<path>] [--quiet] " - "[--reference <repository>] [--name <name>] [--url <url>]" - "[--depth <depth>] [--] [<path>...]"), + "[--reference <repository>] [--name <name>] [--depth <depth>] " + "--url <url> --path <path>"), NULL }; argc = parse_options(argc, argv, prefix, module_clone_options, git_submodule_helper_usage, 0); - if (!path || !*path) - die(_("submodule--helper: unspecified or empty --path")); + if (argc || !url || !path || !*path) + usage_with_options(git_submodule_helper_usage, + module_clone_options); strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name); sm_gitdir = xstrdup(absolute_path(sb.buf)); @@ -244,6 +568,280 @@ static int module_clone(int argc, const char **argv, const char *prefix) return 0; } +struct submodule_update_clone { + /* index into 'list', the list of submodules to look into for cloning */ + int current; + struct module_list list; + unsigned warn_if_uninitialized : 1; + + /* update parameter passed via commandline */ + struct submodule_update_strategy update; + + /* configuration parameters which are passed on to the children */ + int quiet; + const char *reference; + const char *depth; + const char *recursive_prefix; + const char *prefix; + + /* Machine-readable status lines to be consumed by git-submodule.sh */ + struct string_list projectlines; + + /* If we want to stop as fast as possible and return an error */ + unsigned quickstop : 1; +}; +#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \ + SUBMODULE_UPDATE_STRATEGY_INIT, 0, NULL, NULL, NULL, NULL, \ + STRING_LIST_INIT_DUP, 0} + + +static void next_submodule_warn_missing(struct submodule_update_clone *suc, + struct strbuf *out, const char *displaypath) +{ + /* + * Only mention uninitialized submodules when their + * paths have been specified. + */ + if (suc->warn_if_uninitialized) { + strbuf_addf(out, + _("Submodule path '%s' not initialized"), + displaypath); + strbuf_addch(out, '\n'); + strbuf_addstr(out, + _("Maybe you want to use 'update --init'?")); + strbuf_addch(out, '\n'); + } +} + +/** + * Determine whether 'ce' needs to be cloned. If so, prepare the 'child' to + * run the clone. Returns 1 if 'ce' needs to be cloned, 0 otherwise. + */ +static int prepare_to_clone_next_submodule(const struct cache_entry *ce, + struct child_process *child, + struct submodule_update_clone *suc, + struct strbuf *out) +{ + const struct submodule *sub = NULL; + struct strbuf displaypath_sb = STRBUF_INIT; + struct strbuf sb = STRBUF_INIT; + const char *displaypath = NULL; + char *url = NULL; + int needs_cloning = 0; + + if (ce_stage(ce)) { + if (suc->recursive_prefix) + strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name); + else + strbuf_addf(&sb, "%s", ce->name); + strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf); + strbuf_addch(out, '\n'); + goto cleanup; + } + + sub = submodule_from_path(null_sha1, ce->name); + + if (suc->recursive_prefix) + displaypath = relative_path(suc->recursive_prefix, + ce->name, &displaypath_sb); + else + displaypath = ce->name; + + if (!sub) { + next_submodule_warn_missing(suc, out, displaypath); + goto cleanup; + } + + if (suc->update.type == SM_UPDATE_NONE + || (suc->update.type == SM_UPDATE_UNSPECIFIED + && sub->update_strategy.type == SM_UPDATE_NONE)) { + strbuf_addf(out, _("Skipping submodule '%s'"), displaypath); + strbuf_addch(out, '\n'); + goto cleanup; + } + + /* + * Looking up the url in .git/config. + * We must not fall back to .gitmodules as we only want + * to process configured submodules. + */ + strbuf_reset(&sb); + strbuf_addf(&sb, "submodule.%s.url", sub->name); + git_config_get_string(sb.buf, &url); + if (!url) { + next_submodule_warn_missing(suc, out, displaypath); + goto cleanup; + } + + strbuf_reset(&sb); + strbuf_addf(&sb, "%s/.git", ce->name); + needs_cloning = !file_exists(sb.buf); + + strbuf_reset(&sb); + strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode, + sha1_to_hex(ce->sha1), ce_stage(ce), + needs_cloning, ce->name); + string_list_append(&suc->projectlines, sb.buf); + + if (!needs_cloning) + goto cleanup; + + child->git_cmd = 1; + child->no_stdin = 1; + child->stdout_to_stderr = 1; + child->err = -1; + argv_array_push(&child->args, "submodule--helper"); + argv_array_push(&child->args, "clone"); + if (suc->quiet) + argv_array_push(&child->args, "--quiet"); + if (suc->prefix) + argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL); + argv_array_pushl(&child->args, "--path", sub->path, NULL); + argv_array_pushl(&child->args, "--name", sub->name, NULL); + argv_array_pushl(&child->args, "--url", url, NULL); + if (suc->reference) + argv_array_push(&child->args, suc->reference); + if (suc->depth) + argv_array_push(&child->args, suc->depth); + +cleanup: + free(url); + strbuf_reset(&displaypath_sb); + strbuf_reset(&sb); + + return needs_cloning; +} + +static int update_clone_get_next_task(struct child_process *child, + struct strbuf *err, + void *suc_cb, + void **void_task_cb) +{ + struct submodule_update_clone *suc = suc_cb; + + for (; suc->current < suc->list.nr; suc->current++) { + const struct cache_entry *ce = suc->list.entries[suc->current]; + if (prepare_to_clone_next_submodule(ce, child, suc, err)) { + suc->current++; + return 1; + } + } + return 0; +} + +static int update_clone_start_failure(struct strbuf *err, + void *suc_cb, + void *void_task_cb) +{ + struct submodule_update_clone *suc = suc_cb; + suc->quickstop = 1; + return 1; +} + +static int update_clone_task_finished(int result, + struct strbuf *err, + void *suc_cb, + void *void_task_cb) +{ + struct submodule_update_clone *suc = suc_cb; + + if (!result) + return 0; + + suc->quickstop = 1; + return 1; +} + +static int update_clone(int argc, const char **argv, const char *prefix) +{ + const char *update = NULL; + int max_jobs = -1; + struct string_list_item *item; + struct pathspec pathspec; + struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT; + + struct option module_update_clone_options[] = { + OPT_STRING(0, "prefix", &prefix, + N_("path"), + N_("path into the working tree")), + OPT_STRING(0, "recursive-prefix", &suc.recursive_prefix, + N_("path"), + N_("path into the working tree, across nested " + "submodule boundaries")), + OPT_STRING(0, "update", &update, + N_("string"), + N_("rebase, merge, checkout or none")), + OPT_STRING(0, "reference", &suc.reference, N_("repo"), + N_("reference repository")), + OPT_STRING(0, "depth", &suc.depth, "<depth>", + N_("Create a shallow clone truncated to the " + "specified number of revisions")), + OPT_INTEGER('j', "jobs", &max_jobs, + N_("parallel jobs")), + OPT__QUIET(&suc.quiet, N_("don't print cloning progress")), + OPT_END() + }; + + const char *const git_submodule_helper_usage[] = { + N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"), + NULL + }; + suc.prefix = prefix; + + argc = parse_options(argc, argv, prefix, module_update_clone_options, + git_submodule_helper_usage, 0); + + if (update) + if (parse_submodule_update_strategy(update, &suc.update) < 0) + die(_("bad value for update parameter")); + + if (module_list_compute(argc, argv, prefix, &pathspec, &suc.list) < 0) + return 1; + + if (pathspec.nr) + suc.warn_if_uninitialized = 1; + + /* Overlay the parsed .gitmodules file with .git/config */ + gitmodules_config(); + git_config(submodule_config, NULL); + + if (max_jobs < 0) + max_jobs = parallel_submodules(); + + run_processes_parallel(max_jobs, + update_clone_get_next_task, + update_clone_start_failure, + update_clone_task_finished, + &suc); + + /* + * We saved the output and put it out all at once now. + * That means: + * - the listener does not have to interleave their (checkout) + * work with our fetching. The writes involved in a + * checkout involve more straightforward sequential I/O. + * - the listener can avoid doing any work if fetching failed. + */ + if (suc.quickstop) + return 1; + + for_each_string_list_item(item, &suc.projectlines) + utf8_fprintf(stdout, "%s", item->string); + + return 0; +} + +static int resolve_relative_path(int argc, const char **argv, const char *prefix) +{ + struct strbuf sb = STRBUF_INIT; + if (argc != 3) + die("submodule--helper relative_path takes exactly 2 arguments, got %d", argc); + + printf("%s", relative_path(argv[1], argv[2], &sb)); + strbuf_release(&sb); + return 0; +} + struct cmd_struct { const char *cmd; int (*fn)(int, const char **, const char *); @@ -253,19 +851,24 @@ static struct cmd_struct commands[] = { {"list", module_list}, {"name", module_name}, {"clone", module_clone}, + {"update-clone", update_clone}, + {"relative-path", resolve_relative_path}, + {"resolve-relative-url", resolve_relative_url}, + {"resolve-relative-url-test", resolve_relative_url_test}, + {"init", module_init} }; int cmd_submodule__helper(int argc, const char **argv, const char *prefix) { int i; if (argc < 2) - die(_("fatal: submodule--helper subcommand must be " + die(_("submodule--helper subcommand must be " "called with a subcommand")); for (i = 0; i < ARRAY_SIZE(commands); i++) if (!strcmp(argv[1], commands[i].cmd)) return commands[i].fn(argc - 1, argv + 1, prefix); - die(_("fatal: '%s' is not a valid submodule--helper " + die(_("'%s' is not a valid submodule--helper " "subcommand"), argv[1]); } diff --git a/builtin/tag.c b/builtin/tag.c index 1705c94..50e4ae5 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -29,6 +29,7 @@ static const char * const git_tag_usage[] = { }; static unsigned int colopts; +static int force_sign_annotate; static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, const char *format) { @@ -104,13 +105,7 @@ static int delete_tag(const char *name, const char *ref, static int verify_tag(const char *name, const char *ref, const unsigned char *sha1) { - const char *argv_verify_tag[] = {"verify-tag", - "-v", "SHA1_HEX", NULL}; - argv_verify_tag[2] = sha1_to_hex(sha1); - - if (run_command_v_opt(argv_verify_tag, RUN_GIT_CMD)) - return error(_("could not verify the tag '%s'"), name); - return 0; + return gpg_verify_tag(sha1, name, GPG_VERIFY_VERBOSE); } static int do_sign(struct strbuf *buffer) @@ -166,6 +161,11 @@ static int git_tag_config(const char *var, const char *value, void *cb) status = git_gpg_config(var, value, cb); if (status) return status; + if (!strcmp(var, "tag.forcesignannotated")) { + force_sign_annotate = git_config_bool(var, value); + return 0; + } + if (starts_with(var, "column.")) return git_column_config(var, value, "tag", &colopts); return git_default_config(var, value, cb); @@ -327,7 +327,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) char *cleanup_arg = NULL; int create_reflog = 0; int annotate = 0, force = 0; - int cmdmode = 0; + int cmdmode = 0, create_tag_object = 0; const char *msgfile = NULL, *keyid = NULL; struct msg_arg msg = { 0, STRBUF_INIT }; struct ref_transaction *transaction; @@ -385,12 +385,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix) opt.sign = 1; set_signing_key(keyid); } - if (opt.sign) - annotate = 1; + create_tag_object = (opt.sign || annotate || msg.given || msgfile); + if (argc == 0 && !cmdmode) cmdmode = 'l'; - if ((annotate || msg.given || msgfile || force) && (cmdmode != 0)) + if ((create_tag_object || force) && (cmdmode != 0)) usage_with_options(git_tag_usage, options); finalize_colopts(&colopts, -1); @@ -431,7 +431,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix) if (msg.given || msgfile) { if (msg.given && msgfile) die(_("only one -F or -m option is allowed.")); - annotate = 1; if (msg.given) strbuf_addbuf(&buf, &(msg.buf)); else { @@ -474,8 +473,11 @@ int cmd_tag(int argc, const char **argv, const char *prefix) else die(_("Invalid cleanup mode %s"), cleanup_arg); - if (annotate) + if (create_tag_object) { + if (force_sign_annotate && !annotate) + opt.sign = 1; create_tag(object, tag, &buf, &opt, prev, object); + } transaction = ref_transaction_begin(&err); if (!transaction || diff --git a/builtin/update-index.c b/builtin/update-index.c index 1c94ca5..b8b8522 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -255,7 +255,7 @@ static int process_lstat_error(const char *path, int err) { if (err == ENOENT || err == ENOTDIR) return remove_one_path(path); - return error("lstat(\"%s\"): %s", path, strerror(errno)); + return error("lstat(\"%s\"): %s", path, strerror(err)); } static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st) diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index dbfe14f..2caedf1 100644 --- a/builtin/upload-archive.c +++ b/builtin/upload-archive.c @@ -104,8 +104,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix) pfd[1].events = POLLIN; if (poll(pfd, 2, -1) < 0) { if (errno != EINTR) { - error("poll failed resuming: %s", - strerror(errno)); + error_errno("poll failed resuming"); sleep(1); } continue; diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index 00663f6..99f8148 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -18,55 +18,6 @@ static const char * const verify_tag_usage[] = { NULL }; -static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags) -{ - struct signature_check sigc; - int len; - int ret; - - memset(&sigc, 0, sizeof(sigc)); - - len = parse_signature(buf, size); - - if (size == len) { - if (flags & GPG_VERIFY_VERBOSE) - write_in_full(1, buf, len); - return error("no signature found"); - } - - ret = check_signature(buf, len, buf + len, size - len, &sigc); - print_signature_buffer(&sigc, flags); - - signature_check_clear(&sigc); - return ret; -} - -static int verify_tag(const char *name, unsigned flags) -{ - enum object_type type; - unsigned char sha1[20]; - char *buf; - unsigned long size; - int ret; - - if (get_sha1(name, sha1)) - return error("tag '%s' not found.", name); - - type = sha1_object_info(sha1, NULL); - if (type != OBJ_TAG) - return error("%s: cannot verify a non-tag object of type %s.", - name, typename(type)); - - buf = read_sha1_file(sha1, &type, &size); - if (!buf) - return error("%s: unable to read file.", name); - - ret = run_gpg_verify(buf, size, flags); - - free(buf); - return ret; -} - static int git_verify_tag_config(const char *var, const char *value, void *cb) { int status = git_gpg_config(var, value, cb); @@ -95,11 +46,13 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) if (verbose) flags |= GPG_VERIFY_VERBOSE; - /* sometimes the program was terminated because this signal - * was received in the process of writing the gpg input: */ - signal(SIGPIPE, SIG_IGN); - while (i < argc) - if (verify_tag(argv[i++], flags)) + while (i < argc) { + unsigned char sha1[20]; + const char *name = argv[i++]; + if (get_sha1(name, sha1)) + had_error = !!error("tag '%s' not found.", name); + else if (gpg_verify_tag(sha1, name, flags)) had_error = 1; + } return had_error; } diff --git a/builtin/worktree.c b/builtin/worktree.c index 38b5609..96a2834 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -21,6 +21,7 @@ static const char * const worktree_usage[] = { struct add_opts { int force; int detach; + int checkout; const char *new_branch; int force_new_branch; }; @@ -109,7 +110,7 @@ static void prune_worktrees(void) if (ret < 0 && errno == ENOTDIR) ret = unlink(path.buf); if (ret) - error(_("failed to remove: %s"), strerror(errno)); + error_errno(_("failed to remove '%s'"), path.buf); } closedir(dir); if (!show_only) @@ -204,7 +205,7 @@ static int add_worktree(const char *path, const char *refname, if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) && ref_exists(symref.buf)) { /* it's a branch */ if (!opts->force) - die_if_checked_out(symref.buf); + die_if_checked_out(symref.buf, 0); } else { /* must be a commit */ commit = lookup_commit_reference_by_name(refname); if (!commit) @@ -284,18 +285,22 @@ static int add_worktree(const char *path, const char *refname, if (ret) goto done; - cp.argv = NULL; - argv_array_clear(&cp.args); - argv_array_pushl(&cp.args, "reset", "--hard", NULL); - cp.env = child_env.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; + if (opts->checkout) { + cp.argv = NULL; + argv_array_clear(&cp.args); + argv_array_pushl(&cp.args, "reset", "--hard", NULL); + cp.env = child_env.argv; + ret = run_command(&cp); + if (ret) + goto done; } + + is_junk = 0; + free(junk_work_tree); + free(junk_git_dir); + junk_work_tree = NULL; + junk_git_dir = NULL; + done: strbuf_reset(&sb); strbuf_addf(&sb, "%s/locked", sb_repo.buf); @@ -320,10 +325,12 @@ static int add(int ac, const char **av, const char *prefix) OPT_STRING('B', NULL, &new_branch_force, N_("branch"), N_("create or reset a branch")), OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")), + OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")), OPT_END() }; memset(&opts, 0, sizeof(opts)); + opts.checkout = 1; ac = parse_options(ac, av, prefix, options, worktree_usage, 0); if (!!opts.detach + !!opts.new_branch + !!new_branch_force > 1) die(_("-b, -B, and --detach are mutually exclusive")); @@ -342,7 +349,7 @@ static int add(int ac, const char **av, const char *prefix) if (!opts.force && !strbuf_check_branch_ref(&symref, opts.new_branch) && ref_exists(symref.buf)) - die_if_checked_out(symref.buf); + die_if_checked_out(symref.buf, 0); strbuf_release(&symref); } diff --git a/cache-tree.c b/cache-tree.c index 3ebf9c3..ddf0cc9 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -663,7 +663,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) cnt++; else { struct cache_tree_sub *sub; - struct tree *subtree = lookup_tree(entry.sha1); + struct tree *subtree = lookup_tree(entry.oid->hash); if (!subtree->object.parsed) parse_tree(subtree); sub = cache_tree_sub(it, entry.path); @@ -710,7 +710,7 @@ int cache_tree_matches_traversal(struct cache_tree *root, it = find_cache_tree_from_traversal(root, info); it = cache_tree_find(it, ent->path); - if (it && it->entry_count > 0 && !hashcmp(ent->sha1, it->sha1)) + if (it && it->entry_count > 0 && !hashcmp(ent->oid->hash, it->sha1)) return it->entry_count; return 0; } @@ -367,8 +367,8 @@ extern void free_name_hash(struct index_state *istate); #define rename_cache_entry_at(pos, new_name) rename_index_entry_at(&the_index, (pos), (new_name)) #define remove_cache_entry_at(pos) remove_index_entry_at(&the_index, (pos)) #define remove_file_from_cache(path) remove_file_from_index(&the_index, (path)) -#define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags)) -#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags)) +#define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags), 0) +#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags), 0) #define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL) #define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options)) #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options)) @@ -581,8 +581,8 @@ extern int remove_file_from_index(struct index_state *, const char *path); #define ADD_CACHE_IGNORE_ERRORS 4 #define ADD_CACHE_IGNORE_REMOVAL 8 #define ADD_CACHE_INTENT 16 -extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags); -extern int add_file_to_index(struct index_state *, const char *path, int flags); +extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags, int force_mode); +extern int add_file_to_index(struct index_state *, const char *path, int flags, int force_mode); extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, unsigned int refresh_options); extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b); extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce); @@ -654,6 +654,7 @@ extern int warn_on_object_refname_ambiguity; extern const char *apply_default_whitespace; extern const char *apply_default_ignorewhitespace; extern const char *git_attributes_file; +extern const char *git_hooks_path; extern int zlib_compression_level; extern int core_compression_level; extern int core_compression_seen; @@ -807,11 +808,14 @@ extern void check_repository_format(void); */ 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_common_path(const char *fmt, ...) __attribute__((format (printf, 1, 2))); extern char *mksnpath(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 void strbuf_git_common_path(struct strbuf *sb, const char *fmt, ...) + __attribute__((format (printf, 2, 3))); extern char *git_path_buf(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3))); extern void strbuf_git_path_submodule(struct strbuf *sb, const char *path, @@ -1162,6 +1166,8 @@ extern int get_sha1_blob(const char *str, unsigned char *sha1); extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix); extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc); +extern int get_oid(const char *str, struct object_id *oid); + typedef int each_abbrev_fn(const unsigned char *sha1, void *); extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *); @@ -1766,14 +1772,14 @@ void packet_trace_identity(const char *prog); * return 0 if success, 1 - if addition of a file failed and * ADD_FILES_IGNORE_ERRORS was specified in flags */ -int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int flags); +int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int flags, int force_mode); /* diff.c */ extern int diff_auto_refresh_index; /* match-trees.c */ -void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int); -void shift_tree_by(const unsigned char *, const unsigned char *, unsigned char *, const char *); +void shift_tree(const struct object_id *, const struct object_id *, struct object_id *, int); +void shift_tree_by(const struct object_id *, const struct object_id *, struct object_id *, const char *); /* * whitespace rules. diff --git a/check-racy.c b/check-racy.c index 00d92a1..24b6542 100644 --- a/check-racy.c +++ b/check-racy.c @@ -12,7 +12,7 @@ int main(int ac, char **av) struct stat st; if (lstat(ce->name, &st)) { - error("lstat(%s): %s", ce->name, strerror(errno)); + error_errno("lstat(%s)", ce->name); continue; } diff --git a/combine-diff.c b/combine-diff.c index 0e1d4b0..8f2313d 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1005,8 +1005,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, struct strbuf buf = STRBUF_INIT; if (strbuf_readlink(&buf, elem->path, st.st_size) < 0) { - error("readlink(%s): %s", elem->path, - strerror(errno)); + error_errno("readlink(%s)", elem->path); return; } result_size = buf.len; @@ -147,6 +147,7 @@ struct pretty_print_context { int preserve_subject; struct date_mode date_mode; unsigned date_mode_explicit:1; + int expand_tabs_in_log; int need_8bit_cte; char *notes_message; struct reflog_walk_info *reflog_info; @@ -160,6 +161,7 @@ struct pretty_print_context { * should not be counted on by callers. */ struct string_list in_body_headers; + int graph_width; }; struct userformat_want { diff --git a/compat/mingw.c b/compat/mingw.c index a8218e6..2b5467d 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -2162,7 +2162,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen) return -1; } -static void setup_windows_environment() +static void setup_windows_environment(void) { char *tmp = getenv("TMPDIR"); @@ -2204,7 +2204,7 @@ typedef struct { extern int __wgetmainargs(int *argc, wchar_t ***argv, wchar_t ***env, int glob, _startupinfo *si); -static NORETURN void die_startup() +static NORETURN void die_startup(void) { fputs("fatal: not enough memory for initialization", stderr); exit(128); @@ -2224,7 +2224,7 @@ static char *wcstoutfdup_startup(char *buffer, const wchar_t *wcs, size_t len) return memcpy(malloc_startup(len), buffer, len); } -void mingw_startup() +void mingw_startup(void) { int i, maxlen, argc; char *buffer; diff --git a/compat/mingw.h b/compat/mingw.h index 69bb43d..9a8803b 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -532,8 +532,8 @@ extern CRITICAL_SECTION pinfo_cs; * A replacement of main() that adds win32 specific initialization. */ -void mingw_startup(); -#define main(c,v) dummy_decl_mingw_main(); \ +void mingw_startup(void); +#define main(c,v) dummy_decl_mingw_main(void); \ static int mingw_main(c,v); \ int main(int argc, char **argv) \ { \ diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c index fba5986..d8bde06 100644 --- a/compat/regex/regcomp.c +++ b/compat/regex/regcomp.c @@ -18,8 +18,6 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <stdint.h> - static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, size_t length, reg_syntax_t syntax); static void re_compile_fastmap_iter (regex_t *bufp, diff --git a/compat/regex/regex.c b/compat/regex/regex.c index 6aaae00..5cb23e5 100644 --- a/compat/regex/regex.c +++ b/compat/regex/regex.c @@ -60,6 +60,7 @@ GNU regex allows. Include it before <regex.h>, which correctly #undefs RE_DUP_MAX and sets it to the right value. */ #include <limits.h> +#include <stdint.h> #ifdef GAWK #undef alloca diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c index b905aea..6c7c9b6 100644 --- a/compat/win32/syslog.c +++ b/compat/win32/syslog.c @@ -28,13 +28,13 @@ void syslog(int priority, const char *fmt, ...) va_end(ap); if (str_len < 0) { - warning("vsnprintf failed: '%s'", strerror(errno)); + warning_errno("vsnprintf failed"); return; } str = malloc(st_add(str_len, 1)); if (!str) { - warning("malloc failed: '%s'", strerror(errno)); + warning_errno("malloc failed"); return; } @@ -45,7 +45,7 @@ void syslog(int priority, const char *fmt, ...) while ((pos = strstr(str, "%1")) != NULL) { str = realloc(str, st_add(++str_len, 1)); if (!str) { - warning("realloc failed: '%s'", strerror(errno)); + warning_errno("realloc failed"); return; } memmove(pos + 2, pos + 1, strlen(pos)); diff --git a/compat/winansi.c b/compat/winansi.c index 5dfa5ed..db4a5b0 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -483,6 +483,7 @@ static size_t sizeof_ioinfo = 0; #define IOINFO_L2E 5 #define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) +#define FPIPE 0x08 #define FDEV 0x40 static inline ioinfo* _pioinfo(int fd) @@ -491,7 +492,7 @@ static inline ioinfo* _pioinfo(int fd) (fd & (IOINFO_ARRAY_ELTS - 1)) * sizeof_ioinfo); } -static int init_sizeof_ioinfo() +static int init_sizeof_ioinfo(void) { int istty, wastty; /* don't init twice */ @@ -530,6 +531,45 @@ static HANDLE swap_osfhnd(int fd, HANDLE new_handle) return old_handle; } +#ifdef DETECT_MSYS_TTY + +#include <winternl.h> +#include <ntstatus.h> + +static void detect_msys_tty(int fd) +{ + ULONG result; + BYTE buffer[1024]; + POBJECT_NAME_INFORMATION nameinfo = (POBJECT_NAME_INFORMATION) buffer; + PWSTR name; + + /* check if fd is a pipe */ + HANDLE h = (HANDLE) _get_osfhandle(fd); + if (GetFileType(h) != FILE_TYPE_PIPE) + return; + + /* get pipe name */ + if (!NT_SUCCESS(NtQueryObject(h, ObjectNameInformation, + buffer, sizeof(buffer) - 2, &result))) + return; + name = nameinfo->Name.Buffer; + name[nameinfo->Name.Length] = 0; + + /* check if this could be a MSYS2 pty pipe ('msys-XXXX-ptyN-XX') */ + if (!wcsstr(name, L"msys-") || !wcsstr(name, L"-pty")) + return; + + /* init ioinfo size if we haven't done so */ + if (init_sizeof_ioinfo()) + return; + + /* set FDEV flag, reset FPIPE flag */ + _pioinfo(fd)->osflags &= ~FPIPE; + _pioinfo(fd)->osflags |= FDEV; +} + +#endif + void winansi_init(void) { int con1, con2; @@ -538,8 +578,15 @@ void winansi_init(void) /* check if either stdout or stderr is a console output screen buffer */ con1 = is_console(1); con2 = is_console(2); - if (!con1 && !con2) + if (!con1 && !con2) { +#ifdef DETECT_MSYS_TTY + /* check if stdin / stdout / stderr are MSYS2 pty pipes */ + detect_msys_tty(0); + detect_msys_tty(1); + detect_msys_tty(2); +#endif return; + } /* create a named pipe to communicate with the console thread */ xsnprintf(name, sizeof(name), "\\\\.\\pipe\\winansi%lu", GetCurrentProcessId()); @@ -575,8 +622,11 @@ void winansi_init(void) HANDLE winansi_get_osfhandle(int fd) { HANDLE hnd = (HANDLE) _get_osfhandle(fd); - if ((fd == 1 || fd == 2) && isatty(fd) - && GetFileType(hnd) == FILE_TYPE_PIPE) - return (fd == 1) ? hconsole1 : hconsole2; + if (isatty(fd) && GetFileType(hnd) == FILE_TYPE_PIPE) { + if (fd == 1 && hconsole1) + return hconsole1; + else if (fd == 2 && hconsole2) + return hconsole2; + } return hnd; } @@ -162,7 +162,7 @@ void git_config_push_parameter(const char *text) { struct strbuf env = STRBUF_INIT; const char *old = getenv(CONFIG_DATA_ENVIRONMENT); - if (old) { + if (old && *old) { strbuf_addstr(&env, old); strbuf_addch(&env, ' '); } @@ -717,6 +717,9 @@ static int git_default_core_config(const char *var, const char *value) if (!strcmp(var, "core.attributesfile")) return git_config_pathname(&git_attributes_file, var, value); + if (!strcmp(var, "core.hookspath")) + return git_config_pathname(&git_hooks_path, var, value); + if (!strcmp(var, "core.bare")) { is_bare_repository_cfg = git_config_bool(var, value); return 0; @@ -803,8 +806,6 @@ static int git_default_core_config(const char *var, const char *value) if (!strcmp(var, "core.autocrlf")) { if (value && !strcasecmp(value, "input")) { - if (core_eol == EOL_CRLF) - return error("core.autocrlf=input conflicts with core.eol=crlf"); auto_crlf = AUTO_CRLF_INPUT; return 0; } @@ -830,8 +831,6 @@ static int git_default_core_config(const char *var, const char *value) core_eol = EOL_NATIVE; else core_eol = EOL_UNSET; - if (core_eol == EOL_CRLF && auto_crlf == AUTO_CRLF_INPUT) - return error("core.autocrlf=input conflicts with core.eol=crlf"); return 0; } @@ -1282,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data) * something went really wrong and we should stop * immediately. */ - die(_("unknown error occured while reading the configuration files")); + die(_("unknown error occurred while reading the configuration files")); } static void configset_iter(struct config_set *cs, config_fn_t fn, void *data) @@ -2017,7 +2016,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, lock = xcalloc(1, sizeof(struct lock_file)); fd = hold_lock_file_for_update(lock, config_filename, 0); if (fd < 0) { - error("could not lock config file %s: %s", config_filename, strerror(errno)); + error_errno("could not lock config file %s", config_filename); free(store.key); ret = CONFIG_NO_LOCK; goto out_free; @@ -2031,8 +2030,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, free(store.key); if ( ENOENT != errno ) { - error("opening %s: %s", config_filename, - strerror(errno)); + error_errno("opening %s", config_filename); ret = CONFIG_INVALID_FILE; /* same as "invalid config file" */ goto out_free; } @@ -2116,8 +2114,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, if (contents == MAP_FAILED) { if (errno == ENODEV && S_ISDIR(st.st_mode)) errno = EISDIR; - error("unable to mmap '%s': %s", - config_filename, strerror(errno)); + error_errno("unable to mmap '%s'", config_filename); ret = CONFIG_INVALID_FILE; contents = NULL; goto out_free; @@ -2126,8 +2123,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, in_fd = -1; if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) { - error("chmod on %s failed: %s", - get_lock_file_path(lock), strerror(errno)); + error_errno("chmod on %s failed", get_lock_file_path(lock)); ret = CONFIG_NO_WRITE; goto out_free; } @@ -2183,8 +2179,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, } if (commit_lock_file(lock) < 0) { - error("could not write config file %s: %s", config_filename, - strerror(errno)); + error_errno("could not write config file %s", config_filename); ret = CONFIG_NO_WRITE; lock = NULL; goto out_free; @@ -2335,8 +2330,8 @@ int git_config_rename_section_in_file(const char *config_filename, fstat(fileno(config_file), &st); if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) { - ret = error("chmod on %s failed: %s", - get_lock_file_path(lock), strerror(errno)); + ret = error_errno("chmod on %s failed", + get_lock_file_path(lock)); goto out; } @@ -2390,8 +2385,8 @@ int git_config_rename_section_in_file(const char *config_filename, fclose(config_file); unlock_and_out: if (commit_lock_file(lock) < 0) - ret = error("could not write config file %s: %s", - config_filename, strerror(errno)); + ret = error_errno("could not write config file %s", + config_filename); out: free(filename_buf); return ret; diff --git a/config.mak.uname b/config.mak.uname index 40d6b29..a88f139 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -557,7 +557,8 @@ else BASIC_LDFLAGS += -Wl,--large-address-aware endif CC = gcc - COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 + COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY + EXTLIBS += -lntdll INSTALL = /bin/install NO_R_TO_GCC_LINKER = YesPlease INTERNAL_QSORT = YesPlease diff --git a/connected.c b/connected.c index 299c560..bf1b12e 100644 --- a/connected.c +++ b/connected.c @@ -86,17 +86,14 @@ static int check_everything_connected_real(sha1_iterate_fn fn, memcpy(commit, sha1_to_hex(sha1), 40); if (write_in_full(rev_list.in, commit, 41) < 0) { if (errno != EPIPE && errno != EINVAL) - error(_("failed write to rev-list: %s"), - strerror(errno)); + error_errno(_("failed write to rev-list")); err = -1; break; } } while (!fn(cb_data, sha1)); - if (close(rev_list.in)) { - error(_("failed to close rev-list's stdin: %s"), strerror(errno)); - err = -1; - } + if (close(rev_list.in)) + err = error_errno(_("failed to close rev-list's stdin")); sigchain_pop(SIGPIPE); return finish_command(&rev_list) || err; diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e3918c8..3402475 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1339,15 +1339,15 @@ _git_help () { case "$cur" in --*) - __gitcomp "--all --info --man --web" + __gitcomp "--all --guides --info --man --web" return ;; esac __git_compute_all_commands __gitcomp "$__git_all_commands $(__git_aliases) attributes cli core-tutorial cvs-migration - diffcore gitk glossary hooks ignore modules - namespaces repository-layout tutorial tutorial-2 + diffcore everyday gitk glossary hooks ignore modules + namespaces repository-layout revisions tutorial tutorial-2 workflows " } @@ -1458,6 +1458,7 @@ _git_log () --relative-date --date= --pretty= --format= --oneline --show-signature + --cherry-mark --cherry-pick --graph --decorate --decorate= diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 64219e6..97eacd7 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -355,8 +355,8 @@ __git_ps1 () # incorrect.) # local ps1_expanded=yes - [ -z "$ZSH_VERSION" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no - [ -z "$BASH_VERSION" ] || shopt -q promptvars || ps1_expanded=no + [ -z "${ZSH_VERSION-}" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no + [ -z "${BASH_VERSION-}" ] || shopt -q promptvars || ps1_expanded=no local repo_info rev_parse_exit_code repo_info="$(git rev-parse --git-dir --is-inside-git-dir \ @@ -368,7 +368,7 @@ __git_ps1 () return $exit fi - local short_sha + local short_sha="" if [ "$rev_parse_exit_code" = "0" ]; then short_sha="${repo_info##*$'\n'}" repo_info="${repo_info%$'\n'*}" diff --git a/contrib/credential/gnome-keyring/Makefile b/contrib/credential/gnome-keyring/Makefile index c3c7c98..22c19df 100644 --- a/contrib/credential/gnome-keyring/Makefile +++ b/contrib/credential/gnome-keyring/Makefile @@ -4,12 +4,13 @@ all:: $(MAIN) CC = gcc RM = rm -f CFLAGS = -g -O2 -Wall +PKG_CONFIG = pkg-config -include ../../../config.mak.autogen -include ../../../config.mak -INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0) -LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0) +INCS:=$(shell $(PKG_CONFIG) --cflags gnome-keyring-1 glib-2.0) +LIBS:=$(shell $(PKG_CONFIG) --libs gnome-keyring-1 glib-2.0) SRCS:=$(MAIN).c OBJS:=$(SRCS:.c=.o) diff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES index 53c71b4..100cc7a 100644 --- a/contrib/hooks/multimail/CHANGES +++ b/contrib/hooks/multimail/CHANGES @@ -1,3 +1,11 @@ +Release 1.3.1 (bugfix-only release) +=================================== + +* Generate links to commits in combined emails (it was done only for + commit emails in 1.3.0). + +* Fix broken links on PyPi. + Release 1.3.0 ============= diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README index 1e04801..0c91d19 100644 --- a/contrib/hooks/multimail/README +++ b/contrib/hooks/multimail/README @@ -1,4 +1,4 @@ -git-multimail 1.3.0 +git-multimail 1.3.1 =================== .. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git index ee1fa75..1210bde 100644 --- a/contrib/hooks/multimail/README.Git +++ b/contrib/hooks/multimail/README.Git @@ -6,10 +6,10 @@ website: https://github.com/git-multimail/git-multimail The version in this directory was obtained from the upstream project -on May 03 2016 and consists of the "git-multimail" subdirectory from +on May 13 2016 and consists of the "git-multimail" subdirectory from revision - 26f3ae9f86aa7f8a054ba89235c4d3879f98b03d refs/tags/1.3.0 + 3ce5470d4abf7251604cbf64e73a962e1b617f5e refs/tags/1.3.1 Please see the README file in this directory for information about how to report bugs or contribute to git-multimail. diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py index f2c92ae..54ab4a4 100755 --- a/contrib/hooks/multimail/git_multimail.py +++ b/contrib/hooks/multimail/git_multimail.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -__version__ = '1.3.0' +__version__ = '1.3.1' # Copyright (c) 2015 Matthieu Moy and others # Copyright (c) 2012-2014 Michael Haggerty and others @@ -1704,6 +1704,14 @@ class BranchChange(ReferenceChange): self.header_template = COMBINED_HEADER_TEMPLATE self.intro_template = COMBINED_INTRO_TEMPLATE self.footer_template = COMBINED_FOOTER_TEMPLATE + + def revision_gen_link(base_url): + # revision is used only to generate the body, and + # _content_type is set while generating headers. Get it + # from the BranchChange object. + revision._content_type = self._content_type + return revision.generate_browse_link(base_url) + self.generate_browse_link = revision_gen_link for line in self.generate_email(push, body_filter, values): yield line @@ -1380,27 +1380,22 @@ static struct stream_filter *ident_filter(const unsigned char *sha1) struct stream_filter *get_stream_filter(const char *path, const unsigned char *sha1) { struct conv_attrs ca; - enum crlf_action crlf_action; struct stream_filter *filter = NULL; convert_attrs(&ca, path); - if (ca.drv && (ca.drv->smudge || ca.drv->clean)) - return filter; + return NULL; + + if (ca.crlf_action == CRLF_AUTO || ca.crlf_action == CRLF_AUTO_CRLF) + return NULL; if (ca.ident) filter = ident_filter(sha1); - crlf_action = ca.crlf_action; - - if ((crlf_action == CRLF_BINARY) || - crlf_action == CRLF_AUTO_INPUT || - (crlf_action == CRLF_TEXT_INPUT)) - filter = cascade_filter(filter, &null_filter_singleton); - - else if (output_eol(crlf_action) == EOL_CRLF && - !(crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_CRLF)) + if (output_eol(ca.crlf_action) == EOL_CRLF) filter = cascade_filter(filter, lf_to_crlf_filter()); + else + filter = cascade_filter(filter, &null_filter_singleton); return filter; } @@ -42,15 +42,15 @@ int copy_file(const char *dst, const char *src, int mode) status = copy_fd(fdi, fdo); switch (status) { case COPY_READ_ERROR: - error("copy-fd: read returned %s", strerror(errno)); + error_errno("copy-fd: read returned"); break; case COPY_WRITE_ERROR: - error("copy-fd: write returned %s", strerror(errno)); + error_errno("copy-fd: write returned"); break; } close(fdi); if (close(fdo) != 0) - return error("%s: close error: %s", dst, strerror(errno)); + return error_errno("%s: close error", dst); if (!status && adjust_shared_perm(dst)) return -1; diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c index 291c0fd..1f14d56 100644 --- a/credential-cache--daemon.c +++ b/credential-cache--daemon.c @@ -179,12 +179,12 @@ static int serve_cache_loop(int fd) client = accept(fd, NULL, NULL); if (client < 0) { - warning("accept failed: %s", strerror(errno)); + warning_errno("accept failed"); return 1; } client2 = dup(client); if (client2 < 0) { - warning("dup failed: %s", strerror(errno)); + warning_errno("dup failed"); close(client); return 1; } diff --git a/credential.c b/credential.c index 7d6501d..aa99666 100644 --- a/credential.c +++ b/credential.c @@ -63,9 +63,12 @@ static int credential_config_callback(const char *var, const char *value, key = dot + 1; } - if (!strcmp(key, "helper")) - string_list_append(&c->helpers, value); - else if (!strcmp(key, "username")) { + if (!strcmp(key, "helper")) { + if (*value) + string_list_append(&c->helpers, value); + else + string_list_clear(&c->helpers, 0); + } else if (!strcmp(key, "username")) { if (!c->username) c->username = xstrdup(value); } @@ -669,6 +669,15 @@ static void hostinfo_clear(struct hostinfo *hi) strbuf_release(&hi->tcp_port); } +static void set_keep_alive(int sockfd) +{ + int ka = 1; + + if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) + logerror("unable to set SO_KEEPALIVE on socket: %s", + strerror(errno)); +} + static int execute(void) { char *line = packet_buffer; @@ -681,6 +690,7 @@ static int execute(void) if (addr) loginfo("Connection from %s:%s", addr, port); + set_keep_alive(0); alarm(init_timeout ? init_timeout : timeout); pktlen = packet_read(0, NULL, NULL, packet_buffer, sizeof(packet_buffer), 0); alarm(0); @@ -951,6 +961,8 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis continue; } + set_keep_alive(sockfd); + if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) { logerror("Could not bind to %s: %s", ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen), @@ -1010,6 +1022,8 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis return 0; } + set_keep_alive(sockfd); + if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) { logerror("Could not bind to %s: %s", ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)), @@ -74,6 +74,8 @@ static int local_tzoffset(unsigned long time) localtime_r(&t, &tm); t_local = tm_to_time_t(&tm); + if (t_local == -1) + return 0; /* error; just use +0000 */ if (t_local < t) { eastwest = -1; offset = t - t_local; diff --git a/diff-no-index.c b/diff-no-index.c index 03daadb..1f8999b 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -65,8 +65,7 @@ static int populate_from_stdin(struct diff_filespec *s) size_t size = 0; if (strbuf_read(&buf, 0, 0) < 0) - return error("error while reading from stdin %s", - strerror(errno)); + return error_errno("error while reading from stdin"); s->should_munmap = 0; s->data = strbuf_detach(&buf, &size); @@ -26,6 +26,7 @@ #endif static int diff_detect_rename_default; +static int diff_compaction_heuristic; /* experimental */ static int diff_rename_limit_default = 400; static int diff_suppress_blank_empty; static int diff_use_color_default = -1; @@ -168,6 +169,11 @@ long parse_algorithm_value(const char *value) * never be affected by the setting of diff.renames * the user happens to have in the configuration file. */ +void init_diff_ui_defaults(void) +{ + diff_detect_rename_default = 1; +} + int git_diff_ui_config(const char *var, const char *value, void *cb) { if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { @@ -184,6 +190,10 @@ int git_diff_ui_config(const char *var, const char *value, void *cb) diff_detect_rename_default = git_config_rename(var, value); return 0; } + if (!strcmp(var, "diff.compactionheuristic")) { + diff_compaction_heuristic = git_config_bool(var, value); + return 0; + } if (!strcmp(var, "diff.autorefreshindex")) { diff_auto_refresh_index = git_config_bool(var, value); return 0; @@ -3273,6 +3283,8 @@ void diff_setup(struct diff_options *options) options->use_color = diff_use_color_default; options->detect_rename = diff_detect_rename_default; options->xdl_opts |= diff_algorithm; + if (diff_compaction_heuristic) + DIFF_XDL_SET(options, COMPACTION_HEURISTIC); options->orderfile = diff_order_file_cfg; @@ -3793,6 +3805,10 @@ int diff_opt_parse(struct diff_options *options, DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL); else if (!strcmp(arg, "--ignore-blank-lines")) DIFF_XDL_SET(options, IGNORE_BLANK_LINES); + else if (!strcmp(arg, "--compaction-heuristic")) + DIFF_XDL_SET(options, COMPACTION_HEURISTIC); + else if (!strcmp(arg, "--no-compaction-heuristic")) + DIFF_XDL_CLR(options, COMPACTION_HEURISTIC); else if (!strcmp(arg, "--patience")) options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF); else if (!strcmp(arg, "--histogram")) @@ -266,6 +266,7 @@ extern int parse_long_opt(const char *opt, const char **argv, const char **optarg); extern int git_diff_basic_config(const char *var, const char *value, void *cb); +extern void init_diff_ui_defaults(void); extern int git_diff_ui_config(const char *var, const char *value, void *cb); extern void diff_setup(struct diff_options *); extern int diff_opt_parse(struct diff_options *, const char **, int, const char *); @@ -53,13 +53,12 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, int check_only, const struct path_simplify *simplify); static int get_dtype(struct dirent *de, const char *path, int len); -/* helper string functions with support for the ignore_case flag */ -int strcmp_icase(const char *a, const char *b) +int fspathcmp(const char *a, const char *b) { return ignore_case ? strcasecmp(a, b) : strcmp(a, b); } -int strncmp_icase(const char *a, const char *b, size_t count) +int fspathncmp(const char *a, const char *b, size_t count) { return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count); } @@ -795,12 +794,12 @@ int match_basename(const char *basename, int basenamelen, { if (prefix == patternlen) { if (patternlen == basenamelen && - !strncmp_icase(pattern, basename, basenamelen)) + !fspathncmp(pattern, basename, basenamelen)) return 1; } else if (flags & EXC_FLAG_ENDSWITH) { /* "*literal" matching against "fooliteral" */ if (patternlen - 1 <= basenamelen && - !strncmp_icase(pattern + 1, + !fspathncmp(pattern + 1, basename + basenamelen - (patternlen - 1), patternlen - 1)) return 1; @@ -837,7 +836,7 @@ int match_pathname(const char *pathname, int pathlen, */ if (pathlen < baselen + 1 || (baselen && pathname[baselen] != '/') || - strncmp_icase(pathname, base, baselen)) + fspathncmp(pathname, base, baselen)) return 0; namelen = baselen ? pathlen - baselen - 1 : pathlen; @@ -851,7 +850,7 @@ int match_pathname(const char *pathname, int pathlen, if (prefix > namelen) return 0; - if (strncmp_icase(pattern, name, prefix)) + if (fspathncmp(pattern, name, prefix)) return 0; pattern += prefix; patternlen -= prefix; @@ -270,8 +270,8 @@ extern int remove_dir_recursively(struct strbuf *path, int flag); /* tries to remove the path with empty directories along it, ignores ENOENT */ extern int remove_path(const char *path); -extern int strcmp_icase(const char *a, const char *b); -extern int strncmp_icase(const char *a, const char *b, size_t count); +extern int fspathcmp(const char *a, const char *b); +extern int fspathncmp(const char *a, const char *b, size_t count); /* * The prefix part of pattern must not contains wildcards. @@ -63,7 +63,6 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en if (!buffer) return 0; if (strbuf_read_file(buffer, path, 0) < 0) - return error("could not read file '%s': %s", - path, strerror(errno)); + return error_errno("could not read file '%s'", path); return 0; } @@ -168,8 +168,8 @@ static int write_entry(struct cache_entry *ce, ret = symlink(new, path); free(new); if (ret) - return error("unable to create symlink %s (%s)", - path, strerror(errno)); + return error_errno("unable to create symlink %s", + path); break; } @@ -186,8 +186,7 @@ static int write_entry(struct cache_entry *ce, fd = open_output_fd(path, ce, to_tempfile); if (fd < 0) { free(new); - return error("unable to create file %s (%s)", - path, strerror(errno)); + return error_errno("unable to create file %s", path); } wrote = write_in_full(fd, new, size); @@ -284,8 +283,7 @@ int checkout_entry(struct cache_entry *ce, return error("%s is a directory", path.buf); remove_subtree(&path); } else if (unlink(path.buf)) - return error("unable to unlink old '%s' (%s)", - path.buf, strerror(errno)); + return error_errno("unable to unlink old '%s'", path.buf); } else if (state->not_new) return 0; diff --git a/environment.c b/environment.c index 96160a7..ca72464 100644 --- a/environment.c +++ b/environment.c @@ -31,6 +31,7 @@ const char *git_log_output_encoding; const char *apply_default_whitespace; const char *apply_default_ignorewhitespace; const char *git_attributes_file; +const char *git_hooks_path; int zlib_compression_level = Z_BEST_SPEED; int core_compression_level; int core_compression_seen; diff --git a/fast-import.c b/fast-import.c index 9fc7093..c504ef7 100644 --- a/fast-import.c +++ b/fast-import.c @@ -329,6 +329,7 @@ static const char *export_marks_file; static const char *import_marks_file; static int import_marks_file_from_stream; static int import_marks_file_ignore_missing; +static int import_marks_file_done; static int relative_marks_paths; /* Our last blob */ @@ -414,7 +415,7 @@ static void write_crash_report(const char *err) struct recent_command *rc; if (!rpt) { - error("can't write crash report %s: %s", loc, strerror(errno)); + error_errno("can't write crash report %s", loc); free(loc); return; } @@ -1512,7 +1513,7 @@ static int tree_content_set( t = root->tree; for (i = 0; i < t->entry_count; i++) { e = t->entries[i]; - if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) { + if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) { if (!*slash1) { if (!S_ISDIR(mode) && e->versions[1].mode == mode @@ -1602,7 +1603,7 @@ static int tree_content_remove( t = root->tree; for (i = 0; i < t->entry_count; i++) { e = t->entries[i]; - if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) { + if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) { if (*slash1 && !S_ISDIR(e->versions[1].mode)) /* * If p names a file in some subdirectory, and a @@ -1669,7 +1670,7 @@ static int tree_content_get( t = root->tree; for (i = 0; i < t->entry_count; i++) { e = t->entries[i]; - if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) { + if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) { if (!*slash1) goto found_entry; if (!S_ISDIR(e->versions[1].mode)) @@ -1802,12 +1803,12 @@ static void dump_marks(void) static struct lock_file mark_lock; FILE *f; - if (!export_marks_file) + if (!export_marks_file || (import_marks_file && !import_marks_file_done)) return; if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) { - failure |= error("Unable to write marks file %s: %s", - export_marks_file, strerror(errno)); + failure |= error_errno("Unable to write marks file %s", + export_marks_file); return; } @@ -1822,8 +1823,8 @@ static void dump_marks(void) dump_marks_helper(f, 0, marks); if (commit_lock_file(&mark_lock)) { - failure |= error("Unable to write file %s: %s", - export_marks_file, strerror(errno)); + failure |= error_errno("Unable to write file %s", + export_marks_file); return; } } @@ -1835,7 +1836,7 @@ static void read_marks(void) if (f) ; else if (import_marks_file_ignore_missing && errno == ENOENT) - return; /* Marks file does not exist */ + goto done; /* Marks file does not exist */ else die_errno("cannot read '%s'", import_marks_file); while (fgets(line, sizeof(line), f)) { @@ -1865,6 +1866,8 @@ static void read_marks(void) insert_mark(mark, e); } fclose(f); +done: + import_marks_file_done = 1; } @@ -313,9 +313,9 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op if (S_ISGITLINK(entry.mode)) continue; if (S_ISDIR(entry.mode)) - result = options->walk(&lookup_tree(entry.sha1)->object, OBJ_TREE, data, options); + result = options->walk(&lookup_tree(entry.oid->hash)->object, OBJ_TREE, data, options); else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) - result = options->walk(&lookup_blob(entry.sha1)->object, OBJ_BLOB, data, options); + result = options->walk(&lookup_blob(entry.oid->hash)->object, OBJ_BLOB, data, options); else { result = error("in tree %s: entry %s has bad mode %.6o", oid_to_hex(&tree->object.oid), entry.path, entry.mode); @@ -451,11 +451,11 @@ static int fsck_tree(struct tree *item, struct fsck_options *options) while (desc.size) { unsigned mode; const char *name; - const unsigned char *sha1; + const struct object_id *oid; - sha1 = tree_entry_extract(&desc, &name, &mode); + oid = tree_entry_extract(&desc, &name, &mode); - has_null_sha1 |= is_null_sha1(sha1); + has_null_sha1 |= is_null_oid(oid); has_full_path |= !!strchr(name, '/'); has_empty_name |= !*name; has_dot |= !strcmp(name, "."); diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 77876d4..642cce1 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -45,6 +45,8 @@ my ($diff_new_color) = my $normal_color = $repo->get_color("", "reset"); my $diff_algorithm = $repo->config('diff.algorithm'); +my $diff_compaction_heuristic = $repo->config_bool('diff.compactionheuristic'); +my $diff_filter = $repo->config('interactive.difffilter'); my $use_readkey = 0; my $use_termcap = 0; @@ -748,13 +750,23 @@ sub parse_diff { if (defined $diff_algorithm) { splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}"; } + if ($diff_compaction_heuristic) { + splice @diff_cmd, 1, 0, "--compaction-heuristic"; + } if (defined $patch_mode_revision) { push @diff_cmd, get_diff_reference($patch_mode_revision); } my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path); my @colored = (); if ($diff_use_color) { - @colored = run_cmd_pipe("git", @diff_cmd, qw(--color --), $path); + my @display_cmd = ("git", @diff_cmd, qw(--color --), $path); + if (defined $diff_filter) { + # quotemeta is overkill, but sufficient for shell-quoting + my $diff = join(' ', map { quotemeta } @display_cmd); + @display_cmd = ("$diff | $diff_filter"); + } + + @colored = run_cmd_pipe(@display_cmd); } my (@hunk) = { TEXT => [], DISPLAY => [], TYPE => 'header' }; @@ -765,7 +777,7 @@ sub parse_diff { } push @{$hunk[-1]{TEXT}}, $diff[$i]; push @{$hunk[-1]{DISPLAY}}, - ($diff_use_color ? $colored[$i] : $diff[$i]); + (@colored ? $colored[$i] : $diff[$i]); } return @hunk; } diff --git a/git-compat-util.h b/git-compat-util.h index 1f8b5f3..49d4029 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -409,7 +409,9 @@ extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2))); extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); extern int error(const char *err, ...) __attribute__((format (printf, 1, 2))); +extern int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2))); +extern void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2))); #ifndef NO_OPENSSL #ifdef APPLE_COMMON_CRYPTO diff --git a/git-difftool.perl b/git-difftool.perl index 488d14b..ebd13ba 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -138,6 +138,7 @@ sub setup_dir_diff my %submodule; my %symlink; my @working_tree = (); + my %working_tree_dups = (); my @rawdiff = split('\0', $diffrtn); my $i = 0; @@ -188,6 +189,10 @@ EOF } if ($rmode ne $null_mode) { + # Avoid duplicate working_tree entries + if ($working_tree_dups{$dst_path}++) { + next; + } my ($use, $wt_sha1) = use_wt_file($repo, $workdir, $dst_path, $rsha1); if ($use) { @@ -273,7 +278,7 @@ EOF # temporary file to both the left and right directories to show the # change in the recorded SHA1 for the submodule. for my $path (keys %submodule) { - my $ok; + my $ok = 0; if (defined($submodule{$path}{left})) { $ok = write_to_file("$ldir/$path", "Subproject commit $submodule{$path}{left}"); @@ -289,7 +294,7 @@ EOF # shows only the link itself, not the contents of the link target. # This loop replicates that behavior. for my $path (keys %symlink) { - my $ok; + my $ok = 0; if (defined($symlink{$path}{left})) { $ok = write_to_file("$ldir/$path", $symlink{$path}{left}); diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 8643f74..dc2fd1b 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -44,6 +44,12 @@ esac # MRC is the current "merge reference commit" # MRT is the current "merge result tree" +if ! git diff-index --quiet --cached HEAD -- +then + echo "Error: Your local changes to the following files would be overwritten by merge" + git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /' + exit 2 +fi MRC=$(git rev-parse --verify -q $head) MRT=$(git write-tree) NON_FF_MERGE=0 diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 92adcc0..9abd00b 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -372,3 +372,28 @@ get_merge_tool () { fi echo "$merge_tool" } + +mergetool_find_win32_cmd () { + executable=$1 + sub_directory=$2 + + # Use $executable if it exists in $PATH + if type -p "$executable" >/dev/null 2>&1 + then + printf '%s' "$executable" + return + fi + + # Look for executable in the typical locations + for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' | + cut -d '=' -f 2- | sort -u) + do + if test -n "$directory" && test -x "$directory/$sub_directory/$executable" + then + printf '%s' "$directory/$sub_directory/$executable" + return + fi + done + + printf '%s' "$executable" +} @@ -1167,6 +1167,15 @@ class P4UserMap: self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">" self.emails[output["Email"]] = output["User"] + mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE) + for mapUserConfig in gitConfigList("git-p4.mapUser"): + mapUser = mapUserConfigRegex.findall(mapUserConfig) + if mapUser and len(mapUser[0]) == 3: + user = mapUser[0][0] + fullname = mapUser[0][1] + email = mapUser[0][2] + self.users[user] = fullname + " <" + email + ">" + self.emails[email] = user s = '' for (key, val) in self.users.items(): @@ -2318,6 +2327,15 @@ class P4Sync(Command, P4UserMap): fnum = fnum + 1 return files + def extractJobsFromCommit(self, commit): + jobs = [] + jnum = 0 + while commit.has_key("job%s" % jnum): + job = commit["job%s" % jnum] + jobs.append(job) + jnum = jnum + 1 + return jobs + def stripRepoPath(self, path, prefixes): """When streaming files, this is called to map a p4 depot path to where it should go in git. The prefixes are either @@ -2656,13 +2674,14 @@ class P4Sync(Command, P4UserMap): return True hasPrefix = [p for p in self.branchPrefixes if p4PathStartsWith(path, p)] - if hasPrefix and self.verbose: + if not hasPrefix and self.verbose: print('Ignoring file outside of prefix: {0}'.format(path)) return hasPrefix def commit(self, details, files, branch, parent = ""): epoch = details["time"] author = details["user"] + jobs = self.extractJobsFromCommit(details) if self.verbose: print('commit into {0}'.format(branch)) @@ -2690,6 +2709,8 @@ class P4Sync(Command, P4UserMap): self.gitStream.write("data <<EOT\n") self.gitStream.write(details["desc"]) + if len(jobs) > 0: + self.gitStream.write("\nJobs: %s" % (' '.join(jobs))) self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" % (','.join(self.branchPrefixes), details["change"])) if len(details['options']) > 0: diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 9ae898b..3752393 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -9,8 +9,8 @@ # below were not inside any function, and expected to return # to the function that dot-sourced us. # -# However, FreeBSD /bin/sh misbehaves on such a construct and -# continues to run the statements that follow such a "return". +# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a +# construct and continue to run the statements that follow such a "return". # As a work-around, we introduce an extra layer of a function # here, and immediately call it after defining it. git_rebase__am () { diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 655ebaa..05f22e4 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -192,7 +192,6 @@ make_patch () { die_with_patch () { echo "$1" > "$state_dir"/stopped-sha make_patch "$1" - git rerere die "$2" } @@ -549,7 +548,8 @@ do_next () { mark_action_done do_pick $sha1 "$rest" - warn "Stopped at $sha1... $rest" + sha1_abbrev=$(git rev-parse --short $sha1) + warn "Stopped at $sha1_abbrev... $rest" exit_with_patch $sha1 0 ;; squash|s|fixup|f) @@ -866,12 +866,12 @@ add_exec_commands () { # $3: the input filename check_commit_sha () { badsha=0 - if test -z $1 + if test -z "$1" then badsha=1 else sha1_verif="$(git rev-parse --verify --quiet $1^{commit})" - if test -z $sha1_verif + if test -z "$sha1_verif" then badsha=1 fi @@ -1038,8 +1038,8 @@ check_todo_list () { # below were not inside any function, and expected to return # to the function that dot-sourced us. # -# However, FreeBSD /bin/sh misbehaves on such a construct and -# continues to run the statements that follow such a "return". +# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a +# construct and continue to run the statements that follow such a "return". # As a work-around, we introduce an extra layer of a function # here, and immediately call it after defining it. git_rebase__interactive () { diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 2cc2a6d..06a4723 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -67,7 +67,9 @@ call_merge () { GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY fi test -z "$strategy" && strategy=recursive - eval 'git-merge-$strategy' $strategy_opts '"$cmt^" -- "$hd" "$cmt"' + # If cmt doesn't have a parent, don't include it as a base + base=$(git rev-parse --verify --quiet $cmt^) + eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"' rv=$? case "$rv" in 0) @@ -105,8 +107,8 @@ finish_rb_merge () { # below were not inside any function, and expected to return # to the function that dot-sourced us. # -# However, FreeBSD /bin/sh misbehaves on such a construct and -# continues to run the statements that follow such a "return". +# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a +# construct and continue to run the statements that follow such a "return". # As a work-around, we introduce an extra layer of a function # here, and immediately call it after defining it. git_rebase__merge () { diff --git a/git-rebase.sh b/git-rebase.sh index cf60c43..44ede36 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -87,7 +87,10 @@ preserve_merges= autosquash= keep_empty= test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t -gpg_sign_opt= +case "$(git config --bool commit.gpgsign)" in +true) gpg_sign_opt=-S ;; +*) gpg_sign_opt= ;; +esac read_basic_state () { test -f "$state_dir/head-name" && @@ -248,6 +251,7 @@ do ;; --exec=*) cmd="${cmd}exec ${1#--exec=}${LF}" + test -z "$interactive_rebase" && interactive_rebase=implied ;; --interactive) interactive_rebase=explicit @@ -348,12 +352,6 @@ do done test $# -gt 2 && usage -if test -n "$cmd" && - test "$interactive_rebase" != explicit -then - die "$(gettext "The --exec option must be used with the --interactive option")" -fi - if test -n "$action" then test -z "$in_progress" && die "$(gettext "No rebase in progress?")" diff --git a/git-sh-setup.sh b/git-sh-setup.sh index c48139a..85db5f1 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -160,8 +160,8 @@ git_pager() { else GIT_PAGER=cat fi - : ${LESS=-FRX} - : ${LV=-c} + : "${LESS=-FRX}" + : "${LV=-c}" export LESS LV eval "$GIT_PAGER" '"$@"' @@ -344,7 +344,7 @@ git_dir_init () { echo >&2 "Unable to determine absolute path of git directory" exit 1 } - : ${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path 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 c7c65e2..c7509e8 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -185,7 +185,7 @@ store_stash () { git update-ref --create-reflog -m "$stash_msg" $ref_stash $w_commit ret=$? - test $ret != 0 && test -z $quiet && + test $ret != 0 && test -z "$quiet" && die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")" return $ret } @@ -277,7 +277,7 @@ save_stash () { git clean --force --quiet -d $CLEAN_X_OPTION fi - if test "$keep_index" = "t" && test -n $i_tree + if test "$keep_index" = "t" && test -n "$i_tree" then git read-tree --reset -u $i_tree fi diff --git a/git-submodule.sh b/git-submodule.sh index d56207e..7fe8a51 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -46,114 +46,6 @@ prefix= custom_name= depth= -# The function takes at most 2 arguments. The first argument is the -# URL that navigates to the submodule origin repo. When relative, this URL -# is relative to the superproject origin URL repo. The second up_path -# argument, if specified, is the relative path that navigates -# from the submodule working tree to the superproject working tree. -# -# The output of the function is the origin URL of the submodule. -# -# The output will either be an absolute URL or filesystem path (if the -# superproject origin URL is an absolute URL or filesystem path, -# respectively) or a relative file system path (if the superproject -# origin URL is a relative file system path). -# -# When the output is a relative file system path, the path is either -# relative to the submodule working tree, if up_path is specified, or to -# the superproject working tree otherwise. -resolve_relative_url () -{ - remote=$(get_default_remote) - remoteurl=$(git config "remote.$remote.url") || - remoteurl=$(pwd) # the repository is its own authoritative upstream - url="$1" - remoteurl=${remoteurl%/} - sep=/ - up_path="$2" - - case "$remoteurl" in - *:*|/*) - is_relative= - ;; - ./*|../*) - is_relative=t - ;; - *) - is_relative=t - remoteurl="./$remoteurl" - ;; - esac - - while test -n "$url" - do - case "$url" in - ../*) - url="${url#../}" - case "$remoteurl" in - */*) - remoteurl="${remoteurl%/*}" - ;; - *:*) - remoteurl="${remoteurl%:*}" - sep=: - ;; - *) - if test -z "$is_relative" || test "." = "$remoteurl" - then - die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")" - else - remoteurl=. - fi - ;; - esac - ;; - ./*) - url="${url#./}" - ;; - *) - break;; - esac - done - remoteurl="$remoteurl$sep${url%/}" - echo "${is_relative:+${up_path}}${remoteurl#./}" -} - -# Resolve a path to be relative to another path. This is intended for -# converting submodule paths when git-submodule is run in a subdirectory -# and only handles paths where the directory separator is '/'. -# -# The output is the first argument as a path relative to the second argument, -# which defaults to $wt_prefix if it is omitted. -relative_path () -{ - local target curdir result - target=$1 - curdir=${2-$wt_prefix} - curdir=${curdir%/} - result= - - while test -n "$curdir" - do - case "$target" in - "$curdir/"*) - target=${target#"$curdir"/} - break - ;; - esac - - result="${result}../" - if test "$curdir" = "${curdir%/*}" - then - curdir= - else - curdir="${curdir%/*}" - fi - done - - echo "$result$target" -} - die_if_unmatched () { if test "$1" = "#unmatched" @@ -192,6 +84,17 @@ isnumber() n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1" } +# Sanitize the local git environment for use within a submodule. We +# can't simply use clear_local_git_env since we want to preserve some +# of the settings from GIT_CONFIG_PARAMETERS. +sanitize_submodule_env() +{ + save_config=$GIT_CONFIG_PARAMETERS + clear_local_git_env + GIT_CONFIG_PARAMETERS=$save_config + export GIT_CONFIG_PARAMETERS +} + # # Add a new submodule to the working tree, .gitmodules and the index # @@ -281,7 +184,7 @@ cmd_add() die "$(gettext "Relative path can only be used from the toplevel of the working tree")" # dereference source url relative to parent's url - realrepo=$(resolve_relative_url "$repo") || exit + realrepo=$(git submodule--helper resolve-relative-url "$repo") || exit ;; *:*|/*) # absolute url @@ -347,9 +250,9 @@ Use -f if you really want to add it." >&2 echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")" fi fi - git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" "$reference" "$depth" || exit + git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit ( - clear_local_git_env + sanitize_submodule_env cd "$sm_path" && # ash fails to wordsplit ${branch:+-b "$branch"...} case "$branch" in @@ -407,20 +310,23 @@ cmd_foreach() # command in the subshell (and a recursive call to this function) exec 3<&0 - git submodule--helper list --prefix "$wt_prefix"| + { + git submodule--helper list --prefix "$wt_prefix" || + echo "#unmatched" + } | while read mode sha1 stage sm_path do die_if_unmatched "$mode" if test -e "$sm_path"/.git then - displaypath=$(relative_path "$prefix$sm_path") + displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix") say "$(eval_gettext "Entering '\$displaypath'")" name=$(git submodule--helper name "$sm_path") ( prefix="$prefix$sm_path/" - clear_local_git_env + sanitize_submodule_env cd "$sm_path" && - sm_path=$(relative_path "$sm_path") && + sm_path=$(git submodule--helper relative-path "$sm_path" "$wt_prefix") && # we make $path available to scripts ... path=$sm_path && if test $# -eq 1 @@ -467,50 +373,7 @@ cmd_init() shift done - git submodule--helper list --prefix "$wt_prefix" "$@" | - while read mode sha1 stage sm_path - do - die_if_unmatched "$mode" - name=$(git submodule--helper name "$sm_path") || exit - - displaypath=$(relative_path "$prefix$sm_path") - - # Copy url setting when it is not set yet - if test -z "$(git config "submodule.$name.url")" - then - url=$(git config -f .gitmodules submodule."$name".url) - test -z "$url" && - die "$(eval_gettext "No url found for submodule path '\$displaypath' in .gitmodules")" - - # Possibly a url relative to parent - case "$url" in - ./*|../*) - url=$(resolve_relative_url "$url") || exit - ;; - esac - git config submodule."$name".url "$url" || - die "$(eval_gettext "Failed to register url for submodule path '\$displaypath'")" - - say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$displaypath'")" - fi - - # Copy "update" setting when it is not set yet - if upd="$(git config -f .gitmodules submodule."$name".update)" && - test -n "$upd" && - test -z "$(git config submodule."$name".update)" - then - case "$upd" in - checkout | rebase | merge | none) - ;; # known modes of updating - *) - echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'" - upd=none - ;; - esac - git config submodule."$name".update "$upd" || - die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")" - fi - done + git ${wt_prefix:+-C "$wt_prefix"} submodule--helper init ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} "$@" } # @@ -558,13 +421,16 @@ cmd_deinit() die "$(eval_gettext "Use '--all' if you really want to deinitialize all submodules")" fi - git submodule--helper list --prefix "$wt_prefix" "$@" | + { + git submodule--helper list --prefix "$wt_prefix" "$@" || + echo "#unmatched" + } | while read mode sha1 stage sm_path do die_if_unmatched "$mode" name=$(git submodule--helper name "$sm_path") || exit - displaypath=$(relative_path "$sm_path") + displaypath=$(git submodule--helper relative-path "$sm_path" "$wt_prefix") # Remove the submodule work tree (unless the user already did it) if test -d "$sm_path" @@ -601,14 +467,14 @@ cmd_deinit() } is_tip_reachable () ( - clear_local_git_env + sanitize_submodule_env && cd "$1" && rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) && test -z "$rev" ) fetch_in_submodule () ( - clear_local_git_env + sanitize_submodule_env && cd "$1" && case "$2" in '') @@ -672,6 +538,14 @@ cmd_update() --depth=*) depth=$1 ;; + -j|--jobs) + case "$2" in '') usage ;; esac + jobs="--jobs=$2" + shift + ;; + --jobs=*) + jobs=$1 + ;; --) shift break @@ -691,17 +565,21 @@ cmd_update() cmd_init "--" "$@" || return fi - cloned_modules= - git submodule--helper list --prefix "$wt_prefix" "$@" | { + { + git submodule--helper update-clone ${GIT_QUIET:+--quiet} \ + ${wt_prefix:+--prefix "$wt_prefix"} \ + ${prefix:+--recursive-prefix "$prefix"} \ + ${update:+--update "$update"} \ + ${reference:+--reference "$reference"} \ + ${depth:+--depth "$depth"} \ + ${jobs:+$jobs} \ + "$@" || echo "#unmatched" + } | { err= - while read mode sha1 stage sm_path + while read mode sha1 stage just_cloned sm_path do die_if_unmatched "$mode" - if test "$stage" = U - then - echo >&2 "Skipping unmerged submodule $prefix$sm_path" - continue - fi + name=$(git submodule--helper name "$sm_path") || exit url=$(git config submodule."$name".url) branch=$(get_submodule_config "$name" branch master) @@ -716,31 +594,14 @@ cmd_update() fi fi - displaypath=$(relative_path "$prefix$sm_path") - - if test "$update_module" = "none" - then - echo "Skipping submodule '$displaypath'" - continue - fi - - if test -z "$url" - then - # Only mention uninitialized submodules when its - # path have been specified - test "$#" != "0" && - say "$(eval_gettext "Submodule path '\$displaypath' not initialized -Maybe you want to use 'update --init'?")" - continue - fi + displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix") - if ! test -d "$sm_path"/.git && ! test -f "$sm_path"/.git + if test $just_cloned -eq 1 then - git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$prefix" --path "$sm_path" --name "$name" --url "$url" "$reference" "$depth" || exit - cloned_modules="$cloned_modules;$name" subsha1= + update_module=checkout else - subsha1=$(clear_local_git_env; cd "$sm_path" && + subsha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify HEAD) || die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")" fi @@ -750,11 +611,11 @@ Maybe you want to use 'update --init'?")" if test -z "$nofetch" then # Fetch remote before determining tracking $sha1 - (clear_local_git_env; cd "$sm_path" && git-fetch) || + (sanitize_submodule_env; cd "$sm_path" && git-fetch) || die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")" fi - remote_name=$(clear_local_git_env; cd "$sm_path" && get_default_remote) - sha1=$(clear_local_git_env; cd "$sm_path" && + remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote) + sha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify "${remote_name}/${branch}") || die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")" fi @@ -783,13 +644,6 @@ Maybe you want to use 'update --init'?")" die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain $sha1. Direct fetching of that commit failed.")" fi - # Is this something we just cloned? - case ";$cloned_modules;" in - *";$name;"*) - # then there is no local change to integrate - update_module=checkout ;; - esac - must_die_on_failure= case "$update_module" in checkout) @@ -819,7 +673,7 @@ Maybe you want to use 'update --init'?")" die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")" esac - if (clear_local_git_env; cd "$sm_path" && $command "$sha1") + if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1") then say "$say_msg" elif test -n "$must_die_on_failure" @@ -834,8 +688,9 @@ Maybe you want to use 'update --init'?")" if test -n "$recursive" then ( - prefix="$prefix$sm_path/" - clear_local_git_env + prefix=$(git submodule--helper relative-path "$prefix$sm_path/" "$wt_prefix") + wt_prefix= + sanitize_submodule_env cd "$sm_path" && eval cmd_update ) @@ -873,7 +728,7 @@ Maybe you want to use 'update --init'?")" set_name_rev () { revname=$( ( - clear_local_git_env + sanitize_submodule_env cd "$1" && { git describe "$2" 2>/dev/null || git describe --tags "$2" 2>/dev/null || @@ -1017,7 +872,7 @@ cmd_summary() { ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null && missing_dst=t - display_name=$(relative_path "$name") + display_name=$(git submodule--helper relative-path "$name" "$wt_prefix") total_commits= case "$missing_src,$missing_dst" in @@ -1129,13 +984,16 @@ cmd_status() shift done - git submodule--helper list --prefix "$wt_prefix" "$@" | + { + git submodule--helper list --prefix "$wt_prefix" "$@" || + echo "#unmatched" + } | while read mode sha1 stage sm_path do die_if_unmatched "$mode" name=$(git submodule--helper name "$sm_path") || exit url=$(git config submodule."$name".url) - displaypath=$(relative_path "$prefix$sm_path") + displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix") if test "$stage" = U then say "U$sha1 $displaypath" @@ -1157,7 +1015,7 @@ cmd_status() else if test -z "$cached" then - sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD) + sha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify HEAD) fi set_name_rev "$sm_path" "$sha1" say "+$sha1 $displaypath$revname" @@ -1167,7 +1025,7 @@ cmd_status() then ( prefix="$displaypath/" - clear_local_git_env + sanitize_submodule_env wt_prefix= cd "$sm_path" && eval cmd_status @@ -1207,7 +1065,10 @@ cmd_sync() esac done cd_to_toplevel - git submodule--helper list --prefix "$wt_prefix" "$@" | + { + git submodule--helper list --prefix "$wt_prefix" "$@" || + echo "#unmatched" + } | while read mode sha1 stage sm_path do die_if_unmatched "$mode" @@ -1223,9 +1084,9 @@ cmd_sync() # guarantee a trailing / up_path=${up_path%/}/ && # path from submodule work tree to submodule origin repo - sub_origin_url=$(resolve_relative_url "$url" "$up_path") && + sub_origin_url=$(git submodule--helper resolve-relative-url "$url" "$up_path") && # path from superproject work tree to submodule origin repo - super_config_url=$(resolve_relative_url "$url") || exit + super_config_url=$(git submodule--helper resolve-relative-url "$url") || exit ;; *) sub_origin_url="$url" @@ -1235,14 +1096,14 @@ cmd_sync() if git config "submodule.$name.url" >/dev/null 2>/dev/null then - displaypath=$(relative_path "$prefix$sm_path") + displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix") say "$(eval_gettext "Synchronizing submodule url for '\$displaypath'")" git config submodule."$name".url "$super_config_url" if test -e "$sm_path"/.git then ( - clear_local_git_env + sanitize_submodule_env cd "$sm_path" remote=$(get_default_remote) git config remote."$remote".url "$sub_origin_url" diff --git a/git.spec.in b/git.spec.in deleted file mode 100644 index bfd1cfb..0000000 --- a/git.spec.in +++ /dev/null @@ -1,330 +0,0 @@ -# Pass --without docs to rpmbuild if you don't want the documentation - -Name: git -Version: @@VERSION@@ -Release: 1%{?dist} -Summary: Core git tools -License: GPL -Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ -Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, less, openssh-clients, expat -Provides: git-core = %{version}-%{release} -Obsoletes: git-core <= 1.5.4.2 -Obsoletes: git-p4 - -%description -Git is a fast, scalable, distributed revision control system with an -unusually rich command set that provides both high-level operations -and full access to internals. - -The git rpm installs the core tools with minimal dependencies. To -install all git packages, including tools for integrating with other -SCMs, install the git-all meta-package. - -%package all -Summary: Meta-package to pull in all git tools -Group: Development/Tools -Requires: git = %{version}-%{release} -Requires: git-svn = %{version}-%{release} -Requires: git-cvs = %{version}-%{release} -Requires: git-arch = %{version}-%{release} -Requires: git-email = %{version}-%{release} -Requires: gitk = %{version}-%{release} -Requires: gitweb = %{version}-%{release} -Requires: git-gui = %{version}-%{release} -Obsoletes: git <= 1.5.4.2 - -%description all -Git is a fast, scalable, distributed revision control system with an -unusually rich command set that provides both high-level operations -and full access to internals. - -This is a dummy package which brings in all subpackages. - -%package svn -Summary: Git tools for importing Subversion repositories -Group: Development/Tools -Requires: git = %{version}-%{release}, subversion -%description svn -Git tools for importing Subversion repositories. - -%package cvs -Summary: Git tools for importing CVS repositories -Group: Development/Tools -Requires: git = %{version}-%{release}, cvs, cvsps -%description cvs -Git tools for importing CVS repositories. - -%package arch -Summary: Git tools for importing Arch repositories -Group: Development/Tools -Requires: git = %{version}-%{release}, tla -%description arch -Git tools for importing Arch repositories. - -%package email -Summary: Git tools for sending email -Group: Development/Tools -Requires: git = %{version}-%{release} -%description email -Git tools for sending email. - -%package gui -Summary: Git GUI tool -Group: Development/Tools -Requires: git = %{version}-%{release}, tk >= 8.4 -%description gui -Git GUI tool - -%package -n gitk -Summary: Git revision tree visualiser ('gitk') -Group: Development/Tools -Requires: git = %{version}-%{release}, tk >= 8.4 -%description -n gitk -Git revision tree visualiser ('gitk') - -%package -n gitweb -Summary: Git web interface -Group: Development/Tools -Requires: git = %{version}-%{release} -%description -n gitweb -Browsing git repository on the web - -%package -n perl-Git -Summary: Perl interface to Git -Group: Development/Libraries -Requires: git = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Error) -BuildRequires: perl(ExtUtils::MakeMaker) - -%description -n perl-Git -Perl interface to Git - -%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-%{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -%prep -%setup -q - -%build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ - %{path_settings} \ - all %{!?_without_docs: doc} - -%install -rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - %{path_settings} \ - INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -test ! -d $RPM_BUILD_ROOT%{python_sitelib} || rm -fr $RPM_BUILD_ROOT%{python_sitelib} -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' - -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files -(find $RPM_BUILD_ROOT%{_libexecdir}/git-core -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files -(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files -%if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files -%else -rm -rf $RPM_BUILD_ROOT%{_mandir} -%endif -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f bin-man-doc-files -%defattr(-,root,root) -%{_datadir}/git-core/ -%doc README.md COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html Documentation/howto} -%{!?_without_docs: %doc Documentation/technical} -%{_sysconfdir}/bash_completion.d - -%files svn -%defattr(-,root,root) -%{_libexecdir}/git-core/*svn* -%doc Documentation/*svn*.txt -%{!?_without_docs: %{_mandir}/man1/*svn*.1*} -%{!?_without_docs: %doc Documentation/*svn*.html } - -%files cvs -%defattr(-,root,root) -%doc Documentation/*git-cvs*.txt -%{_bindir}/git-cvsserver -%{_libexecdir}/git-core/*cvs* -%{!?_without_docs: %{_mandir}/man1/*cvs*.1*} -%{!?_without_docs: %doc Documentation/*git-cvs*.html } - -%files arch -%defattr(-,root,root) -%doc Documentation/git-archimport.txt -%{_libexecdir}/git-core/git-archimport -%{!?_without_docs: %{_mandir}/man1/git-archimport.1*} -%{!?_without_docs: %doc Documentation/git-archimport.html } - -%files email -%defattr(-,root,root) -%doc Documentation/*email*.txt -%{_libexecdir}/git-core/*email* -%{!?_without_docs: %{_mandir}/man1/*email*.1*} -%{!?_without_docs: %doc Documentation/*email*.html } - -%files gui -%defattr(-,root,root) -%{_libexecdir}/git-core/git-gui -%{_libexecdir}/git-core/git-citool -%{_libexecdir}/git-core/git-gui--askpass -%{_datadir}/git-gui/ -%{!?_without_docs: %{_mandir}/man1/git-gui.1*} -%{!?_without_docs: %doc Documentation/git-gui.html} -%{!?_without_docs: %{_mandir}/man1/git-citool.1*} -%{!?_without_docs: %doc Documentation/git-citool.html} - -%files -n gitk -%defattr(-,root,root) -%doc Documentation/*gitk*.txt -%{_bindir}/*gitk* -%{_datadir}/gitk/ -%{!?_without_docs: %{_mandir}/man1/*gitk*.1*} -%{!?_without_docs: %doc Documentation/*gitk*.html } - -%files -n gitweb -%defattr(-,root,root) -%doc gitweb/README gitweb/INSTALL Documentation/*gitweb*.txt -%{_datadir}/gitweb -%{!?_without_docs: %{_mandir}/man1/*gitweb*.1*} -%{!?_without_docs: %{_mandir}/man5/*gitweb*.5*} -%{!?_without_docs: %doc Documentation/*gitweb*.html } - -%files -n perl-Git -f perl-files -%defattr(-,root,root) - -%files all -# No files for you! - -%changelog -* Sun Sep 18 2011 Jakub Narebski <jnareb@gmail.com> -- Add gitweb manpages to 'gitweb' subpackage - -* Wed Jun 30 2010 Junio C Hamano <gitster@pobox.com> -- Add 'gitweb' subpackage. - -* Fri Mar 26 2010 Ian Ward Comfort <icomfort@stanford.edu> -- Ship bash completion support from contrib/ in the core package. - -* Sun Jan 31 2010 Junio C Hamano <gitster@pobox.com> -- Do not use %define inside %{!?...} construct. - -* Sat Jan 30 2010 Junio C Hamano <gitster@pobox.com> -- We don't ship Python bits until a real foreign scm interface comes. - -* Mon Feb 04 2009 David J. Mellor <dmellor@whistlingcat.com> -- fixed broken git help -w after renaming the git-core package to git. - -* Fri Sep 12 2008 Quy Tonthat <qtonthat@gmail.com> -- move git-cvsserver to bindir. - -* Sun Jun 15 2008 Junio C Hamano <gitster@pobox.com> -- Remove curl from Requires list. - -* Fri Feb 15 2008 Kristian HΓΈgsberg <krh@redhat.com> -- Rename git-core to just git and rename meta package from git to git-all. - -* Sun Feb 03 2008 James Bowes <jbowes@dangerouslyinc.com> -- Add a BuildRequires for gettext - -* Fri Jan 11 2008 Junio C Hamano <gitster@pobox.com> -- Include gitk message files - -* Sun Jan 06 2008 James Bowes <jbowes@dangerouslyinc.com> -- Make the metapackage require the same version of the subpackages. - -* Wed Dec 12 2007 Junio C Hamano <gitster@pobox.com> -- Adjust htmldir to point at /usr/share/doc/git-core-$version/ - -* Sun Jul 15 2007 Sean Estabrooks <seanlkml@sympatico.ca> -- Removed p4import. - -* Tue Jun 26 2007 Quy Tonthat <qtonthat@gmail.com> -- Fixed problems looking for wrong manpages. - -* Thu Jun 21 2007 Shawn O. Pearce <spearce@spearce.org> -- Added documentation files for git-gui - -* Tue May 13 2007 Quy Tonthat <qtonthat@gmail.com> -- Added lib files for git-gui -- Added Documentation/technical (As needed by Git Users Manual) - -* Tue May 8 2007 Quy Tonthat <qtonthat@gmail.com> -- Added howto files - -* Tue Mar 27 2007 Eygene Ryabinkin <rea-git@codelabs.ru> -- Added the git-p4 package: Perforce import stuff. - -* Mon Feb 13 2007 Nicolas Pitre <nico@fluxnic.net> -- Update core package description (Git isn't as stupid as it used to be) - -* Mon Feb 12 2007 Junio C Hamano <junkio@cox.net> -- Add git-gui and git-citool. - -* Mon Nov 14 2005 H. Peter Anvin <hpa@zytor.com> 0.99.9j-1 -- Change subpackage names to git-<name> instead of git-core-<name> -- Create empty root package which brings in all subpackages -- Rename git-tk -> gitk - -* Thu Nov 10 2005 Chris Wright <chrisw@osdl.org> 0.99.9g-1 -- zlib dependency fix -- Minor cleanups from split -- Move arch import to separate package as well - -* Tue Sep 27 2005 Jim Radford <radford@blackbean.org> -- Move programs with non-standard dependencies (svn, cvs, email) - into separate packages - -* Tue Sep 27 2005 H. Peter Anvin <hpa@zytor.com> -- parallelize build -- COPTS -> CFLAGS - -* Fri Sep 16 2005 Chris Wright <chrisw@osdl.org> 0.99.6-1 -- update to 0.99.6 - -* Fri Sep 16 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl> -- Linus noticed that less is required, added to the dependencies - -* Sun Sep 11 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl> -- Updated dependencies -- Don't assume manpages are gzipped - -* Thu Aug 18 2005 Chris Wright <chrisw@osdl.org> 0.99.4-4 -- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires -- use RPM_OPT_FLAGS in spec file, drop patch0 - -* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.99.4-3 -- use dist tag to differentiate between branches -- use rpm optflags by default (patch0) -- own %{_datadir}/git-core/ - -* Mon Aug 15 2005 Chris Wright <chrisw@osdl.org> -- update spec file to fix Buildroot, Requires, and drop Vendor - -* Sun Aug 07 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl> -- Redid the description -- Cut overlong make line, loosened changelog a bit -- I think Junio (or perhaps OSDL?) should be vendor... - -* Thu Jul 14 2005 Eric Biederman <ebiederm@xmission.com> -- Add the man pages, and the --without docs build option - -* Wed Jul 7 2005 Chris Wright <chris@osdl.org> -- initial git spec file diff --git a/gpg-interface.c b/gpg-interface.c index 3dc2fe3..c4b1e8c 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -219,11 +219,9 @@ int verify_signed_buffer(const char *payload, size_t payload_size, args_gpg[0] = gpg_program; fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX"); if (fd < 0) - return error(_("could not create temporary file '%s': %s"), - path, strerror(errno)); + return error_errno(_("could not create temporary file '%s'"), path); if (write_in_full(fd, signature, signature_size) < 0) - return error(_("failed writing detached signature to '%s': %s"), - path, strerror(errno)); + return error_errno(_("failed writing detached signature to '%s'"), path); close(fd); gpg.argv = args_gpg; @@ -237,6 +235,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size, return error(_("could not run gpg.")); } + sigchain_push(SIGPIPE, SIG_IGN); write_in_full(gpg.in, payload, payload_size); close(gpg.in); @@ -250,6 +249,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size, close(gpg.out); ret = finish_command(&gpg); + sigchain_pop(SIGPIPE); unlink_or_warn(path); @@ -669,6 +669,13 @@ static void graph_output_padding_line(struct git_graph *graph, graph_pad_horizontally(graph, sb, graph->num_new_columns * 2); } + +int graph_width(struct git_graph *graph) +{ + return graph->width; +} + + static void graph_output_skip_line(struct git_graph *graph, struct strbuf *sb) { /* @@ -68,6 +68,11 @@ int graph_next_line(struct git_graph *graph, struct strbuf *sb); /* + * Return current width of the graph in on-screen characters. + */ +int graph_width(struct git_graph *graph); + +/* * graph_show_*: helper functions for printing to stdout */ @@ -1396,9 +1396,17 @@ static int fill_textconv_grep(struct userdiff_driver *driver, return 0; } +static int is_empty_line(const char *bol, const char *eol) +{ + while (bol < eol && isspace(*bol)) + bol++; + return bol == eol; +} + static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int collect_hits) { char *bol; + char *peek_bol = NULL; unsigned long left; unsigned lno = 1; unsigned last_hit = 0; @@ -1543,8 +1551,24 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle show_function = 1; goto next_line; } - if (show_function && match_funcname(opt, gs, bol, eol)) - show_function = 0; + if (show_function && (!peek_bol || peek_bol < bol)) { + unsigned long peek_left = left; + char *peek_eol = eol; + + /* + * Trailing empty lines are not interesting. + * Peek past them to see if they belong to the + * body of the current function. + */ + peek_bol = bol; + while (is_empty_line(peek_bol, peek_eol)) { + peek_bol = peek_eol + 1; + peek_eol = end_of_line(peek_bol, &peek_left); + } + + if (match_funcname(opt, gs, peek_bol, peek_eol)) + show_function = 0; + } if (show_function || (last_hit && lno <= last_hit + opt->post_context)) { /* If the last hit is within the post context, @@ -1732,7 +1756,7 @@ static int grep_source_load_file(struct grep_source *gs) if (lstat(filename, &st) < 0) { err_ret: if (errno != ENOENT) - error(_("'%s': %s"), filename, strerror(errno)); + error_errno(_("failed to stat '%s'"), filename); return -1; } if (!S_ISREG(st.st_mode)) @@ -1743,7 +1767,7 @@ static int grep_source_load_file(struct grep_source *gs) goto err_ret; data = xmallocz(size); if (st.st_size != read_in_full(i, data, size)) { - error(_("'%s': short read %s"), filename, strerror(errno)); + error_errno(_("'%s': short read"), filename); close(i); free(data); return -1; diff --git a/http-backend.c b/http-backend.c index 8870a26..2148814 100644 --- a/http-backend.c +++ b/http-backend.c @@ -484,9 +484,9 @@ static int show_head_ref(const char *refname, const struct object_id *oid, const char *target = resolve_ref_unsafe(refname, RESOLVE_REF_READING, unused.hash, NULL); - const char *target_nons = strip_namespace(target); - strbuf_addf(buf, "ref: %s\n", target_nons); + if (target) + strbuf_addf(buf, "ref: %s\n", strip_namespace(target)); } else { strbuf_addf(buf, "%s\n", oid_to_hex(oid)); } diff --git a/http-push.c b/http-push.c index bd60668..a092f02 100644 --- a/http-push.c +++ b/http-push.c @@ -211,7 +211,7 @@ static void curl_setup_http(CURL *curl, const char *url, static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options) { struct strbuf buf = STRBUF_INIT; - struct curl_slist *dav_headers = NULL; + struct curl_slist *dav_headers = http_copy_default_headers(); if (options & DAV_HEADER_IF) { strbuf_addf(&buf, "If: (<%s>)", lock->token); @@ -417,7 +417,7 @@ static void start_put(struct transfer_request *request) static void start_move(struct transfer_request *request) { struct active_request_slot *slot; - struct curl_slist *dav_headers = NULL; + struct curl_slist *dav_headers = http_copy_default_headers(); slot = get_active_slot(); slot->callback_func = process_response; @@ -845,7 +845,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout) char *ep; char timeout_header[25]; struct remote_lock *lock = NULL; - struct curl_slist *dav_headers = NULL; + struct curl_slist *dav_headers = http_copy_default_headers(); struct xml_ctx ctx; char *escaped; @@ -1126,7 +1126,7 @@ static void remote_ls(const char *path, int flags, struct slot_results results; struct strbuf in_buffer = STRBUF_INIT; struct buffer out_buffer = { STRBUF_INIT, 0 }; - struct curl_slist *dav_headers = NULL; + struct curl_slist *dav_headers = http_copy_default_headers(); struct xml_ctx ctx; struct remote_ls_ctx ls; @@ -1204,7 +1204,7 @@ static int locking_available(void) struct slot_results results; struct strbuf in_buffer = STRBUF_INIT; struct buffer out_buffer = { STRBUF_INIT, 0 }; - struct curl_slist *dav_headers = NULL; + struct curl_slist *dav_headers = http_copy_default_headers(); struct xml_ctx ctx; int lock_flags = 0; char *escaped; @@ -1312,10 +1312,10 @@ static struct object_list **process_tree(struct tree *tree, while (tree_entry(&desc, &entry)) switch (object_type(entry.mode)) { case OBJ_TREE: - p = process_tree(lookup_tree(entry.sha1), p); + p = process_tree(lookup_tree(entry.oid->hash), p); break; case OBJ_BLOB: - p = process_blob(lookup_blob(entry.sha1), p); + p = process_blob(lookup_blob(entry.oid->hash), p); break; default: /* Subproject commit - not in this repository */ @@ -114,6 +114,7 @@ static unsigned long http_auth_methods = CURLAUTH_ANY; static struct curl_slist *pragma_header; static struct curl_slist *no_pragma_header; +static struct curl_slist *extra_http_headers; static struct active_request_slot *active_queue_head; @@ -323,6 +324,19 @@ static int http_options(const char *var, const char *value, void *cb) #endif } + if (!strcmp("http.extraheader", var)) { + if (!value) { + return config_error_nonbool(var); + } else if (!*value) { + curl_slist_free_all(extra_http_headers); + extra_http_headers = NULL; + } else { + extra_http_headers = + curl_slist_append(extra_http_headers, value); + } + return 0; + } + /* Fall back on the default ones */ return git_default_config(var, value, cb); } @@ -446,8 +460,7 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type) rc = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&ka, len); if (rc < 0) - warning("unable to set SO_KEEPALIVE on socket %s", - strerror(errno)); + warning_errno("unable to set SO_KEEPALIVE on socket"); return 0; /* CURL_SOCKOPT_OK only exists since curl 7.21.5 */ } @@ -678,8 +691,10 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) if (remote) var_override(&http_proxy_authmethod, remote->http_proxy_authmethod); - pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache"); - no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:"); + pragma_header = curl_slist_append(http_copy_default_headers(), + "Pragma: no-cache"); + no_pragma_header = curl_slist_append(http_copy_default_headers(), + "Pragma:"); #ifdef USE_CURL_MULTI { @@ -765,6 +780,9 @@ void http_cleanup(void) #endif curl_global_cleanup(); + curl_slist_free_all(extra_http_headers); + extra_http_headers = NULL; + curl_slist_free_all(pragma_header); pragma_header = NULL; @@ -1163,6 +1181,16 @@ int run_one_slot(struct active_request_slot *slot, return handle_curl_result(results); } +struct curl_slist *http_copy_default_headers(void) +{ + struct curl_slist *headers = NULL, *h; + + for (h = extra_http_headers; h; h = h->next) + headers = curl_slist_append(headers, h->data); + + return headers; +} + static CURLcode curlinfo_strbuf(CURL *curl, CURLINFO info, struct strbuf *buf) { char *ptr; @@ -1380,7 +1408,7 @@ static int http_request(const char *url, { struct active_request_slot *slot; struct slot_results results; - struct curl_slist *headers = NULL; + struct curl_slist *headers = http_copy_default_headers(); struct strbuf buf = STRBUF_INIT; const char *accept_language; int ret; @@ -1894,8 +1922,7 @@ struct http_object_request *new_http_object_request(const char *base_url, } if (freq->localfile < 0) { - error("Couldn't create temporary file %s: %s", - freq->tmpfile, strerror(errno)); + error_errno("Couldn't create temporary file %s", freq->tmpfile); goto abort; } @@ -1940,8 +1967,8 @@ struct http_object_request *new_http_object_request(const char *base_url, prev_posn = 0; lseek(freq->localfile, 0, SEEK_SET); if (ftruncate(freq->localfile, 0) < 0) { - error("Couldn't truncate temporary file %s: %s", - freq->tmpfile, strerror(errno)); + error_errno("Couldn't truncate temporary file %s", + freq->tmpfile); goto abort; } } @@ -106,6 +106,7 @@ extern void step_active_slots(void); extern void http_init(struct remote *remote, const char *url, int proactive_auth); extern void http_cleanup(void); +extern struct curl_slist *http_copy_default_headers(void); extern long int git_curl_ipresolve; extern int active_requests; @@ -75,14 +75,12 @@ static int add_mailname_host(struct strbuf *buf) mailname = fopen("/etc/mailname", "r"); if (!mailname) { if (errno != ENOENT) - warning("cannot open /etc/mailname: %s", - strerror(errno)); + warning_errno("cannot open /etc/mailname"); return -1; } if (strbuf_getline(&mailnamebuf, mailname) == EOF) { if (ferror(mailname)) - warning("cannot read /etc/mailname: %s", - strerror(errno)); + warning_errno("cannot read /etc/mailname"); strbuf_release(&mailnamebuf); fclose(mailname); return -1; @@ -125,7 +123,7 @@ static void add_domainname(struct strbuf *out, int *is_bogus) char buf[1024]; if (gethostname(buf, sizeof(buf))) { - warning("cannot get host name: %s", strerror(errno)); + warning_errno("cannot get host name"); strbuf_addstr(out, "(none)"); *is_bogus = 1; return; @@ -480,8 +480,7 @@ static struct commit *check_single_commit(struct rev_info *revs) struct object *obj = revs->pending.objects[i].item; if (obj->flags & UNINTERESTING) continue; - while (obj->type == OBJ_TAG) - obj = deref_tag(obj, NULL, 0); + obj = deref_tag(obj, NULL, 0); if (obj->type != OBJ_COMMIT) die("Non commit %s?", revs->pending.objects[i].name); if (commit) diff --git a/list-objects.c b/list-objects.c index 917cc5d..f3ca6aa 100644 --- a/list-objects.c +++ b/list-objects.c @@ -110,16 +110,16 @@ static void process_tree(struct rev_info *revs, if (S_ISDIR(entry.mode)) process_tree(revs, - lookup_tree(entry.sha1), + lookup_tree(entry.oid->hash), show, base, entry.path, cb_data); else if (S_ISGITLINK(entry.mode)) - process_gitlink(revs, entry.sha1, + process_gitlink(revs, entry.oid->hash, show, base, entry.path, cb_data); else process_blob(revs, - lookup_blob(entry.sha1), + lookup_blob(entry.oid->hash), show, base, entry.path, cb_data); } @@ -47,7 +47,9 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused, assert(opts); /* - * The tentative merge result is the or common ancestor for an internal merge. + * The tentative merge result is the common ancestor for an + * internal merge. For the final merge, it is "ours" by + * default but -Xours/-Xtheirs can tweak the choice. */ if (opts->virtual_ancestor) { stolen = orig; @@ -383,8 +385,12 @@ int ll_merge(mmbuffer_t *result_buf, } } driver = find_ll_merge_driver(ll_driver_name); - if (opts->virtual_ancestor && driver->recursive) - driver = find_ll_merge_driver(driver->recursive); + + if (opts->virtual_ancestor) { + if (driver->recursive) + driver = find_ll_merge_driver(driver->recursive); + marker_size += 2; + } return driver->fn(driver, result_buf, path, ancestor, ancestor_label, ours, our_label, theirs, their_label, opts, marker_size); @@ -683,9 +683,12 @@ void show_log(struct rev_info *opt) ctx.fmt = opt->commit_format; ctx.mailmap = opt->mailmap; ctx.color = opt->diffopt.use_color; + ctx.expand_tabs_in_log = opt->expand_tabs_in_log; ctx.output_encoding = get_log_output_encoding(); if (opt->from_ident.mail_begin && opt->from_ident.name_begin) ctx.from_ident = &opt->from_ident; + if (opt->graph) + ctx.graph_width = graph_width(opt->graph); pretty_print_commit(&ctx, commit, &msgbuf); if (opt->add_signoff) @@ -189,8 +189,7 @@ static int read_mailmap_file(struct string_list *map, const char *filename, if (!f) { if (errno == ENOENT) return 0; - return error("unable to open mailmap at %s: %s", - filename, strerror(errno)); + return error_errno("unable to open mailmap at %s", filename); } while (fgets(buffer, sizeof(buffer), f) != NULL) diff --git a/match-trees.c b/match-trees.c index 1ce0954..396b733 100644 --- a/match-trees.c +++ b/match-trees.c @@ -48,17 +48,17 @@ static int score_matches(unsigned mode1, unsigned mode2, const char *path) } static void *fill_tree_desc_strict(struct tree_desc *desc, - const unsigned char *hash) + const struct object_id *hash) { void *buffer; enum object_type type; unsigned long size; - buffer = read_sha1_file(hash, &type, &size); + buffer = read_sha1_file(hash->hash, &type, &size); if (!buffer) - die("unable to read tree (%s)", sha1_to_hex(hash)); + die("unable to read tree (%s)", oid_to_hex(hash)); if (type != OBJ_TREE) - die("%s is not a tree", sha1_to_hex(hash)); + die("%s is not a tree", oid_to_hex(hash)); init_tree_desc(desc, buffer, size); return buffer; } @@ -73,7 +73,7 @@ static int base_name_entries_compare(const struct name_entry *a, /* * Inspect two trees, and give a score that tells how similar they are. */ -static int score_trees(const unsigned char *hash1, const unsigned char *hash2) +static int score_trees(const struct object_id *hash1, const struct object_id *hash2) { struct tree_desc one; struct tree_desc two; @@ -104,7 +104,7 @@ static int score_trees(const unsigned char *hash1, const unsigned char *hash2) else if (cmp > 0) /* path2 does not appear in one */ score += score_missing(e2.mode, e2.path); - else if (hashcmp(e1.sha1, e2.sha1)) + else if (oidcmp(e1.oid, e2.oid)) /* they are different */ score += score_differs(e1.mode, e2.mode, e1.path); else @@ -119,8 +119,8 @@ static int score_trees(const unsigned char *hash1, const unsigned char *hash2) /* * Match one itself and its subtrees with two and pick the best match. */ -static void match_trees(const unsigned char *hash1, - const unsigned char *hash2, +static void match_trees(const struct object_id *hash1, + const struct object_id *hash2, int *best_score, char **best_match, const char *base, @@ -131,7 +131,7 @@ static void match_trees(const unsigned char *hash1, while (one.size) { const char *path; - const unsigned char *elem; + const struct object_id *elem; unsigned mode; int score; @@ -191,15 +191,15 @@ static int splice_tree(const unsigned char *hash1, while (desc.size) { const char *name; unsigned mode; - const unsigned char *sha1; + const struct object_id *oid; - sha1 = tree_entry_extract(&desc, &name, &mode); + oid = tree_entry_extract(&desc, &name, &mode); if (strlen(name) == toplen && !memcmp(name, prefix, toplen)) { if (!S_ISDIR(mode)) die("entry %s in tree %s is not a tree", name, sha1_to_hex(hash1)); - rewrite_here = (unsigned char *) sha1; + rewrite_here = (unsigned char *) oid->hash; break; } update_tree_entry(&desc); @@ -229,9 +229,9 @@ static int splice_tree(const unsigned char *hash1, * other hand, it could cover tree one and we might need to pick a * subtree of it. */ -void shift_tree(const unsigned char *hash1, - const unsigned char *hash2, - unsigned char *shifted, +void shift_tree(const struct object_id *hash1, + const struct object_id *hash2, + struct object_id *shifted, int depth_limit) { char *add_prefix; @@ -262,7 +262,7 @@ void shift_tree(const unsigned char *hash1, match_trees(hash2, hash1, &del_score, &del_prefix, "", depth_limit); /* Assume we do not have to do any shifting */ - hashcpy(shifted, hash2); + oidcpy(shifted, hash2); if (add_score < del_score) { /* We need to pick a subtree of two */ @@ -271,16 +271,16 @@ void shift_tree(const unsigned char *hash1, if (!*del_prefix) return; - if (get_tree_entry(hash2, del_prefix, shifted, &mode)) + if (get_tree_entry(hash2->hash, del_prefix, shifted->hash, &mode)) die("cannot find path %s in tree %s", - del_prefix, sha1_to_hex(hash2)); + del_prefix, oid_to_hex(hash2)); return; } if (!*add_prefix) return; - splice_tree(hash1, add_prefix, hash2, shifted); + splice_tree(hash1->hash, add_prefix, hash2->hash, shifted->hash); } /* @@ -288,22 +288,22 @@ void shift_tree(const unsigned char *hash1, * Unfortunately we cannot fundamentally tell which one to * be prefixed, as recursive merge can work in either direction. */ -void shift_tree_by(const unsigned char *hash1, - const unsigned char *hash2, - unsigned char *shifted, +void shift_tree_by(const struct object_id *hash1, + const struct object_id *hash2, + struct object_id *shifted, const char *shift_prefix) { - unsigned char sub1[20], sub2[20]; + struct object_id sub1, sub2; unsigned mode1, mode2; unsigned candidate = 0; /* Can hash2 be a tree at shift_prefix in tree hash1? */ - if (!get_tree_entry(hash1, shift_prefix, sub1, &mode1) && + if (!get_tree_entry(hash1->hash, shift_prefix, sub1.hash, &mode1) && S_ISDIR(mode1)) candidate |= 1; /* Can hash1 be a tree at shift_prefix in tree hash2? */ - if (!get_tree_entry(hash2, shift_prefix, sub2, &mode2) && + if (!get_tree_entry(hash2->hash, shift_prefix, sub2.hash, &mode2) && S_ISDIR(mode2)) candidate |= 2; @@ -313,19 +313,19 @@ void shift_tree_by(const unsigned char *hash1, int score; candidate = 0; - score = score_trees(sub1, hash2); + score = score_trees(&sub1, hash2); if (score > best_score) { candidate = 1; best_score = score; } - score = score_trees(sub2, hash1); + score = score_trees(&sub2, hash1); if (score > best_score) candidate = 2; } if (!candidate) { /* Neither is plausible -- do not shift */ - hashcpy(shifted, hash2); + oidcpy(shifted, hash2); return; } @@ -334,11 +334,11 @@ void shift_tree_by(const unsigned char *hash1, * shift tree2 down by adding shift_prefix above it * to match tree1. */ - splice_tree(hash1, shift_prefix, hash2, shifted); + splice_tree(hash1->hash, shift_prefix, hash2->hash, shifted->hash); else /* * shift tree2 up by removing shift_prefix from it * to match tree1. */ - hashcpy(shifted, sub2); + oidcpy(shifted, &sub2); } diff --git a/merge-recursive.c b/merge-recursive.c index b880ae5..65cb5d6 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -29,9 +29,9 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two, struct object_id shifted; if (!*subtree_shift) { - shift_tree(one->object.oid.hash, two->object.oid.hash, shifted.hash, 0); + shift_tree(&one->object.oid, &two->object.oid, &shifted, 0); } else { - shift_tree_by(one->object.oid.hash, two->object.oid.hash, shifted.hash, + shift_tree_by(&one->object.oid, &two->object.oid, &shifted, subtree_shift); } if (!oidcmp(&two->object.oid, &shifted)) @@ -622,7 +622,7 @@ static char *unique_path(struct merge_options *o, const char *path, const char * base_len = newpath.len; while (string_list_has_string(&o->current_file_set, newpath.buf) || string_list_has_string(&o->current_directory_set, newpath.buf) || - file_exists(newpath.buf)) { + (!o->call_depth && file_exists(newpath.buf))) { strbuf_setlen(&newpath, base_len); strbuf_addf(&newpath, "_%d", suffix++); } @@ -1234,8 +1234,8 @@ static void conflict_rename_rename_2to1(struct merge_options *o, a->path, c1->path, ci->branch1, b->path, c2->path, ci->branch2); - remove_file(o, 1, a->path, would_lose_untracked(a->path)); - remove_file(o, 1, b->path, would_lose_untracked(b->path)); + remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path)); + remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path)); mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other, o->branch1, c1->path, @@ -1773,8 +1773,6 @@ static int process_entry(struct merge_options *o, output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. " "Adding %s as %s"), conf, path, other_branch, path, new_path); - if (o->call_depth) - remove_file_from_cache(path); update_file(o, 0, sha, mode, new_path); if (o->call_depth) remove_file_from_cache(path); diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 0000000..7b524d4 --- /dev/null +++ b/mergetools/examdiff @@ -0,0 +1,18 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" -nh +} + +merge_cmd () { + touch "$BACKUP" + if $base_present + then + "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh + else + "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh + fi + check_unchanged +} + +translate_merge_tool_path() { + mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro" +} diff --git a/mergetools/winmerge b/mergetools/winmerge index 74a66d4..f3819d3 100644 --- a/mergetools/winmerge +++ b/mergetools/winmerge @@ -13,24 +13,5 @@ merge_cmd () { } translate_merge_tool_path() { - # Use WinMergeU.exe if it exists in $PATH - if type -p WinMergeU.exe >/dev/null 2>&1 - then - printf WinMergeU.exe - return - fi - - # Look for WinMergeU.exe in the typical locations - winmerge_exe="WinMerge/WinMergeU.exe" - for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' | - cut -d '=' -f 2- | sort -u) - do - if test -n "$directory" && test -x "$directory/$winmerge_exe" - then - printf '%s' "$directory/$winmerge_exe" - return - fi - done - - printf WinMergeU.exe + mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge" } @@ -446,7 +446,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, l = (struct leaf_node *) xcalloc(1, sizeof(struct leaf_node)); hashcpy(l->key_sha1, object_sha1); - hashcpy(l->val_sha1, entry.sha1); + hashcpy(l->val_sha1, entry.oid->hash); if (len < 20) { if (!S_ISDIR(entry.mode) || path_len != 2) goto handle_non_note; /* not subtree */ @@ -493,7 +493,7 @@ handle_non_note: } strbuf_addstr(&non_note_path, entry.path); add_non_note(t, strbuf_detach(&non_note_path, NULL), - entry.mode, entry.sha1); + entry.mode, entry.oid->hash); } } free(buf); diff --git a/parse-options.c b/parse-options.c index 47a9192..312a85d 100644 --- a/parse-options.c +++ b/parse-options.c @@ -110,6 +110,8 @@ static int get_value(struct parse_opt_ctx_t *p, return 0; case OPTION_COUNTUP: + if (*(int *)opt->value < 0) + *(int *)opt->value = 0; *(int *)opt->value = unset ? 0 : *(int *)opt->value + 1; return 0; diff --git a/patch-ids.c b/patch-ids.c index b7b3e5a..a4d0016 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -4,7 +4,7 @@ #include "sha1-lookup.h" #include "patch-ids.h" -static int commit_patch_id(struct commit *commit, struct diff_options *options, +int commit_patch_id(struct commit *commit, struct diff_options *options, unsigned char *sha1) { if (commit->parents) diff --git a/patch-ids.h b/patch-ids.h index c8c7ca1..eeb56b3 100644 --- a/patch-ids.h +++ b/patch-ids.h @@ -13,6 +13,8 @@ struct patch_ids { struct patch_id_bucket *patches; }; +int commit_patch_id(struct commit *commit, struct diff_options *options, + unsigned char *sha1); int init_patch_ids(struct patch_ids *); int free_patch_ids(struct patch_ids *); struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *); @@ -5,6 +5,7 @@ #include "strbuf.h" #include "string-list.h" #include "dir.h" +#include "worktree.h" static int get_st_mode_bits(const char *path, int *mode) { @@ -383,10 +384,11 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len) update_common_dir(buf, git_dir_len, NULL); } -static void do_git_path(struct strbuf *buf, const char *fmt, va_list args) +static void do_git_path(const struct worktree *wt, struct strbuf *buf, + const char *fmt, va_list args) { int gitdir_len; - strbuf_addstr(buf, get_git_dir()); + strbuf_addstr(buf, get_worktree_git_dir(wt)); if (buf->len && !is_dir_sep(buf->buf[buf->len - 1])) strbuf_addch(buf, '/'); gitdir_len = buf->len; @@ -400,7 +402,7 @@ char *git_path_buf(struct strbuf *buf, const char *fmt, ...) va_list args; strbuf_reset(buf); va_start(args, fmt); - do_git_path(buf, fmt, args); + do_git_path(NULL, buf, fmt, args); va_end(args); return buf->buf; } @@ -409,7 +411,7 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) { va_list args; va_start(args, fmt); - do_git_path(sb, fmt, args); + do_git_path(NULL, sb, fmt, args); va_end(args); } @@ -418,7 +420,7 @@ const char *git_path(const char *fmt, ...) struct strbuf *pathname = get_pathname(); va_list args; va_start(args, fmt); - do_git_path(pathname, fmt, args); + do_git_path(NULL, pathname, fmt, args); va_end(args); return pathname->buf; } @@ -428,7 +430,7 @@ char *git_pathdup(const char *fmt, ...) struct strbuf path = STRBUF_INIT; va_list args; va_start(args, fmt); - do_git_path(&path, fmt, args); + do_git_path(NULL, &path, fmt, args); va_end(args); return strbuf_detach(&path, NULL); } @@ -454,6 +456,16 @@ const char *mkpath(const char *fmt, ...) return cleanup_path(pathname->buf); } +const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...) +{ + struct strbuf *pathname = get_pathname(); + va_list args; + va_start(args, fmt); + do_git_path(wt, pathname, fmt, args); + va_end(args); + return pathname->buf; +} + static void do_submodule_path(struct strbuf *buf, const char *path, const char *fmt, va_list args) { @@ -503,6 +515,35 @@ void strbuf_git_path_submodule(struct strbuf *buf, const char *path, va_end(args); } +static void do_git_common_path(struct strbuf *buf, + const char *fmt, + va_list args) +{ + strbuf_addstr(buf, get_git_common_dir()); + if (buf->len && !is_dir_sep(buf->buf[buf->len - 1])) + strbuf_addch(buf, '/'); + strbuf_vaddf(buf, fmt, args); + strbuf_cleanup_path(buf); +} + +const char *git_common_path(const char *fmt, ...) +{ + struct strbuf *pathname = get_pathname(); + va_list args; + va_start(args, fmt); + do_git_common_path(pathname, fmt, args); + va_end(args); + return pathname->buf; +} + +void strbuf_git_common_path(struct strbuf *sb, const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + do_git_common_path(sb, fmt, args); + va_end(args); +} + int validate_headref(const char *path) { struct stat st; diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index b2c14e2..d94d01c 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -97,7 +97,8 @@ sub resolve_local_globs { "existing: $existing\n", " globbed: $refname\n"; } - my $u = (::cmt_metadata("$refname"))[0]; + my $u = (::cmt_metadata("$refname"))[0] or die + "$refname: no associated commit metadata\n"; $u =~ s!^\Q$url\E(/|$)!! or die "$refname: '$url' not found in '$u'\n"; if ($pathname ne $u) { @@ -65,6 +65,9 @@ # term ΡΠΏΡΠ°Π²Π»ΡΠ²Π°ΡΠ° Π΄ΡΠΌΠ° (Π·Π° git-bisect) # mergetag Π΅ΡΠΈΠΊΠ΅Ρ ΠΏΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅ # delta - ΡΠ°Π·Π»ΠΈΠΊΠ°, Π΄Π΅Π»ΡΠ°, ΠΎΠ±Π΅ΠΊΡ-ΡΠ°Π·Π»ΠΈΠΊΠ° +# peeled tag - ΠΏΡΠΎΡΠ»Π΅Π΄Π΅Π½ Π΅ΡΠΈΠΊΠ΅Ρ - ΠΊΠΎΠ³Π°ΡΠΎ Π΅ΡΠΈΠΊΠ΅Ρ ΡΠΎΡΠΈ ΠΊΡΠΌ Π΄ΡΡΠ³ Π΅ΡΠΈΠΊΠ΅Ρ, Π° Π½Π΅ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΠΈ ΠΏΡΠΎΡΠ»Π΅Π΄ΡΠ²Π°ΠΌΠ΅ ΠΏΠΎΠ΄ΠΎΠ±Π½ΠΎ Π½Π° ΡΠΈΠΌΠ²ΠΎΠ»Π½Π° Π²ΡΡΠ·ΠΊΠ° +# strip - ΠΏΡΠ΅ΠΌΠ°Ρ
Π²Π°ΠΌ (Π·Π° ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΠΈ ΡΠΈΠ»ΡΡΠΈΡΠ°Π½Π΅) +# unrelated histories - Π½Π΅Π·Π°Π²ΠΈΡΠΈΠΌΠΈ ΠΈΡΡΠΎΡΠΈΠΈ # ---- # β$varβ - ΠΌΠΎΠΆΠ΅ Π΄Π° Π½Π΅ ΡΡΠ°Π±ΠΎΡΠ²Π° Π·Π° shell ΠΈΠΌΠ° gettext ΠΈ eval_gettext - ΠΏΡΠΎΠ²Π΅ΡΠΊΠ° - Π½Π°ΠΌΠΈΡΠ°Ρ ΡΠ΅ Π»Π΅ΡΠ½ΠΎ ΠΏΠΎ β$ # ======================== @@ -109,8 +112,8 @@ msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-12-22 22:50+0800\n" -"PO-Revision-Date: 2015-12-28 11:32+0200\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-29 15:23+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -133,7 +136,7 @@ msgstr "" "Π Π΅Π΄Π°ΠΊΡΠΈΡΠ°ΠΉΡΠ΅ Π³ΠΈ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ, ΠΈ ΡΠΎΠ³Π°Π²Π° ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit add/rm Π€ΠΠΠβ\n" "Π·Π° Π΄Π° ΠΎΡΠ±Π΅Π»Π΅ΠΆΠΈΡΠ΅ ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°Π½Π΅ΡΠΎ ΠΈΠΌ. Π‘Π»Π΅Π΄ ΡΠΎΠ²Π° ΠΈΠ·Π²ΡΡΡΠ΅ΡΠ΅ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ." -#: advice.c:101 builtin/merge.c:1225 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "ΠΠ΅ ΡΡΠ΅ Π·Π°Π²ΡΡΡΠΈΠ»ΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅. (Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βMERGE_HEADβ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°)." @@ -177,25 +180,25 @@ msgstr "Π€ΠΠ ΠΠΠ’" msgid "archive format" msgstr "Π€ΠΠ ΠΠΠ’ Π½Π° Π°ΡΡ
ΠΈΠ²Π°" -#: archive.c:430 builtin/log.c:1229 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" -msgstr "ΠΏΡΠ΅ΡΠΈΠΊΡ" +msgstr "ΠΠ ΠΠ€ΠΠΠ‘" #: archive.c:431 msgid "prepend prefix to each pathname in the archive" -msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠΎΠ·ΠΈ ΠΏΡΠ΅ΡΠΈΠΊΡ ΠΊΡΠΌ Π²ΡΠ΅ΠΊΠΈ ΠΏΡΡ Π² Π°ΡΡ
ΠΈΠ²Π°" +msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠΎΠ·ΠΈ ΠΠ ΠΠ€ΠΠΠ‘ ΠΊΡΠΌ Π²ΡΠ΅ΠΊΠΈ ΠΏΡΡ Π² Π°ΡΡ
ΠΈΠ²Π°" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536 -#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446 -#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549 +#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989 +#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561 #: builtin/read-tree.c:109 parse-options.h:153 msgid "file" -msgstr "ΡΠ°ΠΉΠ»" +msgstr "Π€ΠΠΠ" #: archive.c:433 builtin/archive.c:89 msgid "write the archive to this file" -msgstr "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° Π°ΡΡ
ΠΈΠ²Π° Π² ΡΠΎΠ·ΠΈ ΡΠ°ΠΉΠ»" +msgstr "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° Π°ΡΡ
ΠΈΠ²Π° Π² ΡΠΎΠ·ΠΈ Π€ΠΠΠ" #: archive.c:435 msgid "read .gitattributes in working directory" @@ -221,7 +224,8 @@ msgstr "Π΄ΠΎΠ±ΡΠΎ ΠΊΠΎΠΌΠΏΡΠ΅ΡΠΈΡΠ°Π½Π΅" msgid "list supported archive formats" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠΏΠΈΡΡΠΊΠ° Ρ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°Π½ΠΈΡΠ΅ ΡΠΎΡΠΌΠ°ΡΠΈ" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" @@ -229,7 +233,7 @@ msgstr "Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" msgid "retrieve the archive from remote repository <repo>" msgstr "ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π° Π°ΡΡ
ΠΈΠ²Π° ΠΎΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Π₯Π ΠΠΠΠΠΠ©Π" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 msgid "command" msgstr "ΠΊΠΎΠΌΠ°Π½Π΄Π°" @@ -237,7 +241,7 @@ msgstr "ΠΊΠΎΠΌΠ°Π½Π΄Π°" msgid "path to the remote git-upload-archive command" msgstr "ΠΏΡΡ ΠΊΡΠΌ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½Π°ΡΠ° ΠΊΠΎΠΌΠ°Π½Π΄Π° βgit-upload-archiveβ" -#: attr.c:265 +#: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -245,85 +249,102 @@ msgstr "" "ΠΡΡΠΈΡΠ°ΡΠ΅Π»Π½ΠΈΡΠ΅ ΡΠ°Π±Π»ΠΎΠ½ΠΈ ΡΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Ρ Π² Π°ΡΡΠΈΠ±ΡΡΠΈΡΠ΅ Π½Π° git.\n" "ΠΠΊΠΎ Π²ΠΈ ΡΡΡΠ±Π²Π° Π½Π°ΡΠ°Π»Π½Π° ΡΠ΄ΠΈΠ²ΠΈΡΠ΅Π»Π½Π°, ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ β\\!β." -#: branch.c:61 +#: branch.c:53 +#, c-format +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking\n" +"\"git branch --set-upstream-to=%s%s%s\"." +msgstr "" +"\n" +"Π‘Π»Π΅Π΄ ΠΊΠΎΡΠ΅ΠΊΡΠΈΡ Π½Π° Π³ΡΠ΅ΡΠΊΠ°ΡΠ°, ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΎΠ±Π½ΠΎΠ²ΠΈΡΠ΅\n" +"ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° Π·Π° ΡΠ»Π΅Π΄Π΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½ ΡΡΠ΅Π·:\n" +"git branch --set-upstream-to=%s%s%s" + +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" "ΠΠ»ΠΎΠ½ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ»ΡΠΆΠΈ ΠΊΠ°ΡΠΎ ΠΈΠ·ΡΠΎΡΠ½ΠΈΠΊ Π·Π° ΡΠΎΠ±ΡΡΠ²Π΅Π½Π°ΡΠ° ΡΠΈ ΡΠΈΠ½Ρ
ΡΠΎΠ½ΠΈΠ·Π°ΡΠΈΡ." -#: branch.c:84 +#: branch.c:93 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΡΠ»Π΅Π΄ΠΈ ΠΊΠ»ΠΎΠ½Π° β%sβ ΠΎΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ ΡΡΠ΅Π· " "ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅." -#: branch.c:85 +#: branch.c:94 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΡΠ»Π΅Π΄ΠΈ ΠΊΠ»ΠΎΠ½Π° β%sβ ΠΎΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ." -#: branch.c:89 +#: branch.c:98 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΡΠ»Π΅Π΄ΠΈ ΠΊΠ»ΠΎΠ½Π° β%sβ ΠΎΡ Π»ΠΎΠΊΠ°Π»Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ ΡΡΠ΅Π· ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅." -#: branch.c:90 +#: branch.c:99 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΡΠ»Π΅Π΄ΠΈ ΠΊΠ»ΠΎΠ½Π° β%sβ ΠΎΡ Π»ΠΎΠΊΠ°Π»Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅." -#: branch.c:95 +#: branch.c:104 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΡΠ»Π΅Π΄ΠΈ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π» β%sβ ΡΡΠ΅Π· ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅." -#: branch.c:96 +#: branch.c:105 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΡΠ»Π΅Π΄ΠΈ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π» β%sβ." -#: branch.c:100 +#: branch.c:109 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΡΠ»Π΅Π΄ΠΈ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π» β%sβ ΡΡΠ΅Π· ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅." -#: branch.c:101 +#: branch.c:110 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΡΠ»Π΅Π΄ΠΈ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π» β%sβ." -#: branch.c:134 +#: branch.c:119 +msgid "Unable to write upstream branch configuration" +msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅ Π·Π° ΡΠ»Π΅Π΄Π΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ Π·Π°ΠΏΠΈΡΠ°Π½ΠΈ" + +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "ΠΡΠΌΠ° ΡΠ»Π΅Π΄Π΅Π½Π΅: Π΄Π²ΡΡΠΌΠΈΡΠ»Π΅Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ β%sβ" -#: branch.c:163 +#: branch.c:185 #, c-format msgid "'%s' is not a valid branch name." msgstr "β%sβ Π½Π΅ Π΅ ΠΏΠΎΠ·Π²ΠΎΠ»Π΅Π½ΠΎ ΠΈΠΌΠ΅ Π·Π° ΠΊΠ»ΠΎΠ½." -#: branch.c:168 +#: branch.c:190 #, c-format msgid "A branch named '%s' already exists." msgstr "ΠΠ΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΠΊΠ»ΠΎΠ½ Ρ ΠΈΠΌΠ΅ β%sβ." -#: branch.c:176 +#: branch.c:198 msgid "Cannot force update the current branch." msgstr "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΎΠ±Π½ΠΎΠ²Π΅Π½." -#: branch.c:196 +#: branch.c:218 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "ΠΠ°Π΄Π°Π΄Π΅Π½ΠΈΡΠ΅ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ Π·Π° ΡΠ»Π΅Π΄Π΅Π½Π΅ΡΠΎ ΡΠ° Π³ΡΠ΅ΡΠ½ΠΈ β Π½Π°ΡΠ°Π»ΠΎΡΠΎ β%sβ Π½Π΅ Π΅ ΠΊΠ»ΠΎΠ½." -#: branch.c:198 +#: branch.c:220 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "Π·Π°ΡΠ²Π΅Π½ΠΈΡΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ ΠΊΠ»ΠΎΠ½ β%sβ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°" -#: branch.c:200 +#: branch.c:222 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -342,26 +363,31 @@ msgstr "" "ΠΌΠΎΠΆΠ΅ Π΄Π° ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΡΠ΅ βgit push -uβ, Π·Π° Π΄Π° Π½Π°ΡΡΡΠΎΠΈΡΠ΅ ΠΊΡΠΌ ΠΊΠΎΠΉ ΠΊΠ»ΠΎΠ½ Π΄Π° ΡΠ΅ " "ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°." -#: branch.c:244 +#: branch.c:266 #, c-format msgid "Not a valid object name: '%s'." msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ: β%sβ" -#: branch.c:264 +#: branch.c:286 #, c-format msgid "Ambiguous object name: '%s'." msgstr "ΠΠ²ΡΡΠΌΠΈΡΠ»Π΅Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ: β%sβ" -#: branch.c:269 +#: branch.c:291 #, c-format msgid "Not a valid branch point: '%s'." msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΌΡΡΡΠΎ Π·Π° Π½Π°ΡΠ°Π»ΠΎ Π½Π° ΠΊΠ»ΠΎΠ½: β%sβ" -#: branch.c:322 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "β%sβ Π²Π΅ΡΠ΅ Π΅ ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½ Π² β%sβ" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π° ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ β%sβ Π½Π΅ Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -372,7 +398,7 @@ msgstr "Π€Π°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΈΠ·Π³Π»Π΅ΠΆΠ΄Π° Π΄Π° Π΅ ΠΏΡΠ°ΡΠΊΠ° Π½Π° gi msgid "unrecognized header: %s%s (%d)" msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°ΡΠ° Π·Π°Π³Π»Π°Π²Π½Π° ΡΠ°ΡΡ: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠ²ΠΎΡΠΈ" @@ -381,10 +407,10 @@ msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠ²ΠΎΡΠΈ" msgid "Repository lacks these prerequisite commits:" msgstr "Π Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ Π»ΠΈΠΏΡΠ²Π°Ρ ΡΠ»Π΅Π΄Π½ΠΈΡΠ΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ:" -#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083 -#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358 -#: builtin/shortlog.c:158 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ Π½Π°ΡΡΡΠΎΠΉΠ²Π°Π½Π΅ Π½Π° ΠΎΠ±Ρ
ΠΎΠΆΠ΄Π°Π½Π΅ΡΠΎ Π½Π° Π²Π΅ΡΡΠΈΠΈΡΠ΅" @@ -424,21 +450,21 @@ msgid "ref '%s' is excluded by the rev-list options" msgstr "" "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ β%sβ Π½Π΅ Π΅ Π±ΠΈΠ» Π²ΠΊΠ»ΡΡΠ΅Π½ ΠΏΠΎΡΠ°Π΄ΠΈ ΠΎΠΏΡΠΈΠΈΡΠ΅ Π·Π°Π΄Π°Π΄Π΅Π½ΠΈ Π½Π° βgit rev-listβ" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°Ρ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Π‘ΡΠ·Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΡΠ°Π·Π½Π° ΠΏΡΠ°ΡΠΊΠ° Π΅ Π½Π΅Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "Π€Π°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "ΠΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit index-packβ Π½Π΅ Π·Π°Π²ΡΡΡΠΈ ΡΡΠΏΠ΅ΡΠ½ΠΎ" @@ -447,8 +473,8 @@ msgstr "ΠΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit index-packβ Π½Π΅ Π·Π°Π²ΡΡΡΠΈ ΡΡΠΏΠ΅ΡΠ½ msgid "invalid color value: %.*s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° ΡΠ²ΡΡ: %.*s" -#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520 -#: builtin/am.c:2149 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°" @@ -462,28 +488,27 @@ msgstr "%s %s Π½Π΅ Π΅ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅!" msgid "memory exhausted" msgstr "ΠΏΠ°ΠΌΠ΅ΡΡΠ° ΡΠ²ΡΡΡΠΈ" -#: config.c:474 config.c:476 +#: config.c:475 config.c:477 #, c-format -msgid "bad config file line %d in %s" -msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠ΅Π΄ %d Π² β%sβ" +msgid "bad config line %d in %s %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠ΅Π΄ %d Π² Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° %s β%sβ" -#: config.c:592 +#: config.c:593 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "" -"Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΠΈΡΠ»ΠΎΠ²Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ β%sβ Π·Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° β%sβ Π² ΡΠ°Π·Π΄Π΅Π»Π° β%sβ: %s" +msgid "bad numeric config value '%s' for '%s' in %s %s: %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΠΈΡΠ»ΠΎΠ²Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ β%sβ Π·Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° β%sβ Π² %s β%sβ: %s" -#: config.c:594 +#: config.c:595 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΠΈΡΠ»ΠΎΠ²Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ β%sβ Π·Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° β%sβ: %s" -#: config.c:679 +#: config.c:680 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Π΄ΠΎΠΌΠ°ΡΠ½Π°ΡΠ° ΠΏΠ°ΠΏΠΊΠ° Π½Π° ΠΏΠΎΡΡΠ΅Π±ΠΈΡΠ΅Π»Ρ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡΠ°: β%sβ" -#: config.c:757 config.c:768 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ Π½ΠΈΠ²ΠΎ Π½Π° ΠΊΠΎΠΌΠΏΡΠ΅ΡΠΈΡΠ°Π½Π΅: %d" @@ -493,42 +518,50 @@ msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ Π½ΠΈΠ²ΠΎ Π½Π° ΠΊΠΎΠΌΠΏΡΠ΅ΡΠΈΡΠ°Π½Π΅: %d" msgid "invalid mode for object creation: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠ΅ΠΆΠΈΠΌ Π·Π° ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈ: %s" -#: config.c:1216 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΈ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ ΠΎΡ ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΈΡ ΡΠ΅Π΄" -#: config.c:1277 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "Π½Π΅ΠΎΡΠ°ΠΊΠ²Π°Π½Π° Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: config.c:1601 +#: config.c:1629 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "Π½Π΅ΡΠ°Π·ΠΏΠΎΠ·Π½Π°ΡΠ° ΡΡΠΎΠΉΠ½ΠΎΡΡ β%sβ ΠΎΡ ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΈΡ ΡΠ΅Π΄" -#: config.c:1603 +#: config.c:1631 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ° β%sβ Π²ΡΠ² ΡΠ°ΠΉΠ»Π° β%sβ Π½Π° ΡΠ΅Π΄ β%d" -#: config.c:1662 +#: config.c:1690 #, c-format msgid "%s has multiple values" msgstr "Π·Π°Π΄Π°Π΄Π΅Π½ΠΈ ΡΠ° Π½ΡΠΊΠΎΠ»ΠΊΠΎ ΡΡΠΎΠΉΠ½ΠΎΡΡΠΈ Π·Π° β%sβ" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π·Π°Π΄Π°Π΄Π΅ Π΄Π° Π΅ β%sβ" + +#: config.c:2226 +#, c-format +msgid "could not unset '%s'" +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 "Π½Π΅ΡΡΠΏΠ΅ΡΠ΅Π½ Π·Π°ΠΏΠΈΡ Π½Π° ΡΠΏΠΈΡΡΠΊΠ° Ρ Π²Π΅ΡΡΠΈΠΈΡΠ΅: %s" +msgid "failed write to rev-list" +msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ΅Π½ Π·Π°ΠΏΠΈΡ Π½Π° ΡΠΏΠΈΡΡΠΊΠ° Ρ Π²Π΅ΡΡΠΈΠΈΡΠ΅" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡΡ Π²Ρ
ΠΎΠ΄ Π½Π° ΡΠΏΠΈΡΡΠΊΠ° Ρ Π²Π΅ΡΡΠΈΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΡΠ²ΠΎΡΠ΅Π½: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡΡ Π²Ρ
ΠΎΠ΄ Π½Π° ΡΠΏΠΈΡΡΠΊΠ° Ρ Π²Π΅ΡΡΠΈΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΡΠ²ΠΎΡΠ΅Π½" #: date.c:95 msgid "in the future" @@ -603,28 +636,28 @@ msgstr[1] "ΠΏΡΠ΅Π΄ΠΈ %lu Π³ΠΎΠ΄ΠΈΠ½ΠΈ" msgid "failed to read orderfile '%s'" msgstr "ΡΠ°ΠΉΠ»ΡΡ Ρ ΠΏΠΎΠ΄ΡΠ΅Π΄Π±Π°ΡΠ° Π½Π° ΡΡΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Π’ΡΡΡΠ΅Π½Π΅ Π½Π° ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½ΠΈΡ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈ ΡΡΡΠ΅ΡΠ°Π½ΠΈ Ρ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ°Π·ΠΏΠΎΠ·Π½Π°Π²Π°Π½Π΅ Π½Π° β%sβ ΠΊΠ°ΡΠΎ ΠΏΡΠΎΡΠ΅Π½Ρ-ΠΏΡΠ°Π³ Π·Π° ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°ΡΠ° ΠΏΠΎ " "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " ΠΠ΅ΠΏΠΎΠ·Π½Π°Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ β%sβ Π·Π° ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°ΡΠ° ΠΏΠΎ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "ΠΠ΅ΠΏΠΎΠ·Π½Π°ΡΠ° ΡΡΠΎΠΉΠ½ΠΎΡΡ β%sβ Π·Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βdiff.submoduleβ" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -633,17 +666,17 @@ msgstr "" "ΠΡΠ΅ΡΠΊΠΈ Π² Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βdiff.dirstatβ:\n" "%s" -#: diff.c:3000 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "" "Π²ΡΠ½ΡΠ½Π°ΡΠ° ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΡΠ°Π·Π»ΠΈΠΊΠΈ Π·Π°Π²ΡΡΡΠΈ Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ. Π‘ΠΏΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°Π±ΠΎΡΠ°ΡΠ° ΠΏΡΠΈ β%sβ" -#: diff.c:3396 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "ΠΠΏΡΠΈΡΡΠ° β--followβ ΠΈΠ·ΠΈΡΠΊΠ²Π° ΡΠΎΡΠ½ΠΎ Π΅Π΄ΠΈΠ½ ΠΏΡΡ" -#: diff.c:3559 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -652,20 +685,21 @@ msgstr "" "ΠΠ΅ΡΠ°Π·ΠΏΠΎΠ·Π½Π°Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ ΠΊΡΠΌ ΠΎΠΏΡΠΈΡΡΠ° β--dirstat/-Xβ:\n" "%s" -#: diff.c:3573 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "ΠΠ΅ΡΠ°Π·ΠΏΠΎΠ·Π½Π°Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ ΠΊΡΠΌ ΠΎΠΏΡΠΈΡΡΠ° β--submoduleβ: β%sβ" -#: dir.c:1915 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "ΠΈΠΌΠ΅ΡΠΎ ΠΈ Π²Π΅ΡΡΠΈΡΡΠ° Π½Π° ΡΠ΄ΡΠΎΡΠΎ Π½Π΅ Π±ΡΡ
Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈ" -#: dir.c:1998 -msgid "Untracked cache is disabled on this system." -msgstr "ΠΠ΅ΡΠ° Π·Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½ Π½Π° ΡΠ°Π·ΠΈ ΡΠΈΡΡΠ΅ΠΌΠ°" +#: dir.c:1942 +msgid "Untracked cache is disabled on this system or location." +msgstr "" +"ΠΠ΅ΡΠ° Π·Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½ Π½Π° ΡΠ°Π·ΠΈ ΡΠΈΡΡΠ΅ΠΌΠ° ΠΈΠ»ΠΈ ΠΌΠ΅ΡΡΠΎΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠ°ΡΠ° βgpgβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ°ΡΡΠΈΡΠ°Π½Π°." @@ -679,43 +713,43 @@ msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠ°ΡΠ° βgpgβ Π½Π΅ ΠΏΠΎΠ΄ΠΏΠΈΡΠ° Π΄Π°Π½Π½ΠΈΡΠ΅." #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠ°ΡΠ° βgpgβ Π½Π΅ ΡΡΠΏΡ Π΄Π° ΡΡΠ·Π΄Π°Π΄Π΅ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ: %s" +msgid "could not create temporary file '%s'" +msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠ°ΡΠ° Π½Π΅ ΡΡΠΏΡ Π΄Π° ΡΡΠ·Π΄Π°Π΄Π΅ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠ°ΡΠ° βgpgβ Π½Π΅ ΡΡΠΏΡ Π΄Π° Π·Π°ΠΏΠΈΡΠ΅ ΡΠ°ΠΌΠΎΡΡΠΎΡΡΠ΅Π»Π½ΠΈΡ ΠΏΠΎΠ΄ΠΏΠΈΡ ΠΊΡΠΌ β%sβ: %s" +msgid "failed writing detached signature to '%s'" +msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠ°ΡΠ° Π½Π΅ ΡΡΠΏΡ Π΄Π° Π·Π°ΠΏΠΈΡΠ΅ ΡΠ°ΠΌΠΎΡΡΠΎΡΡΠ΅Π»Π½ΠΈΡ ΠΏΠΎΠ΄ΠΏΠΈΡ Π² β%sβ" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "β%sβ: ΡΠ°ΠΉΠ»ΡΡ ΡΠΎΡΠ΅Π½ ΠΎΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "β%sβ: β%sβ" +msgid "failed to stat '%s'" +msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΡΠ΅Π· βstatβ Π·Π° β%sβ" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "β%sβ: ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° β%sβ Π²ΡΡΠ½Π° ΠΏΠΎ-ΠΌΠ°Π»ΠΊΠΎ Π±Π°ΠΉΡΠΎΠ²Π΅ ΠΎΡ Π·Π°ΡΠ²Π΅Π½ΠΈΡΠ΅" +msgid "'%s': short read" +msgstr "β%sβ: ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ΡΠΎ Π²ΡΡΠ½Π° ΠΏΠΎ-ΠΌΠ°Π»ΠΊΠΎ Π±Π°ΠΉΡΠΎΠ²Π΅ ΠΎΡ Π·Π°ΡΠ²Π΅Π½ΠΈΡΠ΅" -#: help.c:207 +#: help.c:205 #, c-format msgid "available git commands in '%s'" msgstr "Π½Π°Π»ΠΈΡΠ½ΠΈ ΠΊΠΎΠΌΠ°Π½Π΄ΠΈ Π½Π° git ΠΎΡ β%sβ" -#: help.c:214 +#: help.c:212 msgid "git commands available from elsewhere on your $PATH" msgstr "ΠΊΠΎΠΌΠ°Π½Π΄ΠΈ Π½Π° git ΠΎΡ Π΄ΡΡΠ³ΠΈ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ ΠΎΡ β$PATHβ" -#: help.c:246 +#: help.c:244 msgid "These are common Git commands used in various situations:" msgstr "Π’ΠΎΠ²Π° ΡΠ° Π½Π°ΠΉ-ΡΠ΅ΡΡΠΎ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½ΠΈΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄ΠΈ Π½Π° Git:" -#: help.c:311 +#: help.c:309 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -724,11 +758,11 @@ msgstr "" "ΠΠ·Π³Π»Π΅ΠΆΠ΄Π°, ΡΠ΅ β%sβ Π΅ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π½Π° git, Π½ΠΎ ΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π°\n" "Π±ΡΠ΄Π΅ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½Π°. ΠΠ΅ΡΠΎΡΡΠ½ΠΎ ΠΏΠ°ΠΊΠ΅ΡΡΡ βgit-%sβ Π΅ ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½." -#: help.c:368 +#: help.c:366 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Π‘ΡΡΠ°Π½Π½ΠΎ, ΠΈΠ·Π³Π»Π΅ΠΆΠ΄Π°, ΡΠ΅ Π½Π° ΡΠΈΡΡΠ΅ΠΌΠ°ΡΠ° Π²ΠΈ Π½ΡΠΌΠ° Π½ΠΈΡΠΎ Π΅Π΄Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π° Π½Π° git." -#: help.c:390 +#: help.c:388 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -739,17 +773,17 @@ msgstr "" "ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°. ΠΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ΡΠΎ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎ ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠ°Π²Π°, ΠΊΠ°ΡΠΎ ΡΠ΅ ΡΡΠΈΡΠ°, ΡΠ΅ ΠΈΠΌΠ°ΡΠ΅ " "ΠΏΡΠ΅Π΄Π²ΠΈΠ΄ β%sβ" -#: help.c:395 +#: help.c:393 #, c-format msgid "in %0.1f seconds automatically..." msgstr "ΡΠ»Π΅Π΄ %0.1f ΡΠ΅ΠΊΡΠ½Π΄ΠΈβ¦" -#: help.c:402 +#: help.c:400 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: β%sβ Π½Π΅ Π΅ ΠΊΠΎΠΌΠ°Π½Π΄Π° Π½Π° git. ΠΠΎΠ³Π»Π΅Π΄Π½Π΅ΡΠ΅ ΠΈΠ·Ρ
ΠΎΠ΄Π° ΠΎΡ βgit --helpβ." -#: help.c:406 help.c:466 +#: help.c:404 help.c:464 msgid "" "\n" "Did you mean this?" @@ -763,17 +797,41 @@ msgstr[1] "" "\n" "ΠΠΎΠΌΠ°Π½Π΄ΠΈ Ρ ΠΏΠΎΠ΄ΠΎΠ±Π½ΠΎ ΠΈΠΌΠ΅ ΡΠ°:" -#: help.c:462 +#: help.c:460 #, c-format msgid "%s: %s - %s" msgstr "%s: %s β %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Π€Π°ΠΉΠ»ΡΡ-ΠΊΠ»ΡΡΠ°Π»ΠΊΠ° β%s.lockβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½: %s\n" +"\n" +"ΠΠ·Π³Π»Π΅ΠΆΠ΄Π°, ΡΠ΅ ΠΈ Π΄ΡΡΠ³ ΠΏΡΠΎΡΠ΅Ρ Π½Π° git Π΅ ΠΏΡΡΠ½Π°Ρ Π² ΡΠΎΠ²Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅, Π½Π°ΠΏΡ.\n" +"ΡΠ΅Π΄Π°ΠΊΡΠΎΡ, ΡΡΠ°ΡΡΠΈΡΠ°Π½ Ρ βgit commitβ. Π£Π²Π΅ΡΠ΅ΡΠ΅ ΡΠ΅, ΡΠ΅ Π²ΡΠΈΡΠΊΠΈ ΠΏΠΎΠ΄ΠΎΠ±Π½ΠΈ\n" +"ΠΏΡΠΎΡΠ΅ΡΠΈ ΡΠ° ΡΠΏΡΠ΅Π½ΠΈ ΠΈ ΠΎΠΏΠΈΡΠ°ΠΉΡΠ΅ ΠΎΡΠ½ΠΎΠ²ΠΎ. ΠΠΊΠΎ ΡΠΎΠ²Π° Π½Π΅ ΠΏΠΎΠΌΠΎΠ³Π½Π΅, Π²Π΅ΡΠΎΡΡΠ½Π°ΡΠ°\n" +"ΠΏΡΠΈΡΠΈΠ½Π° Π΅, ΡΠ΅ Π½ΡΠΊΠΎΠΉ ΠΏΡΠΎΡΠ΅Ρ Π½Π° git Π² ΡΠΎΠ²Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π΅ Π·Π°Π±ΠΈΠ». ΠΠ° Π΄Π°\n" +"ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠΈΡΠ΅ ΡΠ°Π±ΠΎΡΠ°, ΡΠ΅ ΡΡΡΠ±Π²Π° ΡΡΡΠ½ΠΎ Π΄Π° ΠΈΠ·ΡΡΠΈΠ΅ΡΠ΅ ΡΠ°ΠΉΠ»Π°:" + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Π€Π°ΠΉΠ»ΡΡ-ΠΊΠ»ΡΡΠ°Π»ΠΊΠ° β%s.lockβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "ΠΊΠ΅ΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:722 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° Π½ΠΎΠ²ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡ" @@ -791,66 +849,66 @@ msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° βaddinfo_cacheβ Π·Π° ΠΏ msgid "error building trees" msgstr "Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΠΈΠ·Π³ΡΠ°ΠΆΠ΄Π°Π½Π΅ Π½Π° Π΄ΡΡΠ²Π΅ΡΠ°ΡΠ°" -#: merge-recursive.c:686 +#: merge-recursive.c:689 #, c-format msgid "failed to create path '%s'%s" msgstr "Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΡΡΡ β%sβ%s" -#: merge-recursive.c:697 +#: merge-recursive.c:700 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° β%sβ, Π·Π° Π΄Π° ΡΠ΅ ΠΎΡΠ²ΠΎΠ±ΠΎΠ΄ΠΈ ΠΌΡΡΡΠΎ Π·Π° ΠΏΠΎΠ΄Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ\n" -#: merge-recursive.c:711 merge-recursive.c:732 +#: merge-recursive.c:714 merge-recursive.c:735 msgid ": perhaps a D/F conflict?" msgstr ": Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ Π΅ Π΄Π° ΠΈΠΌΠ° ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ/ΡΠ°ΠΉΠ»." -#: merge-recursive.c:722 +#: merge-recursive.c:725 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ΡΠΎ, Π·Π° Π΄Π° Π½Π΅ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΡ ΡΠ°ΠΉΠ» β%sβ" -#: merge-recursive.c:762 +#: merge-recursive.c:765 #, c-format msgid "cannot read object %s '%s'" msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ (%s) Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: merge-recursive.c:764 +#: merge-recursive.c:767 #, c-format msgid "blob expected for %s '%s'" msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ (%s) ΡΠ΅ ΠΎΡΠ°ΠΊΠ²Π°ΡΠ΅ Π΄Π° Π΅ BLOB, Π° Π½Π΅ Π΅" -#: merge-recursive.c:787 builtin/clone.c:369 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½Π°" -#: merge-recursive.c:795 +#: merge-recursive.c:798 #, c-format msgid "failed to symlink '%s'" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° ΡΠΈΠΌΠ²ΠΎΠ»Π½Π°ΡΠ° Π²ΡΡΠ·ΠΊΠ° β%sβ" -#: merge-recursive.c:798 +#: merge-recursive.c:801 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "Π½Π΅ Π΅ ΡΡΠ½ΠΎ ΠΊΠ°ΠΊΠ²ΠΎ Π΄Π° ΡΠ΅ ΠΏΡΠ°Π²ΠΈ Ρ ΠΎΠ±Π΅ΠΊΡΠ° β%2$sβ (%3$s) Ρ ΠΏΡΠ°Π²Π° Π·Π° Π΄ΠΎΡΡΡΠΏ β%1$06oβ" -#: merge-recursive.c:936 +#: merge-recursive.c:939 msgid "Failed to execute internal merge" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ Π²ΡΡΡΠ΅ΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: merge-recursive.c:940 +#: merge-recursive.c:943 #, c-format msgid "Unable to add %s to database" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈ Π² Π±Π°Π·Π°ΡΠ° Ρ Π΄Π°Π½Π½ΠΈ" -#: merge-recursive.c:956 +#: merge-recursive.c:959 msgid "unsupported object type in the tree" msgstr "Π² Π΄ΡΡΠ²ΠΎΡΠΎ ΠΈΠΌΠ° Π½Π΅ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°Π½ Π²ΠΈΠ΄ ΠΎΠ±Π΅ΠΊΡ" -#: merge-recursive.c:1031 merge-recursive.c:1045 +#: merge-recursive.c:1034 merge-recursive.c:1048 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -859,7 +917,7 @@ msgstr "" "ΠΠΠΠ€ΠΠΠΠ’ (%s/ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅): β%sβ Π΅ ΠΈΠ·ΡΡΠΈΡ Π² %s, Π° β%sβ Π² %s. ΠΠ΅ΡΡΠΈΡ %s Π½Π° β%sβ " "Π΅ ΠΎΡΡΠ°Π²Π΅Π½Π° Π² Π΄ΡΡΠ²ΠΎΡΠΎ." -#: merge-recursive.c:1037 merge-recursive.c:1050 +#: merge-recursive.c:1040 merge-recursive.c:1053 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -868,20 +926,20 @@ msgstr "" "ΠΠΠΠ€ΠΠΠΠ’ (%s/ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅): β%sβ Π΅ ΠΈΠ·ΡΡΠΈΡ Π² %s, Π° β%sβ Π² %s. ΠΠ΅ΡΡΠΈΡ %s Π½Π° β%sβ " "Π΅ ΠΎΡΡΠ°Π²Π΅Π½Π° Π² Π΄ΡΡΠ²ΠΎΡΠΎ: %s." -#: merge-recursive.c:1091 +#: merge-recursive.c:1094 msgid "rename" msgstr "ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅" -#: merge-recursive.c:1091 +#: merge-recursive.c:1094 msgid "renamed" msgstr "ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½" -#: merge-recursive.c:1147 +#: merge-recursive.c:1150 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "β%sβ Π΅ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π² β%sβ, Π·Π°ΡΠΎΠ²Π° ΡΠ΅ Π΄ΠΎΠ±Π°Π²Ρ ΠΊΠ°ΡΠΎ β%sβ" -#: merge-recursive.c:1169 +#: merge-recursive.c:1172 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -890,150 +948,150 @@ msgstr "" "ΠΠΠΠ€ΠΠΠΠ’ (ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅/ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅): β%sβ Π΅ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½ Π½Π° β%sβ Π² ΠΊΠ»ΠΎΠ½ " "β%sβ, Π° β%sβ Π΅ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½ Π½Π° β%sβ Π² β%sβ/%s." -#: merge-recursive.c:1174 +#: merge-recursive.c:1177 msgid " (left unresolved)" msgstr " (Π½Π΅ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°Π½ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡ)" -#: merge-recursive.c:1228 +#: merge-recursive.c:1231 #, 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:1258 +#: merge-recursive.c:1261 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "ΠΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π½Π° β%sβ Π½Π° β%sβ, Π° β%sβ Π½Π° β%sβ" -#: merge-recursive.c:1457 +#: merge-recursive.c:1460 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "ΠΠΠΠ€ΠΠΠΠ’ (ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅/Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅): β%sβ Π΅ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½ Π½Π° β%sβ Π² ΠΊΠ»ΠΎΠ½ β%sβ, Π° " "β%sβ Π΅ Π΄ΠΎΠ±Π°Π²Π΅Π½ Π² β%sβ" -#: merge-recursive.c:1467 +#: merge-recursive.c:1470 #, c-format msgid "Adding merged %s" msgstr "ΠΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠ»Π΅ΡΠΈΡ β%sβ" -#: merge-recursive.c:1472 merge-recursive.c:1674 +#: merge-recursive.c:1475 merge-recursive.c:1677 #, c-format msgid "Adding as %s instead" msgstr "ΠΠΎΠ±Π°Π²ΡΠ½Π΅ ΠΊΠ°ΡΠΎ β%sβ" -#: merge-recursive.c:1523 +#: merge-recursive.c:1526 #, c-format msgid "cannot read object %s" msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΎΡΠ΅ΡΠ΅" -#: merge-recursive.c:1526 +#: merge-recursive.c:1529 #, c-format msgid "object %s is not a blob" msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ Π½Π΅ Π΅ BLOB" -#: merge-recursive.c:1578 +#: merge-recursive.c:1581 msgid "modify" msgstr "ΠΏΡΠΎΠΌΡΠ½Π°" -#: merge-recursive.c:1578 +#: merge-recursive.c:1581 msgid "modified" msgstr "ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½" -#: merge-recursive.c:1588 +#: merge-recursive.c:1591 msgid "content" msgstr "ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅" -#: merge-recursive.c:1595 +#: merge-recursive.c:1598 msgid "add/add" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅/Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅" -#: merge-recursive.c:1629 +#: merge-recursive.c:1632 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "ΠΡΠ΅ΡΠΊΠ°ΡΠ°Π½Π΅ Π½Π° β%sβ (ΡΠ»Π΅ΡΠΈΡΡ ΡΠ΅Π·ΡΠ»ΡΠ°Ρ Π΅ ΠΈΠ΄Π΅Π½ΡΠΈΡΠ΅Π½ ΡΡΡ ΡΠ΅Π³Π°ΡΠ½ΠΈΡ)" -#: merge-recursive.c:1643 +#: merge-recursive.c:1646 #, c-format msgid "Auto-merging %s" msgstr "ΠΠ²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° β%sβ" -#: merge-recursive.c:1647 git-submodule.sh:1025 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "ΠΠΠΠΠΠΠ£Π" -#: merge-recursive.c:1648 +#: merge-recursive.c:1651 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "ΠΠΠΠ€ΠΠΠΠ’ (%s): ΠΠΎΠ½ΡΠ»ΠΈΠΊΡ ΠΏΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° β%sβ" -#: merge-recursive.c:1734 +#: merge-recursive.c:1737 #, c-format msgid "Removing %s" msgstr "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° β%sβ" -#: merge-recursive.c:1759 +#: merge-recursive.c:1762 msgid "file/directory" msgstr "ΡΠ°ΠΉΠ»/Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: merge-recursive.c:1765 +#: merge-recursive.c:1768 msgid "directory/file" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ/ΡΠ°ΠΉΠ»" -#: merge-recursive.c:1770 +#: merge-recursive.c:1773 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "ΠΠΠΠ€ΠΠΠΠ’ (%s): Π‘ΡΡΠ΅ΡΡΠ²ΡΠ²Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π° ΠΈΠΌΠ΅ β%sβ Π² β%sβ. ΠΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° β%sβ " "ΠΊΠ°ΡΠΎ β%sβ" -#: merge-recursive.c:1780 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "ΠΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° β%sβ" -#: merge-recursive.c:1797 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Π€Π°ΡΠ°Π»Π½Π° Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅, Π° ΡΠ°ΠΊΠ°Π²Π° Π½Π΅ ΡΡΡΠ±Π²Π° Π΄Π° Π²ΡΠ·Π½ΠΈΠΊΠ²Π°!" -#: merge-recursive.c:1816 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "ΠΠ΅ΡΠ΅ Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½ΠΎ!" -#: merge-recursive.c:1825 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° Π΄ΡΡΠ²Π΅ΡΠ°ΡΠ° β%sβ ΠΈ β%sβ" -#: merge-recursive.c:1855 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "" "ΠΡΡΡΡ β%sβ Π½Π΅ Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ΅Π½, ΡΠΎΠ²Π° Π΅ Π³ΡΠ΅ΡΠΊΠ° Π² Git, Π΄ΠΎΠΊΠ»Π°Π΄Π²Π°ΠΉΡΠ΅ Ρ Π½Π° " "ΡΠ°Π·ΡΠ°Π±ΠΎΡΡΠΈΡΠΈΡΠ΅, ΠΊΠ°ΡΠΎ ΠΏΡΠ°ΡΠΈΡΠ΅ Π΅-ΠΏΠΈΡΠΌΠΎ Π½Π° Π°Π΄ΡΠ΅Ρ: βgit@vger.kernel.orgβ." -#: merge-recursive.c:1903 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Π‘Π»ΠΈΠ²Π°Π½Π΅:" -#: merge-recursive.c:1916 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "ΠΎΡΠΊΡΠΈΡ Π΅ %u ΠΎΠ±Ρ ΠΏΡΠ΅Π΄ΡΠ΅ΡΡΠ²Π΅Π½ΠΈΠΊ:" msgstr[1] "ΠΎΡΠΊΡΠΈΡΠΈ ΡΠ° %u ΠΎΠ±ΡΠΈ ΠΏΡΠ΅Π΄ΡΠ΅ΡΡΠ²Π΅Π½ΠΈΡΠΈ:" -#: merge-recursive.c:1953 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π΅ Π²ΡΡΠ½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: merge-recursive.c:2010 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ΅Π½ Π°Π½Π°Π»ΠΈΠ· Π½Π° ΠΎΠ±Π΅ΠΊΡΠ° β%sβ" -#: merge-recursive.c:2021 builtin/merge.c:645 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "ΠΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" @@ -1065,28 +1123,28 @@ msgstr "ΠΠ°Π΄Π°Π΄Π΅Π½Π° Π΅ Π»ΠΎΡΠ° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½Π»ΠΈΠ²Π°Ρ msgid "unable to parse object: %s" msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°Π½" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "β¦" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "ΡΠΏΠΎΡΡΠ΅Π±Π°: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " ΠΈΠ»ΠΈ: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-Π§ΠΠ‘ΠΠ" @@ -1095,7 +1153,7 @@ msgstr "-Π§ΠΠ‘ΠΠ" msgid "malformed object name '%s'" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ β%sβ" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "ΠΠ΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° ΡΠ΅ Π΄Π°Π΄Π°Ρ ΠΏΡΠ°Π²Π° Π·Π° Π·Π°ΠΏΠΈΡ Π² Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π° Π³ΡΡΠΏΠ°ΡΠ°" @@ -1151,12 +1209,12 @@ msgstr "ΠΡΡΡΡ β%sβ Π΅ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β%.*sβ" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: ΠΌΠ°Π³ΠΈΡΠ΅ΡΠΊΠΈΡΠ΅ ΠΏΡΡΠΈΡΠ° Π½Π΅ ΡΠ΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°Ρ ΠΎΡ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° β%sβ" -#: pathspec.c:432 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "ΠΏΡΡΡΡ β%sβ Π΅ ΡΠ»Π΅Π΄ ΡΠΈΠΌΠ²ΠΎΠ»Π½Π° Π²ΡΡΠ·ΠΊΠ°" -#: pathspec.c:441 +#: pathspec.c:442 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1164,7 +1222,7 @@ msgstr "" "ΠΠΈΡΠΎ Π½Π΅ ΡΠ΅ ΠΈΠ·ΠΊΠ»ΡΡΠ²Π° ΠΎΡ ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ Π·Π° ΠΈΠ·ΠΊΠ»ΡΡΠ²Π°Π½Π΅.\n" "Π’ΠΎΠ²Π° ΡΠ΅ΡΡΠΎ ΡΠ΅ ΡΠ»ΡΡΠ²Π°, Π°ΠΊΠΎ ΡΡΠ΅ Π·Π°Π±ΡΠ°Π²ΠΈΠ»ΠΈ Π΄Π° Π΄ΠΎΠ±Π°Π²ΠΈΡΠ΅ β:/β ΠΈΠ»ΠΈ β.β." -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "Π°ΡΠ³ΡΠΌΠ΅Π½ΡΡΡ ΠΊΡΠΌ ΠΎΠΏΡΠΈΡΡΠ° β--prettyβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°" @@ -1191,165 +1249,250 @@ msgstr "" "βGIT_INDEX_VERSIONβ.\n" "Π©Π΅ ΡΠ΅ ΠΏΠΎΠ»Π·Π²Π° Π²Π΅ΡΡΠΈΡ %i" -#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 -#: builtin/merge.c:983 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½ Π·Π° Π·Π°ΠΏΠΈΡ" -#: refs/files-backend.c:2359 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ: %s" -#: refs/files-backend.c:2362 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π°Ρ ΠΈΠ·ΡΡΠΈΡΠΈ: %s" -#: refs/files-backend.c:2371 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ" -#: ref-filter.c:245 +#: ref-filter.c:55 #, c-format -msgid "format: %%(end) atom used without corresponding atom" -msgstr "Π³ΡΠ΅ΡΠΊΠ° Π²ΡΠ² ΡΠΎΡΠΌΠ°ΜΡΠ°: Π»Π΅ΠΊΡΠ΅ΠΌΠ°ΡΠ° %%(end) Π΅ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π° Π±Π΅Π· ΡΡΠΎΡΠ²Π΅ΡΠ½Π°ΡΠ° Ρ" +msgid "expected format: %%(color:<color>)" +msgstr "ΠΎΡΠ°ΠΊΠ²Π°Π½ ΡΠΎΡΠΌΠ°Ρ: %%(color:Π¦ΠΠ―Π’)" + +#: ref-filter.c:57 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°Ρ ΡΠ²ΡΡ: %%(color:%s)" -#: ref-filter.c:704 +#: ref-filter.c:71 +#, c-format +msgid "unrecognized format: %%(%s)" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°Ρ ΡΠΎΡΠΌΠ°Ρ: %%(%s)" + +#: ref-filter.c:77 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) Π½Π΅ ΠΏΡΠΈΠ΅ΠΌΠ° Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΈ" + +#: ref-filter.c:84 +#, c-format +msgid "%%(subject) does not take arguments" +msgstr "%%(subject) Π½Π΅ ΠΏΡΠΈΠ΅ΠΌΠ° Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΈ" + +#: ref-filter.c:101 #, c-format msgid "positive value expected contents:lines=%s" msgstr "ΠΎΡΠ°ΠΊΠ²Π° ΡΠ΅ ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° βcontents:lines=%sβ" -#: ref-filter.c:833 +#: ref-filter.c:103 #, c-format -msgid "expected format: %%(color:<color>)" -msgstr "ΠΎΡΠ°ΠΊΠ²Π°Π½ ΡΠΎΡΠΌΠ°Ρ: %%(color:Π¦ΠΠ―Π’)" +msgid "unrecognized %%(contents) argument: %s" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°Ρ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ Π·Π° %%(contents): %s" -#: ref-filter.c:835 -msgid "unable to parse format" -msgstr "ΡΠΎΡΠΌΠ°ΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°Π½" +#: ref-filter.c:113 +#, c-format +msgid "unrecognized %%(objectname) argument: %s" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°Ρ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ Π·Π° %%(objectname): %s" -#: ref-filter.c:870 +#: ref-filter.c:135 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "ΠΎΡΠ°ΠΊΠ²Π°Π½ ΡΠΎΡΠΌΠ°Ρ: %%(align:Π¨ΠΠ ΠΠ§ΠΠΠ,ΠΠΠΠΠ¦ΠΠ―)" -#: ref-filter.c:893 +#: ref-filter.c:147 #, c-format -msgid "improper format entered align:%s" -msgstr "Π²ΡΠ²Π΅Π΄Π΅Π½ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠΎΡΠΌΠ°Ρ align:%s" +msgid "unrecognized position:%s" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°ΡΠ° ΠΏΠΎΠ·ΠΈΡΠΈΡ: %s" -#: ref-filter.c:898 +#: ref-filter.c:151 +#, c-format +msgid "unrecognized width:%s" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°ΡΠ° ΡΠΈΡΠΎΡΠΈΠ½Π°: %s" + +#: ref-filter.c:157 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°Ρ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ Π·Π° %%(align): %s" + +#: ref-filter.c:161 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "ΠΎΡΠ°ΠΊΠ²Π° ΡΠ΅ ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»Π½Π° ΡΠΈΡΠΎΡΠΈΠ½Π° Ρ Π»Π΅ΠΊΡΠ΅ΠΌΠ°ΡΠ° β%%(align)β" -#: ref-filter.c:1219 +#: ref-filter.c:244 +#, c-format +msgid "malformed field name: %.*s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ: β%.*sβ" + +#: ref-filter.c:270 +#, c-format +msgid "unknown field name: %.*s" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°ΡΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ: β%.*sβ" + +#: ref-filter.c:372 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "Π³ΡΠ΅ΡΠΊΠ° Π²ΡΠ² ΡΠΎΡΠΌΠ°ΜΡΠ°: Π»Π΅ΠΊΡΠ΅ΠΌΠ°ΡΠ° %%(end) Π΅ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π° Π±Π΅Π· ΡΡΠΎΡΠ²Π΅ΡΠ½Π°ΡΠ° Ρ" + +#: ref-filter.c:424 +#, c-format +msgid "malformed format string %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ Π½ΠΈΠ· Π·Π° ΡΠΎΡΠΌΠ°ΡΠΈΡΠ°Π½Π΅ β%sβ" + +#: ref-filter.c:878 +msgid ":strip= requires a positive integer argument" +msgstr "β:strip=β ΠΈΠ·ΠΈΡΠΊΠ²Π° Π°ΡΠ³ΡΠΌΠ΅Π½Ρ ΡΡΠ»ΠΎ, ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»Π½ΠΎ ΡΠΈΡΠ»ΠΎ" + +#: ref-filter.c:883 +#, c-format +msgid "ref '%s' does not have %ld components to :strip" +msgstr "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ β%sβ Π½Π΅ ΡΠ°Π·ΠΏΠΎΠ»Π°Π³Π° Ρ %ld ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½ΡΠΈ Π·Π° ΠΏΡΠ΅ΠΌΠ°Ρ
Π²Π°Π½Π΅ (:strip)" + +#: ref-filter.c:1046 +#, c-format +msgid "unknown %.*s format %s" +msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°ΡΠΎ β%.*sβ, ΡΠΎΡΠΌΠ°Ρ β%sβ" + +#: ref-filter.c:1066 ref-filter.c:1097 +#, c-format +msgid "missing object %s for %s" +msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ Π»ΠΈΠΏΡΠ²Π° Π·Π° β%sβ" + +#: ref-filter.c:1069 ref-filter.c:1100 +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°Π½Π΅ ΡΡΠ΅Π· βparse_object_bufferβ Π½Π° β%sβ Π·Π° β%sβ" + +#: ref-filter.c:1311 #, c-format msgid "malformed object at '%s'" msgstr "ΠΎΠ±Π΅ΠΊΡ ΡΡΡ ΡΠ³ΡΠ΅ΡΠ΅Π½ ΡΠΎΡΠΌΠ°Ρ ΠΏΡΠΈ β%sβ" -#: ref-filter.c:1561 +#: ref-filter.c:1373 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Ρ Π³ΡΠ΅ΡΠ½ΠΎ ΠΈΠΌΠ΅ β%sβ" + +#: ref-filter.c:1378 +#, c-format +msgid "ignoring broken ref %s" +msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π» β%sβ" + +#: ref-filter.c:1651 #, c-format msgid "format: %%(end) atom missing" msgstr "Π³ΡΠ΅ΡΠΊΠ° Π²ΡΠ² ΡΠΎΡΠΌΠ°ΜΡΠ°: Π»ΠΈΠΏΡΠ²Π° Π»Π΅ΠΊΡΠ΅ΠΌΠ°ΡΠ° %%(end)" -#: ref-filter.c:1615 +#: ref-filter.c:1705 #, c-format msgid "malformed object name %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ β%sβ" -#: remote.c:756 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "ΠΠ΅Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ Π΅ Π΄Π° ΡΠ΅ Π΄ΠΎΡΡΠ°Π²ΡΡ Π΅Π΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΈ β%sβ, ΠΈ β%sβ ΠΊΡΠΌ β%sβ" -#: remote.c:760 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "β%sβ ΠΎΠ±ΠΈΠΊΠ½ΠΎΠ²Π΅Π½ΠΎ ΡΠ»Π΅Π΄ΠΈ β%sβ, Π° Π½Π΅ β%sβ" -#: remote.c:764 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "β%sβ ΡΠ»Π΅Π΄ΠΈ ΠΊΠ°ΠΊΡΠΎ β%sβ, ΡΠ°ΠΊΠ° ΠΈ β%sβ" -#: remote.c:772 +#: remote.c:762 msgid "Internal error" msgstr "ΠΡΡΡΠ΅ΡΠ½Π° Π³ΡΠ΅ΡΠΊΠ°" -#: remote.c:1687 remote.c:1730 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΊΠ»ΠΎΠ½" -#: remote.c:1696 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "Π½ΡΠΌΠ° ΠΊΠ»ΠΎΠ½ Π½Π° ΠΈΠΌΠ΅ β%sβ" -#: remote.c:1699 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Π½Π΅ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½ ΠΊΠ»ΠΎΠ½-ΠΈΠ·ΡΠΎΡΠ½ΠΈΠΊ Π·Π° ΠΊΠ»ΠΎΠ½Π° β%sβ" -#: remote.c:1705 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "ΠΊΠ»ΠΎΠ½ΡΡ-ΠΈΠ·ΡΠΎΡΠ½ΠΈΠΊ β%sβ Π½Π΅ Π΅ ΡΡΡ
ΡΠ°Π½Π΅Π½ ΠΊΠ°ΡΠΎ ΡΠ»Π΅Π΄ΡΡ ΠΊΠ»ΠΎΠ½" -#: remote.c:1720 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "Π»ΠΈΠΏΡΠ²Π° Π»ΠΎΠΊΠ°Π»Π΅Π½ ΡΠ»Π΅Π΄ΡΡ ΠΊΠ»ΠΎΠ½ Π·Π° ΠΌΠ΅ΡΡΠΎΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ β%sβ Π² " "Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ β%sβ" -#: remote.c:1735 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Π½ΡΠΌΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΊΠ»ΠΎΠ½ΡΡ β%sβ Π΄Π° ΡΠ»Π΅Π΄ΠΈ Π½ΡΠΊΠΎΠΉ Π΄ΡΡΠ³" -#: remote.c:1746 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ Π·Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ Π½Π° β%sβ Π½Π΅ Π²ΠΊΠ»ΡΡΠ²Π° β%sβ" -#: remote.c:1759 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ Π·Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ Π½Π΅ Π²ΠΊΠ»ΡΡΠ²Π° ΡΠ΅Π» (βpush.defaultβ Π΅ βnothingβ)" -#: remote.c:1781 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "ΠΏΡΠΎΡΡΠΎΡΠΎ (simple) ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ Π½Π΅ ΡΡΠΎΡΠ²Π΅ΡΡΡΠ²Π° Π½Π° Π΅Π΄Π½Π° ΡΠ΅Π»" -#: remote.c:2083 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Π’ΠΎΠ·ΠΈ ΠΊΠ»ΠΎΠ½ ΡΠ»Π΅Π΄ΠΈ β%sβ, Π½ΠΎ ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΡ ΠΊΠ»ΠΎΠ½ Π΅ ΠΈΠ·ΡΡΠΈΡ.\n" -#: remote.c:2087 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (Π·Π° Π΄Π° ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°ΡΠ΅ ΡΠΎΠ²Π°, ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit branch --unset-upstreamβ)\n" -#: remote.c:2090 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "ΠΠ»ΠΎΠ½ΡΡ Π΅ Π°ΠΊΡΡΠ°Π»ΠΈΠ·ΠΈΡΠ°Π½ ΠΊΡΠΌ β%sβ.\n" -#: remote.c:2094 +#: remote.c:2085 #, 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:2100 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (ΠΏΡΠ±Π»ΠΈΠΊΡΠ²Π°ΠΉΡΠ΅ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΡΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ ΡΡΠ΅Π· βgit pushβ)\n" -#: remote.c:2103 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1359,11 +1502,11 @@ msgstr[0] "" msgstr[1] "" "ΠΠ»ΠΎΠ½ΡΡ Π²ΠΈ Π΅ Ρ %2$d ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ Π·Π°Π΄ β%1$sβ ΠΈ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ ΡΠ»ΡΡ.\n" -#: remote.c:2111 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (ΠΎΠ±Π½ΠΎΠ²Π΅ΡΠ΅ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡ ΡΠΈ ΠΊΠ»ΠΎΠ½ ΡΡΠ΅Π· βgit pullβ)\n" -#: remote.c:2114 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1378,28 +1521,28 @@ msgstr[1] "" "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ ΡΠ΅ Π΅ ΠΎΡΠ΄Π΅Π»ΠΈΠ» ΠΎΡ β%sβ,\n" "Π΄Π²Π°ΡΠ° ΠΈΠΌΠ°Ρ ΡΡΠΎΡΠ²Π΅ΡΠ½ΠΎ ΠΏΠΎ %d ΠΈ %d Π½Π΅ΡΡΠ²ΠΏΠ°Π΄Π°ΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ.\n" -#: remote.c:2124 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (ΡΠ»Π΅ΠΉΡΠ΅ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½ Π² Π»ΠΎΠΊΠ°Π»Π½ΠΈΡ ΡΡΠ΅Π· βgit pullβ)\n" -#: revision.c:2193 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ Π΅ ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½" -#: revision.c:2196 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ β%sβ Π΅ Π±Π΅Π· ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ " -#: revision.c:2390 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--first-parentβ ΠΈ β--bisectβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: run-command.c:90 +#: run-command.c:92 msgid "open /dev/null failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΎΡΠ²Π°ΡΡΠ½Π΅ Π½Π° β/dev/nullβ" -#: run-command.c:92 +#: run-command.c:94 #, c-format msgid "dup2(%d,%d) failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° dup2(%d,%d)" @@ -1425,7 +1568,7 @@ msgid "the receiving end does not support --atomic push" msgstr "ΠΏΠΎΠ»ΡΡΠ°Π²Π°ΡΠ°ΡΠ° ΡΡΡΠ°Π½Π° Π½Π΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ Ρ ΠΎΠΏΡΠΈΡΡΠ° β--atomicβ" # FIXME git add <pathβ¦> for consistence -#: sequencer.c:183 +#: sequencer.c:174 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1433,7 +1576,7 @@ msgstr "" "ΡΠ»Π΅Π΄ ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈΡΠ΅, ΠΎΡΠ±Π΅Π»Π΅ΠΆΠ΅ΡΠ΅ ΡΡΠΎΡΠ²Π΅ΡΠ½ΠΈΡΠ΅\n" "ΠΏΡΡΠΈΡΠ° Ρ βgit add ΠΠͺΠ’β¦β ΠΈΠ»ΠΈ βgit rm ΠΠͺΠ’β¦β." -#: sequencer.c:186 +#: sequencer.c:177 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1444,227 +1587,227 @@ msgstr "" "ΠΏΠΎΠ΄Π°ΠΉΡΠ΅ ΡΠ΅Π·ΡΠ»ΡΠ°ΡΠ° Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit commit'β." # FIXME - must be the same as Could not write to '%s' above -#: sequencer.c:199 sequencer.c:842 sequencer.c:922 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: sequencer.c:202 +#: sequencer.c:193 #, c-format msgid "Error wrapping up %s" msgstr "ΠΠ±ΡΠ°Π±ΠΎΡΠΊΠ°ΡΠ° Π½Π° β%sβ Π½Π΅ Π·Π°Π²ΡΡΡΠΈ ΡΡΠΏΠ΅ΡΠ½ΠΎ." -#: sequencer.c:217 +#: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." msgstr "ΠΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ Π²ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½ΠΈ ΠΏΡΠΈ ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ." -#: sequencer.c:219 +#: sequencer.c:210 msgid "Your local changes would be overwritten by revert." msgstr "ΠΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ Π²ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½ΠΈ ΠΏΡΠΈ ΠΎΡΠΌΡΠ½Π°ΡΠ° Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ." -#: sequencer.c:222 +#: sequencer.c:213 msgid "Commit your changes or stash them to proceed." msgstr "ΠΠΎΠ΄Π°ΠΉΡΠ΅ ΠΈΠ»ΠΈ ΡΠΊΠ°ΡΠ°ΠΉΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅, Π·Π° Π΄Π° ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠΈΡΠ΅" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:309 +#: sequencer.c:300 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠ°Π·Π΅Π½" -#: sequencer.c:327 +#: sequencer.c:318 msgid "Could not resolve HEAD commit\n" msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ ΡΠΎΡΠ΅Π½ΠΎ ΠΎΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ βHEADβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡΠΎ\n" -#: sequencer.c:347 +#: sequencer.c:338 msgid "Unable to update cache tree\n" msgstr "ΠΡΡΠ²ΠΎΡΠΎ Π½Π° ΠΊΠ΅ΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½ΠΎ\n" -#: sequencer.c:399 +#: sequencer.c:390 #, c-format msgid "Could not parse commit %s\n" msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°Π½ΠΎ\n" -#: sequencer.c:404 +#: sequencer.c:395 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Π ΠΎΠ΄ΠΈΡΠ΅Π»ΡΠΊΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°Π½ΠΎ\n" -#: sequencer.c:469 +#: sequencer.c:460 msgid "Your index file is unmerged." msgstr "ΠΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ Π΅ ΡΠ»ΡΡ." -#: sequencer.c:488 +#: sequencer.c:479 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π΅ ΡΠ»ΠΈΠ²Π°Π½Π΅, Π½ΠΎ Π½Π΅ Π΅ Π΄Π°Π΄Π΅Π½Π° ΠΎΠΏΡΠΈΡΡΠ° β-mβ" -#: sequencer.c:496 +#: sequencer.c:487 #, c-format msgid "Commit %s does not have parent %d" msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π½ΡΠΌΠ° ΡΠΎΠ΄ΠΈΡΠ΅Π» %d" -#: sequencer.c:500 +#: sequencer.c:491 #, 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:513 +#: sequencer.c:504 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: Π½Π΅ΡΠ°Π·ΠΏΠΎΠ·Π½Π°ΡΠ° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΠΊΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ β%sβ" -#: sequencer.c:517 +#: sequencer.c:508 #, c-format msgid "Cannot get commit message for %s" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·Π²Π»ΠΈΡΠ°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° β%sβ" -#: sequencer.c:603 +#: sequencer.c:594 #, c-format msgid "could not revert %s... %s" msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sββ¦ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΌΠ΅Π½Π΅Π½ΠΎ: β%sβ" -#: sequencer.c:604 +#: sequencer.c:595 #, c-format msgid "could not apply %s... %s" msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sββ¦ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½ΠΎ: β%sβ" -#: sequencer.c:639 +#: sequencer.c:630 msgid "empty commit set passed" msgstr "Π·Π°Π΄Π°Π΄Π΅Π½ΠΎ Π΅ ΠΏΡΠ°Π·Π½ΠΎ ΠΌΠ½ΠΎΠΆΠ΅ΡΡΠ²ΠΎ ΠΎΡ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ" -#: sequencer.c:647 +#: sequencer.c:638 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: sequencer.c:651 +#: sequencer.c:642 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: sequencer.c:711 +#: sequencer.c:702 #, c-format msgid "Cannot %s during a %s" msgstr "ΠΠΎ Π²ΡΠ΅ΠΌΠ΅ Π½Π° β%1$sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠΈ β%2$sβ" -#: sequencer.c:733 +#: sequencer.c:724 #, c-format msgid "Could not parse line %d." msgstr "%d-ΡΡ ΡΠ΅Π΄ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°." -#: sequencer.c:738 +#: sequencer.c:729 msgid "No commits parsed." msgstr "ΠΠΈΠΊΠΎΠ΅ ΠΎΡ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΠ°Π·ΠΏΠΎΠ·Π½Π°Π΅." # FIXME Could not open %s. - full stop for consistence with next message -#: sequencer.c:750 +#: sequencer.c:741 #, c-format msgid "Could not open %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΎΡΠ΅ΡΠ΅." -#: sequencer.c:754 +#: sequencer.c:745 #, c-format msgid "Could not read %s." msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠ²ΠΎΡΠΈ." -#: sequencer.c:761 +#: sequencer.c:752 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Π€Π°ΠΉΠ»ΡΡ Ρ ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π½Π° ΠΏΡΠ΅Π΄ΡΡΠΎΡΡΠΈΡΠ΅ Π΄Π΅ΠΉΡΡΠ²ΠΈΡ β β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΠΎΠ»Π·Π²Π°" -#: sequencer.c:791 +#: sequencer.c:782 #, c-format msgid "Invalid key: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΊΠ»ΡΡ: β%sβ" -#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49 +#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 #, c-format msgid "Invalid value for %s: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° β%sβ: β%sβ" -#: sequencer.c:804 +#: sequencer.c:795 #, c-format msgid "Malformed options sheet: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ Π½Π° ΡΠ°ΠΉΠ»Π° Ρ ΠΎΠΏΡΠΈΠΈ: β%sβ" -#: sequencer.c:823 +#: sequencer.c:814 msgid "a cherry-pick or revert is already in progress" msgstr "" "Π² ΠΌΠΎΠΌΠ΅Π½ΡΠ° Π²Π΅ΡΠ΅ ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠ²Π° ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ ΠΈΠ»ΠΈ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½Π°" -#: sequencer.c:824 +#: sequencer.c:815 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit cherry-pick (--continue | --quit | --abort)β" -#: sequencer.c:828 +#: sequencer.c:819 #, c-format msgid "Could not create sequencer directory %s" msgstr "ΠΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Π·Π° ΡΠ΅ΠΊΠ²Π΅Π½ΡΠΎΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: sequencer.c:844 sequencer.c:926 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "ΠΠ±ΡΠ°Π±ΠΎΡΠΊΠ°ΡΠ° Π½Π° β%sβ Π½Π΅ Π·Π°Π²ΡΡΡΠΈ ΡΡΠΏΠ΅ΡΠ½ΠΎ." -#: sequencer.c:863 sequencer.c:996 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "" "Π² ΠΌΠΎΠΌΠ΅Π½ΡΠ° Π½Π΅ ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠ²Π° ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ ΠΈΠ»ΠΈ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½Π°" -#: sequencer.c:865 +#: sequencer.c:856 msgid "cannot resolve HEAD" msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ ΡΠΎΡΠ΅Π½ΠΎ ΠΎΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ βHEADβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡΠΎ" -#: sequencer.c:867 +#: sequencer.c:858 msgid "cannot abort from a branch yet to be born" msgstr "" "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ΡΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²Π΅Π½ΠΎ, ΠΊΠΎΠ³Π°ΡΠΎ ΡΡΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½, ΠΊΠΎΠΉΡΠΎ ΡΠ΅ΠΏΡΡΠ²Π° " "ΠΏΡΠ΅Π΄ΡΡΠΎΠΈ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½" -#: sequencer.c:887 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½: %s" +msgid "cannot open %s" +msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½" -#: sequencer.c:890 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½: %s" -#: sequencer.c:891 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "Π½Π΅ΠΎΡΠ°ΠΊΠ²Π°Π½ ΠΊΡΠ°ΠΉ Π½Π° ΡΠ°ΠΉΠ»" -#: sequencer.c:897 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "Π·Π°ΠΏΠ°Π·Π΅Π½ΠΈΡΡ ΠΏΡΠ΅Π΄ΠΈ Π·Π°ΠΏΠΎΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ΡΠΎ ΡΠ°ΠΉΠ» Π·Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ βHEADβ β β%sβ Π΅ " "ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½" -#: sequencer.c:919 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Π€Π°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΠΎΡΠΌΠ°ΡΠΈΡΠ° ΠΏΠΎ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΡΡΠΈΡ Π½Π°ΡΠΈΠ½." -#: sequencer.c:1064 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠ±Π΅ΡΠ΅ β%sβ" -#: sequencer.c:1067 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° Π²Π΅ΡΡΠΈΡ" -#: sequencer.c:1101 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "ΠΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΌΠ΅Π½Π΅Π½ΠΎ" -#: sequencer.c:1102 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "ΠΡΠΈ ΠΏΡΠ°Π·Π΅Π½ Π²ΡΡΡ
Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° ΡΠ΅ ΠΎΡΠ±ΠΈΡΠ°Ρ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ" @@ -1673,7 +1816,35 @@ msgstr "ΠΡΠΈ ΠΏΡΠ°Π·Π΅Π½ Π²ΡΡΡ
Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° ΡΠ΅ ΠΎΡΠ±ΠΈΡΠ°Ρ ΠΏ msgid "failed to read %s" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: sha1_name.c:463 +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "ΠΡΠ°ΠΊΠ²Π° ΡΠ΅ Π²Π΅ΡΡΠΈΡ Π½Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ Π½Π° git <= %d, Π° Π½Π΅ %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "ΠΎΡΠΊΡΠΈΡΠΈ ΡΠ° Π½Π΅ΠΏΠΎΠ·Π½Π°ΡΠΈ ΡΠ°Π·ΡΠΈΡΠ΅Π½ΠΈΡ Π² Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ:" + +#: sha1_file.c:1080 +msgid "offset before end of packfile (broken .idx?)" +msgstr "" +"ΠΎΡΠΌΠ΅ΡΡΠ²Π°Π½Π΅ ΠΏΡΠ΅Π΄ΠΈ ΠΊΡΠ°Ρ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡ ΡΠ°ΠΉΠ» (Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ Π΅ ΠΈΠ½Π΄Π΅ΠΊΡΡΡ Π΄Π° Π΅ ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½)" + +#: sha1_file.c:2458 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "" +"ΠΎΡΠΌΠ΅ΡΡΠ²Π°Π½Π΅ ΠΏΡΠ΅Π΄ΠΈ Π½Π°ΡΠ°Π»ΠΎΡΠΎ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ (Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ Π΅ " +"ΠΈΠ½Π΄Π΅ΠΊΡΡΡ Π΄Π° Π΅ ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½)" + +#: sha1_file.c:2462 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" +"ΠΎΡΠΌΠ΅ΡΡΠ²Π°Π½Π΅ ΠΏΡΠ΅Π΄ΠΈ ΠΊΡΠ°Ρ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ (Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ Π΅ ΠΈΠ½Π΄Π΅ΠΊΡΡΡ " +"Π΄Π° Π΅ ΠΎΡΡΡΠ·Π°Π½)" + +#: sha1_name.c:462 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1697,67 +1868,315 @@ msgstr "" "ΡΠΏΡΠ΅ΡΠ΅ ΡΠΎΠ²Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠ°ΡΠΎ ΠΈΠ·ΠΏΡΠ»Π½ΠΈΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ°:\n" "βgit config advice.objectNameWarning falseβ" -#: submodule.c:61 submodule.c:95 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "ΠΠ΅ΡΠ»Π΅ΡΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ β.gitmodulesβ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ ΠΏΡΠΎΠΌΠ΅Π½ΡΠ½ΠΈ. ΠΡΡΠ²ΠΎ " "ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°ΠΉΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈΡΠ΅" -#: submodule.c:65 submodule.c:99 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "ΠΡΠ² ΡΠ°ΠΉΠ»Π° β.gitmodulesβ Π»ΠΈΠΏΡΠ²Π° ΡΠ°Π·Π΄Π΅Π» Π·Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ βpath=%sβ" -#: submodule.c:73 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "ΠΠ°ΠΏΠΈΡΡΡ β%sβ Π²ΡΠ² ΡΠ°ΠΉΠ»Π° β.gitmodulesβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½" -#: submodule.c:106 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "ΠΠ°ΠΏΠΈΡΡΡ β%sβ Π²ΡΠ² ΡΠ°ΠΉΠ»Π° β.gitmodulesβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ" -#: submodule.c:117 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠ°ΠΉΠ» β.gitmodulesβ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: submodule.c:1040 +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βsubmodule.fetchJobsβ Π½Π΅ ΠΏΡΠΈΠ΅ΠΌΠ° ΠΎΡΡΠΈΡΠ°ΡΠ΅Π»Π½ΠΈ ΡΡΠΎΠΉΠ½ΠΎΡΡΠΈ" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° β%sβ" + +#: trailer.c:237 #, c-format -msgid "Could not set core.worktree in %s" -msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βcore.worktreeβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π·Π°Π΄Π°Π΄Π΅ Π² β%sβ" +msgid "running trailer command '%s' failed" +msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° Π·Π°Π²ΡΡΡΠ²Π°ΡΠ°ΡΠ° ΠΊΠΎΠΌΠ°Π½Π΄Π° β%sβ" -#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 -#: trailer.c:561 +#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 +#: trailer.c:562 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ β%sβ Π·Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° β%sβ" -#: trailer.c:543 trailer.c:548 builtin/remote.c:296 +#: trailer.c:544 trailer.c:549 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "ΡΡΠΎΠΉΠ½ΠΎΡΡΡΠ° β%sβ ΡΠ΅ ΠΏΠΎΠ²ΡΠ°ΡΡ Π² Π½Π°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅" -#: trailer.c:581 +#: trailer.c:582 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "ΠΏΡΠ°Π·Π½Π° Π·Π°Π²ΡΡΡΠ²Π°ΡΠ° Π»Π΅ΠΊΡΠ΅ΠΌΠ° Π² Π΅ΠΏΠΈΠ»ΠΎΠ³Π° β%.*sβ" -#: trailer.c:701 +#: trailer.c:702 #, c-format msgid "could not read input file '%s'" msgstr "Π²Ρ
ΠΎΠ΄Π½ΠΈΡΡ ΡΠ°ΠΉΠ» β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: trailer.c:704 +#: trailer.c:705 msgid "could not read from stdin" msgstr "ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΠ΅ΡΠ΅" -#: transport-helper.c:1025 +#: trailer.c:857 builtin/am.c:42 +#, c-format +msgid "could not stat %s" +msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΠΎΠ»ΡΡΠΈ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΡΠ΅Π· βstatβ Π·Π° β%sβ" + +#: trailer.c:859 +#, c-format +msgid "file %s is not a regular file" +msgstr "β%sβ Π½Π΅ Π΅ ΠΎΠ±ΠΈΠΊΠ½ΠΎΠ²Π΅Π½ ΡΠ°ΠΉΠ»" + +#: trailer.c:861 +#, c-format +msgid "file %s is not writable by user" +msgstr "β%sβ: Π½ΡΠΌΠ° ΠΏΡΠ°Π²Π° Π·Π° Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»Π°" + +#: trailer.c:873 +msgid "could not open temporary file" +msgstr "Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈΡΡ ΡΠ°ΠΉΠ» Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠ²ΠΎΡΠΈ" + +#: trailer.c:912 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈΡΡ ΡΠ°ΠΉΠ» Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π° Π½Π° β%sβ" + +#: transport-helper.c:1041 #, c-format msgid "Could not read ref %s" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΎΡΠ΅ΡΠ΅." -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"ΠΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ΡΠΎ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ Π½Π° ΡΠ΅Π·ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅:\n" +"%%sΠΠΎΠ΄Π°ΠΉΡΠ΅ ΠΈΠ»ΠΈ ΡΠΊΠ°ΡΠ°ΠΉΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅, Π·Π° Π΄Π° ΠΏΡΠ΅ΠΌΠΈΠ½Π΅ΡΠ΅ ΠΊΡΠΌ Π½ΠΎΠ² ΠΊΠ»ΠΎΠ½." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"ΠΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ΡΠΎ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ Π½Π° ΡΠ΅Π·ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅:\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"Π‘Π»ΠΈΠ²Π°Π½Π΅ΡΠΎ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ Π½Π° ΡΠ΅Π·ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅:\n" +"%%sΠΠΎΠ΄Π°ΠΉΡΠ΅ ΠΈΠ»ΠΈ ΡΠΊΠ°ΡΠ°ΠΉΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅, Π·Π° Π΄Π° ΡΠ»Π΅Π΅ΡΠ΅." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Π‘Π»ΠΈΠ²Π°Π½Π΅ΡΠΎ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ Π½Π° ΡΠ΅Π·ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅:\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"β%sβ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ Π½Π° ΡΠ΅Π·ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅:\n" +"%%sΠΠΎΠ΄Π°ΠΉΡΠ΅ ΠΈΠ»ΠΈ ΡΠΊΠ°ΡΠ°ΠΉΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅, Π·Π° Π΄Π° ΠΈΠ·Π²ΡΡΡΠΈΡΠ΅ β%sβ." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"β%sβ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ Π½Π° ΡΠ΅Π·ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅:\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"ΠΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΡΠ΅Π·ΠΈ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΡΡ
:\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"ΠΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ΡΠΎ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%sΠΡΠ΅ΠΌΠ΅ΡΡΠ΅ΡΠ΅ Π³ΠΈ ΠΈΠ»ΠΈ Π³ΠΈ ΠΈΠ·ΡΡΠΈΠΉΡΠ΅, Π·Π° Π΄Π° ΠΏΡΠ΅ΠΌΠΈΠ½Π΅ΡΠ΅ Π½Π° Π΄ΡΡΠ³ ΠΊΠ»ΠΎΠ½." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"ΠΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ΡΠΎ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Π‘Π»ΠΈΠ²Π°Π½Π΅ΡΠΎ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%sΠΡΠ΅ΠΌΠ΅ΡΡΠ΅ΡΠ΅ Π³ΠΈ ΠΈΠ»ΠΈ Π³ΠΈ ΠΈΠ·ΡΡΠΈΠΉΡΠ΅, Π·Π° Π΄Π° ΡΠ»Π΅Π΅ΡΠ΅." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Π‘Π»ΠΈΠ²Π°Π½Π΅ΡΠΎ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"β%sβ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%sΠΡΠ΅ΠΌΠ΅ΡΡΠ΅ΡΠ΅ Π³ΠΈ ΠΈΠ»ΠΈ Π³ΠΈ ΠΈΠ·ΡΡΠΈΠΉΡΠ΅, Π·Π° Π΄Π° ΠΈΠ·Π²ΡΡΡΠΈΡΠ΅ β%sβ." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"β%sβ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"ΠΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ΡΠΎ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%sΠΡΠ΅ΠΌΠ΅ΡΡΠ΅ΡΠ΅ Π³ΠΈ ΠΈΠ»ΠΈ Π³ΠΈ ΠΈΠ·ΡΡΠΈΠΉΡΠ΅, Π·Π° Π΄Π° ΡΠΌΠ΅Π½ΠΈΡΠ΅ ΠΊΠ»ΠΎΠ½." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"ΠΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ΡΠΎ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Π‘Π»ΠΈΠ²Π°Π½Π΅ΡΠΎ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%sΠΡΠ΅ΠΌΠ΅ΡΡΠ΅ΡΠ΅ Π³ΠΈ ΠΈΠ»ΠΈ Π³ΠΈ ΠΈΠ·ΡΡΠΈΠΉΡΠ΅, Π·Π° Π΄Π° ΡΠ»Π΅Π΅ΡΠ΅." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Π‘Π»ΠΈΠ²Π°Π½Π΅ΡΠΎ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"β%sβ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%sΠΡΠ΅ΠΌΠ΅ΡΡΠ΅ΡΠ΅ Π³ΠΈ ΠΈΠ»ΠΈ Π³ΠΈ ΠΈΠ·ΡΡΠΈΠΉΡΠ΅, Π·Π° Π΄Π° ΠΈΠ·Π²ΡΡΡΠΈΡΠ΅ β%sβ." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"β%sβ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ ΡΠ΅Π·ΠΈ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "ΠΠ°ΠΏΠΈΡΡΡ Π·Π° β%sβ ΡΡΠ²ΠΏΠ°Π΄Π° Ρ ΡΠΎΠ·ΠΈ Π·Π° β%sβ. ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΈΡΠ²ΠΎΠΈ." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Π§Π°ΡΡΠΈΡΠ½ΠΎΡΠΎ ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½ΠΎ: ΡΠ»Π΅Π΄Π½ΠΈΡΠ΅ Π·Π°ΠΏΠΈΡΠΈ Π½Π΅ ΡΠ° " +"Π°ΠΊΡΡΠ°Π»Π½ΠΈ:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"ΠΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΡΠ°ΡΡΠΈΡΠ½ΠΎΡΠΎ ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ ΡΠ΅ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ ΡΠ΅Π·ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ " +"Π΄ΡΡΠ²ΠΎ:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"ΠΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΡΠ°ΡΡΠΈΡΠ½ΠΎΡΠΎ ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ ΡΠ΅Π·ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ " +"Π΄ΡΡΠ²ΠΎ:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "ΠΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ΡΠΎ\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "ΠΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" @@ -1790,210 +2209,206 @@ msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ Π½ΠΎΠΌΠ΅Ρ Π½Π° ΠΏΠΎΡΡ" msgid "invalid '..' path segment" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΠ°ΡΡ ΠΎΡ ΠΏΡΡΡ β..β" -#: wrapper.c:219 wrapper.c:362 +#: wrapper.c:222 wrapper.c:381 #, c-format msgid "could not open '%s' for reading and writing" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½ ΠΈ Π·Π° ΡΠ΅ΡΠ΅Π½Π΅, ΠΈ Π·Π° Π·Π°ΠΏΠΈΡ" -#: wrapper.c:221 wrapper.c:364 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½ Π·Π° Π·Π°ΠΏΠΈΡ" -#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691 -#: builtin/merge.c:1074 builtin/pull.c:380 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "ΡΠ°ΠΉΠ»ΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½: β%sβ" -#: wrapper.c:579 -#, c-format -msgid "unable to access '%s': %s" -msgstr "Π½ΡΠΌΠ° Π΄ΠΎΡΡΡΠΏ Π΄ΠΎ β%sβ: %s" - -#: wrapper.c:600 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "Π½ΡΠΌΠ° Π΄ΠΎΡΡΡΠΏ Π΄ΠΎ β%sβ" -#: wrapper.c:608 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "ΡΠ΅ΠΊΡΡΠ°ΡΠ° ΡΠ°Π±ΠΎΡΠ½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π΅ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½Π°" -#: wrapper.c:635 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½ Π·Π° Π·Π°ΠΏΠΈΡ" # FIXME - must be the same as Could not write to '%s' above -#: wrapper.c:646 builtin/am.c:425 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: wrapper.c:652 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π·Π°ΡΠ²ΠΎΡΠΈ" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "ΠΠ΅ΡΠ»Π΅ΡΠΈ ΠΏΡΡΠΈΡΠ°:" -#: wt-status.c:176 wt-status.c:203 +#: 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:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit rm --cached %s Π€ΠΠΠβ¦β, Π·Π° Π΄Π° ΠΈΠ·Π²Π°Π΄ΠΈΡΠ΅ Π€ΠΠΠΠ° ΠΎΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit add Π€ΠΠΠβ¦β, Π·Π° Π΄Π° ΡΠΊΠ°ΠΆΠ΅ΡΠ΅ ΡΠ°Π·ΡΠ΅ΡΠ°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)" -#: wt-status.c:184 wt-status.c:188 +#: 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:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit rm Π€ΠΠΠβ¦β, Π·Π° Π΄Π° ΡΠΊΠ°ΠΆΠ΅ΡΠ΅ ΡΠ°Π·ΡΠ΅ΡΠ°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "ΠΡΠΎΠΌΠ΅Π½ΠΈ, ΠΊΠΎΠΈΡΠΎ ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΏΠΎΠ΄Π°Π΄Π΅Π½ΠΈ:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "ΠΡΠΎΠΌΠ΅Π½ΠΈ, ΠΊΠΎΠΈΡΠΎ Π½Π΅ ΡΠ° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit add Π€ΠΠΠβ¦β, Π·Π° Π΄Π° ΠΎΠ±Π½ΠΎΠ²ΠΈΡΠ΅ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit add/rm Π€ΠΠΠβ¦β, Π·Π° Π΄Π° ΠΎΠ±Π½ΠΎΠ²ΠΈΡΠ΅ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit checkout -- Π€ΠΠΠβ¦β, Π·Π° Π΄Π° ΠΎΡΡ
Π²ΡΡΠ»ΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ Π² " "ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (ΠΏΠΎΠ΄Π°ΠΉΡΠ΅ ΠΈΠ»ΠΈ ΠΎΡΡ
Π²ΡΡΠ»Π΅ΡΠ΅ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΎΡΠΎ ΠΈΠ»ΠΈ ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΎΡΠΎ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ Π² " "ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit %s Π€ΠΠΠβ¦β, Π·Π° Π΄Π° ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΠ΅ ΠΊΠ°ΠΊΠ²ΠΎ Π²ΠΊΠ»ΡΡΠ²Π°ΡΠ΅ Π² ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "ΠΈΠ·ΡΡΠΈΡΠΈ Π² Π΄Π²Π°ΡΠ° ΡΠ»ΡΡΠ°Ρ:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈ ΠΎΡ Π²Π°Ρ:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "ΠΈΠ·ΡΡΠΈΡΠΈ ΠΎΡ ΡΡΡ
:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈ ΠΎΡ ΡΡΡ
:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "ΠΈΠ·ΡΡΠΈΡΠΈ ΠΎΡ Π²Π°Ρ:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈ ΠΈ Π² Π΄Π²Π°ΡΠ° ΡΠ»ΡΡΠ°Ρ:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΈ ΠΈ Π² Π΄Π²Π°ΡΠ° ΡΠ»ΡΡΠ°Ρ:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "Π³ΡΠ΅ΡΠΊΠ°: ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ Π½Π° ΠΏΡΠΎΠΌΡΠ½Π°ΡΠ° β%xβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ΅Π½ΠΎ" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "Π½ΠΎΠ² ΡΠ°ΠΉΠ»:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "ΠΊΠΎΠΏΠΈΡΠ°Π½:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "ΠΈΠ·ΡΡΠΈΡ:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "ΡΠΌΡΠ½Π° Π½Π° Π²ΠΈΠ΄Π°:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°ΡΠ° ΠΏΡΠΎΠΌΡΠ½Π°:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "Π½Π΅ΡΠ»ΡΡ:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "Π½ΠΎΠ²ΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΎ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΎ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "Π³ΡΠ΅ΡΠΊΠ°: ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ Π½Π° ΠΏΡΠΎΠΌΡΠ½Π°ΡΠ° β%cβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ΅Π½ΠΎ" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅ ΡΠ° ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΈ, Π½ΠΎ Π½Π΅ ΡΠ° ΠΎΠ±Π½ΠΎΠ²Π΅Π½ΠΈ:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "ΠΡΠΎΠΌΠ΅Π½ΠΈ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2001,39 +2416,39 @@ msgstr "" "ΠΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΡΠΉΡΠ΅ Π³ΠΎΡΠ½ΠΈΡ ΡΠ΅Π΄.\n" "ΠΡΠΈΡΠΊΠΎ ΠΎΡΠ΄ΠΎΠ»Ρ ΡΠ΅ Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡΠΎ." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "ΠΡΠΊΠΎΠΈ ΠΏΡΡΠΈΡΠ° Π½Π΅ ΡΠ° ΡΠ»Π΅ΡΠΈ." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°ΠΉΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈΡΠ΅ ΠΈ ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ βgit commitβ)" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "ΠΡΠΈΡΠΊΠΈ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈ ΡΠ° ΡΠ΅ΡΠ΅Π½ΠΈ, Π½ΠΎ ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠ°Π²Π°ΡΠ΅ ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit commitβ, Π·Π° Π΄Π° Π·Π°Π²ΡΡΡΠΈΡΠ΅ ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Π ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΠΏΡΠΈΠ»Π°Π³Π°ΡΠ΅ ΠΏΠΎΡΠ΅Π΄ΠΈΡΠ° ΠΎΡ ΠΊΡΡΠΏΠΊΠΈ ΡΡΠ΅Π· βgit amβ." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Π’Π΅ΠΊΡΡΠ°ΡΠ° ΠΊΡΡΠΏΠΊΠ° Π΅ ΠΏΡΠ°Π·Π½Π°." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°ΠΉΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈΡΠ΅ ΠΈ ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ βgit am --continueβ)" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit am --skipβ, Π·Π° Π΄Π° ΠΏΡΠΎΠΏΡΡΠ½Π΅ΡΠ΅ ΡΠ°Π·ΠΈ ΠΊΡΡΠΏΠΊΠ°)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit am --abortβ, Π·Π° Π΄Π° Π²ΡΠ·ΡΡΠ°Π½ΠΎΠ²ΠΈΡΠ΅ ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΈΡ ΠΊΠ»ΠΎΠ½)" @@ -2187,43 +2602,43 @@ msgstr "" " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit bisect resetβ, Π·Π° Π΄Π° ΡΠ΅ Π²ΡΡΠ½Π΅ΡΠ΅ ΠΊΡΠΌ ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎΡΠΎ " "ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ ΠΈ ΠΊΠ»ΠΎΠ½)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "ΠΠ° ΠΊΠ»ΠΎΠ½ " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "ΠΈΠ·Π²ΡΡΡΠ²Π°ΡΠ΅ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π²ΡΡΡ
Ρ " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "ΠΈΠ·Π²ΡΡΡΠ²Π°ΡΠ΅ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π²ΡΡΡ
Ρ " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π΅ Π΅ ΡΠ²ΡΡΠ·Π°Π½ ΠΈ Π΅ ΠΏΡΠΈ " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π΅ Π΅ ΡΠ²ΡΡΠ·Π°Π½ ΠΈ Π΅ ΠΎΡΠ΄Π΅Π»Π΅ΜΠ½ ΠΎΡ " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "ΠΠ·Π²ΡΠ½ Π²ΡΠΈΡΠΊΠΈ ΠΊΠ»ΠΎΠ½ΠΈ." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "ΠΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "ΠΠ΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "ΠΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2235,32 +2650,32 @@ msgstr "" "ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ΡΠΎ, Π½ΠΎ Π½Π΅ ΡΡΡΠ±Π²Π° Π΄Π° Π·Π°Π±ΡΠ°Π²ΡΡΠ΅ ΡΡΡΠ½ΠΎ Π΄Π° Π΄ΠΎΠ±Π°Π²ΡΡΠ΅ Π½ΠΎΠ²ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅.\n" "ΠΠ° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΠΎΡΡΠΈ ΠΏΠΎΠ³Π»Π΅Π΄Π½Π΅ΡΠ΅ βgit status helpβ." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "ΠΠ΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π½Π΅ ΡΠ° ΠΈΠ·Π²Π΅Π΄Π΅Π½ΠΈ%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΎΠΏΡΠΈΡΡΠ° β-uβ, Π·Π° Π΄Π° ΠΈΠ·Π²Π΅Π΄Π΅ΡΠ΅ Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "ΠΡΠΌΠ° ΠΏΡΠΎΠΌΠ΅Π½ΠΈ" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "ΠΊΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΡΠ° Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2269,52 +2684,56 @@ msgstr "" "ΠΊΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΡΠ° Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ, Π½ΠΎ ΠΈΠΌΠ° Π½ΠΎΠ²ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ " "(ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit addβ, Π·Π° Π΄Π° Π·Π°ΠΏΠΎΡΠ½Π΅ ΡΡΡ
Π½ΠΎΡΠΎ ΡΠ»Π΅Π΄Π΅Π½Π΅)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ΠΊΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΡΠ° Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ, Π½ΠΎ ΠΈΠΌΠ° Π½ΠΎΠ²ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "Π»ΠΈΠΏΡΠ²Π°Ρ ΠΊΠ°ΠΊΠ²ΠΈΡΠΎ ΠΈ Π΄Π° Π΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ (ΡΡΠ·Π΄Π°ΠΉΡΠ΅ ΠΈΠ»ΠΈ ΠΊΠΎΠΏΠΈΡΠ°ΠΉΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ ΠΈ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ " "βgit addβ, Π·Π° Π΄Π° Π·Π°ΠΏΠΎΡΠ½Π΅ ΡΡΡ
Π½ΠΎΡΠΎ ΡΠ»Π΅Π΄Π΅Π½Π΅)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "Π»ΠΈΠΏΡΠ²Π°Ρ ΠΊΠ°ΠΊΠ²ΠΈΡΠΎ ΠΈ Π΄Π° Π΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "Π»ΠΈΠΏΡΠ²Π°Ρ ΠΊΠ°ΠΊΠ²ΠΈΡΠΎ ΠΈ Π΄Π° Π΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΎΠΏΡΠΈΡΡΠ° β-uβ, Π·Π° Π΄Π° ΡΠ΅ ΠΈΠ·Π²Π΅Π΄Π°Ρ ΠΈ " "Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅)\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "Π»ΠΈΠΏΡΠ²Π°Ρ ΠΊΠ°ΠΊΠ²ΠΈΡΠΎ ΠΈ Π΄Π° Π΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ, ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ Π΅ ΡΠΈΡΡΠΎ\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "ΠΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½" -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "ΠΈΠ·ΡΡΠΈΡ" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "Π½Π°Π·Π°Π΄ Ρ " -#: compat/precompose_utf8.c:56 builtin/clone.c:408 +#: wt-status.c:1702 wt-status.c:1705 +msgid "ahead " +msgstr "Π½Π°ΠΏΡΠ΅Π΄ Ρ " + +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° β%sβ" @@ -2328,7 +2747,7 @@ msgstr "git add [ΠΠΠ¦ΠΠ―β¦] [--] ΠΠͺΠ’β¦" msgid "unexpected diff status %c" msgstr "Π½Π΅ΠΎΡΠ°ΠΊΠ²Π°Π½ ΠΈΠ·Ρ
ΠΎΠ΄Π΅Π½ ΠΊΠΎΠ΄ ΠΏΡΠΈ Π³Π΅Π½Π΅ΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°Π·Π»ΠΈΠΊΠ°: %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅" @@ -2341,7 +2760,7 @@ msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° β%sβ\n" msgid "Unstaged changes after refreshing the index:" msgstr "ΠΡΠΎΠΌΠ΅Π½ΠΈ, ΠΊΠΎΠΈΡΠΎ ΠΈ ΡΠ»Π΅Π΄ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π½Π΅ ΡΠ° Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈ ΠΊΡΠΌ Π½Π΅Π³ΠΎ:" -#: builtin/add.c:194 builtin/rev-parse.c:796 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "ΠΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" @@ -2377,15 +2796,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Π‘Π»Π΅Π΄Π½ΠΈΡΠ΅ ΠΏΡΡΠΈΡΠ° ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈ ΡΠΏΠΎΡΠ΅Π΄ Π½ΡΠΊΠΎΠΉ ΠΎΡ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ β.gitignoreβ:\n" -#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543 -#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "ΠΏΡΠΎΠ±Π½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½eΠ½ΠΈΠ΅" -#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΠΎΡΡΠΈ" @@ -2393,7 +2812,7 @@ msgstr "ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΠΎΡΡΠΈ" msgid "interactive picking" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈ" -#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π΅Π½ ΠΈΠ·Π±ΠΎΡ Π½Π° ΠΏΠ°ΡΡΠ΅ΡΠ° ΠΊΠΎΠ΄" @@ -2465,138 +2884,123 @@ msgstr "ΠΠΈΡΠΎ Π½Π΅ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½ΠΎ ΠΈ Π½ΠΈΡΠΎ Π½Π΅ Π΅ Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΎ.\ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "ΠΠ΅ΡΠΎΡΡΠ½ΠΎ ΠΈΡΠΊΠ°Ρ
ΡΠ΅ Π΄Π° ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΡΠ΅ βgit add .β?\n" -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938 -#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:40 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "ΡΠ°ΠΉΠ»ΡΡ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π΅ ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½" -#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "ΠΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/am.c:42 -#, c-format -msgid "could not stat %s" -msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΠΎΠ»ΡΡΠΈ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΡΠ΅Π· βstatβ Π·Π° β%sβ" - -#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/am.c:445 +#: builtin/am.c:430 msgid "could not parse author script" msgstr "ΡΠΊΡΠΈΠΏΡΡΡ Π·Π° Π°Π²ΡΠΎΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°" -#: builtin/am.c:522 +#: builtin/am.c:507 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "β%sβ Π±Π΅ ΠΈΠ·ΡΡΠΈΡ ΠΎΡ ΠΊΡΠΊΠ°ΡΠ° βapplypatch-msgβ" -#: builtin/am.c:563 builtin/notes.c:300 +#: builtin/am.c:548 builtin/notes.c:300 #, c-format msgid "Malformed input line: '%s'." msgstr "ΠΠ°Π΄Π΅Π½ΠΈΡΡ Π²Ρ
ΠΎΠ΄Π΅Π½ ΡΠ΅Π΄ Π΅ Ρ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠΎΡΠΌΠ°Ρ: β%sβ." -#: builtin/am.c:600 builtin/notes.c:315 +#: builtin/am.c:585 builtin/notes.c:315 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "ΠΠ΅Π»Π΅ΠΆΠΊΠ°ΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΊΠΎΠΏΠΈΡΠ° ΠΎΡ β%sβ ΠΊΡΠΌ β%sβ" -#: builtin/am.c:626 +#: builtin/am.c:611 msgid "fseek failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° βfseekβ" -#: builtin/am.c:787 builtin/am.c:875 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½ Π·Π° ΡΠ΅ΡΠ΅Π½Π΅: %s" - -#: builtin/am.c:794 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½ Π·Π° Π·Π°ΠΏΠΈΡ: %s" - -#: builtin/am.c:803 +#: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" msgstr "ΠΊΡΡΠΏΠΊΠ°ΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°" -#: builtin/am.c:868 +#: builtin/am.c:853 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Π‘Π°ΠΌΠΎ Π΅Π΄Π½Π° ΡΠ΅ΡΠΈΡ ΠΊΡΡΠΏΠΊΠΈ ΠΎΡ βStGITβ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΈΠ»Π°Π³Π°Π½Π° Π² Π΄Π°Π΄Π΅Π½ ΠΌΠΎΠΌΠ΅Π½Ρ" -#: builtin/am.c:916 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° Π²ΡΠ΅ΠΌΠ΅" -#: builtin/am.c:919 builtin/am.c:927 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠ΅Π΄ Π·Π° Π΄Π°ΡΠ° βDateβ" -#: builtin/am.c:924 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΎΡΠΌΠ΅ΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°ΡΠΎΠ²ΠΈΡ ΠΏΠΎΡΡ" -#: builtin/am.c:1011 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Π€ΠΎΡΠΌΠ°ΡΡΡ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½." -#: builtin/am.c:1016 builtin/clone.c:373 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: builtin/am.c:1020 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "ΠΡΡΠΏΠΊΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ ΡΠ°Π·Π΄Π΅Π»Π΅Π½ΠΈ." -#: builtin/am.c:1152 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "ΠΈΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/am.c:1203 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Π‘Π»Π΅Π΄ ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΡΠΎΠ·ΠΈ ΠΏΡΠΎΠ±Π»Π΅ΠΌ ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ β%s --continueβ." -#: builtin/am.c:1204 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "ΠΠΊΠΎ ΠΏΡΠ΅Π΄ΠΏΠΎΡΠΈΡΠ°ΡΠ΅ Π΄Π° ΠΏΡΠ΅ΡΠΊΠΎΡΠΈΡΠ΅ ΡΠ°Π·ΠΈ ΠΊΡΡΠΏΠΊΠ°, ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ β%s --skipβ." -#: builtin/am.c:1205 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "ΠΠ° Π΄Π° ΡΠ΅ Π²ΡΡΠ½Π΅ΡΠ΅ ΠΊΡΠΌ ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎΡΠΎ ΡΡΡΡΠΎΡΠ½ΠΈΠ΅, ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ β%s --abortβ." -#: builtin/am.c:1343 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "ΠΡΠ°Π·Π½Π° ΠΊΡΡΠΏΠΊΠ°. ΠΠ°Π»ΠΈ Π½Π΅ Π΅ ΡΠ°Π·Π΄Π΅Π»Π΅Π½Π° ΠΏΠΎΠ³ΡΠ΅ΡΠ½ΠΎ?" -#: builtin/am.c:1417 builtin/log.c:1347 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "Π³ΡΠ΅ΡΠ½Π° ΠΈΠ΄Π΅Π½ΡΠΈΡΠ½ΠΎΡΡ: %s" -#: builtin/am.c:1444 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°Π½ΠΎ: %s" -#: builtin/am.c:1646 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Π Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ Π»ΠΈΠΏΡΠ²Π°Ρ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ BLOB, Π·Π° Π΄Π° ΡΠ΅ ΠΏΡΠ΅ΠΌΠΈΠ½Π΅ ΠΊΡΠΌ ΡΡΠΎΠΉΠ½ΠΎ " "ΡΠ»ΠΈΠ²Π°Π½Π΅." -#: builtin/am.c:1648 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "ΠΠ°Π·ΠΎΠ²ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ ΡΠ΅ ΡΠ΅ΠΊΠΎΠ½ΡΡΡΡΠΈΡΠ° ΠΎΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°β¦" -#: builtin/am.c:1667 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2604,39 +3008,39 @@ msgstr "" "ΠΡΡΠΏΠΊΠ°ΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΈΠ»ΠΎΠΆΠΈ ΠΊΡΠΌ ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ BLOB Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°.\n" "ΠΠ° Π½Π΅ Π±ΠΈ Π΄Π° ΡΡΠ΅ Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π»ΠΈ Π½Π° ΡΡΠΊΠ°?" -#: builtin/am.c:1673 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "ΠΡΠ΅ΠΌΠΈΠ½Π°Π²Π°Π½Π΅ ΠΊΡΠΌ ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ° ΠΊΡΠΌ Π±Π°Π·Π°ΡΠ° ΠΈ ΡΡΠΎΠΉΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅β¦" -#: builtin/am.c:1688 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅." -#: builtin/am.c:1712 builtin/merge.c:632 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "ΠΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit write-treeβ Π½Π΅ ΡΡΠΏΡ Π΄Π° Π·Π°ΠΏΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡ-Π΄ΡΡΠ²ΠΎ" -#: builtin/am.c:1719 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π²ΡΡΡ
Ρ ΠΏΡΠ°Π·Π½Π° ΠΈΡΡΠΎΡΠΈΡ" -#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829 -#: builtin/merge.c:854 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/am.c:1764 builtin/am.c:1768 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠΈ β β%sβ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°." -#: builtin/am.c:1784 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "ΠΠ° ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡΡ\n" "ΠΈΠ·Ρ
ΠΎΠ΄ Π΄Π° Π΅ ΡΠ²ΡΡΠ·Π°Π½ Ρ ΡΠ΅ΡΠΌΠΈΠ½Π°Π», Π° Π² ΠΌΠΎΠΌΠ΅Π½ΡΠ° Π½Π΅ Π΅." -#: builtin/am.c:1789 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Π’ΡΠ»ΠΎΡΠΎ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π·Π° ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π΅:" @@ -2644,38 +3048,38 @@ msgstr "Π’ΡΠ»ΠΎΡΠΎ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π·Π° ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π΅:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1799 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "ΠΡΠΈΠ»Π°Π³Π°Π½Π΅? βyβ β Π΄Π°/βnβ β Π½Π΅/βeβ β ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅/βvβ β ΠΏΡΠ΅Π³Π»Π΅Π΄/βaβ β ΠΏΡΠΈΠ΅ΠΌΠ°Π½Π΅ " "Π½Π° Π²ΡΠΈΡΠΊΠΎ:" -#: builtin/am.c:1849 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "ΠΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ Π΅ ΡΠΈΡΡ: ΠΊΡΡΠΏΠΊΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈ (Π·Π°ΠΌΡΡΡΠ΅Π½ΠΈ ΡΠ°: %s)" -#: builtin/am.c:1884 builtin/am.c:1955 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "ΠΡΠΈΠ»Π°Π³Π°Π½Π΅: %.*s" -#: builtin/am.c:1900 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "ΠΠ΅Π· ΠΏΡΠΎΠΌΠ΅Π½ΠΈ β ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π²Π΅ΡΠ΅ Π΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½Π°." -#: builtin/am.c:1908 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ° ΠΏΡΠΈ %s %.*sβ" -#: builtin/am.c:1914 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "ΠΡΠ±Π»ΠΈΠΊΠ°Ρ Π½Π° ΠΏΡΠΎΠ±Π»Π΅ΠΌΠ½Π°ΡΠ° ΠΊΡΡΠΏΠΊΠ° ΡΠ΅ Π½Π°ΠΌΠΈΡΠ° Π²: %s" -#: builtin/am.c:1958 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2685,7 +3089,7 @@ msgstr "" "ΠΠΊΠΎ Π½ΡΠΌΠ° Π΄ΡΡΠ³Π° ΠΏΡΠΎΠΌΡΠ½Π° Π·Π° Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°, Π½Π°ΠΉ-Π²Π΅ΡΠΎΡΡΠ½ΠΎ Π½ΡΠΊΠΎΡ Π΄ΡΡΠ³Π°\n" "ΠΊΡΡΠΏΠΊΠ° Π΅ Π΄ΠΎΠ²Π΅Π»Π° Π΄ΠΎ ΡΡΡΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ ΠΈ Π² ΡΠ°ΠΊΡΠ² ΡΠ»ΡΡΠ°ΠΉ ΠΏΡΠΎΡΡΠΎ ΠΏΡΠΎΠΏΡΡΠ½Π΅ΡΠ΅ ΡΠ°Π·ΠΈ." -#: builtin/am.c:1965 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2693,17 +3097,17 @@ msgstr "" "ΠΠ½Π΄Π΅ΠΊΡΡΡ Π²ΡΠ΅ ΠΎΡΠ΅ ΡΡΠ΄ΡΡΠΆΠ° Π½Π΅ΡΠ»Π΅ΡΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ.\n" "ΠΡΠ·ΠΌΠΎΠΆΠ½ΠΎ Π΅ Π΄Π° Π½Π΅ ΡΡΠ΅ ΠΈΠ·ΠΏΡΠ»Π½ΠΈΠ»ΠΈ βgit addβ." -#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "β%sβ Π½Π΅ Π΅ ΡΠ°Π·ΠΏΠΎΠ·Π½Π°Ρ ΠΊΠ°ΡΠΎ ΠΎΠ±Π΅ΠΊΡ." -#: builtin/am.c:2125 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "ΠΈΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΠΈΡΡΠ΅Π½" -#: builtin/am.c:2159 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2714,157 +3118,159 @@ msgstr "" "ΠΊΡΠΌ\n" "βORIG_HEADβ" -#: builtin/am.c:2220 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° β--patch-formatβ: β%sβ" -#: builtin/am.c:2253 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [ΠΠΠ¦ΠΠ―β¦] [Π€ΠΠΠ_Π‘_ΠΠΠ©Π|ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―_Π‘_ΠΠΠ©Π]β¦" -#: builtin/am.c:2254 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ΠΠΠ¦ΠΠ―β¦] (--continue | --quit | --abort)" -#: builtin/am.c:2260 +#: builtin/am.c:2245 msgid "run interactively" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½Π° ΡΠ°Π±ΠΎΡΠ°" -#: builtin/am.c:2262 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "ΠΈΠ·ΠΎΡΡΠ°Π²Π΅Π½Π° ΠΎΠΏΡΠΈΡ, ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΠΏΠΎ ΠΈΡΡΠΎΡΠΈΡΠ΅ΡΠΊΠΈ ΠΏΡΠΈΡΠΈΠ½ΠΈ, Π½ΠΈΡΠΎ Π½Π΅ ΠΏΡΠ°Π²ΠΈ" -#: builtin/am.c:2264 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "Π΄Π° ΡΠ΅ ΠΏΡΠ΅ΠΌΠΈΠ½Π°Π²Π° ΠΊΡΠΌ ΡΡΠΎΠΉΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ ΠΏΡΠΈ Π½ΡΠΆΠ΄Π°." -#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ" -#: builtin/am.c:2267 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠ΅Π΄ Π·Π° ΠΏΠΎΠ΄ΠΏΠΈΡ βSigned-off-byβ Π² ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/am.c:2270 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "ΠΏΡΠ΅ΠΊΠΎΠ΄ΠΈΡΠ°Π½Π΅ Π² UTF-8 (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ)" -#: builtin/am.c:2272 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° ΠΎΠΏΡΠΈΡΡΠ° β-kβ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-mailinfoβ" -#: builtin/am.c:2274 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° ΠΎΠΏΡΠΈΡΡΠ° β-bβ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-mailinfoβ" -#: builtin/am.c:2276 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° ΠΎΠΏΡΠΈΡΡΠ° β-mβ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-mailinfoβ" -#: builtin/am.c:2278 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° ΠΎΠΏΡΠΈΡΡΠ° β--keep-crβ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-mailsplitβ Π·Π° ΡΠΎΡΠΌΠ°Ρ βmboxβ" -#: builtin/am.c:2281 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "Π±Π΅Π· ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° ΠΎΠΏΡΠΈΡΡΠ° β--keep-crβ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-mailsplitβ Π½Π΅Π·Π°Π²ΠΈΡΠΈΠΌΠΎ " "ΠΎΡ βam.keepcrβ" -#: builtin/am.c:2284 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "ΠΏΡΠΎΠΏΡΡΠΊΠ°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΎ ΠΏΡΠ΅Π΄ΠΈ ΡΠ΅Π΄Π° Π·Π° ΠΎΡΡΡΠ·Π²Π°Π½Π΅" -#: builtin/am.c:2285 builtin/apply.c:4554 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅" -#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295 -#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 -#: builtin/am.c:2313 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "ΠΏΡΠ΅ΠΊΠ°ΡΠ²Π°Π½Π΅ ΠΏΡΠ΅Π· βgit-applyβ" -#: builtin/am.c:2294 builtin/apply.c:4578 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "ΠΠΠ§ΠΠΠΠ_ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516 -#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93 -#: builtin/pull.c:167 builtin/submodule--helper.c:78 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "ΠΏΡΡ" -#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 #: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "ΠΠ ΠΠ" -#: builtin/am.c:2306 builtin/apply.c:4522 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "ΠΠ ΠΠ" -#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "Π€ΠΠ ΠΠΠ’" -#: builtin/am.c:2310 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "ΡΠΎΡΠΌΠ°Ρ Π½Π° ΠΊΡΡΠΏΠΊΠΈΡΠ΅" -#: builtin/am.c:2316 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "ΠΈΠ·Π±ΡΠ°Π½ΠΎ ΠΎΡ Π²Π°Ρ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π·Π° Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠΈ" -#: builtin/am.c:2318 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠ°Π²Π°Π½Π΅ Π½Π° ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ΡΠΎ Π½Π° ΠΊΡΡΠΏΠΊΠΈ ΡΠ»Π΅Π΄ ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡ" -#: builtin/am.c:2321 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌΠΈ Π½Π° β--continueβ" -#: builtin/am.c:2324 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "ΠΏΡΠ΅ΡΠΊΠ°ΡΠ°Π½Π΅ Π½Π° ΡΠ΅ΠΊΡΡΠ°ΡΠ° ΠΊΡΡΠΏΠΊΠ°" -#: builtin/am.c:2327 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" "Π²ΡΠ·ΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎΡΠΎ ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½Π° ΠΈ ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° " "ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ΡΠΎ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ°." -#: builtin/am.c:2331 +#: builtin/am.c:2316 msgid "lie about committer date" -msgstr "Π΄Π°ΡΠ° Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΡΠ°Π·Π»ΠΈΡΠ½Π° ΠΎΡ ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎΡΠ°" +msgstr "Π΄Π°ΡΠ° Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΡΠ°Π·Π»ΠΈΡΠ½Π° ΠΎΡ ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½Π°ΡΠ°" -#: builtin/am.c:2333 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠ΅ΠΊΡΡΠΎΡΠΎ Π²ΡΠ΅ΠΌΠ΅ ΠΊΠ°ΡΠΎ ΡΠΎΠ²Π° Π·Π° Π°Π²ΡΠΎΡ" -#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "ΠΠΠΠΠ’ΠΠ€ΠΠΠΠ’ΠΠ _ΠΠ_ΠΠΠΠ§" -#: builtin/am.c:2336 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡΡΠ° Ρ GPG" -#: builtin/am.c:2339 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(ΠΏΠΎΠ»Π·Π²Π° ΡΠ΅ Π²ΡΡΡΠ΅ΡΠ½ΠΎ Π·Π° βgit-rebaseβ)" -#: builtin/am.c:2354 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2872,18 +3278,18 @@ msgstr "" "ΠΠΏΡΠΈΠΈΡΠ΅ β-bβ/β--binaryβ ΠΎΡΠ΄Π°Π²Π½Π° Π½Π΅ ΠΏΡΠ°Π²ΡΡ Π½ΠΈΡΠΎ ΠΈ\n" "ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΏΡΠ΅ΠΌΠ°Ρ
Π½Π°ΡΠΈ Π² Π±ΡΠ΄Π΅ΡΠ΅. ΠΠ΅ Π³ΠΈ ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅." -#: builtin/am.c:2361 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/am.c:2376 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "ΠΏΡΠ΅Π΄ΠΈΡΠ½Π°ΡΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π·Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ β%sβ Π²ΡΠ΅ ΠΎΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°, Π° Π΅ Π·Π°Π΄Π°Π΄Π΅Π½ " "ΡΠ°ΠΉΠ» βmboxβ." -#: builtin/am.c:2400 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2892,7 +3298,7 @@ msgstr "" "ΠΡΠΊΡΠΈΡΠ° Π΅ ΠΈΠ·Π»ΠΈΡΠ½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ β%sβ.\n" "ΠΠΎΠΆΠ΅ΡΠ΅ Π΄Π° Ρ ΠΈΠ·ΡΡΠΈΠ΅ΡΠ΅ Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit am --abortβ." -#: builtin/am.c:2406 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "Π ΠΌΠΎΠΌΠ΅Π½ΡΠ° Π½Π΅ ΡΠ΅ΡΠ΅ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΏΠΎ ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°Π½Π΅ ΠΈ Π½ΡΠΌΠ° ΠΊΠ°ΠΊ Π΄Π° ΡΠ΅ ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠΈ." @@ -2925,45 +3331,45 @@ msgstr "Π Π΅Π³ΡΠ»ΡΡΠ½ΠΈΡΡ ΠΈΠ·ΡΠ°Π· Π²ΡΡΠ½Π° %d ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π΄Π΅Π½Π° msgid "unable to find filename in patch at line %d" msgstr "ΠΠΈΠΏΡΠ²Π° ΠΈΠΌΠ΅ Π½Π° ΡΠ°ΠΉΠ» Π½Π° ΡΠ΅Π΄ %d ΠΎΡ ΠΊΡΡΠΏΠΊΠ°ΡΠ°" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: Π»ΠΎΡ ΠΈΠ·Ρ
ΠΎΠ΄ ΠΎΡ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-diffβ β Π½Π° ΡΠ΅Π΄ %2$d ΡΠ΅ ΠΎΡΠ°ΠΊΠ²Π°ΡΠ΅ β/dev/" "nullβ, Π° Π±Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ β%1$sβ" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: Π»ΠΎΡ ΠΈΠ·Ρ
ΠΎΠ΄ ΠΎΡ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-diffβ β Π½Π° ΡΠ΅Π΄ %d Π±Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ " "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° Π½ΠΎΠ² ΡΠ°ΠΉΠ»" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: Π»ΠΎΡ ΠΈΠ·Ρ
ΠΎΠ΄ ΠΎΡ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-diffβ β Π½Π° ΡΠ΅Π΄ %d Π±Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ " "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΡΡΠ°Ρ ΡΠ°ΠΉΠ»" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "ΠΏΡΠΈ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎΡΠΎ ΠΏΡΠ΅Π±ΡΠΎΡΠ²Π°Π½Π΅ Π±Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ Π½Π΅ΠΎΡΠ°ΠΊΠ²Π°Π½ ΡΠ΅Π΄: β%.*sβ" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "ΡΠ°ΡΡ ΠΎΡ ΠΊΡΡΠΏΠΊΠ° Π±Π΅Π· Π·Π°Π³Π»Π°Π²Π½Π° ΡΠ°ΡΡ Π½Π° ΡΠ΅Π΄ %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2978,65 +3384,65 @@ msgstr[1] "" "Π‘Π»Π΅Π΄ ΡΡΠΊΡΠ°ΡΠ°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΡΡΠ²ΠΈΡΠ΅ %d ΡΠ°ΡΡΠΈ ΠΎΡ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½ΡΠΈΡΠ΅ Π½Π° ΠΏΡΡΡ, Π² Π·Π°Π³Π»Π°Π²Π½Π°ΡΠ° " "ΡΠ°ΡΡ Π½Π° βgit diffβ Π»ΠΈΠΏΡΠ²Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΠΈΠΌΠ΅ Π½Π° ΡΠ°ΠΉΠ» (ΡΠ΅Π΄: %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "Π½ΠΎΠ²ΠΈΡΡ ΡΠ°ΠΉΠ» Π·Π°Π²ΠΈΡΠΈ ΠΎΡ ΡΡΠ°ΡΠΎΡΠΎ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ Π½Π° ΡΠ°ΠΉΠ»Π°" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "ΠΈΠ·ΡΡΠΈΡΠΈΡΡ ΡΠ°ΠΉΠ» Π½Π΅ Π΅ ΠΏΡΠ°Π·Π΅Π½" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "Π³ΡΠ΅ΡΠΊΠ° Π² ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π½Π° ΡΠ΅Π΄ %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "Π½ΠΎΠ²ΠΈΡΡ ΡΠ°ΠΉΠ» β%sβ Π·Π°Π²ΠΈΡΠΈ ΠΎΡ ΡΡΠ°ΡΠΎΡΠΎ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ Π½Π° ΡΠ°ΠΉΠ»Π°" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "ΠΈΠ·ΡΡΠΈΡΠΈΡΡ ΡΠ°ΠΉΠ» β%sβ Π½Π΅ Π΅ ΠΏΡΠ°Π·Π΅Π½" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "β ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: ΡΠ°ΠΉΠ»ΡΡ β%sβ Π²Π΅ΡΠ΅ Π΅ ΠΏΡΠ°Π·Π΅Π½, Π½ΠΎ Π½Π΅ Π΅ ΠΈΠ·ΡΡΠΈΡ" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "Π³ΡΠ΅ΡΠΊΠ° Π² Π΄Π²ΠΎΠΈΡΠ½Π°ΡΠ° ΠΊΡΡΠΏΠΊΠ° Π½Π° ΡΠ΅Π΄ %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "Π½Π΅ΡΠ°Π·ΠΏΠΎΠ·Π½Π°ΡΠ° Π΄Π²ΠΎΠΈΡΠ½Π°ΡΠ° ΠΊΡΡΠΏΠΊΠ° Π½Π° ΡΠ΅Π΄ %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π΅ Ρ ΠΈΠ·ΡΡΠ»ΠΎ ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½ΠΈ Π΄Π°Π½Π½ΠΈ Π½Π° ΡΠ΅Π΄ %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "ΡΠΈΠΌΠ²ΠΎΠ»Π½Π°ΡΠ° Π²ΡΡΠ·ΠΊΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½Π°" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ Π½Π°ΡΠ°Π»ΠΎ Π½Π° ΡΠ΅Π΄: β%cβ" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -3045,13 +3451,13 @@ msgstr[0] "" msgstr[1] "" "%d-ΡΠΎ ΠΏΠ°ΡΡΠ΅ ΠΊΠΎΠ΄ Π±Π΅ ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½ΠΎ Π½Π° ΡΠ΅Π΄ %d (ΠΎΡΠΌΠ΅ΡΡΠ²Π°Π½Π΅ ΠΎΡ %d ΡΠ΅Π΄Π°)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "ΠΠΎΠ½ΡΠ΅ΠΊΡΡΡΡ Π΅ Π½Π°ΠΌΠ°Π»Π΅Π½ Π½Π° (%ld/%ld) Π·Π° ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΠ°ΡΡΠ΅ΡΠΎ ΠΊΠΎΠ΄ Π½Π° ΡΠ΅Π΄ %d" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3060,328 +3466,338 @@ msgstr "" "ΠΏΡΠΈ ΡΡΡΡΠ΅Π½Π΅ Π·Π°:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "Π»ΠΈΠΏΡΠ²Π°Ρ Π΄Π°Π½Π½ΠΈΡΠ΅ Π·Π° Π΄Π²ΠΎΠΈΡΠ½Π°ΡΠ° ΠΊΡΡΠΏΠΊΠ° Π·Π° β%sβ" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Π΄Π²ΠΎΠΈΡΠ½Π°ΡΠ° ΠΊΡΡΠΏΠΊΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½Π° Π²ΡΡΡ
Ρ β%sβ" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Π΄Π²ΠΎΠΈΡΠ½Π°ΡΠ° ΠΊΡΡΠΏΠΊΠ° Π·Π° β%sβ Π²ΠΎΠ΄ΠΈ Π΄ΠΎ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΈ ΡΠ΅Π·ΡΠ»ΡΠ°ΡΠΈ (ΠΎΡΠ°ΠΊΠ²Π°ΡΠ΅ ΡΠ΅ SHA1: " "β%sβ, Π° Π±Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ: β%sβ)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°: β%s:%ldβ" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·ΡΠ΅Π³Π»ΠΈ" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° β%sβ" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° β%sβ ΡΠ»Π΅Π΄ ΠΏΡΠΎΡΠ»Π΅Π΄ΡΠ²Π°Π½Π΅ Π½Π° ΡΠΈΠΌΠ²ΠΎΠ»Π½Π° Π²ΡΡΠ·ΠΊΠ°" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ Ρ ΠΏΡΡ β%sβ Π΅ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½ ΠΈΠ»ΠΈ ΠΈΠ·ΡΡΠΈΡ" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "β%sβ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "β%sβ: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "β%sβ Π½Π΅ ΡΡΠΎΡΠ²Π΅ΡΡΡΠ²Π° Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°ΡΠ°ΡΠ° ΠΊΡΡΠΏΠΊΠ° ΠΎΡΡΠ°Π²Ρ ΡΠ°ΠΉΠ»Π° Π½Π΅ΠΏΡΠ°Π·Π΅Π½" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "β%sβ: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ Π²ΠΈΠ΄" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "β%sβ Π΅ ΠΎΡ Π²ΠΈΠ΄ β%oβ, Π° ΡΠ΅ ΠΎΡΠ°ΠΊΠ²Π°ΡΠ΅ β%oβ" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΏΡΡ: β%sβ" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "β%sβ: Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "β%sβ: Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "Π½ΠΎΠ²ΠΈΡΠ΅ ΠΏΡΠ°Π²Π° Π·Π° Π΄ΠΎΡΡΡΠΏ (%o) Π½Π° β%sβ Π½Π΅ ΡΡΠ²ΠΏΠ°Π΄Π°Ρ ΡΡΡ ΡΡΠ°ΡΠΈΡΠ΅ (%o)" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "Π½ΠΎΠ²ΠΈΡΠ΅ ΠΏΡΠ°Π²Π° Π·Π° Π΄ΠΎΡΡΡΠΏ (%o) Π½Π° β%sβ Π½Π΅ ΡΡΠ²ΠΏΠ°Π΄Π°Ρ ΡΡΡ ΡΡΠ°ΡΠΈΡΠ΅ (%o) Π½Π° β%sβ" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "Π·Π°ΡΠ΅Π³Π½Π°ΡΠΈΡΡ ΡΠ°ΠΉΠ» β%sβ Π΅ ΡΠ»Π΅Π΄ ΡΠΈΠΌΠ²ΠΎΠ»Π½Π° Π²ΡΡΠ·ΠΊΠ°" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "ΠΡΡΠΏΠΊΠ°ΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½Π°" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "ΠΡΠΎΠ²Π΅ΡΡΠ²Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ° β%sββ¦" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Π·Π°ΠΏΠΈΡ Π² ΠΊΠ΅ΡΠ° ΡΡΠ΅Π· βmake_cache_entryβ Π·Π° β%sβ" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·Π²Π°Π΄ΠΈ ΠΎΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½Π° ΠΊΡΡΠΏΠΊΠ° Π·Π° ΠΌΠΎΠ΄ΡΠ»Π° β%sβ" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΠΎΠ»ΡΡΠΈ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΡΠ΅Π· βstatβ Π·Π° Π½ΠΎΠ²ΠΎΡΡΠ·Π΄Π°Π΄Π΅Π½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π·Π° ΡΡΠ·Π΄Π°Π΄Π΅ ΠΌΡΡΡΠΎΡΠΎ Π·Π° ΡΡΡ
ΡΠ°Π½Π΅Π½ΠΈΠ΅ Π½Π° Π½ΠΎΠ²ΠΎΡΡΠ·Π΄Π°Π΄Π΅Π½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈ Π·Π°ΠΏΠΈΡ Π² ΠΊΠ΅ΡΠ° Π·Π° β%sβ" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "Π·Π°ΡΠ²Π°ΡΡΠ½Π΅ Π½Π° ΡΠ°ΠΉΠ»Π° β%sβ" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π·Π°ΠΏΠΈΡΠ΅ Ρ ΡΠ΅ΠΆΠΈΠΌ Π½Π° Π΄ΠΎΡΡΡΠΏ β%oβ" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "ΠΡΡΠΏΠΊΠ°ΡΠ° β%sβ Π±Π΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½Π° ΡΠΈΡΡΠΎ." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "Π²ΡΡΡΠ΅ΡΠ½Π° Π³ΡΠ΅ΡΠΊΠ°" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, 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:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "ΡΡΠΊΡΠ°ΡΠ°Π²Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅ΡΠΎ Π½Π° ΡΠ°ΠΉΠ»Π° Ρ ΠΎΡΡ
Π²ΡΡΠ»Π΅Π½ΠΈΡΠ΅ ΠΏΠ°ΡΡΠ΅ΡΠ° Π½Π° β %.*s.rejβ" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-ΡΠΎ ΠΏΠ°ΡΡΠ΅ Π±Π΅ ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½ΠΎ." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "%d-ΡΠΎ ΠΏΠ°ΡΡΠ΅ Π±Π΅ ΠΎΡΡ
Π²ΡΡΠ»Π΅Π½ΠΎ." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "ΠΡΠΎΠΏΡΡΠ½Π°ΡΠ° ΠΊΡΡΠΏΠΊΠ°: β%sβ" + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "Π½Π΅ΠΏΠΎΠ·Π½Π°Ρ Π²Ρ
ΠΎΠ΄" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "ΠΈΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/apply.c:4517 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "Π±Π΅Π· ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈ Π½Π° Π΄Π°Π΄Π΅Π½ΠΈΡ ΠΏΡΡ" -#: builtin/apply.c:4520 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈ Π½Π° Π΄Π°Π΄Π΅Π½ΠΈΡ ΠΏΡΡ" -#: builtin/apply.c:4523 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ΠΏΡΠ΅ΠΌΠ°Ρ
Π²Π°Π½Π΅ Π½Π° ΡΠΎΠ·ΠΈ ΠΠ ΠΠ Π²ΠΎΠ΄Π΅ΡΠΈ Π΅Π»Π΅ΠΌΠ΅Π½ΡΠΈ ΠΎΡ ΠΏΡΡΠΈΡΠ°ΡΠ° Π² ΡΠ°Π·Π»ΠΈΠΊΠ°ΡΠ°" -#: builtin/apply.c:4526 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ΅Π΄ΠΎΠ²Π΅ΡΠ΅ Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈ ΠΎΡ ΡΠ°Π·ΠΈ ΠΊΡΡΠΏΠΊΠ°" -#: builtin/apply.c:4528 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ° Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ Π±Π΅Π· ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ°" -#: builtin/apply.c:4532 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π±ΡΠΎΡ Π½Π° Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈΡΠ΅ ΠΈ ΠΈΠ·ΡΡΠΈΡΠΈΡΠ΅ ΡΠ΅Π΄ΠΎΠ²Π΅" -#: builtin/apply.c:4534 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ° Π½Π° Π²Ρ
ΠΎΠ΄Π½ΠΈΡΠ΅ Π΄Π°Π½Π½ΠΈ Π±Π΅Π· ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ°" -#: builtin/apply.c:4536 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΊΠ° Π΄Π°Π»ΠΈ ΠΊΡΡΠΏΠΊΠ°ΡΠ° ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΈΠ»ΠΎΠΆΠΈ, Π±Π΅Π· Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»Π½ΠΎ ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅" -#: builtin/apply.c:4538 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΊΠ° Π΄Π°Π»ΠΈ ΠΊΡΡΠΏΠΊΠ°ΡΠ° ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½Π° ΠΊΡΠΌ ΡΠ΅ΠΊΡΡΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/apply.c:4540 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π±Π΅Π· ΠΏΡΠΎΠΌΡΠ½Π° Π½Π° ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/apply.c:4542 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°, ΠΊΠΎΡΡΠΎ ΠΏΡΠΎΠΌΠ΅Π½Ρ ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ ΠΈΠ·Π²ΡΠ½ ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/apply.c:4544 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½Π°. ΠΠΏΡΠΈΡΡΠ° ΡΠ΅ ΠΊΠΎΠΌΠ±ΠΈΠ½ΠΈΡΠ° Ρ β--checkβ/β--statβ/β--" "summaryβ" -#: builtin/apply.c:4546 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "ΠΏΡΠΎΠ±Π²Π°Π½Π΅ Ρ ΡΡΠΎΠΉΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅, Π°ΠΊΠΎ ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΈΠ»ΠΎΠΆΠΈ Π΄ΠΈΡΠ΅ΠΊΡΠ½ΠΎ" -#: builtin/apply.c:4548 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Π²ΡΠ΅ΠΌΠ΅Π½Π΅Π½ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π° Π±Π°Π·Π° Π½Π° Π²ΠΊΠ»ΡΡΠ΅Π½Π°ΡΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "ΡΠ°Π·Π΄Π΅Π»ΡΠ½Π΅ Π½Π° ΠΏΡΡΠΈΡΠ°ΡΠ° Ρ Π½ΡΠ»Π΅Π²ΠΈΡ Π·Π½Π°ΠΊ βNULβ" -#: builtin/apply.c:4553 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "Π΄Π° ΡΠ΅ ΠΎΡΠΈΠ³ΡΡΠΈ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡ ΠΎΡ ΠΏΠΎΠ½Π΅ ΡΠ°ΠΊΡΠ² ΠΠ ΠΠ ΡΡΠ²ΠΏΠ°Π΄Π°ΡΠΈ ΡΠ΅Π΄ΠΎΠ²Π΅" -#: builtin/apply.c:4555 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "Π·Π°ΡΠΈΡΠ°Π½Π΅ Π½Π° Π½ΠΎΠ²ΠΈ ΠΈΠ»ΠΈ ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΈ ΡΠ΅Π΄ΠΎΠ²Π΅ Ρ Π³ΡΠ΅ΡΠΊΠΈ Π² Π·Π½Π°ΡΠΈΡΠ΅ Π·Π° ΠΈΠ½ΡΠ΅ΡΠ²Π°Π»ΠΈ" -#: builtin/apply.c:4558 builtin/apply.c:4561 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "" "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ Π² Π·Π½Π°ΡΠΈΡΠ΅ Π·Π° ΠΈΠ½ΡΠ΅ΡΠ²Π°Π»ΠΈ ΠΏΡΠΈ ΠΎΡΠΊΡΠΈΠ²Π°Π½Π΅ Π½Π° ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" -#: builtin/apply.c:4564 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π² ΠΎΠ±ΡΠ°ΡΠ½Π° ΠΏΠΎΡΠΎΠΊΠ°" -#: builtin/apply.c:4566 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "Π±Π΅Π· ΠΈΠ·ΠΈΡΠΊΠ²Π°Π½Π΅ Π½Π° Π΄ΠΎΡΠΈ ΠΈ Π΅Π΄ΠΈΠ½ ΡΠ΅Π΄ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡ" -#: builtin/apply.c:4568 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "ΠΎΡΡΠ°Π²ΡΠ½Π΅ Π½Π° ΠΎΡΡ
Π²ΡΡΠ»Π΅Π½ΠΈΡΠ΅ ΠΏΠ°ΡΡΠ΅ΡΠ° Π²ΡΠ² ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Ρ ΡΠ°Π·ΡΠΈΡΠ΅Π½ΠΈΠ΅ β.rejβ" -#: builtin/apply.c:4570 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "ΠΏΠΎΠ·Π²ΠΎΠ»ΡΠ²Π°Π½Π΅ Π½Π° Π·Π°ΡΡΡΠΏΠ²Π°ΡΠΈ ΡΠ΅ ΠΏΠ°ΡΡΠ΅ΡΠ°" -#: builtin/apply.c:4573 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "ΠΏΡΠ΅Π½Π΅Π±ΡΠ΅Π³Π²Π°Π½Π΅ Π½Π° Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ Π»ΠΈΠΏΡΠ²Π°Ρ Π·Π½Π°ΠΊ Π·Π° Π½ΠΎΠ² ΡΠ΅Π΄ Π² ΠΊΡΠ°Ρ Π½Π° ΡΠ°ΠΉΠ»" -#: builtin/apply.c:4576 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "Π±Π΅Π· Π΄ΠΎΠ²Π΅ΡΡΠ²Π°Π½Π΅ Π½Π° Π½ΠΎΠΌΠ΅ΡΠ°ΡΠ° Π½Π° ΡΠ΅Π΄ΠΎΠ²Π΅ΡΠ΅ Π² Π·Π°Π³Π»Π°Π²Π½ΠΈΡΠ΅ ΡΠ°ΡΡΠΈ Π½Π° ΠΏΠ°ΡΡΠ΅ΡΠ°ΡΠ°" -#: builtin/apply.c:4579 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠ°Π·ΠΈ ΠΠΠ§ΠΠΠΠ_ΠΠΠ ΠΠΠ’ΠΠ ΠΠ― ΠΊΡΠΌ ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/apply.c:4601 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "ΠΊΠ°ΡΠΎ β--3wayβ, Π½ΠΎ ΠΈΠ·Π²ΡΠ½ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/apply.c:4609 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "ΠΊΠ°ΡΠΎ β--indexβ, Π½ΠΎ ΠΈΠ·Π²ΡΠ½ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/apply.c:4612 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "ΠΊΠ°ΡΠΎ β--cachedβ, Π½ΠΎ ΠΈΠ·Π²ΡΠ½ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/apply.c:4631 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "ΠΊΡΡΠΏΠΊΠ°ΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½Π°" -#: builtin/apply.c:4645 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "ΠΏΡΠ΅Π½Π΅Π±ΡΠ΅Π³Π½Π°ΡΠ° Π΅ %d Π³ΡΠ΅ΡΠΊΠ° Π² Π·Π½Π°ΡΠΈΡΠ΅ Π·Π° ΠΈΠ½ΡΠ΅ΡΠ²Π°Π»ΠΈ" msgstr[1] "ΠΏΡΠ΅Π½Π΅Π±ΡΠ΅Π³Π½Π°ΡΠΈ ΡΠ° %d Π³ΡΠ΅ΡΠΊΠΈ Π² Π·Π½Π°ΡΠΈΡΠ΅ Π·Π° ΠΈΠ½ΡΠ΅ΡΠ²Π°Π»ΠΈ" -#: builtin/apply.c:4651 builtin/apply.c:4661 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3436,120 +3852,128 @@ msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" "ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ βBISECT_HEADβ Π²ΠΌΠ΅ΡΡΠΎ Π΄Π° ΡΠ΅ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π° ΡΠ΅ΠΊΡΡΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/blame.c:32 +#: builtin/blame.c:33 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ΠΠΠ¦ΠΠ―β¦] [ΠΠΠ¦ΠΠ―_ΠΠ_ΠΠΠ Π‘ΠΠ―Π’Πβ¦] [ΠΠΠ Π‘ΠΠ―] [--] Π€ΠΠΠ" -#: builtin/blame.c:37 +#: builtin/blame.c:38 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ΠΠΠ¦ΠΠΡΠ΅_ΠΠ_ΠΠΠ Π‘ΠΠ―Π’Π ΡΠ° Π΄ΠΎΠΊΡΠΌΠ΅Π½ΡΠΈΡΠ°Π½ΠΈ Π² ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ git-rev-list(1)" -#: builtin/blame.c:2519 +#: builtin/blame.c:1782 +msgid "Blaming lines" +msgstr "ΠΠ½ΠΎΡΠΈΡΠ°Π½ΠΈ ΡΠ΅Π΄ΠΎΠ²Π΅" + +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π°Π½ΠΎΡΠ°ΡΠΈΠΈΡΠ΅ Ρ Π½Π°ΠΌΠΈΡΠ°Π½Π΅ΡΠΎ ΠΈΠΌ, ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»Π½ΠΎ" # FIXME SHA-1 -> SHA1 -#: builtin/blame.c:2520 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΡΠ°Π·Π½ΠΈ ΡΡΠΌΠΈ ΠΏΠΎ SHA1 Π·Π° Π³ΡΠ°Π½ΠΈΡΠ½ΠΈΡΠ΅ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΎΠΏΡΠΈΡΡΠ° " "Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½Π°)" -#: builtin/blame.c:2521 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "ΠΠ°ΡΠ°Π»Π½ΠΈΡΠ΅ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ Π΄Π° Π½Π΅ ΡΠ΅ ΡΡΠΈΡΠ°Ρ Π·Π° Π³ΡΠ°Π½ΠΈΡΠ½ΠΈ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΎΠΏΡΠΈΡΡΠ° Π΅ " "ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½Π°)" -#: builtin/blame.c:2522 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ° Π·Π° ΠΈΠ·Π²ΡΡΡΠ΅Π½ΠΈΡΠ΅ Π΄Π΅ΠΉΡΡΠ²ΠΈΡ" -#: builtin/blame.c:2523 +#: builtin/blame.c:2535 +msgid "Force progress reporting" +msgstr "ΠΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ°" + +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π΄ΠΎΠΏΡΠ»Π½ΠΈΡΠ΅Π»Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΠΎΠΏΡΠ΅Π΄Π΅Π»ΡΠ½Π΅ΡΠΎ Π½Π° Π°Π½ΠΎΡΠ°ΡΠΈΠΈΡΠ΅" -#: builtin/blame.c:2524 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "" "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎΡΠΎ ΠΈΠΌΠ΅ Π½Π° ΡΠ°ΠΉΠ» (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΡΠΎΠ²Π° Π΅ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎ)" -#: builtin/blame.c:2525 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "" "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΈΡΡ Π½ΠΎΠΌΠ΅Ρ Π½Π° ΡΠ΅Π΄ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΎΠΏΡΠΈΡΡΠ° Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½Π°)" -#: builtin/blame.c:2526 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π²ΡΠ² ΡΠΎΡΠΌΠ°Ρ Π·Π° ΠΏΠΎ-Π½Π°ΡΠ°ΡΡΡΠ½Π° ΠΎΠ±ΡΠ°Π±ΠΎΡΠΊΠ°" -#: builtin/blame.c:2527 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "" "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π²ΡΠ² ΡΠΎΡΠΌΠ°Ρ Π·Π° ΠΊΠΎΠΌΠ°Π½Π΄ΠΈ ΠΎΡ ΠΏΠΎΡΡΠ΅Π±ΠΈΡΠ΅Π»ΡΠΊΠΎ Π½ΠΈΠ²ΠΎ Ρ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π½Π° Π²ΡΠ΅ΠΊΠΈ " "ΡΠ΅Π΄" -#: builtin/blame.c:2528 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΡΡΠΈΡ ΡΠΎΡΠΌΠ°Ρ ΠΊΠ°ΡΠΎ βgit-annotateβ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΎΠΏΡΠΈΡΡΠ° Π΅ " "ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½Π°)" -#: builtin/blame.c:2529 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π΅ΡΠΎΡΠΌΠ°ΡΠΈΡΠ°Π½ΠΈ Π²ΡΠ΅ΠΌΠ΅Π½Π° (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΎΠΏΡΠΈΡΡΠ° Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½Π°)" -#: builtin/blame.c:2530 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΡΠ»Π½ΠΈΡΠ΅ ΡΡΠΌΠΈ ΠΏΠΎ SHA1 (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΎΠΏΡΠΈΡΡΠ° Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½Π°)" -#: builtin/blame.c:2531 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "ΠΠ΅Π· ΠΈΠΌΠ΅ Π½Π° Π°Π²ΡΠΎΡ ΠΈ Π²ΡΠ΅ΠΌΠ΅ Π½Π° ΠΏΡΠΎΠΌΡΠ½Π° (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΎΠΏΡΠΈΡΡΠ° Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½Π°)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "" "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π΅-ΠΏΠΎΡΠ°ΡΠ° Π½Π° Π°Π²ΡΠΎΡΠ°, Π° Π½Π΅ ΠΈΠΌΠ΅ΡΠΎ ΠΌΡ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΎΠΏΡΠΈΡΡΠ° Π΅ " "ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½Π°)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "ΠΠ΅Π· ΡΠ°Π·Π»ΠΈΠΊΠΈ Π² Π·Π½Π°ΡΠΈΡΠ΅ Π·Π° ΠΈΠ½ΡΠ΅ΡΠ²Π°Π»ΠΈ" -#: builtin/blame.c:2534 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "ΠΠΎΠΏΡΠ»Π½ΠΈΡΠ΅Π»Π½ΠΈ ΠΈΠ·ΡΠΈΡΠ»Π΅Π½ΠΈΡ Π·Π° ΠΏΠΎ-Π΄ΠΎΠ±ΡΠΈ ΡΠ΅Π·ΡΠ»ΡΠ°ΡΠΈ" -#: builtin/blame.c:2535 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "ΠΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° Π²Π΅ΡΡΠΈΠΈΡΠ΅ ΠΎΡ Π€ΠΠΠ, Π° Π½Π΅ ΡΡΠ΅Π· ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° βgit-rev-listβ" -#: builtin/blame.c:2536 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° Π€ΠΠΠΠ° ΠΊΠ°ΡΠΎ ΠΊΡΠ°ΠΉΠ½ΠΎ ΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅" -#: builtin/blame.c:2537 builtin/blame.c:2538 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "Π½Π°ΠΏΠ°ΡΠ²Π°Π½Π΅ Π½Π° ΡΠ΅Π΄ΠΎΠ²Π΅ΡΠ΅" -#: builtin/blame.c:2537 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "" "Π’ΡΡΡΠ΅Π½Π΅ Π½Π° ΠΊΠΎΠΏΠΈΡΠ°Π½ΠΈ ΡΠ΅Π΄ΠΎΠ²Π΅ ΠΊΠ°ΠΊΡΠΎ Π² ΡΠ°ΠΌΠΊΠΈΡΠ΅ Π½Π° Π΅Π΄ΠΈΠ½ ΡΠ°ΠΉΠ», ΡΠ°ΠΊΠ° ΠΈ ΠΎΡ Π΅Π΄ΠΈΠ½ ΡΠ°ΠΉΠ» " "ΠΊΡΠΌ Π΄ΡΡΠ³" -#: builtin/blame.c:2538 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "" "Π’ΡΡΡΠ΅Π½Π΅ Π½Π° ΠΏΡΠ΅ΠΌΠ΅ΡΡΠ΅Π½ΠΈ ΡΠ΅Π΄ΠΎΠ²Π΅ ΠΊΠ°ΠΊΡΠΎ Π² ΡΠ°ΠΌΠΊΠΈΡΠ΅ Π½Π° Π΅Π΄ΠΈΠ½ ΡΠ°ΠΉΠ», ΡΠ°ΠΊΠ° ΠΈ ΠΎΡ Π΅Π΄ΠΈΠ½ " "ΡΠ°ΠΉΠ» ΠΊΡΠΌ Π΄ΡΡΠ³" -#: builtin/blame.c:2539 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2539 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "" "ΠΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΠ°ΠΌΠΎ Π·Π° ΡΠ΅Π΄ΠΎΠ²Π΅ΡΠ΅ Π² ΠΈΠ½ΡΠ΅ΡΠ²Π°Π»Π° ΠΎΡ n Π΄ΠΎ m Π²ΠΊΠ»ΡΡΠΈΡΠ΅Π»Π½ΠΎ. ΠΡΠΎΠ΅Π½Π΅ΡΠΎ " @@ -3561,31 +3985,31 @@ 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:2620 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "ΠΏΡΠ΅Π΄ΠΈ 4 Π³ΠΎΠ΄ΠΈΠ½ΠΈ ΠΈ 11 ΠΌΠ΅ΡΠ΅ΡΠ°" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [ΠΠΠ¦ΠΠ―β¦] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [ΠΠΠ¦ΠΠ―β¦] [-l] [-f] ΠΠΠ_ΠΠ_ΠΠΠΠ [ΠΠΠ§ΠΠΠ]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [ΠΠΠ¦ΠΠ―β¦] [-r] (-d | -D) ΠΠΠ_ΠΠ_ΠΠΠΠβ¦" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [ΠΠΠ¦ΠΠ―β¦] (-m | -M) [Π‘Π’ΠΠ _ΠΠΠΠ] ΠΠΠ_ΠΠΠΠ" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [ΠΠΠ¦ΠΠ―β¦] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3594,7 +4018,7 @@ msgstr "" "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½Π° β%sβ, ΠΊΠΎΠΉΡΠΎ Π΅ ΡΠ»ΡΡ ΠΊΡΠΌ β%sβ,\n" " Π½ΠΎ ΠΎΡΠ΅ Π½Π΅ Π΅ ΡΠ»ΡΡ ΠΊΡΠΌ Π²ΡΡΡ
Π° βHEADβ." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3603,12 +4027,12 @@ msgstr "" "ΠΎΡΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½Π° β%sβ, ΠΊΠΎΠΉΡΠΎ Π½Π΅ Π΅ ΡΠ»ΡΡ ΠΊΡΠΌ\n" " β%sβ, Π½ΠΎ Π΅ ΡΠ»ΡΡ ΠΊΡΠΌ Π²ΡΡΡ
Π° βHEADβ." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "ΠΠ±Π΅ΠΊΡΡΡ-ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π·Π° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡ" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3617,301 +4041,322 @@ msgstr "" "ΠΠ»ΠΎΠ½ΡΡ β%sβ Π½Π΅ Π΅ ΡΠ»ΡΡ Π½Π°ΠΏΡΠ»Π½ΠΎ. ΠΠΊΠΎ ΡΡΠ΅ ΡΠΈΠ³ΡΡΠ½ΠΈ, ΡΠ΅ ΠΈΡΠΊΠ°ΡΠ΅\n" "Π΄Π° Π³ΠΎ ΠΈΠ·ΡΡΠΈΠ΅ΡΠ΅, ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ βgit branch -D %sβ." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π½ΠΈΡ ΡΠ°ΠΉΠ»" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "ΠΠΏΡΠΈΡΡΠ° β-aβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ ΠΎΠΏΡΠΈΡΡΠ° β-dβ" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "ΠΠ±Π΅ΠΊΡΡΡ-ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅, ΡΠΎΡΠ΅Π½ ΠΎΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ βHEADβ, Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡ" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΈΠ·ΡΡΠΈΠ΅ΡΠ΅ ΡΠ΅ΠΊΡΡΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ" +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΈΠ·ΡΡΠΈΠ΅ΡΠ΅ ΠΊΠ»ΠΎΠ½Π° β%sβ, ΠΊΠΎΠΉΡΠΎ Π΅ ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½ Π² ΠΏΡΡΡ β%sβ" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "ΡΠ»Π΅Π΄ΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡ." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "ΠΊΠ»ΠΎΠ½ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡ." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "ΠΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΡΠ»Π΅Π΄ΡΡΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "ΠΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΠΊΠ»ΠΎΠ½Π° β%sβ" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "ΠΠ·ΡΡΠΈΡ ΡΠ»Π΅Π΄ΡΡ ΠΊΠ»ΠΎΠ½ β%sβ (ΡΠΎΠΉ ΡΠΎΡΠ΅ΡΠ΅ ΠΊΡΠΌ β%sβ).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "ΠΠ·ΡΡΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ (ΡΠΎΠΉ ΡΠΎΡΠ΅ΡΠ΅ ΠΊΡΠΌ β%sβ).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: ΠΈΠ·ΡΡΠΈΡ]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: Π½Π°Π·Π°Π΄ Ρ %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[Π½Π°Π·Π°Π΄ Ρ %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: Π½Π°ΠΏΡΠ΅Π΄ Ρ %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[Π½Π°ΠΏΡΠ΅Π΄ Ρ %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: Π½Π°ΠΏΡΠ΅Π΄ Ρ %d, Π½Π°Π·Π°Π΄ Ρ %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[Π½Π°ΠΏΡΠ΅Π΄ Ρ %d, Π½Π°Π·Π°Π΄ Ρ %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " βββ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠΊΠ°Π·Π°ΡΠ΅Π» βββ" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½, ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π½Π° β%sβ)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½, Π΄Π²ΠΎΠΈΡΠ½ΠΎ ΡΡΡΡΠ΅Π½Π΅ ΠΎΡ β%sβ)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π΅ Π΅ ΡΠ²ΡΡΠ·Π°Π½ ΠΈ Π΅ ΠΏΡΠΈ β%sβ)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π΅ Π΅ ΡΠ²ΡΡΠ·Π°Π½ ΠΈ Π΅ ΠΎΡΠ΄Π΅Π»Π΅ΜΠ½ ΠΎΡ β%sβ" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "ΠΠ»ΠΎΠ½ΡΡ β%sβ ΡΠ΅ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ° Π²ΡΡΡ
Ρ β%sβ" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "Π’ΡΡΡΠΈ ΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎ Π² ΠΊΠ»ΠΎΠ½Π° β%sβ ΠΏΡΠΈ β%sβ" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "" "Π½Π΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°ΡΠ΅ ΡΠ΅ΠΊΡΡΠΈΡ ΠΊΠ»ΠΎΠ½, Π·Π°ΡΠΎΡΠΎ ΡΡΠ΅ ΠΈΠ·Π²ΡΠ½ ΠΊΠΎΠΉΡΠΎ ΠΈ Π΄Π° Π΅ ΠΊΠ»ΠΎΠ½" -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½: β%sβ" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "ΠΠ° ΠΊΠ»ΠΎΠ½Π° Ρ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ β%sβ Π΅ Π΄Π°Π΄Π΅Π½ΠΎ ΡΠ»ΡΠΆΠ΅Π±Π½ΠΎ ΠΈΠΌΠ΅" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "ΠΠ»ΠΎΠ½ΡΡ Π΅ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½ Π½Π° β%sβ, Π½ΠΎ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π΅ Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "ΠΠ»ΠΎΠ½ΡΡ Π΅ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½, Π½ΠΎ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π½ΠΈΡΡ ΡΠ°ΠΉΠ» Π½Π΅ Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½" -#: builtin/branch.c:587 -#, c-format -msgid "could not write branch description template: %s" -msgstr "ΡΠ°Π±Π»ΠΎΠ½ΡΡ Π·Π° ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½ Π½Π΅ Π±Π΅ Π·Π°ΠΏΠΈΡΠ°Π½: β%sβ" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "ΡΠ°Π±Π»ΠΎΠ½ΡΡ Π·Π° ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½ Π½Π΅ Π±Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/branch.c:616 +#: builtin/branch.c:651 msgid "Generic options" msgstr "ΠΠ±ΡΠΈ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ" -#: builtin/branch.c:618 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Ρ
Π΅ΡΠ° ΠΈ ΡΠ΅ΠΌΠ°ΡΠ°. ΠΠΎΠ²ΡΠ°ΡΡΠ½Π΅ΡΠΎ Π½Π° ΠΎΠΏΡΠΈΡΡΠ° ΠΏΡΠΈΠ±Π°Π²Ρ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΠ΅ ΠΊΠ»ΠΎΠ½ΠΈ" -#: builtin/branch.c:619 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "Π±Π΅Π· ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΎΠ½Π½ΠΈ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΡ" -#: builtin/branch.c:620 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΡΠ΅ΠΆΠΈΠΌΠ° Π½Π° ΡΠ»Π΅Π΄Π΅Π½Π΅ (Π²ΠΈΠΆ git-pull(1))" -#: builtin/branch.c:622 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "ΡΠΌΡΠ½Π° Π½Π° ΡΠ»Π΅Π΄Π΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½" -#: builtin/branch.c:626 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "ΠΊΠ»ΠΎΠ½-ΠΈΠ·ΡΠΎΡΠ½ΠΈΠΊ" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "ΡΠΌΡΠ½Π° Π½Π° ΠΊΠ»ΠΎΠ½Π°-ΠΈΠ·ΡΠΎΡΠ½ΠΈΠΊ" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "ΡΠ²Π΅ΡΠ΅Π½ ΠΈΠ·Ρ
ΠΎΠ΄" -#: builtin/branch.c:627 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ Π²ΡΡΡ
Ρ ΡΠ»Π΅Π΄ΡΡΠΈΡΠ΅ ΠΊΠ»ΠΎΠ½ΠΈ" -#: builtin/branch.c:629 builtin/branch.c:630 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" -msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΡΠ΄ΡΡΠΆΠ°Ρ ΡΠΎΠ²Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" +msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΡΠ΄ΡΡΠΆΠ°Ρ ΡΠΎΠ²Π° ΠΠΠΠΠΠΠΠ" -#: builtin/branch.c:633 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Π‘ΠΏΠ΅ΡΠΈΠ°Π»Π½ΠΈ Π΄Π΅ΠΉΡΡΠ²ΠΈΡ Π½Π° βgit-branchβ:" -#: builtin/branch.c:634 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΠΊΠ°ΠΊΡΠΎ Π½Π° ΡΠ»Π΅Π΄ΡΡΠΈΡΠ΅, ΡΠ°ΠΊΠ° ΠΈ Π½Π° Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΠΊΠ»ΠΎΠ½ΠΈ" -#: builtin/branch.c:636 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈ, ΠΊΠΎΠΈΡΠΎ ΡΠ° Π½Π°ΠΏΡΠ»Π½ΠΎ ΡΠ»Π΅ΡΠΈ" -#: builtin/branch.c:637 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ ΠΈ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈ, ΠΊΠΎΠΈΡΠΎ Π½Π΅ ΡΠ° Π½Π°ΠΏΡΠ»Π½ΠΎ ΡΠ»Π΅ΡΠΈ" -#: builtin/branch.c:638 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "" "ΠΏΡΠ΅ΠΌΠ΅ΡΡΠ²Π°Π½Π΅/ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½ ΠΈ ΠΏΡΠΈΠ½Π°Π΄Π»Π΅ΠΆΠ°ΡΠΈΡΡ ΠΌΡ ΠΆΡΡΠ½Π°Π» Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅" -#: builtin/branch.c:639 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "ΠΏΡΠ΅ΠΌΠ΅ΡΡΠ²Π°Π½Π΅/ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½, Π΄ΠΎΡΠΈ Π°ΠΊΠΎ ΠΈΠΌΠ° Π²Π΅ΡΠ΅ ΠΊΠ»ΠΎΠ½ Ρ ΡΠ°ΠΊΠΎΠ²Π° ΠΈΠΌΠ΅" -#: builtin/branch.c:640 +#: builtin/branch.c:675 msgid "list branch names" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅" -#: builtin/branch.c:641 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΆΡΡΠ½Π°Π»Π° Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½Π°" -#: builtin/branch.c:643 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° ΠΊΠ»ΠΎΠ½Π°" -#: builtin/branch.c:644 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅, ΠΏΡΠ΅ΠΌΠ΅ΡΡΠ²Π°Π½Π΅, ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅, ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅" -#: builtin/branch.c:645 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠ»Π΅ΡΠΈΡΠ΅ ΠΊΠ»ΠΎΠ½ΠΈ" -#: builtin/branch.c:646 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈΡΠ΅ ΠΊΠ»ΠΎΠ½ΠΈ" -#: builtin/branch.c:647 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΠΏΠΎ ΠΊΠΎΠ»ΠΎΠ½ΠΈ" -#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" -msgstr "ΠΊΠ»ΡΡ" +msgstr "ΠΠΠΠ§" -#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "ΠΈΠΌΠ΅ Π½Π° ΠΏΠΎΠ»Π΅ΡΠΎ, ΠΏΠΎ ΠΊΠΎΠ΅ΡΠΎ Π΄Π° Π΅ ΠΏΠΎΠ΄ΡΠ΅Π΄Π±Π°ΡΠ°" -#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398 -#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" -msgstr "ΠΎΠ±Π΅ΠΊΡ" +msgstr "ΠΠΠΠΠ’" -#: builtin/branch.c:652 +#: builtin/branch.c:687 msgid "print only branches of the object" -msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠ°" +msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅ Π½Π° ΠΠΠΠΠ’Π" -#: builtin/branch.c:670 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠΊΡΠΈΠ΅ ΠΊΡΠΌ ΠΊΠ°ΠΊΠ²ΠΎ ΡΠΎΡΠΈ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ" -#: builtin/branch.c:674 builtin/clone.c:697 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "Π Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° βrefs/headsβ Π»ΠΈΠΏΡΠ²Π° ΡΠ°ΠΉΠ» βHEADβ" -#: builtin/branch.c:694 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β--columnβ ΠΈ β--verboseβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: builtin/branch.c:705 builtin/branch.c:747 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "ΠΠ΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎ Π΅ ΠΈΠΌΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½" -#: builtin/branch.c:723 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π·Π°Π΄Π°Π΄Π΅ΡΠ΅ ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π½Π° βHEADβ ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½" -#: builtin/branch.c:728 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°ΡΠ΅ ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ Π΅Π΄ΠΈΠ½ ΠΊΠ»ΠΎΠ½ Π΅Π΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/branch.c:735 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Π ΠΊΠ»ΠΎΠ½Π° β%sβ Π²ΡΠ΅ ΠΎΡΠ΅ Π½ΡΠΌΠ° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ." -#: builtin/branch.c:738 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "ΠΠΈΠΏΡΠ²Π° ΠΊΠ»ΠΎΠ½ Π½Π° ΠΈΠΌΠ΅ β%sβ." -#: builtin/branch.c:753 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "ΠΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ ΠΌΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½ΠΈ Π·Π° ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅" -#: builtin/branch.c:758 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "ΠΠ°Π΄Π°Π΄Π΅Π½ΠΈ ΡΠ° ΠΏΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ ΠΌΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½ΠΈ Π·Π° ΡΠ»Π΅Π΄Π΅Π½Π΅" -#: builtin/branch.c:762 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3919,39 +4364,39 @@ msgstr "" "Π‘Π»Π΅Π΄Π΅Π½ΠΎΡΠΎ ΠΎΡ βHEADβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π·Π°Π΄Π°Π΄Π΅ Π΄Π° Π΅ β%sβ, Π·Π°ΡΠΎΡΠΎ ΡΠΎ Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ " "Π½ΠΈΠΊΠΎΠΉ ΠΊΠ»ΠΎΠ½." -#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "ΠΡΠΌΠ° ΠΊΠ»ΠΎΠ½ Π½Π° ΠΈΠΌΠ΅ β%sβ." -#: builtin/branch.c:769 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "ΠΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΠΊΠ»ΠΎΠ½ Π½Π° ΠΈΠΌΠ΅ β%sβ." -#: builtin/branch.c:781 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "ΠΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ ΠΌΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½ΠΈ Π·Π° ΠΌΠ°Ρ
Π°Π½Π΅ Π½Π° ΡΠ»Π΅Π΄Π΅Π½Π΅" -#: builtin/branch.c:785 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Π‘Π»Π΅Π΄Π΅Π½ΠΎΡΠΎ ΠΎΡ βHEADβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΠΌΠ°Ρ
Π½Π΅, Π·Π°ΡΠΎΡΠΎ ΡΠΎ Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ Π½ΠΈΠΊΠΎΠΉ ΠΊΠ»ΠΎΠ½." -#: builtin/branch.c:791 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "ΠΡΠΌΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΊΠ»ΠΎΠ½ΡΡ β%sβ Π΄Π° ΡΠ»Π΅Π΄ΠΈ Π½ΡΠΊΠΎΠΉ Π΄ΡΡΠ³" -#: builtin/branch.c:805 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "ΠΡΠΌΠ° Π½ΠΈΠΊΠ°ΠΊΡΠ² ΡΠΌΠΈΡΡΠ» ΡΡΡΠ½ΠΎ Π΄Π° ΡΡΠ·Π΄Π°Π²Π°ΡΠ΅ βHEADβ." -#: builtin/branch.c:811 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β-aβ ΠΈ β-rβ Π½Π° βgit branchβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ Ρ ΠΈΠΌΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½" -#: builtin/branch.c:814 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3960,7 +4405,7 @@ msgstr "" "ΠΠΏΡΠΈΡΡΠ° β--set-upstreamβ Π²Π΅ΡΠ΅ Π΅ ΠΎΡΡΠ°ΡΡΠ»Π° ΠΈ ΠΏΡΠ΅Π΄ΡΡΠΎΠΈ Π΄Π° Π±ΡΠ΄Π΅ ΠΌΠ°Ρ
Π½Π°ΡΠ°. " "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ β--trackβ ΠΈΠ»ΠΈ β--set-upstream-toβ\n" -#: builtin/branch.c:831 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3971,16 +4416,6 @@ msgstr "" "ΠΠ° Π΄Π° Π½Π°ΠΊΠ°ΡΠ°ΡΠ΅ β%sβ Π΄Π° ΡΠ»Π΅Π΄ΠΈ β%sβ, ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ ΡΠ»Π΅Π΄Π½Π°ΡΠ° ΠΊΠΎΠΌΠ°Π½Π΄Π°:\n" "\n" -#: builtin/branch.c:832 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:833 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4077,7 +4512,7 @@ msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ Π°ΡΡΠΈΠ±ΡΡΠΈ, Π·Π°Π΄Π°Π΄Π΅Π½ΠΈ msgid "use .gitattributes only from the index" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»Π° β.gitattributesβ ΡΠ°ΠΌΠΎ ΠΎΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 msgid "read file names from stdin" msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" @@ -4085,7 +4520,7 @@ msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ ΠΎΡ ΡΡΠ° msgid "terminate input and output records by a NUL character" msgstr "ΡΠ°Π·Π΄Π΅Π»ΡΠ½Π΅ Π½Π° Π²Ρ
ΠΎΠ΄Π½ΠΈΡΠ΅ ΠΈ ΠΈΠ·Ρ
ΠΎΠ΄Π½ΠΈΡΠ΅ Π·Π°ΠΏΠΈΡΠΈ Ρ Π½ΡΠ»Π΅Π²ΠΈΡ Π·Π½Π°ΠΊ βNULβ" -#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "Π±Π΅Π· ΠΏΠΎΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ°" @@ -4138,49 +4573,54 @@ msgstr "ΠΊΠΎΠ½ΡΠ°ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°Π½: %s" msgid "no contacts specified" msgstr "Π½Π΅ ΡΠ° ΡΠΊΠ°Π·Π°Π½ΠΈ ΠΊΠΎΠ½ΡΠ°ΠΊΡΠΈ" -#: builtin/checkout-index.c:126 +#: builtin/checkout-index.c:127 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [ΠΠΠ¦ΠΠ―β¦] [--] [Π€ΠΠΠβ¦]" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:144 +msgid "stage should be between 1 and 3 or all" +msgstr "Π΅ΡΠ°ΠΏΡΡ ΡΡΡΠ±Π²Π° Π΄Π° Π΅ β1β, β2β, β3β ΠΈΠ»ΠΈ βallβ (Π²ΡΠΈΡΠΊΠΈ)" + +#: builtin/checkout-index.c:160 msgid "check out all files in the index" msgstr "ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:161 msgid "force overwrite of existing files" msgstr "ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅, Π΄ΠΎΡΠΈ ΠΈ Π΄Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°Ρ" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:163 msgid "no warning for existing files and files not in index" msgstr "Π±Π΅Π· ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΡ ΠΏΡΠΈ Π»ΠΈΠΏΡΠ²Π°ΡΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:165 msgid "don't checkout new files" msgstr "Π±Π΅Π· ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π° Π½ΠΎΠ²ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/checkout-index.c:195 +#: builtin/checkout-index.c:167 msgid "update stat information in the index file" msgstr "ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΡΡΠ΅Π· βstatβ Π·Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/checkout-index.c:201 +#: builtin/checkout-index.c:171 msgid "read list of paths from the standard input" msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΡΡΠΈΡΠ°ΡΠ° ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:173 msgid "write the content to temporary files" msgstr "Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π²ΡΠ² Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/checkout-index.c:204 builtin/column.c:30 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 -#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181 +#: builtin/checkout-index.c:174 builtin/column.c:30 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "ΠΠΠ" -#: builtin/checkout-index.c:205 +#: builtin/checkout-index.c:175 msgid "when creating files, prepend <string>" msgstr "ΠΏΡΠΈ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° Π½ΠΎΠ²ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π΄Π° ΡΠ΅ Π΄ΠΎΠ±Π°Π²Ρ ΠΏΡΠ΅ΡΠΈΠΊΡΠ° ΠΠΠ" -#: builtin/checkout-index.c:208 +#: builtin/checkout-index.c:177 msgid "copy out the files from named stage" msgstr "ΠΊΠΎΠΏΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ ΠΎΡ ΡΠΎΠ²Π° ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅" @@ -4222,45 +4662,49 @@ msgstr "ΠΏΡΡΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΠ»ΡΠ½" msgid "Unable to add merge result for '%s'" msgstr "Π Π΅Π·ΡΠ»ΡΠ°ΡΡΡ Π·Π° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΠ»ΡΠ½" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "ΠΠΏΡΠΈΡΡΠ° β%sβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΡΡΠΈΡΠ°" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "ΠΠΏΡΠΈΡΡΠ° β%sβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ β%sβ" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "ΠΠ΅Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ Π΅ Π΅Π΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Π΄Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°ΡΠ΅ ΠΏΡΡΠΈΡΠ° ΠΈ Π΄Π° ΠΏΡΠ΅ΠΌΠΈΠ½Π΅ΡΠ΅ ΠΊΡΠΌ ΠΊΠ»ΠΎΠ½Π° β%sβ." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½ ΡΠ°ΠΉΠ» Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "ΠΏΡΡΡΡ β%sβ Π½Π΅ Π΅ ΡΠ»ΡΡ" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "ΠΏΡΡΠ²ΠΎ ΡΡΡΠ±Π²Π° Π΄Π° ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°ΡΠ΅ ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΡΠΈ" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "ΠΡΡΠ½Π°Π»ΡΡ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅ Π·Π° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠΎΡΠ»Π΅Π΄ΠΈ: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π² ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΡΠΎΡΠΈ ΠΊΡΠΌ" +#: builtin/checkout.c:664 builtin/clone.c:661 +msgid "unable to update HEAD" +msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½" + #: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" @@ -4276,7 +4720,7 @@ msgstr "ΠΠ΅ΡΠ΅ ΡΡΠ΅ Π½Π° β%sβ\n" msgid "Switched to and reset branch '%s'\n" msgstr "ΠΡΠ΅ΠΌΠΈΠ½Π°Π²Π°Π½Π΅ ΠΊΡΠΌ ΠΊΠ»ΠΎΠ½Π° β%sβ ΠΈ Π·Π°Π½ΡΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅\n" -#: builtin/checkout.c:677 builtin/checkout.c:1066 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "ΠΡΠ΅ΠΌΠΈΠ½Π°Ρ
ΡΠ΅ ΠΊΡΠΌ Π½ΠΎΠ²ΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ\n" @@ -4348,7 +4792,7 @@ msgstr "Π²ΡΡΡΠ΅ΡΠ½Π° Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΠΎΠ±Ρ
ΠΎΠΆΠ΄Π°Π½Π΅ΡΠΎ Π½Π° Π²Π΅ΡΡ msgid "Previous HEAD position was" msgstr "ΠΡΠ΅Π΄ΠΈ ΡΠΎΠ²Π° βHEADβ ΡΠΎΡΠ΅ΡΠ΅ ΠΊΡΠΌ" -#: builtin/checkout.c:823 builtin/checkout.c:1061 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Π ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΡΡΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½, ΠΊΠΎΠΉΡΠΎ ΠΏΡΠ΅Π΄ΡΡΠΎΠΈ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½" @@ -4357,137 +4801,137 @@ msgstr "Π ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΡΡΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½, ΠΊΠΎΠΉΡΠΎ ΠΏΡΠ΅Π΄ΡΡΠΎΠΈ Π΄Π° msgid "only one reference expected, %d given." msgstr "ΠΎΡΠ°ΠΊΠ²Π°ΡΠ΅ ΡΠ΅ Π΅Π΄ΠΈΠ½ ΡΠΊΠ°Π·Π°ΡΠ΅Π», Π° ΡΡΠ΅ ΠΏΠΎΠ΄Π°Π»ΠΈ %d." -#: builtin/checkout.c:1007 builtin/worktree.c:213 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠΊΠ°Π·Π°ΡΠ΅Π»: %s" -#: builtin/checkout.c:1036 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΎΠ±Π΅ΠΊΡ-Π΄ΡΡΠ²ΠΎ: %s" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΡΡ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΎ Ρ ΠΏΡΠ΅ΠΌΠΈΠ½Π°Π²Π°Π½Π΅ΡΠΎ ΠΎΡ Π΅Π΄ΠΈΠ½ ΠΊΠ»ΠΎΠ½ ΠΊΡΠΌ Π΄ΡΡΠ³" -#: builtin/checkout.c:1078 builtin/checkout.c:1082 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β%sβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ ΠΏΡΠ΅ΠΌΠΈΠ½Π°Π²Π°Π½Π΅ΡΠΎ ΠΎΡ Π΅Π΄ΠΈΠ½ ΠΊΠ»ΠΎΠ½ ΠΊΡΠΌ Π΄ΡΡΠ³" -#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094 -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β%sβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ β%sβ" -#: builtin/checkout.c:1102 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "ΠΠ° Π΄Π° ΠΏΡΠ΅ΠΌΠΈΠ½Π΅ΡΠ΅ ΠΊΡΠΌ ΠΊΠ»ΠΎΠ½, ΠΏΠΎΠ΄Π°ΠΉΡΠ΅ ΡΠΊΠ°Π·Π°ΡΠ΅Π», ΠΊΠΎΠΉΡΠΎ ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅. β%sβ Π½Π΅ " "Π΅ ΡΠ°ΠΊΡΠ²" -#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320 -#: builtin/worktree.c:322 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "ΠΊΠ»ΠΎΠ½" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ ΠΈ ΠΏΡΠ΅ΠΌΠΈΠ½Π°Π²Π°Π½Π΅ ΠΊΡΠΌ Π½ΠΎΠ² ΠΊΠ»ΠΎΠ½" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅/Π·Π°Π½ΡΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½ ΠΈ ΠΏΡΠ΅ΠΌΠΈΠ½Π°Π²Π°Π½Π΅ ΠΊΡΠΌ Π½Π΅Π³ΠΎ" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΆΡΡΠ½Π°Π» Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅ Π·Π° Π½ΠΎΠ² ΠΊΠ»ΠΎΠ½" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "ΠΎΡΠ΄Π΅Π»ΡΠ½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ βHEADβ ΠΊΡΠΌ ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΊΠΎΠΉ ΠΊΠ»ΠΎΠ½ Π±ΠΈΠ²Π° ΡΠ»Π΅Π΄Π΅Π½ ΠΏΡΠΈ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° Π½ΠΎΠ²ΠΈΡ ΠΊΠ»ΠΎΠ½" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "ΠΠΠ_ΠΠΠΠ" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "Π½ΠΎΠ² ΠΊΠ»ΠΎΠ½ Π±Π΅Π· ΡΠΎΠ΄ΠΈΡΠ΅Π»" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π° Π²Π°ΡΠ°ΡΠ° Π²Π΅ΡΡΠΈΡ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π° ΡΡΠΆΠ΄Π°ΡΠ° Π²Π΅ΡΡΠΈΡ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ (Π²Π°ΡΠΈΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ ΡΠ΅ Π±ΡΠ΄Π°Ρ Π·Π°Π½ΡΠ»Π΅Π½ΠΈ)" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "ΠΈΠ·Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΡΡΠΎΠΉΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Ρ Π½ΠΎΠ²ΠΈΡ ΠΊΠ»ΠΎΠ½" -#: builtin/checkout.c:1150 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ)" -#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" -msgstr "ΡΡΠΈΠ»" +msgstr "Π‘Π’ΠΠ" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ ΠΏΡΠΈ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡ (ΡΠ»ΠΈΠ²Π°Π½Π΅ ΠΈΠ»ΠΈ ΡΡΠΎΠΉΠ½Π° ΡΠ°Π·Π»ΠΈΠΊΠ°)" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "Π±Π΅Π· ΠΎΠ³ΡΠ°Π½ΠΈΡΠ°Π²Π°Π½Π΅ Π½Π° ΠΈΠ·Π±ΡΠΎΠ΅Π½ΠΈΡΠ΅ ΠΏΡΡΠΈΡΠ° ΡΠ°ΠΌΠΎ Π΄ΠΎ ΡΠ°ΡΡΠΈΡΠ½ΠΎ ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½ΠΈΡΠ΅" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" "ΠΎΠΏΠΈΡ Π·Π° ΠΎΡΠ³Π°ΡΠ²Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½ ΡΠ»Π΅Π΄ Π½Π΅ΡΡΠΏΠ΅ΡΠ΅Π½ ΠΎΠΏΠΈΡ Ρ βgit checkout " "ΠΠΠ‘ΠͺΠ©ΠΠ‘Π’ΠΠ£ΠΠΠ©_ΠΠΠΠβ" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "Π±Π΅Π· ΠΏΡΠΎΠ²Π΅ΡΠΊΠ° Π΄Π°Π»ΠΈ Π΄ΡΡΠ³ΠΎ ΡΠ°Π±ΠΎΡΠ½ΠΎ Π΄ΡΡΠ²ΠΎ Π΄ΡΡΠΆΠΈ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ" -#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ°" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β-bβ, β-Bβ ΠΈ β--orphanβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ Π΅Π΄Π½Π° Ρ Π΄ΡΡΠ³Π°" -#: builtin/checkout.c:1208 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--trackβ ΠΈΠ·ΠΈΡΠΊΠ²Π° ΠΈΠΌΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½" -#: builtin/checkout.c:1213 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "ΠΠΈΠΏΡΠ²Π° ΠΈΠΌΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½, ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΎΠΏΡΠΈΡΡΠ° β-bβ" -#: builtin/checkout.c:1249 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "ΡΠΊΠ°Π·Π°Π½ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΏΡΡ" -#: builtin/checkout.c:1256 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4496,12 +4940,12 @@ msgstr "" "ΠΠ΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΅Π΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Π΄Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°ΡΠ΅ ΠΏΡΡΠΈΡΠ° ΠΈ Π΄Π° ΠΏΡΠ΅ΠΌΠΈΠ½Π΅ΡΠ΅ ΠΊΡΠΌ ΠΊΠ»ΠΎΠ½Π° β%sβ.\n" "ΠΠ°Π»ΠΈ Π½Π΅ ΠΈΡΠΊΠ°ΡΠ΅ Π΄Π° ΠΈΠ·ΡΠ΅Π³Π»ΠΈΡΠ΅ β%sβ, ΠΊΠΎΠΉΡΠΎ Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅?" -#: builtin/checkout.c:1261 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: ΠΎΠΏΡΠΈΡΡΠ° β--detachβ Π½Π΅ ΠΏΡΠΈΠ΅ΠΌΠ° Π°ΡΠ³ΡΠΌΠ΅Π½Ρ-ΠΏΡΡ β%sβ" -#: builtin/checkout.c:1265 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4539,7 +4983,7 @@ msgstr "Π₯ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ β%sβ ΡΠ΅ Π±ΡΠ΄Π΅ ΠΏΡΠ΅ΡΠΊΠΎΡΠ΅Π½ΠΎ\n" msgid "failed to remove %s" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ" -#: builtin/clean.c:315 +#: builtin/clean.c:291 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -4551,7 +4995,7 @@ msgstr "" "ΠΠ ΠΠ€ΠΠΠ‘ β ΠΈΠ·Π±ΠΎΡ Π½Π° Π΅Π΄ΠΈΠ½ΡΡΠ²Π΅Π½ ΠΎΠ±Π΅ΠΊΡ ΠΏΠΎ ΡΠΎΠ·ΠΈ ΡΠ½ΠΈΠΊΠ°Π»Π΅Π½ ΠΏΡΠ΅ΡΠΈΠΊΡ\n" " β (ΠΏΡΠ°Π·Π½ΠΎ) Π½ΠΈΡΠΎ Π΄Π° Π½Π΅ ΡΠ΅ ΠΈΠ·Π±ΠΈΡΠ°" -#: builtin/clean.c:319 +#: builtin/clean.c:295 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -4571,38 +5015,38 @@ msgstr "" "* β ΠΈΠ·Π±ΠΈΡΠ°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ\n" " β (ΠΏΡΠ°Π·Π½ΠΎ) Π·Π°Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΠΈΠ·Π±ΠΈΡΠ°Π½Π΅ΡΠΎ" -#: builtin/clean.c:535 +#: builtin/clean.c:511 #, c-format msgid "Huh (%s)?" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΈΠ·Π±ΠΎΡ (%s). ΠΠ·Π±Π΅ΡΠ΅ΡΠ΅ ΠΎΡΠ½ΠΎΠ²ΠΎ." # FIXME - should we use >> or sth else -#: builtin/clean.c:677 +#: builtin/clean.c:653 #, c-format msgid "Input ignore patterns>> " msgstr "Π¨Π°Π±Π»ΠΎΠ½ΠΈ Π·Π° ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈ Π΅Π»Π΅ΠΌΠ΅Π½ΡΠΈβ« " -#: builtin/clean.c:714 +#: builtin/clean.c:690 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ΠΠ ΠΠΠ£ΠΠ ΠΠΠΠΠΠΠ: ΠΠΈΠΊΠΎΠΉ ΠΎΠ±Π΅ΠΊΡ Π½Π΅ Π½Π°ΠΏΠ°ΡΠ²Π° Π½Π° β%sβ" -#: builtin/clean.c:735 +#: builtin/clean.c:711 msgid "Select items to delete" msgstr "ΠΠ·Π±ΠΈΡΠ°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈ Π·Π° ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:776 +#: builtin/clean.c:752 #, c-format msgid "Remove %s [y/N]? " msgstr "ΠΠ° ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅ Π»ΠΈ β%sβ? βyβ β Π΄Π°, βNβ β ΠΠ" # FIXME improve message -#: builtin/clean.c:801 +#: builtin/clean.c:777 msgid "Bye." msgstr "ΠΠ·Ρ
ΠΎΠ΄." -#: builtin/clean.c:809 +#: builtin/clean.c:785 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4620,63 +5064,63 @@ msgstr "" "help β ΡΠΎΠ·ΠΈ ΠΊΡΠ°ΠΉ\n" "? β ΠΏΠΎΠ΄ΡΠΊΠ°Π·ΠΊΠ° Π·Π° ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅" -#: builtin/clean.c:836 +#: builtin/clean.c:812 msgid "*** Commands ***" msgstr "βββ ΠΠΎΠΌΠ°Π½Π΄ΠΈ βββ" # FIXME improve message -#: builtin/clean.c:837 +#: builtin/clean.c:813 msgid "What now" msgstr "ΠΠ·Π±ΠΎΡ Π½Π° ΡΠ»Π΅Π΄Π²Π°ΡΠΎ Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅" -#: builtin/clean.c:845 +#: builtin/clean.c:821 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Π‘Π»Π΅Π΄Π½ΠΈΡΡ ΠΎΠ±Π΅ΠΊΡ ΡΠ΅ Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ:" msgstr[1] "Π‘Π»Π΅Π΄Π½ΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΈΠ·ΡΡΠΈΡΠΈ:" -#: builtin/clean.c:862 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "Π€Π°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ Π·Π° ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ ΡΠ²ΡΡΡΠΈΡ
Π°. ΠΠ·Ρ
ΠΎΠ΄ ΠΎΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ°ΡΠ°." -#: builtin/clean.c:893 +#: builtin/clean.c:869 msgid "do not print names of files removed" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΈΠ·ΡΡΠΈΡΠΈ" -#: builtin/clean.c:895 +#: builtin/clean.c:871 msgid "force" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅" -#: builtin/clean.c:896 +#: builtin/clean.c:872 msgid "interactive cleaning" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅" -#: builtin/clean.c:898 +#: builtin/clean.c:874 msgid "remove whole directories" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΡΠ΅Π»ΠΈ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ" -#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709 -#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" -msgstr "ΡΠ°Π±Π»ΠΎΠ½" +msgstr "Π¨ΠΠΠΠΠ" -#: builtin/clean.c:900 +#: builtin/clean.c:876 msgid "add <pattern> to ignore rules" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° Π¨ΠΠΠΠΠ ΠΎΡ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅, ΠΊΠΎΠΈΡΠΎ Π΄Π° Π½Π΅ ΡΠ΅ ΡΡΠΈΡΡ" -#: builtin/clean.c:901 +#: builtin/clean.c:877 msgid "remove ignored files, too" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ ΠΈ Π½Π° ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/clean.c:903 +#: builtin/clean.c:879 msgid "remove only ignored files" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/clean.c:921 +#: builtin/clean.c:897 msgid "-x and -X cannot be used together" msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β-xβ ΠΈ β-Xβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: builtin/clean.c:925 +#: builtin/clean.c:901 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -4684,7 +5128,7 @@ msgstr "" "ΠΠ°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βclean.requireForceβ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½Π° ΠΊΠ°ΡΠΎ ΠΈΡΡΠΈΠ½Π°, ΠΊΠΎΠ΅ΡΠΎ ΠΈΠ·ΠΈΡΠΊΠ²Π° Π½ΡΠΊΠΎΡ " "ΠΎΡ ΠΎΠΏΡΠΈΠΈΡΠ΅ β-iβ, β-nβ ΠΈΠ»ΠΈ β-fβ. ΠΡΠΌΠ° Π΄Π° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠΈ ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅" -#: builtin/clean.c:928 +#: builtin/clean.c:904 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4697,148 +5141,168 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ΠΠΠ¦ΠΠ―β¦] [--] Π₯Π ΠΠΠΠΠΠ©Π [ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―]" -#: builtin/clone.c:59 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "Π±Π΅Π· ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° ΡΠ°Π±ΠΎΡΠ½ΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Π³ΠΎΠ»ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/clone.c:64 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "" "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅-ΠΎΠ³Π»Π΅Π΄Π°Π»ΠΎ (Π²ΠΊΠ»ΡΡΠ²Π° ΠΎΠΏΡΠΈΡΡΠ° β--bareβ Π·Π° Π³ΠΎΠ»ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅)" -#: builtin/clone.c:66 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ ΠΎΡ Π»ΠΎΠΊΠ°Π»Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/clone.c:68 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "Π±Π΅Π· ΡΠ²ΡΡΠ΄ΠΈ Π²ΡΡΠ·ΠΊΠΈ, ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ Π²ΠΈΠ½Π°Π³ΠΈ Π΄Π° ΡΠ΅ ΠΊΠΎΠΏΠΈΡΠ°Ρ" -#: builtin/clone.c:70 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "Π½Π°ΡΡΡΠΎΠΉΠ²Π°Π½Π΅ Π·Π° ΡΠΏΠΎΠ΄Π΅Π»Π΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/clone.c:72 builtin/clone.c:74 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅ ΠΏΡΠΈ ΡΠΎΠ²Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅" -#: builtin/clone.c:75 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "Π±ΡΠΎΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ, ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½ΠΈ ΠΏΠ°ΡΠ°Π»Π΅Π»Π½ΠΎ" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Ρ ΡΠ°Π±Π»ΠΎΠ½ΠΈ" -#: builtin/clone.c:76 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ, ΠΊΠΎΡΡΠΎ ΡΡΠ΄ΡΡΠΆΠ° ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π΄Π° ΡΠ΅ ΠΏΠΎΠ»Π·Π²Π°Ρ" -#: builtin/clone.c:78 builtin/submodule--helper.c:179 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "Π΅ΡΠ°Π»ΠΎΠ½Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/clone.c:80 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--referenceβ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π° ΡΠ°ΠΌΠΎ ΠΏΡΠΈ ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅" -#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "ΠΠΠ" -#: builtin/clone.c:82 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠΎΠ²Π° ΠΠΠ Π²ΠΌΠ΅ΡΡΠΎ βoriginβ ΠΏΡΠΈ ΠΏΡΠΎΡΠ»Π΅Π΄ΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈ" -#: builtin/clone.c:84 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π° ΡΠΎΠ·ΠΈ ΠΠΠΠ, Π° Π½Π΅ ΡΠΎΡΠ΅Π½ΠΈΡΡ ΠΎΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π» βHEADβ" -#: builtin/clone.c:86 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "ΠΏΡΡ ΠΊΡΠΌ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-upload-packβ Π½Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "ΠΠͺΠΠΠΠ§ΠΠΠ" -#: builtin/clone.c:88 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "ΠΏΠ»ΠΈΡΠΊΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ Π΄ΠΎ ΡΠ°Π·ΠΈ ΠΠͺΠΠΠΠ§ΠΠΠ" -#: builtin/clone.c:90 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "" "ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° Π΅Π΄ΠΈΠ½ ΠΊΠ»ΠΎΠ½ β ΠΈΠ»ΠΈ ΡΠΎΡΠ΅Π½ΠΈΡ ΠΎΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ βHEADβ, ΠΈΠ»ΠΈ ΠΈΠ·ΡΠΈΡΠ½ΠΎ " "Π·Π°Π΄Π°Π΄Π΅Π½ΠΈΡ Ρ β--branchβ" -#: builtin/clone.c:91 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "Π²ΡΠΈΡΠΊΠΈ ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½ΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ ΡΠ΅ ΡΠ° ΠΏΠ»ΠΈΡΠΊΠΈ" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "Π‘ΠΠ£ΠΠΠΠΠ_ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―" -#: builtin/clone.c:92 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "ΠΎΡΠ΄Π΅Π»Π½Π° Π‘ΠΠ£ΠΠΠΠΠ_ΠΠΠ ΠΠΠ’ΠΠ ΠΠ― Π·Π° git ΠΈΠ·Π²ΡΠ½ ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/clone.c:93 +#: builtin/clone.c:100 msgid "key=value" msgstr "ΠΠΠΠ§=Π‘Π’ΠΠΠΠΠ‘Π’" -#: builtin/clone.c:94 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅ Π½Π° Π½ΠΎΠ²ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/clone.c:300 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 +msgid "use IPv4 addresses only" +msgstr "ΡΠ°ΠΌΠΎ Π°Π΄ΡΠ΅ΡΠΈ IPv4" + +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 +msgid "use IPv6 addresses only" +msgstr "ΡΠ°ΠΌΠΎ Π°Π΄ΡΠ΅ΡΠΈ IPv6" + +#: builtin/clone.c:241 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +msgstr "" +"ΠΠΌΠ΅ΡΠΎ Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ³Π°ΡΠ½Π°ΡΠΎ.\n" +"ΠΠ°Π΄Π°ΠΉΡΠ΅ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° ΠΈΠ·ΡΠΈΡΠ½ΠΎ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΈΡ ΡΠ΅Π΄" + +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "Π²ΡΠ΅ ΠΎΡΠ΅ Π½Π΅ ΡΠ΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ° Π΅ΡΠ°Π»ΠΎΠ½Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ ΠΊΠ°ΡΠΎ ΡΠ²ΡΡΠ·Π°Π½ΠΎ." -#: builtin/clone.c:302 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Π΅ΡΠ°Π»ΠΎΠ½Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ Π½Π΅ Π΅ Π»ΠΎΠΊΠ°Π»Π½ΠΎ" -#: builtin/clone.c:307 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "Π΅ΡΠ°Π»ΠΎΠ½Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ Π΅ ΠΏΠ»ΠΈΡΠΊΠΎ" -#: builtin/clone.c:310 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "Π΅ΡΠ°Π»ΠΎΠ½Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ Π΅ Ρ ΠΏΡΠΈΡΠ°ΠΆΠ΄Π°Π½Π΅" -#: builtin/clone.c:375 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΡΠ΅Π· βstatβ Π·Π° β%sβ" - -#: builtin/clone.c:377 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "β%sβ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΠΈ Π½Π΅ Π΅ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/clone.c:391 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΡΠ΅Π· βstatβ Π·Π° β%sβ\n" -#: builtin/clone.c:413 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "Π²ΡΡΠ·ΠΊΠ°ΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: builtin/clone.c:417 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "ΡΠ°ΠΉΠ»ΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΊΠΎΠΏΠΈΡΠ°Π½ ΠΊΠ°ΡΠΎ β%sβ" -#: builtin/clone.c:442 builtin/clone.c:626 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ΡΠΎ Π·Π°Π²ΡΡΡΠΈ.\n" -#: builtin/clone.c:454 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4849,7 +5313,7 @@ msgstr "" "ΠΊΠ»ΠΎΠ½ Π² ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΡΠ° ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½ΠΈ Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit statusβ. ΠΠΎΠΆΠ΅ΡΠ΅ Π΄Π°\n" "Π·Π°Π²ΡΡΡΠΈΡΠ΅ ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ΡΠΎ Π½Π° ΠΊΠ»ΠΎΠ½Π° Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit checkout -f HEADβ.\n" -#: builtin/clone.c:531 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" @@ -4857,116 +5321,126 @@ msgstr "" "ΠΈ ΠΊΠΎΠΉΡΠΎ ΡΠ»Π΅Π΄Π²Π° Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½, Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°." # FIXME translator note that the space at end is necesssary -#: builtin/clone.c:621 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° Π½Π° Π²ΡΡΠ·ΠΊΠ°ΡΠ°β¦ " -#: builtin/clone.c:624 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π½Π΅ ΠΈΠ·ΠΏΡΠ°ΡΠΈ Π²ΡΠΈΡΠΊΠΈ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ." -#: builtin/clone.c:688 +# FIXME merge with next? +#: builtin/clone.c:649 +#, c-format +msgid "unable to update %s" +msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½" + +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ ΠΎΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ ΡΠΎΡΠΈ ΠΊΡΠΌ Π½Π΅ΡΠΎ,\n" "ΠΊΠΎΠ΅ΡΠΎ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°. ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·ΡΠ΅Π³Π»ΠΈ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ ΠΊΠ»ΠΎΠ½.\n" -#: builtin/clone.c:719 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠ΄Π³ΠΎΡΠ²Π΅Π½ΠΎ" -#: builtin/clone.c:808 +#: builtin/clone.c:767 +msgid "unable to write parameters to config file" +msgstr "Π½Π°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ Π·Π°ΠΏΠΈΡΠ°Π½ΠΈ Π² ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π½ΠΈΡ ΡΠ°ΠΉΠ»" + +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠΈ ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½Π΅ Π·Π° ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅" -#: builtin/clone.c:810 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈΡΡ ΡΠ°ΠΉΠ» Π·Π° Π°Π»ΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ" -#: builtin/clone.c:842 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "ΠΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ ΠΌΠ½ΠΎΠ³ΠΎ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΈ." -#: builtin/clone.c:846 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Π’ΡΡΠ±Π²Π° Π΄Π° ΡΠΊΠ°ΠΆΠ΅ΡΠ΅ ΠΊΠΎΠ΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ ΠΈΡΠΊΠ°ΡΠ΅ Π΄Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ°ΡΠ΅." -#: builtin/clone.c:857 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--bareβ ΠΈ β--origin %sβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/clone.c:860 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--bareβ ΠΈ β--separate-git-dirβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/clone.c:873 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ" -#: builtin/clone.c:879 builtin/fetch.c:1166 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "Π΄ΡΠ»Π±ΠΎΡΠΈΠ½Π°ΡΠ° ΡΡΡΠ±Π²Π° Π΄Π° Π΅ ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»Π½ΠΎ ΡΡΠ»ΠΎ ΡΠΈΡΠ»ΠΎ, Π° Π½Π΅ β%sβ" -#: builtin/clone.c:889 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ΡΠ΅Π»Π΅Π²ΠΈΡΡ ΠΏΡΡ β%sβ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΠΈ Π½Π΅ Π΅ ΠΏΡΠ°Π·Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ." -#: builtin/clone.c:899 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "Π² β%sβ Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΡΠ°Π±ΠΎΡΠ½ΠΎ Π΄ΡΡΠ²ΠΎ." -#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224 -#: builtin/worktree.c:221 builtin/worktree.c:248 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΠΊΠΈΡΠ΅ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ Π½Π° β%sβ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ ΡΡΠ·Π΄Π°Π΄Π΅Π½ΠΈ" -#: builtin/clone.c:917 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ Π² β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½ΠΎ." -#: builtin/clone.c:935 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ ΠΈ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Π³ΠΎΠ»ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π² β%sββ¦\n" -#: builtin/clone.c:937 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ ΠΈ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π² β%sββ¦\n" -#: builtin/clone.c:975 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "ΠΡΠΈ Π»ΠΎΠΊΠ°Π»Π½ΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ ΠΎΠΏΡΠΈΡΡΠ° β--depthβ ΡΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠ°. ΠΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΡΡ
Π΅ΠΌΠ°ΡΠ° " "βfile://β." -#: builtin/clone.c:978 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π΅ ΠΏΠ»ΠΈΡΠΊΠΎ, Π·Π°ΡΠΎΠ²Π° ΠΎΠΏΡΠΈΡΡΠ° β--localβ ΡΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠ°" -#: builtin/clone.c:983 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--localβ ΡΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠ°" -#: builtin/clone.c:987 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "ΠΠ΅ ΡΠ΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ° ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ Π½Π° Π²ΡΡΠ·ΠΊΠΈ ΠΎΡ Π²ΠΈΠ΄Π° β%sβ " -#: builtin/clone.c:1036 builtin/clone.c:1044 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "ΠΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΡ ΠΊΠ»ΠΎΠ½ β%sβ Π»ΠΈΠΏΡΠ²Π° Π² ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ" -#: builtin/clone.c:1047 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "ΠΠ·Π³Π»Π΅ΠΆΠ΄Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Ρ
ΡΠ΅ ΠΏΡΠ°Π·Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅." @@ -5110,66 +5584,66 @@ msgstr "" "Π§ΡΠ΅Π· ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit cherry-pick --continueβ ΡΠ΅ ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠΈΡΠ΅ ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π°\n" "ΠΎΡΡΠ°Π½Π°Π»ΠΈΡΠ΅ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "Π²ΡΡΡ
ΠΎΠ²ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ (HEAD tree object) Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·Π²Π°Π΄Π΅Π½ΠΎ ΠΎΡ ΠΏΠ°ΠΊΠ΅Ρ" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "ΠΡΡΠ²ΠΎΡΠΎ Π½Π° ΠΎΡΠ½ΠΎΠ²Π½ΠΈΡ ΠΊΠ΅Ρ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½ΠΎ" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "ΠΏΠΎ Π²ΡΠ΅ΠΌΠ΅ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠΈ ΡΠ°ΡΡΠΈΡΠ½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "ΠΏΠΎ Π²ΡΠ΅ΠΌΠ΅ Π½Π° ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠΈ ΡΠ°ΡΡΠΈΡΠ½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "ΠΈΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "Π²ΡΠ΅ΠΌΠ΅Π½Π½ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "Π·Π°Π³Π»Π°Π²Π½Π°ΡΠ° ΡΠ°ΡΡ Π·Π° Π°Π²ΡΠΎΡ Π² ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π»ΠΈΠΏΡΠ²Π°" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "Π·Π°Π³Π»Π°Π²Π½Π°ΡΠ° ΡΠ°ΡΡ Π·Π° Π°Π²ΡΠΎΡ Π² ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π°" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ ΠΊΡΠΌ ΠΎΠΏΡΠΈΡΡΠ° β--authorβ" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠΎΡΠΌΠ°Ρ Π½Π° Π΄Π°ΡΠ°: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5177,39 +5651,39 @@ msgstr "" "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·Π±Π΅ΡΠ΅ Π·Π½Π°ΠΊ Π·Π° ΠΊΠΎΠΌΠ΅Π½ΡΠ°Ρ β Π² ΡΠ΅ΠΊΡΡΠΎΡΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΡΠ° " "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½ΠΈ Π²ΡΠΈΡΠΊΠΈ ΠΏΠΎΠ΄ΠΎΠ±Π½ΠΈ Π·Π½Π°ΡΠΈ" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "ΡΠ»Π΅Π΄Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡΠΎ: %s" -#: builtin/commit.c:702 builtin/shortlog.c:273 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ Π±Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½ΠΎ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, 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 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ SQUASH_MSG Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½ΠΎ" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ MERGE_MSG Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½ΠΎ" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "ΡΠ°Π±Π»ΠΎΠ½ΡΡ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠ°Π·Π΅Π½" # FIXME -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5225,7 +5699,7 @@ msgstr "" "ΠΈ ΠΎΠΏΠΈΡΠ°ΠΉΡΠ΅ ΠΎΡΠ½ΠΎΠ²ΠΎ.\n" # FIXME -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5241,7 +5715,7 @@ msgstr "" " %s\n" "ΠΈ ΠΎΠΏΠΈΡΠ°ΠΉΡΠ΅ ΠΎΡΠ½ΠΎΠ²ΠΎ.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5250,7 +5724,7 @@ msgstr "" "ΠΡΠ²Π΅Π΄Π΅ΡΠ΅ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅. Π Π΅Π΄ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π·Π°ΠΏΠΎΡΠ²Π°Ρ\n" "Ρ β%cβ, ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΏΡΠΎΠΏΡΡΠ½Π°ΡΠΈ, Π° ΠΏΡΠ°Π·Π½ΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5261,96 +5735,96 @@ msgstr "" "Ρ β%cβ, ΡΡΡΠΎ ΡΠ΅ Π±ΡΠ΄Π°Ρ Π²ΠΊΠ»ΡΡΠ΅Π½ΠΈ β ΠΌΠΎΠΆΠ΅ Π΄Π° Π³ΠΈ ΠΈΠ·ΡΡΠΈΠ΅ΡΠ΅ Π²ΠΈΠ΅. ΠΡΠ°Π·Π½ΠΎ \n" "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sΠΠ²ΡΠΎΡ: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sΠΠ°ΡΠ°: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sΠΠΎΠ΄Π°Π²Π°Ρ: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "ΠΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "ΠΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ ΠΈΠ·Π³ΡΠ°ΠΆΠ΄Π°Π½Π΅ Π½Π° Π΄ΡΡΠ²Π΅ΡΠ°ΡΠ°" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "ΠΠΎΠ΄Π°ΠΉΡΠ΅ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Ρ Π½ΡΠΊΠΎΡ ΠΎΡ ΠΎΠΏΡΠΈΠΈΡΠ΅ β-mβ ΠΈΠ»ΠΈ β-Fβ.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, 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 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅: β%sβ" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β--longβ ΠΈ β-zβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β--reset-authorβ ΠΈ β--authorβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "ΠΡΠΌΠ° ΠΊΠ°ΠΊΠ²ΠΎ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠΏΡΠ°Π²Π΅Π½ΠΎ." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "Π ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠ²Π° ΡΠ»ΠΈΠ²Π°Π½Π΅, Π½Π΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΏΠΎΠΏΡΠ°Π²ΡΡΠ΅." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Π ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠ²Π° ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅, Π½Π΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΏΠΎΠΏΡΠ°Π²ΡΡΠ΅." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β--squashβ ΠΈ β--fixupβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β-cβ, β-Cβ, β-Fβ ΠΈ β--fixupββ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "ΠΠΏΡΠΈΡΡΠ° β-mβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ β-cβ, β-Cβ, β-Fβ ΠΈ β--fixupβ." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "ΠΠΏΡΠΈΡΡΠ° β--reset-authorβ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π° ΡΠ°ΠΌΠΎ Π·Π°Π΅Π΄Π½ΠΎ Ρ β-Cβ, β-cβ ΠΈΠ»ΠΈ\n" "β--amendβ." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "ΠΠΏΡΠΈΠΈΡΠ΅ β--includeβ, β--onlyβ, β--allβ, β--interactiveβ ΠΈ β--patchβ ΡΠ°\n" "Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β--includeβ ΠΈ β--onlyβ ΠΈΠ·ΠΈΡΠΊΠ²Π°Ρ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΈ." # FIXME bad message -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "" "Π§ΡΠ΄Π΅ΡΠ½ΠΎ ΡΡΠ΅ ΡΠ΅ ΡΠ΅ΡΠΈΠ»ΠΈ ΠΊΠ°ΠΊ Π΄Π° ΠΏΠΎΠΏΡΠ°Π²ΠΈΡΠ΅ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π½Π° ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ " @@ -5358,271 +5832,269 @@ msgstr "" "ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ ΠΈΠ½Π΄Π΅ΠΊΡ. Π‘ΠΏΠΎΠ΄Π΅Π»Π΅ΡΠ΅ ΠΈ Ρ Π΄ΡΡΠ³ ΠΏΠΎΡΡΠ΅Π±ΠΈΡΠ΅Π» ΡΡΠΈΠΊΠ° Ρ βgit commit --amend -" "oβ." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "ΠΠ°Π΄Π°Π΄Π΅Π½ΠΈ ΡΠ° ΠΈΠ·ΡΠΈΡΠ½ΠΈ ΠΏΡΡΠΈΡΠ° Π±Π΅Π· ΠΎΠΏΡΠΈΠΈΡΠ΅ β-iβ ΠΈΠ»ΠΈ β-oβ. ΠΡΠΈΠ΅ΠΌΠ° ΡΠ΅, ΡΠ΅ Π²ΡΠ΅ Π΅Π΄Π½ΠΎ " "ΡΡΠ΅\n" "ΠΏΠΎΠ»Π·Π²Π°Π»ΠΈ ΠΎΠΏΡΠΈΡΡΠ° β--onlyβ Ρ ΠΠͺΠ’ΠΈΡΠ°β¦" -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "ΠΠ΅ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°Ρ ΡΠ΅ΠΆΠΈΠΌ Π½Π° ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ β%sβ" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "ΠΠΏΡΠΈΡΡΠ° β-aβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° ΡΡΡ Π·Π°Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΡΡΠΈΡΠ°." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "ΠΊΡΠ°ΡΠΊΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544 -#: builtin/worktree.c:423 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "ΡΠΎΡΠΌΠ°Ρ Π½Π° ΠΈΠ·Ρ
ΠΎΠ΄Π° Π·Π° ΡΠ΅ΡΠ΅Π½Π΅ ΠΎΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ°" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "ΠΏΠΎΠ΄ΡΠΎΠ±Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "ΡΠ°Π·Π΄Π΅Π»ΡΠ½Π΅ Π½Π° Π΅Π»Π΅ΠΌΠ΅Π½ΡΠΈΡΠ΅ Ρ Π½ΡΠ»Π΅Π²ΠΈΡ Π·Π½Π°ΠΊ βNULβ" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" -msgstr "ΡΠ΅ΠΆΠΈΠΌ" +msgstr "Π ΠΠΠΠ" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -"ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅. ΠΡΠ·ΠΌΠΎΠΆΠ½ΠΈΡΠ΅ ΡΠ΅ΠΆΠΈΠΌΠΈ ΡΠ° βallβ (ΠΏΠΎΠ΄ΡΠΎΠ±Π½Π°\n" -"ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ), βnormalβ (ΠΊΡΠ°ΡΠΊΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ), βnoβ (Π±Π΅Π· Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅).\n" -"Π‘ΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡΡ ΡΠ΅ΠΆΠΈΠΌ Π΅: βallβ." +"ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅. ΠΡΠ·ΠΌΠΎΠΆΠ½ΠΈΡΠ΅ Π ΠΠΠΠΠΈ ΡΠ° βallβ (ΠΏΠΎΠ΄ΡΠΎΠ±Π½Π° " +"ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ), βnormalβ (ΠΊΡΠ°ΡΠΊΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ), βnoβ (Π±Π΅Π· Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅). " +"Π‘ΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡΡ Π ΠΠΠΠ Π΅: βallβ." -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" -msgstr "ΠΊΠΎΠ³Π°" +msgstr "ΠΠΠΠ" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅. ΠΠΏΡΠΈΡ Ρ Π½Π΅Π·Π°Π΄ΡΠ»ΠΆΠΈΡΠ΅Π»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ β " -"Π΅Π΄Π½Π° ΠΎΡ\n" -"βallβ (Π²ΡΠΈΡΠΊΠΈ), βdirtyβ (ΡΠ΅Π·ΠΈ Ρ Π½Π΅ΠΏΠΎΠ΄Π°Π΄Π΅Π½ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ), βuntrackedβ (Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ)" +"Π΅Π΄Π½Π° ΠΎΡ βallβ (Π²ΡΠΈΡΠΊΠΈ), βdirtyβ (ΡΠ΅Π·ΠΈ Ρ Π½Π΅ΠΏΠΎΠ΄Π°Π΄Π΅Π½ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ), " +"βuntrackedβ (Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΠΊΠΎΠ»ΠΎΠ½ΠΈ" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "ΡΠΎΠΊΡ ΡΠΎ ΡΡΠ·Π΄Π°Π΄Π΅Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡΠΎ" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "ΡΠΎΠΊΡ ΡΠΎ ΡΡΠ·Π΄Π°Π΄Π΅Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π°Π½Π°Π»ΠΈΠ·ΠΈΡΠ°Π½ΠΎ" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "Π½Π΅ΡΠ²ΡΡΠ·Π°Π½ Π²ΡΡΡ
βHEADβ" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (Π½Π°ΡΠ°Π»Π½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "Π±Π΅Π· ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΠ»Π΅Π΄ ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠ°Π·Π»ΠΈΠΊΠ°ΡΠ° ΠΊΡΠΌ ΡΠ°Π±Π»ΠΎΠ½Π° Π·Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "ΠΠΏΡΠΈΠΈ Π·Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" -msgstr "Π²Π·ΠΈΠΌΠ°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΎΡ ΡΠ°ΠΉΠ»" +msgstr "Π²Π·ΠΈΠΌΠ°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΎΡ Π€ΠΠΠ" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" -msgstr "Π°Π²ΡΠΎΡ" +msgstr "ΠΠΠ’ΠΠ " -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" -msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° Π°Π²ΡΠΎΡ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ" +msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΠΠ’ΠΠ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" -msgstr "Π΄Π°ΡΠ°" +msgstr "ΠΠΠ’Π" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" -msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° Π΄Π°ΡΠ° Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ" +msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΠΠ’Π Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392 -#: builtin/notes.c:555 builtin/tag.c:349 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 +#: builtin/notes.c:558 builtin/tag.c:349 msgid "message" -msgstr "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅" +msgstr "Π‘ΠͺΠΠΠ©ΠΠΠΠ" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" -msgstr "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" +msgstr "Π‘ΠͺΠΠΠ©ΠΠΠΠ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" -msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" +msgstr "ΠΠΠΠΠΠΠΠ" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" -msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ ΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΎΡ ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" +msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ ΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΎΡ ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ ΠΠΠΠΠΠΠΠ" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" -msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΎΡ ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" +msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΎΡ ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ ΠΠΠΠΠΠΠΠ" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -"ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎΡΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ Π·Π° Π²ΠΊΠ°ΡΠ²Π°Π½Π΅ Π½Π° " -"ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ\n" -"ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π² ΠΏΡΠ΅Π΄Π½ΠΎΡΠΎ Π±Π΅Π· ΡΠ»Π΅Π΄Π°" +"ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎΡΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ Π·Π° Π²ΠΊΠ°ΡΠ²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ " +"ΠΠΠΠΠΠΠΠ Π² ΠΏΡΠ΅Π΄Π½ΠΎΡΠΎ Π±Π΅Π· ΡΠ»Π΅Π΄Π°" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "" "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎΡΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ Π·Π° ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ Π½Π° " -"ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ\n" -"ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π² ΠΏΡΠ΅Π΄Π½ΠΎΡΠΎ" +"ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ ΠΠΠΠΠΠΠΠ Π² ΠΏΡΠ΅Π΄Π½ΠΎΡΠΎ" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "ΡΠΌΡΠ½Π° Π½Π° Π°Π²ΡΠΎΡΠ° Π΄Π° ΡΡΠ²ΠΏΠ°Π΄Π° Ρ ΠΏΠΎΠ΄Π°Π²Π°ΡΠΈΡ (ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π° ΡΠ΅ Ρ β-Cβ/β-cβ/β--amendβ)" -#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΠΏΠΎΠ»Π΅ Π·Π° ΠΏΠΎΠ΄ΠΏΠΈΡ β βSigned-off-by:β" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" -msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΡΠ°Π±Π»ΠΎΠ½Π΅Π½ ΡΠ°ΠΉΠ»" +msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΡΠ°Π±Π»ΠΎΠ½Π΅Π½ Π€ΠΠΠ" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "ΠΊΠΎΠΈ ΠΏΡΠ°Π·Π½ΠΈ Π·Π½Π°ΡΠΈ ΠΈ #ΠΊΠΎΠΌΠ΅Π½ΡΠ°ΡΠΈ Π΄Π° ΡΠ΅ ΠΌΠ°Ρ
Π°Ρ ΠΎΡ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΡΡΠ°" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "Π²ΠΌΡΠΊΠ²Π°Π½Π΅ Π½Π° ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ Π² ΡΠ°Π±Π»ΠΎΠ½Π° Π·Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ Ρ GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "ΠΠΏΡΠΈΠΈ Π·Π° ΠΈΠ·Π±ΠΎΡ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ ΠΊΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈ" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "Π±Π΅Π· ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° ΠΊΡΠΊΠ°ΡΠ° ΠΏΡΠ΅Π΄ΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ (pre-commit)" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "ΠΎΡΠΏΠ΅ΡΠ°ΡΠ²Π°Π½Π΅ Π½Π° ΡΠΎΠ²Π°, ΠΊΠΎΠ΅ΡΠΎ Π±ΠΈ Π±ΠΈΠ»ΠΎ ΠΏΠΎΠ΄Π°Π΄Π΅Π½ΠΎ" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "ΠΏΠΎΠΏΡΠ°Π²ΡΠ½Π΅ Π½Π° ΠΏΡΠ΅Π΄ΠΈΡΠ½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "Π±Π΅Π· ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° ΠΊΡΠΊΠ°ΡΠ° ΡΠ»Π΅Π΄ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ (post-rewrite)" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "ΠΏΠΎΠ·Π²ΠΎΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΠΏΡΠ°Π·Π½ΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "ΠΏΠΎΠ·Π²ΠΎΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ Ρ ΠΏΡΠ°Π·Π½ΠΈ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΡ" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "Π²ΡΡΡ
ΠΎΠ²ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ βHEADβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½ΠΎ" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "ΠΠΎΠ²ΡΠ΅Π΄Π΅Π½ ΡΠ°ΠΉΠ» Π·Π° Π²ΡΡΡ
Π° Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ βMERGE_HEADβ (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "ΡΠ΅ΠΆΠΈΠΌΡΡ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ βMERGE_MODEβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½ΠΎ: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "ΠΠ΅ΠΈΠ·Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΠΏΠΎΡΠ°Π΄ΠΈ Π½Π΅ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½ΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "ΠΠ΅ΠΈΠ·Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΠΏΠΎΡΠ°Π΄ΠΈ ΠΏΡΠ°Π·Π½ΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5632,145 +6104,151 @@ msgstr "" "Π½Π΅ Π΅ Π·Π°ΠΏΠΈΡΠ°Π½. ΠΡΠΎΠ²Π΅ΡΠ΅ΡΠ΅ Π΄Π°Π»ΠΈ Π΄ΠΈΡΠΊΡΡ Π½Π΅ Π΅ ΠΏΡΠ΅ΠΏΡΠ»Π½Π΅Π½ ΠΈΠ»ΠΈ Π½Π΅ ΡΡΠ΅\n" "ΠΏΡΠ΅Π²ΠΈΡΠΈΠ»ΠΈ Π΄ΠΈΡΠΊΠΎΠ²Π°ΡΠ° ΡΠΈ ΠΊΠ²ΠΎΡΠ°. Π‘Π»Π΅Π΄ ΡΠΎΠ²Π° ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ βgit reset HEADβ." -#: builtin/config.c:8 +#: builtin/config.c:9 msgid "git config [<options>]" msgstr "git config [ΠΠΠ¦ΠΠ―β¦]" -#: builtin/config.c:54 +#: builtin/config.c:56 msgid "Config file location" msgstr "ΠΠ΅ΡΡΠΎΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ Π½Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π½ΠΈΡ ΡΠ°ΠΉΠ»" -#: builtin/config.c:55 +#: builtin/config.c:57 msgid "use global config file" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° Π³Π»ΠΎΠ±Π°Π»Π½ΠΈΡ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π΅Π½ ΡΠ°ΠΉΠ»" -#: builtin/config.c:56 +#: builtin/config.c:58 msgid "use system config file" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠΈΡΡΠ΅ΠΌΠ½ΠΈΡ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π΅Π½ ΡΠ°ΠΉΠ»" -#: builtin/config.c:57 +#: builtin/config.c:59 msgid "use repository config file" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π½ΠΈΡ ΡΠ°ΠΉΠ» Π½Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ" -#: builtin/config.c:58 +#: builtin/config.c:60 msgid "use given config file" -msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° Π·Π°Π΄Π°Π΄Π΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π΅Π½ ΡΠ°ΠΉΠ»" +msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° Π·Π°Π΄Π°Π΄Π΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π΅Π½ Π€ΠΠΠ" -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "blob-id" -msgstr "ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ Π½Π° BLOB" +msgstr "ΠΠΠΠΠ’ΠΠ€ΠΠΠΠ’ΠΠ " -#: builtin/config.c:59 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "" -"ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡΡΠ° ΠΎΡ BLOB Ρ ΡΠΎΠ·ΠΈ ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ Π½Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ" +"ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡΡΠ° ΠΎΡ BLOB Ρ ΡΠΎΠ·ΠΈ ΠΠΠΠΠ’ΠΠ€ΠΠΠΠ’ΠΠ Π½Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ" -#: builtin/config.c:60 +#: builtin/config.c:62 msgid "Action" msgstr "ΠΠ΅ΠΉΡΡΠ²ΠΈΠ΅" -#: builtin/config.c:61 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ: ΠΠΠ [Π ΠΠΠ£ΠΠ―Π ΠΠ_ΠΠΠ ΠΠ_ΠΠ_Π‘Π’ΠΠΠΠΠ‘Π’Π’Π]" -#: builtin/config.c:62 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΡΠΎΠΉΠ½ΠΎΡΡΠΈ: ΠΊΠ»ΡΡ [Π ΠΠΠ£ΠΠ―Π ΠΠ_ΠΠΠ ΠΠ_ΠΠ_Π‘Π’ΠΠΠΠΠ‘Π’Π’Π]" -#: builtin/config.c:63 +#: builtin/config.c:65 msgid "get values for regexp: name-regex [value-regex]" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡΠΈΡΠ΅ Π·Π° Π ΠΠΠ£ΠΠ―Π ΠΠΈΡ_ΠΠΠ ΠΠ: Π ΠΠΠ£ΠΠ―Π ΠΠ_ΠΠΠ ΠΠ_ΠΠ_ΠΠΠΠ’Π " "[Π ΠΠΠ£ΠΠ―Π ΠΠ_ΠΠΠ ΠΠ_ΠΠ_Π‘Π’ΠΠΠΠΠ‘Π’Π’Π]" -#: builtin/config.c:64 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡΡΠ° Π·Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡ Π°Π΄ΡΠ΅Ρ: Π ΠΠΠΠΠ[.ΠΠ ΠΠΠΠΠΠΠΠ] ΠΠΠ ΠΠ‘" -#: builtin/config.c:65 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "" "Π·Π°ΠΌΡΠ½Π° Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΡΠ²ΠΏΠ°Π΄Π°ΡΠΈ ΠΏΡΠΎΠΌΠ΅Π½Π»ΠΈΠ²ΠΈ: ΠΠΠ Π‘Π’ΠΠΠΠΠ‘Π’ " "[Π ΠΠΠ£ΠΠ―Π ΠΠ_ΠΠΠ ΠΠ_ΠΠ_Π‘Π’ΠΠΠΠΠ‘Π’Π’Π]" -#: builtin/config.c:66 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° Π½ΠΎΠ²Π° ΠΏΡΠΎΠΌΠ΅Π½Π»ΠΈΠ²Π°: ΠΠΠ Π‘Π’ΠΠΠΠΠ‘Π’" -#: builtin/config.c:67 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½Π»ΠΈΠ²Π°: ΠΠΠ [Π ΠΠΠ£ΠΠ―Π ΠΠ_ΠΠΠ ΠΠ_ΠΠ_Π‘Π’ΠΠΠΠΠ‘Π’Π’Π]" -#: builtin/config.c:68 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΡΠ²ΠΏΠ°Π΄Π°ΡΠΈ: ΠΠΠ [Π ΠΠΠ£ΠΠ―Π ΠΠ_ΠΠΠ ΠΠ_ΠΠ_Π‘Π’ΠΠΠΠΠ‘Π’Π’Π]" -#: builtin/config.c:69 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°Π·Π΄Π΅Π»: Π‘Π’ΠΠ Π_ΠΠΠ ΠΠΠΠ_ΠΠΠ" -#: builtin/config.c:70 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΡΠ°Π·Π΄Π΅Π»: ΠΠΠ" -#: builtin/config.c:71 +#: builtin/config.c:73 msgid "list all" msgstr "ΠΈΠ·Π±ΡΠΎΡΠ²Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ" -#: builtin/config.c:72 +#: builtin/config.c:74 msgid "open an editor" msgstr "ΠΎΡΠ²Π°ΡΡΠ½Π΅ Π½Π° ΡΠ΅Π΄Π°ΠΊΡΠΎΡ" -#: builtin/config.c:73 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π·Π°Π΄Π°Π΄Π΅Π½ΠΈΡ ΡΠ²ΡΡ: Π½ΠΎΠΌΠ΅Ρ [ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ]" -#: builtin/config.c:74 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π·Π°Π΄Π°Π΄Π΅Π½ΠΈΡ ΡΠ²ΡΡ: Π½ΠΎΠΌΠ΅Ρ [ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡΡ ΠΈΠ·Ρ
ΠΎΠ΄ Π΅ ΡΠ΅ΡΠΌΠΈΠ½Π°Π»]" -#: builtin/config.c:75 +#: builtin/config.c:77 msgid "Type" msgstr "ΠΠΈΠ΄" -#: builtin/config.c:76 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "Π‘Π’ΠΠΠΠΠ‘Π’Π’Π Π΅ βtrueβ (ΠΈΡΡΠΈΠ½Π°) ΠΈΠ»ΠΈ βfalseβ (Π»ΡΠΆΠ°)" -#: builtin/config.c:77 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "Π‘Π’ΠΠΠΠΠ‘Π’Π’Π Π΅ ΡΡΠ»ΠΎ, Π΄Π΅ΡΠ΅ΡΠΈΡΠ½ΠΎ ΡΠΈΡΠ»ΠΎ" -#: builtin/config.c:78 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "Π‘Π’ΠΠΠΠΠ‘Π’Π’Π Π΅ β--boolβ (Π±ΡΠ»Π΅Π²Π°) ΠΈΠ»ΠΈ β--intβ (Π΄Π΅ΡΠ΅ΡΠΈΡΠ½ΠΎ ΡΡΠ»ΠΎ ΡΠΈΡΠ»ΠΎ)" -#: builtin/config.c:79 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "Π‘Π’ΠΠΠΠΠ‘Π’Π’Π Π΅ ΠΏΡΡ (Π΄ΠΎ ΡΠ°ΠΉΠ» ΠΈΠ»ΠΈ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ)" -#: builtin/config.c:80 +#: builtin/config.c:82 msgid "Other" msgstr "ΠΡΡΠ³ΠΈ" # FIXME NUL byte to null char, terminate -> razdelitel - da stane ednakvo -#: builtin/config.c:81 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "ΡΠ°Π·Π΄Π΅Π»ΡΠ½Π΅ Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡΠΈΡΠ΅ Ρ Π½ΡΠ»Π΅Π²ΠΈΡ Π·Π½Π°ΠΊ βNULβ" -#: builtin/config.c:82 +#: builtin/config.c:84 msgid "show variable names only" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΠΏΡΠΎΠΌΠ΅Π½Π»ΠΈΠ²ΠΈΡΠ΅" -#: builtin/config.c:83 +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "ΠΏΡΠΈ ΡΡΡΡΠ΅Π½Π΅ Π΄Π° ΡΠ΅ ΡΠ²Π°ΠΆΠ°Ρ ΠΈ Π΄ΠΈΡΠ΅ΠΊΡΠΈΠ²ΠΈΡΠ΅ Π·Π° Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅" -#: builtin/config.c:303 +#: builtin/config.c:86 +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "" +"ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΌΡΡΡΠΎΡΠΎ Π½Π° Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° (ΡΠ°ΠΉΠ», ΡΡΠ°Π½Π΄Π°ΡΡΠ΅Π½ Π²Ρ
ΠΎΠ΄, " +"ΠΎΠ±Π΅ΠΊΡ BLOB, ΠΊΠΎΠΌΠ°Π½Π΄Π΅Π½ ΡΠ΅Π΄)" + +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "Π½Π΅ΡΠ°Π·ΠΏΠΎΠ·Π½Π°ΡΠ° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ ΡΠ²ΡΡ" -#: builtin/config.c:441 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5785,7 +6263,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:575 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΎΠ½Π½ΠΈΡΡ ΡΠ°ΠΉΠ» β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½" @@ -5822,7 +6300,7 @@ msgstr "Π² Π°Π½ΠΎΡΠΈΡΠ°Π½ΠΈΡ Π΅ΡΠΈΠΊΠ΅Ρ β%sβ Π»ΠΈΠΏΡΠ²Π° Π²Π³ΡΠ°Π΄Π΅Π msgid "tag '%s' is really '%s' here" msgstr "Π΅ΡΠΈΠΊΠ΅ΡΡΡ β%sβ ΡΡΠΊ Π΅ Π²ΡΡΡΠ½ΠΎΡΡ β%sβ" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ β%sβ" @@ -5918,7 +6396,7 @@ msgstr "Π΄Π° ΡΠ΅ ΡΡΡΡΠΈ ΡΠ°ΠΌΠΎ Π² ΡΠΎΠ·ΠΈ ΠΠ ΠΠ ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈ Π΅Ρ msgid "only consider tags matching <pattern>" msgstr "Π΄Π° ΡΠ΅ ΡΡΡΡΠΈ ΡΠ°ΠΌΠΎ ΠΈΠ·ΠΌΠ΅ΠΆΠ΄Ρ Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅ Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈ ΡΠΎΠ·ΠΈ Π¨ΠΠΠΠΠ" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠΊΡΠ°ΡΠ΅Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ ΠΊΠ°ΡΠΎ ΡΠ΅Π·Π΅ΡΠ²Π΅Π½ Π²Π°ΡΠΈΠ°Π½Ρ" @@ -5952,21 +6430,21 @@ msgstr "β%sβ: Π½Π΅ Π΅ Π½ΠΈΡΠΎ ΠΎΠ±ΠΈΠΊΠ½ΠΎΠ²Π΅Π½ ΡΠ°ΠΉΠ», Π½ΠΈΡΠΎ ΡΠΈΠΌΠ msgid "invalid option: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΠΎΠΏΡΠΈΡ: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "ΠΠ΅ Π΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π½Π° Git" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "Π·Π°Π΄Π°Π΄Π΅Π½ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΎΠ±Π΅ΠΊΡ β%sβ." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "Π·Π°Π΄Π°Π΄Π΅Π½ΠΈ ΡΠ° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ 2 ΠΎΠ±Π΅ΠΊΡΠ° BLOB: β%sβ" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "Π·Π°Π΄Π°Π΄Π΅Π½ Π΅ Π½Π΅ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°Π½ ΠΎΠ±Π΅ΠΊΡ β%sβ." @@ -5989,11 +6467,11 @@ msgstr "ΠΠ°ΠΊ Π΄Π° ΡΠ΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ²Π°Ρ Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅ Π½Π° ΡΠΈΠ»ΡΡ #: builtin/fast-export.c:988 msgid "Dump marks to this file" -msgstr "ΠΠ°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΌΠ°ΡΠΊΠ΅ΡΠΈΡΠ΅ Π² ΡΠΎΠ·ΠΈ ΡΠ°ΠΉΠ»" +msgstr "ΠΠ°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΌΠ°ΡΠΊΠ΅ΡΠΈΡΠ΅ Π² ΡΠΎΠ·ΠΈ Π€ΠΠΠ" #: builtin/fast-export.c:990 msgid "Import marks from this file" -msgstr "ΠΠ½Π°ΡΡΠ½Π΅ Π½Π° ΠΌΠ°ΡΠΊΠ΅ΡΠΈΡΠ΅ ΠΎΡ ΡΠΎΠ·ΠΈ ΡΠ°ΠΉΠ»" +msgstr "ΠΠ½Π°ΡΡΠ½Π΅ Π½Π° ΠΌΠ°ΡΠΊΠ΅ΡΠΈΡΠ΅ ΠΎΡ ΡΠΎΠ·ΠΈ Π€ΠΠΠ" #: builtin/fast-export.c:992 msgid "Fake a tagger when tags lack one" @@ -6013,11 +6491,11 @@ msgstr "ΠΠ΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° ΠΎΠ±Π΅ΠΊΡΠ #: builtin/fast-export.c:998 msgid "refspec" -msgstr "ΡΠΊΠ°Π·Π°ΡΠ΅Π» Π½Π° Π²Π΅ΡΡΠΈΡ" +msgstr "Π£ΠΠΠΠΠ’ΠΠ_ΠΠ_ΠΠΠ Π‘ΠΠ―" #: builtin/fast-export.c:999 msgid "Apply refspec to exported refs" -msgstr "ΠΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π΅ΡΡΠΈΡ ΠΊΡΠΌ ΠΈΠ·Π½Π΅ΡΠ΅Π½ΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" +msgstr "ΠΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° Π£ΠΠΠΠΠ’ΠΠΡ_ΠΠ_ΠΠΠ Π‘ΠΠ― ΠΊΡΠΌ ΠΈΠ·Π½Π΅ΡΠ΅Π½ΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" #: builtin/fast-export.c:1000 msgid "anonymize output" @@ -6039,164 +6517,163 @@ msgstr "git fetch --multiple [ΠΠΠ¦ΠΠ―β¦] [(Π₯Π ΠΠΠΠΠΠ©Π | ΠΠ Π£ΠΠ)β msgid "git fetch --all [<options>]" msgstr "git fetch --all [ΠΠΠ¦ΠΠ―β¦]" -#: builtin/fetch.c:90 builtin/pull.c:162 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ ΠΎΡ Π²ΡΠΈΡΠΊΠΈ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ°" -#: builtin/fetch.c:92 builtin/pull.c:165 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ ΠΊΡΠΌ β.git/FETCH_HEADβ Π²ΠΌΠ΅ΡΡΠΎ Π·Π°ΠΌΡΠ½Π°" -#: builtin/fetch.c:94 builtin/pull.c:168 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ ΠΏΡΡ, ΠΊΡΠ΄Π΅ΡΠΎ Π΄Π° ΡΠ΅ ΠΊΠ°ΡΠΈ ΠΏΠ°ΠΊΠ΅ΡΡΡ" -#: builtin/fetch.c:95 builtin/pull.c:170 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° Π»ΠΎΠΊΠ°Π»Π½ΠΈΡ ΠΊΠ»ΠΎΠ½" -#: builtin/fetch.c:97 +#: builtin/fetch.c:99 msgid "fetch from multiple remotes" msgstr "Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ ΠΎΡ ΠΌΠ½ΠΎΠΆΠ΅ΡΡΠ²ΠΎ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ°" -#: builtin/fetch.c:99 builtin/pull.c:172 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ Π΅ΡΠΈΠΊΠ΅ΡΠΈ ΠΈ ΠΏΡΠΈΠ½Π°Π΄Π»Π΅ΠΆΠ°ΡΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/fetch.c:101 +#: builtin/fetch.c:103 msgid "do not fetch all tags (--no-tags)" msgstr "Π±Π΅Π· Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ΡΠΎ Π½Π° Π²ΡΠΈΡΠΊΠΈ Π΅ΡΠΈΠΊΠ΅ΡΠΈ β--no-tagsβ" -#: builtin/fetch.c:103 builtin/pull.c:175 +#: builtin/fetch.c:105 +msgid "number of submodules fetched in parallel" +msgstr "Π±ΡΠΎΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ Π΄ΠΎΡΡΠ°Π²Π΅Π½ΠΈ ΠΏΠ°ΡΠ°Π»Π΅Π»Π½ΠΎ" + +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "ΠΎΠΊΠ°ΡΡΡΡΠ½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅ ΡΠ»Π΅Π΄ΡΡΠΈ Π²Π΅ΡΠ΅ Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈ ΠΊΠ»ΠΎΠ½ΠΈ" -#: builtin/fetch.c:104 builtin/pull.c:178 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" -msgstr "ΠΏΡΠΈ Π½ΡΠΆΠ΄Π°" +msgstr "ΠΠ Π ΠΠ£ΠΠΠ" -#: builtin/fetch.c:105 builtin/pull.c:179 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ Π½Π° ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎΡΠΎ Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅" -#: builtin/fetch.c:109 builtin/pull.c:184 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½ΠΈΡΠ΅ ΠΏΠ°ΠΊΠ΅ΡΠΈ Ρ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/fetch.c:111 +#: builtin/fetch.c:115 msgid "allow updating of HEAD ref" msgstr "ΠΏΠΎΠ·Π²ΠΎΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ βHEADβ" -#: builtin/fetch.c:114 builtin/pull.c:187 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "Π·Π°Π΄ΡΠ»Π±ΠΎΡΠ°Π²Π°Π½Π΅ Π½Π° ΠΈΡΡΠΎΡΠΈΡΡΠ° Π½Π° ΠΏΠ»ΠΈΡΠΊΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/fetch.c:116 builtin/pull.c:190 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "ΠΏΡΠ΅Π²ΡΡΡΠ°Π½Π΅ Π² ΠΏΡΠ»Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/fetch.c:118 builtin/log.c:1233 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/fetch.c:119 +#: builtin/fetch.c:123 msgid "prepend this to submodule path output" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠΎΠ²Π° ΠΏΡΠ΅Π΄ ΠΏΡΡΡ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π°" -#: builtin/fetch.c:122 +#: builtin/fetch.c:126 msgid "default mode for recursion" msgstr "ΡΡΠ°Π½Π΄Π°ΡΡΠ΅Π½ ΡΠ΅ΠΆΠΈΠΌ Π½Π° ΡΠ΅ΠΊΡΡΡΠΈΡ" -#: builtin/fetch.c:124 builtin/pull.c:193 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "ΠΏΡΠΈΠ΅ΠΌΠ°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ, ΠΊΠΎΠΈΡΠΎ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Ρ β.git/shallowβ" -#: builtin/fetch.c:125 builtin/pull.c:195 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" -msgstr "ΠΊΠ°ΡΡΠ° Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" +msgstr "ΠΠΠ Π’Π_Π‘_Π£ΠΠΠΠΠ’ΠΠΠ" -#: builtin/fetch.c:126 builtin/pull.c:196 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" -msgstr "ΡΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΊΠ°ΡΡΠ°ΡΠ° Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ Π·Π° Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅" +msgstr "ΡΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΠΠ Π’ΠΡΠ°_Π‘_Π£ΠΠΠΠΠ’ΠΠΠ Π·Π° Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅" -#: builtin/fetch.c:378 +#: builtin/fetch.c:386 msgid "Couldn't find remote ref HEAD" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π² ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡ" -#: builtin/fetch.c:458 +#: builtin/fetch.c:466 #, c-format msgid "object %s not found" msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ Π»ΠΈΠΏΡΠ²Π°" -#: builtin/fetch.c:463 +#: builtin/fetch.c:471 msgid "[up to date]" msgstr "[Π°ΠΊΡΡΠ°Π»ΠΈΠ·ΠΈΡΠ°Π½]" -#: builtin/fetch.c:477 +#: builtin/fetch.c:485 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s β %s (Π² ΡΠ΅ΠΊΡΡΠΈΡ ΠΊΠ»ΠΎΠ½ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π΄ΠΎΡΡΠ°Π²Ρ)" -#: builtin/fetch.c:478 builtin/fetch.c:566 +#: builtin/fetch.c:486 builtin/fetch.c:574 msgid "[rejected]" msgstr "[ΠΎΡΡ
Π²ΡΡΠ»Π΅Π½]" -#: builtin/fetch.c:489 +#: builtin/fetch.c:497 msgid "[tag update]" msgstr "[ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅]" -#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544 +#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 msgid " (unable to update local ref)" msgstr " (Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ ΠΎΠ±Π½ΠΎΠ²Π΅Π½ΠΈ)" -#: builtin/fetch.c:509 +#: builtin/fetch.c:517 msgid "[new tag]" msgstr "[Π½ΠΎΠ² Π΅ΡΠΈΠΊΠ΅Ρ]" -#: builtin/fetch.c:512 +#: builtin/fetch.c:520 msgid "[new branch]" msgstr "[Π½ΠΎΠ² ΠΊΠ»ΠΎΠ½]" -#: builtin/fetch.c:515 +#: builtin/fetch.c:523 msgid "[new ref]" msgstr "[Π½ΠΎΠ² ΡΠΊΠ°Π·Π°ΡΠ΅Π»]" -#: builtin/fetch.c:561 +#: builtin/fetch.c:569 msgid "unable to update local ref" msgstr "Π»ΠΎΠΊΠ°Π»Π΅Π½ ΡΠΊΠ°Π·Π°ΡΠ΅Π» Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½" -#: builtin/fetch.c:561 +#: builtin/fetch.c:569 msgid "forced update" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅" -#: builtin/fetch.c:568 +#: builtin/fetch.c:576 msgid "(non-fast-forward)" msgstr "(ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π΅ Π΅ ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ)" -#: builtin/fetch.c:602 builtin/fetch.c:843 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½: %s\n" - -#: builtin/fetch.c:611 +#: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" msgstr "Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ β%sβ Π½Π΅ ΠΈΠ·ΠΏΡΠ°ΡΠΈ Π²ΡΠΈΡΠΊΠΈ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ\n" -#: builtin/fetch.c:629 +#: builtin/fetch.c:637 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "ΠΎΡΡ
Π²ΡΡΠ»ΡΠ½Π΅ Π½Π° Π²ΡΡΡ
Π° β%sβ, Π·Π°ΡΠΎΡΠΎ ΠΏΠ»ΠΈΡΠΊΠΈΡΠ΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ° Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ " "ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½ΠΈ" -#: builtin/fetch.c:716 builtin/fetch.c:808 +#: builtin/fetch.c:724 builtin/fetch.c:816 #, c-format msgid "From %.*s\n" msgstr "ΠΡ %.*s\n" # FIXME - is the space necessary -#: builtin/fetch.c:727 +#: builtin/fetch.c:735 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6206,55 +6683,55 @@ msgstr "" "βgit remote prune %sβ, Π·Π° Π΄Π° ΠΏΡΠ΅ΠΌΠ°Ρ
Π½Π΅ΡΠ΅ ΠΎΡΡΠ°ΡΠ΅Π»ΠΈΡΠ΅ ΠΊΠ»ΠΎΠ½ΠΈ, ΠΊΠΎΠΈΡΠΎ\n" "ΠΏΡΠ΅Π΄ΠΈΠ·Π²ΠΈΠΊΠ²Π°Ρ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°" -#: builtin/fetch.c:779 +#: builtin/fetch.c:787 #, c-format msgid " (%s will become dangling)" msgstr " (ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ ΡΠ΅ ΡΠ΅ ΠΎΠΊΠ°ΠΆΠ΅ ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½)" -#: builtin/fetch.c:780 +#: builtin/fetch.c:788 #, c-format msgid " (%s has become dangling)" msgstr " (ΠΎΠ±Π΅ΠΊΡΡΡ β%sβ Π²Π΅ΡΠ΅ Π΅ ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½)" -#: builtin/fetch.c:812 +#: builtin/fetch.c:820 msgid "[deleted]" msgstr "[ΠΈΠ·ΡΡΠΈΡ]" -#: builtin/fetch.c:813 builtin/remote.c:1040 +#: builtin/fetch.c:821 builtin/remote.c:1025 msgid "(none)" msgstr "(Π½ΠΈΡΠΎ)" -#: builtin/fetch.c:833 +#: builtin/fetch.c:841 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π΄ΠΎΡΡΠ°Π²ΠΈΡΠ΅ Π² ΡΠ΅ΠΊΡΡΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ Π½Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅, ΠΊΠΎΠ΅ΡΠΎ Π½Π΅ Π΅ Π³ΠΎΠ»ΠΎ" -#: builtin/fetch.c:852 +#: builtin/fetch.c:860 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Π‘ΡΠΎΠΉΠ½ΠΎΡΡΡΠ° β%2$sβ Π·Π° ΠΎΠΏΡΠΈΡΡΠ° β%1$sβ Π½Π΅ Π΅ ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ β%3$sβ" -#: builtin/fetch.c:855 +#: builtin/fetch.c:863 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "ΠΠΏΡΠΈΡΡΠ° β%sβ ΡΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠ° ΠΏΡΠΈ β%sβ\n" -#: builtin/fetch.c:911 +#: builtin/fetch.c:920 #, c-format msgid "Don't know how to fetch from %s" msgstr "ΠΠ΅ ΡΠ΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ° Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ ΠΎΡ β%sβ" -#: builtin/fetch.c:1072 +#: builtin/fetch.c:1080 #, c-format msgid "Fetching %s\n" msgstr "ΠΠΎΡΡΠ°Π²ΡΠ½Π΅ Π½Π° β%sβ\n" -#: builtin/fetch.c:1074 builtin/remote.c:96 +#: builtin/fetch.c:1082 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π΄ΠΎΡΡΠ°Π²ΠΈ" -#: builtin/fetch.c:1092 +#: builtin/fetch.c:1100 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -6262,33 +6739,33 @@ msgstr "" "ΠΠ΅ ΡΡΠ΅ ΡΠΊΠ°Π·Π°Π»ΠΈ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅. ΠΠ°Π΄Π°ΠΉΡΠ΅ ΠΈΠ»ΠΈ Π°Π΄ΡΠ΅Ρ, ΠΈΠ»ΠΈ ΠΈΠΌΠ΅\n" "Π½Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅, ΠΎΡΠΊΡΠ΄Π΅ΡΠΎ Π΄Π° ΡΠ΅ Π΄ΠΎΡΡΠ°Π²ΡΡ Π½ΠΎΠ²ΠΈΡΠ΅ Π²Π΅ΡΡΠΈΠΈ." -#: builtin/fetch.c:1115 +#: builtin/fetch.c:1123 msgid "You need to specify a tag name." msgstr "Π’ΡΡΠ±Π²Π° Π΄Π° ΡΠΊΠ°ΠΆΠ΅ΡΠ΅ ΠΈΠΌΠ΅ Π½Π° Π΅ΡΠΈΠΊΠ΅Ρ." -#: builtin/fetch.c:1157 +#: builtin/fetch.c:1165 msgid "--depth and --unshallow cannot be used together" msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--depthβ ΠΈ β--unshallowβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: builtin/fetch.c:1159 +#: builtin/fetch.c:1167 msgid "--unshallow on a complete repository does not make sense" msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΡΠ΅ ΠΎΠΏΡΠΈΡΡΠ° β--unshallowβ Π²ΡΡΡ
Ρ ΠΏΡΠ»Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/fetch.c:1179 +#: builtin/fetch.c:1187 msgid "fetch --all does not take a repository argument" msgstr "ΠΊΡΠΌ βgit fetch --allβ Π½Π΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° Π΄ΠΎΠ±Π°Π²ΠΈΡΠ΅ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ β Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1189 msgid "fetch --all does not make sense with refspecs" msgstr "" "ΠΊΡΠΌ βgit fetch --allβ Π½Π΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° Π΄ΠΎΠ±Π°Π²ΠΈΡΠ΅ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ β ΡΠΊΠ°Π·Π°ΡΠ΅Π» Π½Π° Π²Π΅ΡΡΠΈΡ" -#: builtin/fetch.c:1192 +#: builtin/fetch.c:1200 #, c-format msgid "No such remote or remote group: %s" msgstr "ΠΡΠΌΠ° Π½ΠΈΡΠΎ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅, Π½ΠΈΡΠΎ Π³ΡΡΠΏΠ° ΠΎΡ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ° Π½Π° ΠΈΠΌΠ΅ β%sβ" -#: builtin/fetch.c:1200 +#: builtin/fetch.c:1208 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Π£ΠΊΠ°Π·Π²Π°Π½Π΅ΡΠΎ Π½Π° Π³ΡΡΠΏΠ° ΠΈ ΡΠΊΠ°Π·Π²Π°Π½Π΅ΡΠΎ Π½Π° Π²Π΅ΡΡΠΈΡ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" @@ -6362,7 +6839,7 @@ msgstr "Π€ΠΠ ΠΠΠ’ Π·Π° ΠΈΠ·Ρ
ΠΎΠ΄Π°" #: builtin/for-each-ref.c:41 msgid "print only refs which points at the given object" -msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅, ΡΠΎΡΠ΅ΡΠΈ ΠΊΡΠΌ ΠΎΠ±Π΅ΠΊΡΠ°" +msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅, ΡΠΎΡΠ΅ΡΠΈ ΠΊΡΠΌ ΠΠΠΠΠ’Π" #: builtin/for-each-ref.c:43 msgid "print only refs that are merged" @@ -6374,7 +6851,7 @@ msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" #: builtin/for-each-ref.c:45 msgid "print only refs which contain the commit" -msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΡΠ΄ΡΡΠΆΠ°Ρ ΡΠΎΠ²Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" +msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΡΠ΄ΡΡΠΆΠ°Ρ ΡΠΎΠ²Π° ΠΠΠΠΠΠΠΠ" #: builtin/fsck.c:156 builtin/prune.c:140 msgid "Checking connectivity" @@ -6384,56 +6861,56 @@ msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° Π½Π° Π²ΡΡΠ·ΠΊΠ°ΡΠ°" msgid "Checking object directories" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈΡΠ΅ Ρ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ΠΠΠ¦ΠΠ―β¦] [ΠΠΠΠΠ’β¦]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "ΠΏΠΎΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° Π½Π΅Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "ΠΏΠΎΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "ΠΏΠΎΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "ΠΏΠΎΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΊΠΎΡΠ΅Π½ΠΎΠ²ΠΈΡΠ΅ Π²ΡΠ·Π»ΠΈ" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈ ΠΎΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π΄Π° ΡΠ° ΠΊΠΎΡΠ΅Π½ΠΎΠ²ΠΈ" # FIXME bad message -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "ΠΏΡΠΎΡΠ»Π΅Π΄ΡΠ²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅ ΠΎΡ ΠΆΡΡΠ½Π°Π»Π° ΠΊΠ°ΡΠΎ Π³Π»Π°Π²ΠΈ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "Π΄ΠΎΠΏΡΠ»Π½ΠΈΡΠ΅Π»Π½ΠΎ Π΄Π° ΡΠ΅ ΠΏΡΠΎΠ²Π΅ΡΡΠ²Π°Ρ ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ΅ ΠΈ Π°Π»ΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΊΠ° ΡΠ°ΠΌΠΎ Π½Π° Π²ΡΡΠ·ΠΊΠ°ΡΠ°" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "ΠΏΠΎ-ΡΡΡΠΎΠ³ΠΈ ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅ Π² Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β.git/lost-foundβ" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "ΠΏΠΎΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ°" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" @@ -6527,239 +7004,253 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ΠΠΠ¦ΠΠ―β¦] [-e] Π¨ΠΠΠΠΠ [ΠΠΠ Π‘ΠΠ―β¦] [[--] ΠΠͺΠ’β¦]" -#: builtin/grep.c:218 +#: builtin/grep.c:219 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Π½ΠΈΡΠΊΠ°: %s" -#: builtin/grep.c:441 builtin/grep.c:476 +#: builtin/grep.c:277 +#, c-format +msgid "invalid number of threads specified (%d) for %s" +msgstr "Π·Π°Π΄Π°Π΄Π΅Π½ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ Π±ΡΠΎΠΉ Π½ΠΈΡΠΊΠΈ (%d) Π·Π° %s" + +#: builtin/grep.c:452 builtin/grep.c:487 #, c-format msgid "unable to read tree (%s)" msgstr "Π΄ΡΡΠ²ΠΎΡΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½ΠΎ (%s)" -#: builtin/grep.c:491 +#: builtin/grep.c:502 #, c-format msgid "unable to grep from object of type %s" msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·ΠΏΡΠ»Π½ΠΈ βgrepβ ΠΎΡ ΠΎΠ±Π΅ΠΊΡ ΠΎΡ Π²ΠΈΠ΄Π° %s" -#: builtin/grep.c:547 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β%cβ ΠΎΡΠ°ΠΊΠ²Π° ΡΠΈΡΠ»ΠΎ Π·Π° Π°ΡΠ³ΡΠΌΠ΅Π½Ρ" -#: builtin/grep.c:564 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½" -#: builtin/grep.c:633 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "ΡΡΡΡΠ΅Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°, Π° Π½Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/grep.c:635 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "ΡΡΡΡΠ΅Π½Π΅ ΠΈ Π²ΡΠ² ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π½Π΅ ΡΠ° ΠΏΠΎΠ΄ ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ΡΠΎ Π½Π° git" -#: builtin/grep.c:637 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "ΡΡΡΡΠ΅Π½Π΅ ΠΈ Π² ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅, ΠΈ Π² Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/grep.c:639 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ ΡΠΊΠ°Π·Π°Π½ΠΈ Π² β.gitignoreβ" -#: builtin/grep.c:642 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ΅Π΄ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π½Π΅ ΡΡΠ²ΠΏΠ°Π΄Π°Ρ" -#: builtin/grep.c:644 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "Π±Π΅Π· Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π½Π° ΡΠ΅Π³ΠΈΡΡΡΡΠ° Π½Π° Π±ΡΠΊΠ²ΠΈΡΠ΅ (Π³Π»Π°Π²Π½ΠΈ/ΠΌΠ°Π»ΠΊΠΈ)" -#: builtin/grep.c:646 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "Π½Π°ΠΏΠ°ΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ ΡΠ°ΠΌΠΎ ΠΏΠΎ Π³ΡΠ°Π½ΠΈΡΠΈΡΠ΅ Π½Π° Π΄ΡΠΌΠΈΡΠ΅" -#: builtin/grep.c:648 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "ΠΎΠ±ΡΠ°Π±ΠΎΡΠ²Π°Π½Π΅ Π½Π° Π΄Π²ΠΎΠΈΡΠ½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ ΠΊΠ°ΡΠΎ ΡΠ΅ΠΊΡΡΠΎΠ²ΠΈ" -#: builtin/grep.c:650 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "ΠΏΡΠ΅ΡΠΊΠ°ΡΠ°Π½Π΅ Π½Π° Π΄Π²ΠΎΠΈΡΠ½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/grep.c:653 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "" "ΠΎΠ±ΡΠ°Π±ΠΎΡΠ²Π°Π½Π΅ Π½Π° Π΄Π²ΠΎΠΈΡΠ½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ ΡΡΠ΅Π· ΡΠΈΠ»ΡΡΠΈ Π·Π° ΠΏΡΠ΅ΠΎΠ±ΡΠ°Π·ΡΠ²Π°Π½Π΅ ΠΊΡΠΌ ΡΠ΅ΠΊΡΡ" -#: builtin/grep.c:655 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "Π½Π°Π²Π»ΠΈΠ·Π°Π½Π΅ ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»Π½ΠΎ Π½Π° ΡΠ°Π·ΠΈ ΠΠͺΠΠΠΠ§ΠΠΠ Π² Π΄ΡΡΠ²ΠΎΡΠΎ" -#: builtin/grep.c:659 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "ΡΠ°Π·ΡΠΈΡΠ΅Π½ΠΈ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΠΈ ΠΈΠ·ΡΠ°Π·ΠΈ ΠΏΠΎ POSIX" -#: builtin/grep.c:662 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "ΠΎΡΠ½ΠΎΠ²Π½ΠΈ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΠΈ ΠΈΠ·ΡΠ°Π·ΠΈ ΠΏΠΎ POSIX (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ)" -#: builtin/grep.c:665 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ ΡΠ° Π΄ΠΎΡΠ»ΠΎΠ²Π½ΠΈ Π½ΠΈΠ·ΠΎΠ²Π΅" -#: builtin/grep.c:668 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "ΡΠ΅Π³ΡΠ»ΡΡΠ½ΠΈ ΠΈΠ·ΡΠ°Π·ΠΈ Π½Π° Perl" -#: builtin/grep.c:671 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½ΠΎΠΌΠ΅ΡΠ°ΡΠ° Π½Π° ΡΠ΅Π΄ΠΎΠ²Π΅ΡΠ΅" -#: builtin/grep.c:672 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅" -#: builtin/grep.c:673 +#: builtin/grep.c:686 msgid "show filenames" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅" -#: builtin/grep.c:675 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»Π½ΠΈΡΠ΅ ΠΈΠΌΠ΅Π½Π° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ ΡΠΏΡΡΠΌΠΎ ΠΎΡΠ½ΠΎΠ²Π½Π°ΡΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π° " "Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ" -#: builtin/grep.c:677 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ Π±Π΅Π· Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈΡΠ΅ ΡΠ΅Π΄ΠΎΠ²Π΅" -#: builtin/grep.c:679 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π½Π° β--files-with-matchesβ" -#: builtin/grep.c:682 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π½Π΅ ΡΡΠ΄ΡΡΠΆΠ°Ρ ΡΠ΅Π΄, Π½Π°ΠΏΠ°ΡΠ²Π°Ρ Π½Π° " "ΡΠ°Π±Π»ΠΎΠ½Π°" -#: builtin/grep.c:684 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½ΡΠ»Π΅Π²ΠΈΡ Π·Π½Π°ΠΊ βNULβ ΡΠ»Π΅Π΄ Π²ΡΡΠΊΠΎ ΠΈΠΌΠ΅ Π½Π° ΡΠ°ΠΉΠ»" -#: builtin/grep.c:686 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π±ΡΠΎΡ Π½Π° ΡΡΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡΡΠ° Π²ΠΌΠ΅ΡΡΠΎ Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈΡΠ΅ ΡΠ΅Π΄ΠΎΠ²Π΅" -#: builtin/grep.c:687 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "ΠΎΡΠ²Π΅ΡΡΠ²Π°Π½Π΅ Π½Π° Π½Π°ΠΏΠ°ΡΠ²Π°Π½ΠΈΡΡΠ°" -#: builtin/grep.c:689 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΡΠ°Π·Π΅Π½ ΡΠ΅Π΄ ΠΌΠ΅ΠΆΠ΄Ρ Π½Π°ΠΏΠ°ΡΠ²Π°Π½ΠΈΡΡΠ° ΠΎΡ ΡΠ°Π·Π»ΠΈΡΠ½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/grep.c:691 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅ΡΠΎ Π½Π° ΡΠ°ΠΉΠ»Π° ΡΠ°ΠΌΠΎ Π²Π΅Π΄Π½ΡΠΆ Π·Π° Π²ΡΠΈΡΠΊΠΈ Π½Π°ΠΏΠ°ΡΠ²Π°Π½ΠΈΡ ΠΎΡ ΡΠΎΠ·ΠΈ ΡΠ°ΠΉΠ»" -#: builtin/grep.c:694 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ°ΠΊΡΠ² ΠΠ ΠΠ ΡΠ΅Π΄ΠΎΠ²Π΅ ΠΏΡΠ΅Π΄ΠΈ ΠΈ ΡΠ»Π΅Π΄ Π½Π°ΠΏΠ°ΡΠ²Π°Π½ΠΈΡΡΠ°" -#: builtin/grep.c:697 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ°ΠΊΡΠ² ΠΠ ΠΠ ΡΠ΅Π΄ΠΎΠ²Π΅ ΠΏΡΠ΅Π΄ΠΈ Π½Π°ΠΏΠ°ΡΠ²Π°Π½ΠΈΡΡΠ°" -#: builtin/grep.c:699 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ°ΠΊΡΠ² ΠΠ ΠΠ ΡΠ΅Π΄ΠΎΠ²Π΅ ΡΠ»Π΅Π΄ Π½Π°ΠΏΠ°ΡΠ²Π°Π½ΠΈΡΡΠ°" -#: builtin/grep.c:700 +#: builtin/grep.c:714 +msgid "use <n> worker threads" +msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠ°ΠΊΡΠ² ΠΠ ΠΠ ΡΠ°Π±ΠΎΡΠ΅ΡΠΈ Π½ΠΈΡΠΊΠΈ" + +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π½Π° β-C ΠΠ ΠΠβ" -#: builtin/grep.c:703 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ΅Π΄ Ρ ΠΈΠΌΠ΅ΡΠΎ Π½Π° ΡΡΠ½ΠΊΡΠΈΡΡΠ°, Π² ΠΊΠΎΡΡΠΎ Π΅ Π½Π°ΠΏΠ°ΡΠ½Π°Ρ ΡΠ°Π±Π»ΠΎΠ½Π°" -#: builtin/grep.c:705 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΎΠ±Ρ
Π²Π°ΡΠ°ΡΠ°ΡΠ° ΡΡΠ½ΠΊΡΠΈΡ" -#: builtin/grep.c:708 +#: builtin/grep.c:723 msgid "read patterns from file" -msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ ΠΎΡ ΡΠ°ΠΉΠ»" +msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ ΠΎΡ Π€ΠΠΠ" -#: builtin/grep.c:710 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "Π½Π°ΠΏΠ°ΡΠ²Π°Π½Π΅ Π½Π° Π¨ΠΠΠΠΠ" -#: builtin/grep.c:712 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "ΠΊΠΎΠΌΠ±ΠΈΠ½ΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ ΡΠΊΠ°Π·Π°Π½ΠΈ Ρ ΠΎΠΏΡΠΈΡΡΠ° β-eβ" -#: builtin/grep.c:724 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "" "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ ΠΈΠ·Ρ
ΠΎΠ΄. ΠΠ·Ρ
ΠΎΠ΄Π½ΠΈΡΡ ΠΊΠΎΠ΄ ΡΠΊΠ°Π·Π²Π° Π½Π°Π»ΠΈΡΠΈΠ΅ΡΠΎ Π½Π° " "Π½Π°ΠΏΠ°ΡΠ²Π°Π½Π΅" -#: builtin/grep.c:726 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ΅Π΄ΠΎΠ²Π΅ ΡΠ°ΠΌΠΎ ΠΎΡ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π½Π°ΠΏΠ°ΡΠ²Π°Ρ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΠ°Π±Π»ΠΎΠ½ΠΈ" -#: builtin/grep.c:728 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π΄ΡΡΠ²ΠΎΡΠΎ Π·Π° Π°Π½Π°Π»ΠΈΠ· Π½Π° ΡΠ΅Π³ΡΠ»ΡΡΠ½ΠΈΡ ΠΈΠ·ΡΠ°Π·" -#: builtin/grep.c:732 +#: builtin/grep.c:747 msgid "pager" msgstr "ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΠΏΡΠ΅Π³Π»Π΅Π΄ ΠΏΠΎ ΡΡΡΠ°Π½ΠΈΡΠΈ" -#: builtin/grep.c:732 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ²ΠΏΠ°Π΄Π°ΡΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΠΏΡΠ΅Π³Π»Π΅Π΄ ΠΏΠΎ ΡΡΡΠ°Π½ΠΈΡΠΈ" -#: builtin/grep.c:735 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "ΠΏΠΎΠ·Π²ΠΎΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΡΡΠ°ΡΡΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° grep(1) (ΡΠ΅ΠΊΡΡΠΈΡΡ ΠΊΠΎΠΌΠΏΠΈΠ»Π°Ρ ΠΏΡΠ΅Π½Π΅Π±ΡΠ΅Π³Π²Π° ΡΠ°Π·ΠΈ " "ΠΎΠΏΡΠΈΡ)" -#: builtin/grep.c:793 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "Π»ΠΈΠΏΡΠ²Π° ΡΠ°Π±Π»ΠΎΠ½." -#: builtin/grep.c:851 +#: builtin/grep.c:845 builtin/index-pack.c:1477 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "Π·Π°Π΄Π°Π΄Π΅Π½ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ Π±ΡΠΎΠΉ Π½ΠΈΡΠΊΠΈ: %d" + +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "" "ΠΎΠΏΡΠΈΡΡΠ° β--open-files-in-pagerβ Π΅ ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° ΡΠ°ΠΌΠΎ Ρ ΡΡΡΡΠ΅Π½Π΅ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/grep.c:877 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--cachedβ ΠΈ β--untrackedβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ Ρ β--no-indexβ." -#: builtin/grep.c:882 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--cachedβ ΠΈ β--untrackedβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ Ρ ΡΡΡΡΠ΅Π½Π΅ Π²ΡΠ² Π²Π΅ΡΡΠΈΠΈ." -#: builtin/grep.c:885 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--(no-)exclude-standardβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ Ρ ΡΡΡΡΠ΅Π½Π΅ ΠΏΠΎ ΡΠ»Π΅Π΄Π΅Π½ΠΈ " "ΡΠ°ΠΉΠ»ΠΎΠ²Π΅." -#: builtin/grep.c:893 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--cachedβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° ΡΡΡ Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° Π΄ΡΡΠ²ΠΎ." -#: builtin/hash-object.c:80 +#: builtin/hash-object.c:81 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -6767,40 +7258,40 @@ msgstr "" "git hash-object [-t ΠΠΠ] [-w] [--path=Π€ΠΠΠ | --no-filters] [--stdin] [--] " "Π€ΠΠΠβ¦" -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:82 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:92 +#: builtin/hash-object.c:93 msgid "type" msgstr "ΠΠΠ" -#: builtin/hash-object.c:92 +#: builtin/hash-object.c:93 msgid "object type" -msgstr "Π²ΠΈΠ΄ Π½Π° ΠΎΠ±Π΅ΠΊΡΠ°" +msgstr "ΠΠΠ Π½Π° ΠΎΠ±Π΅ΠΊΡΠ°" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "write the object into the object database" msgstr "Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠ° Π² Π±Π°Π·Π°ΡΠ° ΠΎΡ Π΄Π°Π½Π½ΠΈ Π·Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "read the object from stdin" msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠ° ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "store file as is without filters" msgstr "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»Π° ΠΊΠ°ΠΊΡΠΎ Π΅ β Π±Π΅Π· ΡΠΈΠ»ΡΡΠΈ" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ ΠΈ Ρ
Π΅ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΡΠΎΠΈΠ·Π²ΠΎΠ»Π½ΠΈ Π΄Π°Π½Π½ΠΈ Π·Π° ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½ΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ Π·Π° ΡΡΠ°ΡΠΈΡΠ°Π½Π΅ Π½Π° " "Git" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "process file as it were from this path" -msgstr "ΠΎΠ±ΡΠ°Π±ΠΎΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»Π° Π²ΡΠ΅ Π΅Π΄Π½ΠΎ Π΅ Ρ ΡΠΎΠ·ΠΈ ΠΏΡΡ" +msgstr "ΠΎΠ±ΡΠ°Π±ΠΎΡΠ²Π°Π½Π΅ Π½Π° Π€ΠΠΠΠ° Π²ΡΠ΅ Π΅Π΄Π½ΠΎ Π΅ Ρ ΡΠΎΠ·ΠΈ ΠΏΡΡ" #: builtin/help.c:41 msgid "print all available commands" @@ -6846,10 +7337,10 @@ msgstr "ΠΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ ΡΡΠ°ΡΠ° Π²Π΅ΡΡΠΈΡ Π½Π° βemacsclientβ β %d #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° β%sβ: %s" +msgid "failed to exec '%s'" +msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° β%sβ" -#: builtin/help.c:208 +#: builtin/help.c:205 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -6858,7 +7349,7 @@ msgstr "" "β%sβ: ΠΏΡΡ ΠΊΡΠΌ Π½Π΅ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°Π½Π° ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΠΏΡΠ΅Π³Π»Π΅Π΄ Π½Π°\n" " ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ. ΠΠΌΠ΅ΡΡΠΎ Π½Π΅Ρ ΠΏΡΠΎΠ±Π²Π°ΠΉΡΠ΅ βman.<tool>.cmdβ." -#: builtin/help.c:220 +#: builtin/help.c:217 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -6867,63 +7358,63 @@ msgstr "" "β%sβ: ΠΊΠΎΠΌΠ°Π½Π΄Π° Π·Π° ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°Π½Π° ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΠΏΡΠ΅Π³Π»Π΅Π΄ Π½Π°\n" " ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ. ΠΠΌΠ΅ΡΡΠΎ Π½Π΅Ρ ΠΏΡΠΎΠ±Π²Π°ΠΉΡΠ΅ βman.<tool>.pathβ." -#: builtin/help.c:337 +#: builtin/help.c:334 #, c-format msgid "'%s': unknown man viewer." msgstr "β%sβ: Π½Π΅ΠΏΠΎΠ·Π½Π°ΡΠ° ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΠΏΡΠ΅Π³Π»Π΅Π΄ Π½Π° ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ." -#: builtin/help.c:354 +#: builtin/help.c:351 msgid "no man viewer handled the request" msgstr "Π½ΠΈΠΊΠΎΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΠΏΡΠ΅Π³Π»Π΅Π΄ Π½Π° ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎ Π½Π΅ ΡΡΠΏΡ Π΄Π° ΠΎΠ±ΡΠ°Π±ΠΎΡΠΈ Π·Π°ΡΠ²ΠΊΠ°ΡΠ°" -#: builtin/help.c:362 +#: builtin/help.c:359 msgid "no info viewer handled the request" msgstr "" "Π½ΠΈΠΊΠΎΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΠΏΡΠ΅Π³Π»Π΅Π΄ Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΎΠ½Π½ΠΈΡΠ΅ ΡΡΡΠ°Π½ΠΈΡΠΈ Π½Π΅ ΡΡΠΏΡ Π΄Π° ΠΎΠ±ΡΠ°Π±ΠΎΡΠΈ " "Π·Π°ΡΠ²ΠΊΠ°ΡΠ°" -#: builtin/help.c:411 +#: builtin/help.c:408 msgid "Defining attributes per path" msgstr "Π£ΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° Π°ΡΡΠΈΠ±ΡΡΠΈ ΠΊΡΠΌ ΠΏΡΡ" -#: builtin/help.c:412 +#: builtin/help.c:409 msgid "Everyday Git With 20 Commands Or So" msgstr "ΠΠΆΠ΅Π΄Π½Π΅Π²ΠΈΠ΅ΡΠΎ Π² Git Π² ΡΠ°ΠΌΠΊΠΈΡΠ΅ Π½Π° 20-ΠΈΠ½Π° ΠΊΠΎΠΌΠ°Π½Π΄ΠΈ" -#: builtin/help.c:413 +#: builtin/help.c:410 msgid "A Git glossary" msgstr "Π Π΅ΡΠ½ΠΈΠΊ Ρ ΡΠ΅ΡΠΌΠΈΠ½ΠΈΡΠ΅ Π½Π° Git" -#: builtin/help.c:414 +#: builtin/help.c:411 msgid "Specifies intentionally untracked files to ignore" msgstr "Π£ΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅, ΠΊΠΎΠΈΡΠΎ Π΄Π° Π±ΡΠ΄Π°Ρ Π½Π°ΡΠΎΡΠ½ΠΎ ΠΏΡΠ΅Π½Π΅Π±ΡΠ΅Π³Π²Π°Π½ΠΈ" -#: builtin/help.c:415 +#: builtin/help.c:412 msgid "Defining submodule properties" msgstr "ΠΠ΅ΡΠΈΠ½ΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ²ΠΎΠΉΡΡΠ²Π°ΡΠ° Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅" -#: builtin/help.c:416 +#: builtin/help.c:413 msgid "Specifying revisions and ranges for Git" msgstr "Π£ΠΊΠ°Π·Π²Π°Π½Π΅ Π½Π° Π²Π΅ΡΡΠΈΠΈ ΠΈ ΠΈΠ½ΡΠ΅ΡΠ²Π°Π»ΠΈ Π² Git" -#: builtin/help.c:417 +#: builtin/help.c:414 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "ΠΡΠ²Π΅ΠΆΠ΄Π°Ρ ΡΡΠΎΠΊ Π·Π° Git (Π²Π΅ΡΡΠΈΠΈ ΠΏΠΎΠ½Π΅ 1.5.1)" -#: builtin/help.c:418 +#: builtin/help.c:415 msgid "An overview of recommended workflows with Git" msgstr "ΠΠ±Ρ ΠΏΡΠ΅Π³Π»Π΅Π΄ Π½Π° ΠΏΡΠ΅ΠΏΠΎΡΡΡΠ²Π°Π½ΠΈΡΠ΅ Π½Π°ΡΠΈΠ½ΠΈ Π·Π° ΡΠ°Π±ΠΎΡΠ° Ρ Git" -#: builtin/help.c:430 +#: builtin/help.c:427 msgid "The common Git guides are:\n" msgstr "ΠΠΎΠΏΡΠ»ΡΡΠ½ΠΈΡΠ΅ ΠΏΡΡΠ΅Π²ΠΎΠ΄ΠΈΡΠ΅Π»ΠΈ Π² Git ΡΠ°:\n" -#: builtin/help.c:451 builtin/help.c:468 +#: builtin/help.c:448 builtin/help.c:465 #, c-format msgid "usage: %s%s" msgstr "ΡΠΏΠΎΡΡΠ΅Π±Π°: %s%s" -#: builtin/help.c:484 +#: builtin/help.c:481 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "βgit %sβ Π΅ ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π½Π° β%sβ" @@ -7119,118 +7610,115 @@ msgstr "" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ΡΠΎ Π·Π°Π²ΡΡΡΠΈ Ρ %d Π»ΠΎΠΊΠ°Π»Π½ΠΈ ΠΎΠ±Π΅ΠΊΡΠ°" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ΡΠΎ Π·Π°Π²ΡΡΡΠΈ Ρ %d Π»ΠΎΠΊΠ°Π»Π΅Π½ ΠΎΠ±Π΅ΠΊΡ" +msgstr[1] "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ΡΠΎ Π·Π°Π²ΡΡΡΠΈ Ρ %d Π»ΠΎΠΊΠ°Π»Π½ΠΈ ΠΎΠ±Π΅ΠΊΡΠ°" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "ΠΠ΅ΠΎΡΠ°ΠΊΠ²Π°Π½Π° ΠΏΠΎΡΠ»Π΅Π΄Π²Π°ΡΠ° ΡΡΠΌΠ° Π·Π° Π³ΡΠ΅ΡΠΊΠΈ Π·Π° β%sβ (ΠΏΡΠΈΡΠΈΠ½Π°ΡΠ° ΠΌΠΎΠΆΠ΅ Π΄Π° Π΅ Π³ΡΠ΅ΡΠΊΠ° Π² " "Π΄ΠΈΡΠΊΠ°)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Π² ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΈΠΌΠ° %d Π½Π΅Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠ° ΡΠ°Π·Π»ΠΈΠΊΠ°" msgstr[1] "Π² ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΈΠΌΠ° %d Π½Π΅Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈ ΡΠ°Π·Π»ΠΈΠΊΠΈ" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Π΄ΠΎΠ±Π°Π²Π΅Π½ΠΈΡΡ ΠΎΠ±Π΅ΠΊΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΊΠΎΠΌΠΏΡΠ΅ΡΠΈΡΠ° Ρ βdeflateβ: %d" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΡ ΠΎΠ±Π΅ΠΊΡ β%sβ Π΅ ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ Π·Π°ΡΠ²Π°ΡΡΠ½Π΅ΡΠΎ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡ ΡΠ°ΠΉΠ»" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "" "Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΡΠ°ΠΉΠ»Π° β%sβ, ΠΎΡΠΈΠ³ΡΡΡΠ²Π°Ρ Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "" "Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ Π·Π°ΡΠ²Π°ΡΡΠ½Π΅ΡΠΎ Π½Π° Π·Π°ΠΏΠΈΡΠ°Π½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ, ΠΎΡΠΈΠ³ΡΡΡΠ²Π°Ρ Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° " "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡΡ ΡΠ°ΠΉΠ» Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠ°Π·Π΅Π½" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "ΡΠ°ΠΉΠ»ΡΡ Π·Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΡ
ΡΠ°Π½Π΅Π½" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "Π·Π°Π΄Π°Π΄Π΅Π½Π° Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° Π²Π΅ΡΡΠΈΡ ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½Π΅: βpack.indexversion=%<PRIu32>β" -#: builtin/index-pack.c:1475 -#, c-format -msgid "invalid number of threads specified (%d)" -msgstr "Π·Π°Π΄Π°Π΄Π΅Π½ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ Π±ΡΠΎΠΉ Π½ΠΈΡΠΊΠΈ: %d" - -#: builtin/index-pack.c:1479 builtin/index-pack.c:1663 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "Π»ΠΈΠΏΡΠ²Π° ΠΏΠΎΠ΄Π΄ΡΡΠΆΠΊΠ° Π·Π° Π½ΠΈΡΠΊΠΈ. β%sβ ΡΠ΅ ΡΠ΅ ΠΏΡΠ΅Π½Π΅Π±ΡΠ΅Π³Π½Π΅" -#: builtin/index-pack.c:1537 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Π‘ΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈΡΡ ΠΏΠ°ΠΊΠ΅ΡΠ΅Π½ ΡΠ°ΠΉΠ» β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½" -#: builtin/index-pack.c:1539 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Π‘ΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π·Π° ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½" -#: builtin/index-pack.c:1586 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d ΠΎΠ±Π΅ΠΊΡ Π½Π΅ Π΅ ΡΠ°Π·Π»ΠΈΠΊΠ°" msgstr[1] "%d ΠΎΠ±Π΅ΠΊΡΠ° Π½Π΅ ΡΠ° ΡΠ°Π·Π»ΠΈΠΊΠ°" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1596 #, 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:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "ΠΈΠΌΠ΅ΡΠΎ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ Π½Π΅ Π·Π°Π²ΡΡΡΠ²Π° Π½Π° β.packβ" + # FIXME it is not the cwd it is the previous cwd -#: builtin/index-pack.c:1623 +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "ΠΡΠΎΡΠ΅ΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π²ΡΡΠ½Π΅ ΠΊΡΠΌ ΠΏΡΠ΅Π΄ΠΈΡΠ½Π°ΡΠ° ΡΠ°Π±ΠΎΡΠ½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/index-pack.c:1675 builtin/index-pack.c:1678 -#: builtin/index-pack.c:1690 builtin/index-pack.c:1694 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ β%sβ" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--fix-thinβ ΠΈΠ·ΠΈΡΠΊΠ²Π° β--stdinβ" -#: builtin/index-pack.c:1712 builtin/index-pack.c:1721 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "ΠΈΠΌΠ΅ΡΠΎ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡ ΡΠ°ΠΉΠ» β%sβ Π½Π΅ Π·Π°Π²ΡΡΡΠ²Π° Π½Π° β.packβ" - -#: builtin/index-pack.c:1729 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--verifyβ ΠΈΠ·ΠΈΡΠΊΠ²Π° ΠΈΠΌΠ΅ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ΅Π½ ΡΠ°ΠΉΠ»" @@ -7269,28 +7757,27 @@ msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΊΠΎΠΏΠΈΡΠ° Π² β%sβ" msgid "ignoring template %s" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°Π±Π»ΠΎΠ½Π° β%sβ" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Ρ ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ Π½Π΅ Π΅ ΠΎΡΠΊΡΠΈΡΠ°: β%sβ" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "" -"ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ Ρ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ Π½ΠΎΠΌΠ΅Ρ Π½Π° ΡΠΎΡΠΌΠ°ΜΡΠ° %d Π½ΡΠΌΠ° Π΄Π° Π±ΡΠ΄Π°Ρ ΠΊΠΎΠΏΠΈΡΠ°Π½ΠΈ ΠΎΡ β%sβ" +msgid "not copying templates from '%s': %s" +msgstr "ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ Π½ΡΠΌΠ° Π΄Π° Π±ΡΠ΄Π°Ρ ΠΊΠΎΠΏΠΈΡΠ°Π½ΠΈ ΠΎΡ β%sβ: β%sβ" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "ΠΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ ΠΎΡ Π²ΠΈΠ΄ %d Π½Π΅ ΡΠ΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°Ρ" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠ΅ΠΌΠ΅ΡΡΠΈ Π² β%sβ" @@ -7298,24 +7785,24 @@ 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π½Π° Git Π² β%s%sβ\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "ΠΠ°Π½ΠΎΠ²ΠΎ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠ°Π½ΠΎ, ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΎ" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠ°Π½ΠΎ ΠΏΡΠ°Π·Π½ΠΎ" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr ", ΡΠΏΠΎΠ΄Π΅Π»Π΅Π½ΠΎ" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7323,27 +7810,27 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―_Π‘_Π¨ΠΠΠΠΠΠ] [--" "shared[=ΠΠ ΠΠΠ]] [ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "ΠΏΡΠ°Π²Π°" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "ΡΠΊΠ°Π·Π²Π°Π½Π΅, ΡΠ΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ Π½Π° Git ΡΠ΅ Π±ΡΠ΄Π΅ ΡΠΏΠΎΠ΄Π΅Π»Π΅Π½ΠΎ ΠΎΡ ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ Π΅Π΄ΠΈΠ½ " "ΠΏΠΎΡΡΠ΅Π±ΠΈΡΠ΅Π»" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π²Π»Π΅Π·Π΅ Π² Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7352,31 +7839,39 @@ msgstr "" "%s (ΠΈΠ»ΠΈ --work-tree=ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―) ΠΈΠ·ΠΈΡΠΊΠ²Π° ΡΠΊΠ°Π·Π²Π°Π½Π΅ΡΠΎ Π½Π° %s (ΠΈΠ»ΠΈ --git-" "dir=ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, 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>...]" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<value>])...] [<file>...]" msgstr "" -"git interpret-trailers [--trim-empty] [(--trailer ΠΠΠΠ‘ΠΠΠ[(=|:)Π‘Π’ΠΠΠΠΠ‘Π’])β¦] " -"[Π€ΠΠΠβ¦]" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"ΠΠΠΠ‘ΠΠΠ[(=|:)Π‘Π’ΠΠΠΠΠ‘Π’])β¦] [Π€ΠΠΠβ¦]" -#: builtin/interpret-trailers.c:25 +#: builtin/interpret-trailers.c:26 +msgid "edit files in place" +msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠ½ΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅" + +#: builtin/interpret-trailers.c:27 msgid "trim empty trailers" msgstr "ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ Π½Π° ΠΏΡΠ°Π·Π½ΠΈΡΠ΅ Π΅ΠΏΠΈΠ»ΠΎΠ·ΠΈ" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:28 msgid "trailer" msgstr "Π΅ΠΏΠΈΠ»ΠΎΠ³" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:29 msgid "trailer(s) to add" msgstr "Π΅ΠΏΠΈΠ»ΠΎΠ³(Π·ΠΈ) Π·Π° Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅" +#: builtin/interpret-trailers.c:42 +msgid "no input file given for in-place editing" +msgstr "Π½Π΅ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½ Π²Ρ
ΠΎΠ΄Π΅Π½ ΡΠ°ΠΉΠ» Π·Π° ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΌΡΡΡΠΎ" + #: builtin/log.c:43 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ΠΠΠ¦ΠΠ―β¦] [ΠΠΠΠΠΠΠΠ_ΠΠ_ΠΠΠ Π‘ΠΠΠ’Π] [[--] ΠΠͺΠ’β¦]" @@ -7390,277 +7885,327 @@ msgstr "git show [ΠΠΠ¦ΠΠ―β¦] ΠΠΠΠΠ’β¦" msgid "invalid --decorate option: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΠΎΠΏΡΠΈΡ β--decorateβ: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ°Π·Π»ΠΈΠΊΠΈΡΠ΅" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ·Ρ
ΠΎΠ΄Π½ΠΈΡ ΠΊΠΎΠ΄" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "" "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ» Π·Π° ΡΡΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΡΡΠ° Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° ΠΈ Π°Π΄ΡΠ΅ΡΠΈΡΠ΅ Π½Π° Π΅-ΠΏΠΎΡΠ° (β." "mailmapβ)" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ Π½Π° ΡΠΎΡΠΌΠ°ΜΡΠ° Π½Π° ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π°ΡΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "" "ΠΠ±ΡΠ°Π±ΠΎΡΠ²Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠ΅Π΄ΠΎΠ²Π΅ΡΠ΅ Π²ΡΠ² ΡΠ°ΠΉΠ»Π° Π² ΠΈΠ½ΡΠ΅ΡΠ²Π°Π»Π° ΠΎΡ n Π΄ΠΎ m Π²ΠΊΠ»ΡΡΠΈΡΠ΅Π»Π½ΠΎ. " "ΠΡΠΎΠ΅Π½Π΅ΡΠΎ Π·Π°ΠΏΠΎΡΠ²Π° ΠΎΡ 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Π Π΅Π·ΡΠ»ΡΠ°Ρ: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ΠΏΠΎΠ²ΡΠ΅Π΄Π΅Π½ ΡΠ°ΠΉΠ»" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "ΠΠ±Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½: %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ΅Π½ Π²ΠΈΠ΄: %d" -#: builtin/log.c:714 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "Π½Π΅ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π½Π° βformat.headersβ" -#: builtin/log.c:798 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "ΠΏΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ Π΄ΡΠ»Π³ΠΎ ΠΈΠΌΠ΅ Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Π·Π° ΠΈΠ·Ρ
ΠΎΠ΄Π½Π°ΡΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ" -#: builtin/log.c:813 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Π€Π°ΠΉΠ»ΡΡ-ΠΊΡΡΠΏΠΊΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½" -#: builtin/log.c:827 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Π’ΡΡΠ±Π²Π° Π΄Π° Π·Π°Π΄Π°Π΄Π΅ΡΠ΅ ΡΠΎΡΠ½ΠΎ Π΅Π΄ΠΈΠ½ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½." -#: builtin/log.c:837 +#: builtin/log.c:851 msgid "Not a range." msgstr "ΠΠ΅ Π΅ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½." -#: builtin/log.c:943 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "ΠΡΠΈΠ΄ΡΡΠΆΠ°Π²Π°ΡΠΎΡΠΎ ΠΏΠΈΡΠΌΠΎ ΡΡΡΠ±Π²Π° Π΄Π° Π΅ ΡΠΎΡΠΌΠ°ΡΠΈΡΠ°Π½ΠΎ ΠΊΠ°ΡΠΎ Π΅-ΠΏΠΈΡΠΌΠΎ" # FIXME bad wording insanely -#: builtin/log.c:1022 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠΎΡΠΌΠ°Ρ Π½Π° Π·Π°Π³Π»Π°Π²Π½Π°ΡΠ° ΡΠ°ΡΡ Π·Π° ΠΎΡΠ³ΠΎΠ²ΠΎΡ βin-reply-toβ: %s" -#: builtin/log.c:1050 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ΠΠΠ¦ΠΠ―β¦] [ΠΠ’ | ΠΠΠΠΠΠΠΠ_ΠΠ_ΠΠΠ Π‘ΠΠΠ’Π]" -# FIXME message WTF why ask it -#: builtin/log.c:1095 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "ΠΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΡΠΊΠ°ΠΆΠ΅ΡΠ΅ ΠΌΠ°ΠΊΡΠΈΠΌΡΠΌ Π΅Π΄Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π·Π° ΠΈΠ·Ρ
ΠΎΠ΄." -#: builtin/log.c:1211 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "ΠΠ΅ΠΏΠΎΠ·Π½Π°ΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ β%sβ" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠΊΡΠΈΠ΅ ΠΊΡΠΌ ΠΊΠ°ΠΊΠ²ΠΎ ΡΠΎΡΠΈ β%sβ." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Π’ΠΎΡΠ½Π°ΡΠ° Π±Π°Π·Π° Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠΊΡΠΈΠ΅." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"Π‘Π»Π΅Π΄Π΅Π½ΠΈΡΡ ΠΊΠ»ΠΎΠ½ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΡΠ°Π½ΠΎΠ²Π΅Π½. ΠΠΊΠΎ ΠΈΡΠΊΠ°ΡΠ΅ ΡΡΡΠ½ΠΎ Π΄Π° Π³ΠΎ\n" +"Π·Π°Π΄Π°Π΄Π΅ΡΠ΅, ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit branch --set-upstream-toβ.\n" +"ΠΠΎΠΆΠ΅ΡΠ΅ ΡΡΡΠ½ΠΎ Π΄Π° Π·Π°Π΄Π°Π΄Π΅ΡΠ΅ Π±Π°Π·ΠΎΠ²ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΡΡΠ΅Π· β--base=<base-commit-id>β." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Π’ΠΎΡΠ½Π°ΡΠ° Π±Π°Π·Π° ΠΏΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠΊΡΠΈΡΠ°" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "Π±Π°Π·ΠΎΠ²ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΡΡΡΠ±Π²Π° Π΄Π° Π΅ ΠΏΡΠ΅Π΄ΡΠ΅ΡΡΠ²Π΅Π½ΠΈΠΊΡΡ Π½Π° ΡΠΏΠΈΡΡΠΊΠ° Ρ Π²Π΅ΡΡΠΈΠΈΡΠ΅" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "Π±Π°Π·ΠΎΠ²ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π΅ Π² ΡΠΏΠΈΡΡΠΊΠ° Ρ Π²Π΅ΡΡΠΈΠΈΡΠ΅" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡΡΡ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "Π½ΠΎΠΌΠ΅ΡΠ°ΡΠΈΡ β[PATCH n/m]β Π΄ΠΎΡΠΈ ΠΈ ΠΏΡΠΈ Π΅Π΄ΠΈΠ½ΡΡΠ²Π΅Π½Π° ΠΊΡΡΠΏΠΊΠ°" -#: builtin/log.c:1214 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "Π½ΠΎΠΌΠ΅ΡΠ°ΡΠΈΡ β[PATCH]β Π΄ΠΎΡΠΈ ΠΈ ΠΏΡΠΈ ΠΌΠ½ΠΎΠΆΠ΅ΡΡΠ²ΠΎ ΠΊΡΡΠΏΠΊΠΈ" -#: builtin/log.c:1218 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠΈΡΠ΅ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ ΠΈΠ·Ρ
ΠΎΠ΄" -#: builtin/log.c:1220 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΏΡΠΈΠ΄ΡΡΠΆΠ°Π²Π°ΡΠΎ ΠΏΠΈΡΠΌΠΎ" -#: builtin/log.c:1222 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "ΠΏΡΠΎΡΡΠ° ΡΠΈΡΠ»ΠΎΠ²Π° ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»Π½ΠΎΡΡ Π·Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅-ΠΊΡΡΠΏΠΊΠΈ" -#: builtin/log.c:1223 +#: builtin/log.c:1389 msgid "sfx" msgstr "ΠΠΠΠ¦Π" -#: builtin/log.c:1224 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠ΅Π·ΠΈ ΠΠΠΠ¦Π Π·Π° ΡΡΡΠΈΠΊΡ Π²ΠΌΠ΅ΡΡΠΎ β.patchβ" -#: builtin/log.c:1226 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "Π½ΠΎΠΌΠ΅ΡΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΊΡΡΠΏΠΊΠΈΡΠ΅ Π΄Π° Π·Π°ΠΏΠΎΡΠ²Π° ΠΎΡ ΡΠΎΠ·ΠΈ ΠΠ ΠΠ, Π° Π½Π΅ Ρ 1" -#: builtin/log.c:1228 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "ΠΎΡΠ±Π΅Π»ΡΠ·Π²Π°Π½Π΅, ΡΠ΅ ΡΠΎΠ²Π° Π΅ N-ΡΠ°ΡΠ° ΠΏΠΎΡΠ΅Π΄Π½Π° ΡΠ΅Π΄Π°ΠΊΡΠΈΡ Π½Π° ΠΏΠΎΡΠ΅Π΄ΠΈΡΠ°ΡΠ° ΠΎΡ ΠΊΡΡΠΏΠΊΠΈ" -#: builtin/log.c:1230 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠΎΠ·ΠΈ β[ΠΠ ΠΠ€ΠΠΠ‘]β Π²ΠΌΠ΅ΡΡΠΎ β[PATCH]β" -#: builtin/log.c:1233 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΈΠ·Ρ
ΠΎΠ΄Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π² ΡΠ°Π·ΠΈ ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―" -#: builtin/log.c:1236 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "Π±Π΅Π· Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅/ΠΌΠ°Ρ
Π°Π½Π΅ Π½Π° ΠΏΡΠ΅ΡΠΈΠΊΡΠ° β[PATCH]β" -#: builtin/log.c:1239 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ°Π·Π»ΠΈΠΊΠΈ ΠΌΠ΅ΠΆΠ΄Ρ Π΄Π²ΠΎΠΈΡΠ½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/log.c:1241 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "Π² Π·Π°Π³Π»Π°Π²Π½Π°ΡΠ° ΡΠ°ΡΡ βFrom:β (ΠΎΡ) Ρ
Π΅ΡΡΡ Π΄Π° Π΅ ΡΠ°ΠΌΠΎ ΠΎΡ Π½ΡΠ»ΠΈ" -#: builtin/log.c:1243 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "Π΄Π° Π½Π΅ ΡΠ΅ Π²ΠΊΠ»ΡΡΠ²Π°Ρ ΠΊΡΡΠΏΠΊΠΈ, ΠΊΠΎΠΈΡΠΎ ΠΏΡΠΈΡΡΡΡΠ²Π°Ρ Π² ΡΠ»Π΅Π΄Π΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½" -#: builtin/log.c:1245 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π²ΡΠ² ΡΠΎΡΠΌΠ°Ρ Π·Π° ΠΊΡΡΠΏΠΊΠΈ, Π° Π½Π° Π² ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ (ΠΊΡΡΠΏΠΊΠ° ΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°)" -#: builtin/log.c:1247 +#: builtin/log.c:1413 msgid "Messaging" msgstr "ΠΠΏΡΠΈΠΈ ΠΏΡΠΈ ΠΈΠ·ΠΏΡΠ°ΡΠ°Π½Π΅" -#: builtin/log.c:1248 +#: builtin/log.c:1414 msgid "header" msgstr "ΠΠΠΠΠΠΠΠ_Π§ΠΠ‘Π’" -#: builtin/log.c:1249 +#: builtin/log.c:1415 msgid "add email header" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΠ°Π·ΠΈ ΠΠΠΠΠΠΠΠ_Π§ΠΠ‘Π’" -#: builtin/log.c:1250 builtin/log.c:1252 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "Π-ΠΠΠ©Π" -#: builtin/log.c:1250 +#: builtin/log.c:1416 msgid "add To: header" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° Π·Π°Π³Π»Π°Π²Π½Π° ΡΠ°ΡΡ βTo:β (Π΄ΠΎ)" -#: builtin/log.c:1252 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° Π·Π°Π³Π»Π°Π²Π½Π° ΡΠ°ΡΡ βCc:β (ΠΈ Π΄ΠΎ)" -#: builtin/log.c:1254 +#: builtin/log.c:1420 msgid "ident" msgstr "ΠΠΠΠΠ’ΠΠ§ΠΠΠ‘Π’" -#: builtin/log.c:1255 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° Π°Π΄ΡΠ΅ΡΠ° Π² Π·Π°Π³Π»Π°Π²Π½Π°ΡΠ° ΡΠ°ΡΡ βFromβ (ΠΎΡ) Π΄Π° Π΅ ΡΠ°Π·ΠΈ ΠΠΠΠΠ’ΠΠ§ΠΠΠ‘Π’. ΠΠΊΠΎ " "Π½Π΅ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½Π° ΡΠ°ΠΊΠ°Π²Π°, ΡΠ΅ Π²Π·ΠΈΠΌΠ° Π°Π΄ΡΠ΅ΡΠ° Π½Π° ΠΏΠΎΠ΄Π°Π²Π°ΡΠΈΡ" -#: builtin/log.c:1257 +#: builtin/log.c:1423 msgid "message-id" msgstr "ΠΠΠΠΠ’ΠΠ€ΠΠΠΠ’ΠΠ _ΠΠ_Π‘ΠͺΠΠΠ©ΠΠΠΠ" -#: builtin/log.c:1258 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "" "ΠΏΡΡΠ²ΠΎΡΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π΄Π° Π΅ Π² ΠΎΡΠ³ΠΎΠ²ΠΎΡ Π½Π° Π΅-ΠΏΠΈΡΠΌΠΎΡΠΎ Ρ ΡΠΎΠ·ΠΈ " "ΠΠΠΠΠ’ΠΠ€ΠΠΠΠ’ΠΠ _ΠΠ_Π‘ΠͺΠΠΠ©ΠΠΠΠ" -#: builtin/log.c:1259 builtin/log.c:1262 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "Π³ΡΠ°Π½ΠΈΡΠ°" -#: builtin/log.c:1260 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "ΠΏΡΠΈΠΊΡΠ΅ΠΏΡΠ½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ°" -#: builtin/log.c:1263 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅ Π½Π° ΠΊΡΡΠΏΠΊΠ°ΡΠ° Π² ΡΠ΅ΠΊΡΡΠ° Π½Π° ΠΏΠΈΡΠΌΠ°ΡΠ°" -#: builtin/log.c:1267 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "" -"ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° Π½ΠΈΡΠΊΠΈ Π·Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΡΡΠ°. Π‘ΡΠΈΠ»ΡΡ Π΅ βshallowβ (ΠΏΠ»ΠΈΡΡΠΊ) ΠΈΠ»ΠΈ " +"ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° Π½ΠΈΡΠΊΠΈ Π·Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΡΡΠ°. Π‘Π’ΠΠΡΡ Π΅ βshallowβ (ΠΏΠ»ΠΈΡΡΠΊ) ΠΈΠ»ΠΈ " "βdeepβ (Π΄ΡΠ»Π±ΠΎΠΊ)" -#: builtin/log.c:1269 +#: builtin/log.c:1435 msgid "signature" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡ" -#: builtin/log.c:1270 +#: builtin/log.c:1436 msgid "add a signature" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΠΏΠΎΠ»Π΅ Π·Π° ΠΏΠΎΠ΄ΠΏΠΈΡ" -#: builtin/log.c:1272 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "ΠΠΠΠΠΠ_ΠΠΠΠΠΠΠΠ" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎΡΠΎ ΠΠΠΠΎΠ²ΠΎ Π΄ΡΡΠ²ΠΎ ΠΊΡΠΌ ΡΠ΅ΡΠΈΡΡΠ° ΠΊΡΡΠΏΠΊΠΈ" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΠΏΠΎΠ΄ΠΏΠΈΡ ΠΎΡ ΡΠ°ΠΉΠ»" -#: builtin/log.c:1273 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΠΊΡΡΠΏΠΊΠΈΡΠ΅" -#: builtin/log.c:1362 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β-nβ ΠΈ β-kβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/log.c:1364 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--subject-prefixβ ΠΈ β-kβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/log.c:1372 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--name-onlyβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ Π³Π΅Π½Π΅ΡΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΊΡΡΠΏΠΊΠΈ" -#: builtin/log.c:1374 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--name-statusβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ Π³Π΅Π½Π΅ΡΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΊΡΡΠΏΠΊΠΈ" -#: builtin/log.c:1376 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--checkβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ Π³Π΅Π½Π΅ΡΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΊΡΡΠΏΠΊΠΈ" -#: builtin/log.c:1401 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "" "ΠΈΠ·Ρ
ΠΎΠ΄ΡΡ ΠΌΠΎΠΆΠ΅ Π΄Π° ΠΈΠ»ΠΈ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡΡ, ΠΈΠ»ΠΈ Π΄Π° Π΅ Π² Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ, Π½ΠΎ Π½Π΅ ΠΈ Π΄Π²Π΅ΡΠ΅." -#: builtin/log.c:1403 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "ΠΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: builtin/log.c:1500 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Ρ ΠΏΠΎΠ΄ΠΏΠΈΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/log.c:1563 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "ΠΠ·Ρ
ΠΎΠ΄Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ ΡΡΠ·Π΄Π°Π΄Π΅Π½ΠΈ" -#: builtin/log.c:1611 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ΠΠ’ΠΠΠΠΠ§ΠΠ_ΠΠΠΠ [ΠΠ ΠͺΠ₯ [ΠΠ ΠΠΠΠ]]]" -#: builtin/log.c:1665 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7668,106 +8213,151 @@ msgstr "" "Π‘Π»Π΅Π΄Π΅Π½ΠΈΡΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ ΠΊΠ»ΠΎΠ½ Π½Π΅ Π±Π΅ ΠΎΡΠΊΡΠΈΡ, Π·Π°ΡΠΎΠ²Π° ΠΈΠ·ΡΠΈΡΠ½ΠΎ Π·Π°Π΄Π°ΠΉΡΠ΅ " "ΠΠ’ΠΠΠΠΠ§ΠΠ_ΠΠΠΠ.\n" -#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690 -#, c-format -msgid "Unknown commit %s" -msgstr "ΠΠ΅ΠΏΠΎΠ·Π½Π°ΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ β%sβ" - -#: builtin/ls-files.c:358 +#: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [ΠΠΠ¦ΠΠ―β¦] [Π€ΠΠΠβ¦]" -#: builtin/ls-files.c:415 +#: builtin/ls-files.c:427 msgid "identify the file status with tags" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ Ρ Π΅Π΄Π½ΠΎΠ±ΡΠΊΠ²Π΅Π½ΠΈ ΡΠ»Π°Π³ΠΎΠ²Π΅" -#: builtin/ls-files.c:417 +#: builtin/ls-files.c:429 msgid "use lowercase letters for 'assume unchanged' files" msgstr "ΠΌΠ°Π»ΠΊΠΈ Π±ΡΠΊΠ²ΠΈ Π·Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π΄Π° ΡΠ΅ ΡΡΠ΅ΡΠ°Ρ Π·Π° Π½Π΅ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΈ" -#: builtin/ls-files.c:419 +#: builtin/ls-files.c:431 msgid "show cached files in the output (default)" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΊΠ΅ΡΠΈΡΠ°Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ)" -#: builtin/ls-files.c:421 +#: builtin/ls-files.c:433 msgid "show deleted files in the output" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ·ΡΡΠΈΡΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/ls-files.c:423 +#: builtin/ls-files.c:435 msgid "show modified files in the output" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/ls-files.c:425 +#: builtin/ls-files.c:437 msgid "show other files in the output" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π΄ΡΡΠ³ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:439 msgid "show ignored files in the output" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:442 msgid "show staged contents' object name in the output" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠΌΠ΅ΡΠΎ Π½Π° ΠΎΠ±Π΅ΠΊΡΠ° Π·Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:444 msgid "show files on the filesystem that need to be removed" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΡΡΠ±Π²Π° Π΄Π° Π±ΡΠ΄Π°Ρ ΠΈΠ·ΡΡΠΈΡΠΈ" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:446 msgid "show 'other' directories' names only" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΈΠΌΠ΅ΡΠΎ Π½Π° Π΄ΡΡΠ³ΠΈΡΠ΅ (Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅) Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:448 +msgid "show line endings of files" +msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π·Π½Π°ΡΠΈΡΠ΅ Π·Π° ΠΊΡΠ°ΠΉ Π½Π° ΡΠ΅Π΄ Π²ΡΠ² ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅" + +#: builtin/ls-files.c:450 msgid "don't show empty directories" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΡΠ°Π·Π½ΠΈΡΠ΅ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:453 msgid "show unmerged files in the output" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" # FIXME not clear about what this option does -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:455 msgid "show resolve-undo information" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° Π·Π° ΠΎΡΠΌΡΠ½Π° Π½Π° ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡΠ΅ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:457 msgid "skip files matching pattern" msgstr "ΠΏΡΠ΅ΡΠΊΠ°ΡΠ°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈ Π¨ΠΠΠΠΠΠ°" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:460 msgid "exclude patterns are read from <file>" msgstr "ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ Π·Π° ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π΄Π° ΡΠ΅ ΠΏΡΠΎΡΠ΅ΡΠ°Ρ ΠΎΡ ΡΠΎΠ·ΠΈ Π€ΠΠΠ" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:463 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° Π΄ΠΎΠΏΡΠ»Π½ΠΈΡΠ΅Π»Π½ΠΈΡΠ΅ ΡΠ°Π±Π»ΠΎΠ½ΠΈ Π·Π° ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ ΠΏΠΎ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ ΠΎΡ ΡΠΎΠ·ΠΈ Π€ΠΠΠ" -#: builtin/ls-files.c:452 +#: builtin/ls-files.c:465 msgid "add the standard git exclusions" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½ΠΈΡΠ΅ ΠΎΡ Git ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:468 msgid "make the output relative to the project top directory" msgstr "ΠΏΡΡΠΈΡΠ°ΡΠ° Π΄Π° ΡΠ° ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»Π½ΠΈ ΡΠΏΡΡΠΌΠΎ ΠΎΡΠ½ΠΎΠ²Π½Π°ΡΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π° ΠΏΡΠΎΠ΅ΠΊΡΠ°" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:471 msgid "if any <file> is not in the index, treat this as an error" msgstr "Π³ΡΠ΅ΡΠΊΠ°, Π°ΠΊΠΎ Π½ΡΠΊΠΎΠΉ ΠΎΡ ΡΠ΅Π·ΠΈ Π€ΠΠΠΠΎΠ²Π΅ Π½Π΅ Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:472 msgid "tree-ish" msgstr "Π£ΠΠΠΠΠ’ΠΠ_ΠΠͺΠ_ΠΠͺΠ ΠΠ" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:473 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "ΡΡΠΈΡΠ°Π½Π΅, ΡΠ΅ ΠΏΡΡΠΈΡΠ°ΡΠ° ΠΈΠ·ΡΡΠΈΡΠΈ ΡΠ»Π΅Π΄ Π£ΠΠΠΠΠ’ΠΠΡ_ΠΠͺΠ_ΠΠͺΠ ΠΠ Π²ΡΠ΅ ΠΎΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°Ρ" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:475 msgid "show debugging data" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° Π·Π° ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ Π½Π° Π³ΡΠ΅ΡΠΊΠΈ" +#: builtin/ls-remote.c:7 +msgid "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repository> [<refs>...]]" +msgstr "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=ΠΠΠΠΠΠΠ]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [Π₯Π ΠΠΠΠΠΠ©Π [Π£ΠΠΠΠΠ’ΠΠβ¦]]" + +#: builtin/ls-remote.c:50 +msgid "do not print remote URL" +msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π°Π΄ΡΠ΅ΡΠΈΡΠ΅ Π½Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΠ΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ°" + +#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +msgid "exec" +msgstr "ΠΠΠΠΠΠΠ" + +#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +msgid "path of git-upload-pack on the remote host" +msgstr "ΠΏΡΡ ΠΊΡΠΌ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-upload-packβ Π½Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½Π°ΡΠ° ΠΌΠ°ΡΠΈΠ½Π°" + +#: builtin/ls-remote.c:56 +msgid "limit to tags" +msgstr "ΡΠ°ΠΌΠΎ Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅" + +#: builtin/ls-remote.c:57 +msgid "limit to heads" +msgstr "ΡΠ°ΠΌΠΎ Π²ΡΡΡ
ΠΎΠ²Π΅ΡΠ΅" + +#: builtin/ls-remote.c:58 +msgid "do not show peeled tags" +msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΡΠΎΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ Π΅ΡΠΈΠΊΠ΅ΡΠΈ" + +#: builtin/ls-remote.c:60 +msgid "take url.<base>.insteadOf into account" +msgstr "Π²Π·ΠΈΠΌΠ°Π½Π΅ ΠΏΡΠ΅Π΄Π²ΠΈΠ΄ Π½Π° βurl.ΠΠΠΠ.insteadOfβ" + +#: builtin/ls-remote.c:62 +msgid "exit with exit code 2 if no matching refs are found" +msgstr "ΠΈΠ·Ρ
ΠΎΠ΄ Ρ ΠΊΠΎΠ΄ 2, Π°ΠΊΠΎ Π½Π΅ ΡΠ΅ ΠΎΡΠΊΡΠΈΡΡ ΡΡΠ²ΠΏΠ°Π΄Π°ΡΠΈ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" + +#: builtin/ls-remote.c:64 +msgid "show underlying ref in addition to the object pointed by it" +msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π·Π°Π΅Π΄Π½ΠΎ Ρ ΠΎΠ±Π΅ΠΊΡΠ° ΡΠΎΡΠ΅Π½ ΠΎΡ Π½Π΅Π³ΠΎ" + #: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [ΠΠΠ¦ΠΠ―β¦] Π£ΠΠΠΠΠ’ΠΠ_ΠΠͺΠ_ΠΠͺΠ ΠΠ [ΠΠͺΠ’β¦]" @@ -7819,175 +8409,179 @@ msgid "git merge --abort" msgstr "git merge --abort" # FIXME -m rather than just m -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β-mβ ΠΈΠ·ΠΈΡΠΊΠ²Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ΠΡΠΌΠ° ΡΠ°ΠΊΠ°Π²Π° ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅: β%sβ.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "ΠΠ°Π»ΠΈΡΠ½ΠΈΡΠ΅ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ ΡΠ°:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "ΠΠΎΠΏΡΠ»Π½ΠΈΡΠ΅Π»Π½ΠΈΡΠ΅ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ ΡΠ°:" -#: builtin/merge.c:193 builtin/pull.c:119 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°ΡΠ° ΡΠ»Π΅Π΄ Π·Π°Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: builtin/merge.c:196 builtin/pull.c:122 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°ΡΠ° ΡΠ»Π΅Π΄ Π·Π°Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: builtin/merge.c:197 builtin/pull.c:125 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π½Π° β--statβ)" -#: builtin/merge.c:199 builtin/pull.c:128 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ (Π½Π° ΠΌΠ°ΠΊΡΠΈΠΌΡΠΌ ΡΠ°ΠΊΡΠ² ΠΠ ΠΠ) Π·Π°ΠΏΠΈΡΠΈ ΠΎΡ ΡΡΠΊΡΠ°ΡΠ΅Π½ΠΈΡ ΠΆΡΡΠ½Π°Π» Π² ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ " "Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/merge.c:202 builtin/pull.c:131 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Π΅Π΄Π½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π²ΠΌΠ΅ΡΡΠΎ ΠΈΠ·Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: builtin/merge.c:204 builtin/pull.c:134 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "ΠΈΠ·Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΠΏΡΠΈ ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅)" -#: builtin/merge.c:206 builtin/pull.c:137 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ ΠΏΡΠ΅Π΄ΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "ΠΏΠΎΠ·Π²ΠΎΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ (ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅)" -#: builtin/merge.c:209 builtin/pull.c:143 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅, Π°ΠΊΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π΅ Π΅ ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ°, ΡΠ΅ ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π΅ Ρ ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΏΠΎΠ΄ΠΏΠΈΡ Π½Π° GPG" -#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" -msgstr "ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ" +msgstr "Π‘Π’Π ΠΠ’ΠΠΠΠ―" -#: builtin/merge.c:215 builtin/pull.c:149 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" -msgstr "ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅, ΠΊΠΎΡΡΠΎ Π΄Π° ΡΠ΅ ΠΏΠΎΠ»Π·Π²Π°" +msgstr "Π‘Π’Π ΠΠ’ΠΠΠΠ― Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅, ΠΊΠΎΡΡΠΎ Π΄Π° ΡΠ΅ ΠΏΠΎΠ»Π·Π²Π°" -#: builtin/merge.c:216 builtin/pull.c:152 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" -msgstr "ΠΎΠΏΡΠΈΡ=ΡΡΠΎΠΉΠ½ΠΎΡΡ" +msgstr "ΠΠΠ¦ΠΠ―=Π‘Π’ΠΠΠΠΠ‘Π’" -#: builtin/merge.c:217 builtin/pull.c:153 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" -msgstr "ΠΎΠΏΡΠΈΡ Π·Π° ΠΈΠ·Π±ΡΠ°Π½Π°ΡΠ° ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅" +msgstr "ΠΠΠ¦ΠΠ― Π·Π° ΠΈΠ·Π±ΡΠ°Π½Π°ΡΠ° ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ ΡΡΡ ΡΠ»ΠΈΠ²Π°Π½Π΅ (ΠΏΡΠΈ Π½Π΅ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΈ ΡΠ»ΠΈΠ²Π°Π½ΠΈΡ)" +msgstr "Π‘ΠͺΠΠΠ©ΠΠΠΠ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ ΡΡΡ ΡΠ»ΠΈΠ²Π°Π½Π΅ (ΠΏΡΠΈ Π½Π΅ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΈ ΡΠ»ΠΈΠ²Π°Π½ΠΈΡ)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΡΠ΅ΠΊΡΡΠΎΡΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "ΠΏΠΎΠ·Π²ΠΎΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° Π½Π΅Π·Π°Π²ΠΈΡΠΈΠΌΠΈ ΠΈΡΡΠΎΡΠΈΠΈ" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠΈ ΡΠΊΠ°ΡΠ°Π²Π°Π½Π΅" -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠΊΠ°ΡΠ°Π²Π°Π½Π΅" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΎΠ±Π΅ΠΊΡ: β%sβ" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡ-Π΄ΡΡΠ²ΠΎ" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (Π½ΡΠΌΠ° ΠΊΠ°ΠΊΠ²ΠΎ Π΄Π° ΡΠ΅ ΡΠΌΠ°ΡΠΊΠ°)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ ΡΡΡ ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ β ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½ΡΠΌΠ° Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½\n" -#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 -#: builtin/merge.c:988 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "ΠΠ°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "ΠΠ°Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π·Π° ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "ΠΠΈΠΏΡΠ²Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ β ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½ΡΠΌΠ° Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½\n" -#: builtin/merge.c:447 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "β%sβ Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/merge.c:537 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ Π½ΠΈΠ· Π·Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βbranch.%s.mergeoptionsβ: β%sβ" -#: builtin/merge.c:656 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "ΠΠΎΠ΄Π΄ΡΡΠΆΠ° ΡΠ΅ ΡΠ°ΠΌΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° ΡΠΎΡΠ½ΠΎ Π΄Π²Π΅ ΠΈΡΡΠΎΡΠΈΠΈ." -#: builtin/merge.c:670 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "ΠΠ΅ΠΏΠΎΠ·Π½Π°ΡΠ° ΠΎΠΏΡΠΈΡ Π·Π° ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎΡΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ βmerge-recursiveβ: β-X%sβ" -#: builtin/merge.c:683 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½" -#: builtin/merge.c:772 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "ΠΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΠ΅ΡΠ΅" -#: builtin/merge.c:781 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Π‘Π»ΠΈΠ²Π°Π½Π΅ΡΠΎ Π½ΡΠΌΠ° Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠ΄Π°Π΄Π΅Π½ΠΎ. ΠΠ° Π·Π°Π²ΡΡΡΠ²Π°Π½Π΅ΡΠΎ ΠΌΡ ΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ ΠΌΡ " "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit commitβ.\n" -#: builtin/merge.c:787 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8002,55 +8596,55 @@ msgstr "" "Π Π΅Π΄ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π·Π°ΠΏΠΎΡΠ²Π°Ρ Ρ β%cβ ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΏΡΠΎΠΏΡΡΠ½Π°ΡΠΈ, Π° ΠΏΡΠ°Π·Π½ΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅\n" "ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ.\n" -#: builtin/merge.c:811 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "ΠΡΠ°Π·Π½ΠΎ ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅." # FIXME - WTF is wonderful. -#: builtin/merge.c:823 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "ΠΡΡΠ²ΠΈΡΡ Π΅ΡΠ°ΠΏ Π½Π° ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎΡΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π·Π°Π²ΡΡΡΠΈ.\n" -#: builtin/merge.c:878 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ β ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°ΠΉΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈΡΠ΅ ΠΈ ΠΏΠΎΠ΄Π°ΠΉΡΠ΅ ΡΠ΅Π·ΡΠ»ΡΠ°ΡΠ°.\n" -#: builtin/merge.c:894 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "β%sβ Π½Π΅ Π΅ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/merge.c:935 +#: builtin/merge.c:947 msgid "No current branch." msgstr "ΠΡΠΌΠ° ΡΠ΅ΠΊΡΡ ΠΊΠ»ΠΎΠ½." -#: builtin/merge.c:937 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ Π½Π΅ ΡΠ»Π΅Π΄ΠΈ Π½ΠΈΠΊΠΎΠΉ." -#: builtin/merge.c:939 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ Π½Π΅ ΡΠ»Π΅Π΄ΠΈ Π½ΠΈΠΊΠΎΠΉ ΠΊΠ»ΠΎΠ½." -#: builtin/merge.c:944 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "ΠΠΈΠΊΠΎΠΉ ΠΊΠ»ΠΎΠ½ Π½Π΅ ΡΠ»Π΅Π΄ΠΈ ΠΊΠ»ΠΎΠ½Π° β%sβ ΠΎΡ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ β%sβ" -#: builtin/merge.c:1079 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π·Π°ΡΠ²ΠΎΡΠΈ" -#: builtin/merge.c:1206 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΠ΅ ΡΠ»ΠΈΠ²Π°Π½Π΅, Π·Π°ΡΠΎΡΠΎ Π² ΠΌΠΎΠΌΠ΅Π½ΡΠ° Π½Π΅ ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠ²Π° ΡΠ°ΠΊΠΎΠ²Π° " "(Π»ΠΈΠΏΡΠ²Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π» βMERGE_HEADβ)." -#: builtin/merge.c:1222 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8058,7 +8652,7 @@ msgstr "" "ΠΠ΅ ΡΡΠ΅ Π·Π°Π²ΡΡΡΠΈΠ»ΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅. (Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βMERGE_HEADβ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°).\n" "ΠΠΎΠ΄Π°ΠΉΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ ΡΠΈ, ΠΏΡΠ΅Π΄ΠΈ Π΄Π° Π·Π°ΠΏΠΎΡΠ½Π΅ΡΠ΅ Π½ΠΎΠ²ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅." -#: builtin/merge.c:1229 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8066,111 +8660,115 @@ msgstr "" "ΠΠ΅ ΡΡΠ΅ Π·Π°Π²ΡΡΡΠΈΠ»ΠΈ ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ (ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βCHERRY_PICK_HEADβ\n" "ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°). ΠΠΎΠ΄Π°ΠΉΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ ΡΠΈ, ΠΏΡΠ΅Π΄ΠΈ Π΄Π° Π·Π°ΠΏΠΎΡΠ½Π΅ΡΠ΅ Π½ΠΎΠ²ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅." -#: builtin/merge.c:1232 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "ΠΠ΅ ΡΡΠ΅ Π·Π°Π²ΡΡΡΠΈΠ»ΠΈ ΠΎΡΠ±ΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ (ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βCHERRY_PICK_HEADβ\n" "ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°)." -#: builtin/merge.c:1241 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "ΠΠΏΡΠΈΡΡΠ° β--squashβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ β--no-ffβ." -#: builtin/merge.c:1249 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "ΠΠ΅ Π΅ ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ ΠΈ Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βmerge.defaultToUpstreamβ Π½Π΅ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½Π°." -#: builtin/merge.c:1266 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ ΡΡΡ ΡΠΌΠ°ΡΠΊΠ²Π°Π½Π΅ Π²ΡΠ² Π²ΡΡΡ
Π±Π΅Π· ΠΈΡΡΠΎΡΠΈΡ Π²ΡΠ΅ ΠΎΡΠ΅ Π½Π΅ ΡΠ΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°" -#: builtin/merge.c:1268 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "ΠΠΎΠ½Π΅ΠΆΠ΅ Π²ΡΡΡ
ΡΡ Π΅ Π±Π΅Π· ΠΈΡΡΠΎΡΠΈΡ, Π²ΡΠΈΡΠΊΠΈ ΡΠ»ΠΈΠ²Π°Π½ΠΈΡ ΡΠ° ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΈ, Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ " "ΠΈΠ·Π²ΡΡΡΠΈ Π½Π΅ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ ΠΈΠ·ΠΈΡΠΊΠ²Π°Π½ΠΎ ΠΎΡ ΠΎΠΏΡΠΈΡΡΠ° β--no-ffβ" -#: builtin/merge.c:1274 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "β%sβ β Π½Π΅ Π΅ Π½Π΅ΡΠΎ, ΠΊΠΎΠ΅ΡΠΎ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΠ»Π΅Π΅" -#: builtin/merge.c:1276 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "ΠΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΡΠ»Π΅Π΅ΡΠ΅ ΡΠΎΡΠ½ΠΎ Π΅Π΄Π½ΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π²ΡΠ² Π²ΡΡΡ
Π±Π΅Π· ΠΈΡΡΠΎΡΠΈΡ" -#: builtin/merge.c:1331 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π΅ Ρ Π½Π΅Π΄ΠΎΠ²Π΅ΡΠ΅Π½ ΠΏΠΎΠ΄ΠΏΠΈΡ ΠΎΡ GPG, ΠΊΠΎΠΉΡΠΎ ΡΠ²ΡΡΠ΄ΠΈ, ΡΠ΅ Π΅ Π½Π° β%sβ." -#: builtin/merge.c:1334 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π΅ Ρ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΏΠΎΠ΄ΠΏΠΈΡ ΠΎΡ GPG, ΠΊΠΎΠΉΡΠΎ ΡΠ²ΡΡΠ΄ΠΈ, ΡΠ΅ Π΅ Π½Π° β%sβ." -#: builtin/merge.c:1337 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π΅ Π±Π΅Π· ΠΏΠΎΠ΄ΠΏΠΈΡ ΠΎΡ GPG." -#: builtin/merge.c:1340 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β%sβ Π΅ Ρ ΠΊΠΎΡΠ΅ΠΊΡΠ΅Π½ ΠΏΠΎΠ΄ΠΏΠΈΡ ΠΎΡ GPG Π½Π° β%sβ.\n" -#: builtin/merge.c:1423 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "Π½Π΅Π·Π°Π²ΠΈΡΠΈΠΌΠΈ ΠΈΡΡΠΎΡΠΈΠΈ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΠ»Π΅ΡΡ" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "ΠΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ β%s..%sβ\n" -#: builtin/merge.c:1460 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "ΠΡΠΎΠ±Π° Ρ Π½Π°ΠΉ-ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎΡΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π² ΡΠ°ΠΌΠΊΠΈΡΠ΅ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°β¦\n" # FIXME WTF message -#: builtin/merge.c:1467 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅.\n" -#: builtin/merge.c:1499 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "" "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠΈ ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅, ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ΡΠΎ." -#: builtin/merge.c:1522 builtin/merge.c:1601 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "ΠΡΠΈΠ²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π΄ΡΡΠ²ΠΎΡΠΎ ΠΊΡΠΌ ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎΡΠΎβ¦\n" -#: builtin/merge.c:1526 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "ΠΡΠΎΠ±Π²Π°Π½Π΅ ΡΡΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡΡΠ° Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ β%sββ¦\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "ΠΠΈΠΊΠΎΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΠΈΠ·Π²ΡΡΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ.\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ ΡΡΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ β%sβ.\n" -#: builtin/merge.c:1603 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "ΠΠΎΠ»Π·Π²Π° ΡΠ΅ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡΡΠ° β%sβ, ΠΊΠΎΡΡΠΎ ΡΠ΅ ΠΏΠΎΠ΄Π³ΠΎΡΠ²ΠΈ Π΄ΡΡΠ²ΠΎΡΠΎ Π·Π° ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°Π½Π΅ Π½Π° " "ΡΡΠΊΠ°.\n" -#: builtin/merge.c:1615 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8258,19 +8856,19 @@ msgstr "Π±Π΅Π· ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΡ ΠΏΡΠΈ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈ" msgid "set labels for file1/orig-file/file2" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠΈ Π·Π° Π€ΠΠΠ_1/ΠΠ ΠΠΠΠΠΠ/Π€ΠΠΠ_2" -#: builtin/mktree.c:64 +#: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:150 +#: builtin/mktree.c:152 msgid "input is NUL terminated" msgstr "Π²Ρ
ΠΎΠ΄Π½ΠΈΡΠ΅ Π·Π°ΠΏΠΈΡΠΈ ΡΠ° ΡΠ°Π·Π΄Π΅Π»Π΅Π½ΠΈ Ρ Π½ΡΠ»Π΅Π²ΠΈΡ Π·Π½Π°ΠΊ βNULβ" -#: builtin/mktree.c:151 builtin/write-tree.c:24 +#: builtin/mktree.c:153 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "ΡΠ°Π·ΡΠ΅ΡΠ°Π²Π°Π½Π΅ Π½Π° Π»ΠΈΠΏΡΠ²Π°ΡΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/mktree.c:152 +#: builtin/mktree.c:154 msgid "allow creation of more than one tree" msgstr "ΡΠ°Π·ΡΠ΅ΡΠ°Π²Π°Π½Π΅ Π½Π° ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ Π΅Π΄Π½ΠΎ Π΄ΡΡΠ²ΠΎ" @@ -8278,138 +8876,136 @@ msgstr "ΡΠ°Π·ΡΠ΅ΡΠ°Π²Π°Π½Π΅ Π½Π° ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [ΠΠΠ¦ΠΠ―β¦] ΠΠΠΠΠ’β¦ Π¦ΠΠ" -# FIXME message< -#: builtin/mv.c:69 +#: builtin/mv.c:70 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "ΠΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°, Π½ΠΎ Π½Π΅ Π΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»" -#: builtin/mv.c:71 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "ΠΠ° Π΄Π° ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠΈΡΠ΅, ΠΈΠ»ΠΈ Π²ΠΊΠ°ΡΠ°ΠΉΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ ΠΏΠΎ ΡΠ°ΠΉΠ»Π° β.gitmodulesβ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°,\n" "ΠΈΠ»ΠΈ Π³ΠΈ ΡΠΊΠ°ΡΠ°ΠΉΡΠ΅" -# FIXME message -#: builtin/mv.c:89 +#: builtin/mv.c:90 #, c-format msgid "%.*s is in index" msgstr "β%.*sβ Π²Π΅ΡΠ΅ Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/mv.c:111 +#: builtin/mv.c:112 msgid "force move/rename even if target exists" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΏΡΠ΅ΠΌΠ΅ΡΡΠ²Π°Π½Π΅/ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π΄ΠΎΡΠΈ ΡΠ΅Π»ΡΠ° Π΄Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°" -#: builtin/mv.c:112 +#: builtin/mv.c:113 msgid "skip move/rename errors" msgstr "ΠΏΡΠ΅ΡΠΊΠ°ΡΠ°Π½Π΅ Π½Π° Π³ΡΠ΅ΡΠΊΠΈΡΠ΅ ΠΏΡΠΈ ΠΏΡΠ΅ΠΌΠ΅ΡΡΠ²Π°Π½Π΅/ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅" -#: builtin/mv.c:151 +#: builtin/mv.c:152 #, c-format msgid "destination '%s' is not a directory" msgstr "ΡΠ΅Π»ΡΠ° β%sβ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΠΈ Π½Π΅ Π΅ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/mv.c:162 +#: builtin/mv.c:163 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° Π½Π° ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΠΎΠ±Π΅ΠΊΡ ΠΎΡ β%sβ Π½Π° β%sβ\n" -#: builtin/mv.c:166 +#: builtin/mv.c:167 msgid "bad source" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΎΠ±Π΅ΠΊΡ" -#: builtin/mv.c:169 +#: builtin/mv.c:170 msgid "can not move directory into itself" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠ΅ΠΌΠ΅ΡΡΠΈ Π² ΡΠ΅Π±Π΅ ΡΠΈ" -#: builtin/mv.c:172 +#: builtin/mv.c:173 msgid "cannot move directory over file" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΡΠ΅ΠΌΠ΅ΡΡΠΈ Π²ΡΡΡ
Ρ ΡΠ°ΠΉΠ»" -#: builtin/mv.c:181 +#: builtin/mv.c:182 msgid "source directory is empty" msgstr "ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½Π°ΡΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π΅ ΠΏΡΠ°Π·Π½Π°" -#: builtin/mv.c:206 +#: builtin/mv.c:207 msgid "not under version control" msgstr "Π½Π΅ Π΅ ΠΏΠΎΠ΄ ΠΊΠΎΠ½ΡΡΠΎΠ»Π° Π½Π° Git" -#: builtin/mv.c:209 +#: builtin/mv.c:210 msgid "destination exists" msgstr "ΡΠ΅Π»ΡΠ° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°" -#: builtin/mv.c:217 +#: builtin/mv.c:218 #, c-format msgid "overwriting '%s'" msgstr "ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° β%sβ" -#: builtin/mv.c:220 +#: builtin/mv.c:221 msgid "Cannot overwrite" msgstr "ΠΡΠ΅Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ΡΠΎ Π΅ Π½Π΅Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ" -#: builtin/mv.c:223 +#: builtin/mv.c:224 msgid "multiple sources for the same target" msgstr "ΠΌΠ½ΠΎΠΆΠ΅ΡΡΠ²ΠΎ ΠΈΠ·ΡΠΎΡΠ½ΠΈΡΠΈ Π·Π° Π΅Π΄Π½Π° ΡΠ΅Π»" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination directory does not exist" msgstr "ΡΠ΅Π»Π΅Π²Π°ΡΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°" -#: builtin/mv.c:232 +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, ΠΎΠ±Π΅ΠΊΡ: β%sβ, ΡΠ΅Π»: β%sβ" -#: builtin/mv.c:253 +#: builtin/mv.c:254 #, c-format msgid "Renaming %s to %s\n" msgstr "ΠΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π½Π° β%sβ Π½Π° β%sβ\n" -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π½Π° β%sβ" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [ΠΠΠ¦ΠΠ―β¦] ΠΠΠΠΠΠΠΠβ¦" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [ΠΠΠ¦ΠΠ―β¦] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [ΠΠΠ¦ΠΠ―β¦] --stdin" # FIXME sha -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° (Π±Π΅Π· ΡΡΠΌΠΈΡΠ΅ ΠΏΠΎ SHA1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅ Π·Π° ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡΡΠ°" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" -msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠ°Π±Π»ΠΎΠ½ΠΈΡΠ΅ Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈ Π½Π° Π¨ΠΠΠΠΠΠ°" +msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅ Π½Π°ΠΏΠ°ΡΠ²Π°ΡΠΈ Π½Π° Π¨ΠΠΠΠΠΠ°" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ, ΠΊΠΎΠΈΡΠΎ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ Π΄ΠΎΡΡΠΈΠ³Π½Π°ΡΠΈ ΠΎΡ Π²ΡΠΈΡΠΊΠΈ " "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "ΡΠ΅ΡΠ΅Π½Π΅ ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "Π΄Π° ΡΠ΅ ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Ρ ΠΈ Π½Π΅Π΄Π΅ΡΠΈΠ½ΠΈΡΠ°Π½ΠΈΡΠ΅ ΠΈΠΌΠ΅Π½Π° (ΡΡΠ°Π½Π΄Π°ΡΡΠ½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π½Π° ΠΎΠΏΡΠΈΡΡΠ°)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡΠΈΡΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈ-Π΅ΡΠΈΠΊΠ΅ΡΠΈ (Π·Π° Π²ΡΡΡΠ΅ΡΠ½ΠΈ Π½ΡΠΆΠ΄ΠΈ)" @@ -8557,24 +9153,16 @@ msgstr "ΠΎΠ±Π΅ΠΊΡΡΡ-Π±Π΅Π»Π΅ΠΆΠΊΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½ msgid "The note contents have been left in %s" msgstr "Π‘ΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠ°ΡΠ° Π΅ Π²ΡΠ² ΡΠ°ΠΉΠ»Π° β%sβ" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507 -#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653 -#: builtin/notes.c:877 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΡΠΊΡΠΈΠ΅ ΠΊΡΠΌ ΠΊΠ°ΠΊΠ²ΠΎ ΡΠΎΡΠΈ β%sβ." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8586,42 +9174,42 @@ msgid "Cannot read note data from non-blob object '%s'." msgstr "" "Π‘ΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠ° Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π²Π·Π΅ΠΌΠ΅ ΠΎΡ ΠΎΠ±Π΅ΠΊΡ, ΠΊΠΎΠΉΡΠΎ Π½Π΅ Π΅ BLOB: β%sβ." -#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490 -#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646 -#: builtin/notes.c:942 +#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 +#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "ΠΏΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ ΠΌΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΈ" -#: builtin/notes.c:372 builtin/notes.c:659 +#: builtin/notes.c:375 builtin/notes.c:662 #, c-format msgid "No note found for object %s." msgstr "ΠΡΠΌΠ° Π±Π΅Π»Π΅ΠΆΠΊΠΈ Π·Π° ΠΎΠ±Π΅ΠΊΡΠ° β%sβ." -#: builtin/notes.c:393 builtin/notes.c:556 +#: builtin/notes.c:396 builtin/notes.c:559 msgid "note contents as a string" msgstr "Π½ΠΈΠ·, ΠΊΠΎΠΉΡΠΎ Π΅ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠ°ΡΠ°" -#: builtin/notes.c:396 builtin/notes.c:559 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents in a file" -msgstr "ΡΠ°ΠΉΠ» ΡΡΡ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠ°ΡΠ°" +msgstr "Π€ΠΠΠ ΡΡΡ ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠ°ΡΠ°" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "reuse and edit specified note object" -msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ ΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΎΠ±Π΅ΠΊΡ-Π±Π΅Π»Π΅ΠΆΠΊΠ°" +msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ ΠΈ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΠΠΠΠ’-Π±Π΅Π»Π΅ΠΆΠΊΠ°" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse specified note object" -msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΎΠ±Π΅ΠΊΡ-Π±Π΅Π»Π΅ΠΆΠΊΠ°" +msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΠΠΠΠ’-Π±Π΅Π»Π΅ΠΆΠΊΠ°" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "allow storing empty note" msgstr "ΠΏΡΠΈΠ΅ΠΌΠ°Π½Π΅ ΠΈ Π½Π° ΠΏΡΠ°Π·Π½ΠΈ Π±Π΅Π»Π΅ΠΆΠΊΠΈ" -#: builtin/notes.c:406 builtin/notes.c:477 +#: builtin/notes.c:409 builtin/notes.c:480 msgid "replace existing notes" msgstr "Π·Π°ΠΌΡΠ½Π° Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈΡΠ΅ Π±Π΅Π»Π΅ΠΆΠΊΠΈ" -#: builtin/notes.c:431 +#: builtin/notes.c:434 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8630,32 +9218,32 @@ msgstr "" "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈ Π±Π΅Π»Π΅ΠΆΠΊΠ°, Π·Π°ΡΠΎΡΠΎ ΡΠ°ΠΊΠ°Π²Π° Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° Π·Π° ΠΎΠ±Π΅ΠΊΡΠ° β%sβ. " "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΎΠΏΡΠΈΡΡΠ° β-fβ, Π·Π° Π΄Π° ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈ Π±Π΅Π»Π΅ΠΆΠΊΠΈ." -#: builtin/notes.c:446 builtin/notes.c:525 +#: builtin/notes.c:449 builtin/notes.c:528 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "ΠΡΠ΅Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈΡΠ΅ Π±Π΅Π»Π΅ΠΆΠΊΠΈ Π·Π° ΠΎΠ±Π΅ΠΊΡΠ° β%sβ\n" -#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠ°ΡΠ° Π·Π° ΠΎΠ±Π΅ΠΊΡΠ° β%sβ\n" -#: builtin/notes.c:478 +#: builtin/notes.c:481 msgid "read objects from stdin" msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" # FIXME imporve message -#: builtin/notes.c:480 +#: builtin/notes.c:483 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "Π·Π°ΡΠ΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅ Π·Π° ΠΠΠΠΠΠΠΡΠ°, ΠΊΠΎΡΡΠΎ ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ²Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ (Π²ΠΊΠ»ΡΡΠ²Π° " "ΠΎΠΏΡΠΈΡΡΠ° β--stdinβ)" -#: builtin/notes.c:498 +#: builtin/notes.c:501 msgid "too few parameters" msgstr "ΠΏΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ ΠΌΠ°Π»ΠΊΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΈ" -#: builtin/notes.c:519 +#: builtin/notes.c:522 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8664,14 +9252,14 @@ msgstr "" "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΊΠΎΠΏΠΈΡΠ° Π±Π΅Π»Π΅ΠΆΠΊΠ°, Π·Π°ΡΠΎΡΠΎ ΡΠ°ΠΊΠ°Π²Π° Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° Π·Π° ΠΎΠ±Π΅ΠΊΡΠ° β%sβ. " "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΎΠΏΡΠΈΡΡΠ° β-fβ, Π·Π° Π΄Π° ΠΏΡΠ΅Π·Π°ΠΏΠΈΡΠ΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈ Π±Π΅Π»Π΅ΠΆΠΊΠΈ." -#: builtin/notes.c:531 +#: builtin/notes.c:534 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΊΠΎΠΏΠΈΡΠ° Π±Π΅Π»Π΅ΠΆΠΊΠ°, ΠΊΠΎΡΡΠΎ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° β Π½ΡΠΌΠ° Π±Π΅Π»Π΅ΠΆΠΊΠΈ Π·Π° ΠΎΠ±Π΅ΠΊΡΠ°-" "ΠΈΠ·ΡΠΎΡΠ½ΠΈΠΊ β%sβ." -#: builtin/notes.c:583 +#: builtin/notes.c:586 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -8682,67 +9270,67 @@ msgstr "" "ΠΠΌΠ΅ΡΡΠΎ ΡΠΎΠ²Π° Π³ΠΈ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βaddβ: βgit notes add -f -m/-F/-c/-" "Cβ.\n" -#: builtin/notes.c:764 +#: builtin/notes.c:768 msgid "General options" msgstr "ΠΠ±ΡΠΈ ΠΎΠΏΡΠΈΠΈ" -#: builtin/notes.c:766 +#: builtin/notes.c:770 msgid "Merge options" msgstr "ΠΠΏΡΠΈΠΈ ΠΏΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: builtin/notes.c:768 +#: builtin/notes.c:772 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:770 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "ΠΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈ Π±Π΅Π»Π΅ΠΆΠΊΠΈ" -#: builtin/notes.c:772 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "Π·Π°Π²ΡΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ ΡΡΠ΅Π· ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈ Π±Π΅Π»Π΅ΠΆΠΊΠΈ" -#: builtin/notes.c:774 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "ΠΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠΎΡΠ΅ΠΊΡΠΈΡΡΠ° ΠΏΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠΈ" -#: builtin/notes.c:776 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠΈ" -#: builtin/notes.c:853 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Π ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΡΠ΅ ΠΈΠ·Π²ΡΡΡΠ²Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠΈΡΠ΅ Π² β%sβ ΠΏΡΠΈ β%sβ" -#: builtin/notes.c:880 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "ΠΡΠΌΠ° Π±Π΅Π»Π΅ΠΆΠΊΠΈ Π·Π° ΠΎΠ±Π΅ΠΊΡΠ° β%sβ\n" -#: builtin/notes.c:892 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "ΠΎΠΏΠΈΡΡΡ Π·Π° ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π° Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠ° Π±Π΅Π»Π΅ΠΆΠΊΠ° Π½Π΅ ΡΠ΅ ΡΡΠΈΡΠ° Π·Π° Π³ΡΠ΅ΡΠΊΠ°" -#: builtin/notes.c:895 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΈΠΌΠ΅Π½Π°ΡΠ° Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" -#: builtin/notes.c:976 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "Π£ΠΠΠΠΠ’ΠΠ_ΠΠ_ΠΠΠΠΠΠΠ" -#: builtin/notes.c:977 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "Π΄Π° ΡΠ΅ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π° Π±Π΅Π»Π΅ΠΆΠΊΠ°ΡΠ° ΡΠΎΡΠ΅Π½Π° ΠΎΡ ΡΠΎΠ·ΠΈ Π£ΠΠΠΠΠ’ΠΠ_ΠΠ_ΠΠΠΠΠΠΠ" -#: builtin/notes.c:1012 builtin/remote.c:1647 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "ΠΠ΅ΠΏΠΎΠ·Π½Π°ΡΠ° ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°: %s" @@ -8766,181 +9354,187 @@ msgstr "" msgid "deflate error (%d)" msgstr "Π³ΡΠ΅ΡΠΊΠ° ΠΏΡΠΈ Π΄Π΅ΠΊΠΎΠΌΠΏΡΠ΅ΡΠΈΡΠ°Π½Π΅ Ρ βdeflateβ (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" +"ΠΈΠ·ΠΊΠ»ΡΡΠ²Π°Π½Π΅ Π½Π° Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° Π±ΠΈΡΠΎΠ²Π°ΡΠ° ΠΌΠ°ΡΠΊΠ°, ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ΅ ΡΠ° ΡΠ°Π·Π΄Π΅Π»Π΅Π½ΠΈ ΠΏΠΎΡΠ°Π΄ΠΈ " +"ΡΡΠΎΠΉΠ½ΠΎΡΡΡΠ° Π½Π° βpack.packSizeLimitβ" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "ΠΠ°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" -#: builtin/pack-objects.c:1011 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "ΠΈΠ·ΠΊΠ»ΡΡΠ²Π°Π½Π΅ Π½Π° Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° Π±ΠΈΡΠΎΠ²Π°ΡΠ° ΠΌΠ°ΡΠΊΠ°, Π·Π°ΡΠΎΡΠΎ Π½ΡΠΊΠΎΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ Π½ΡΠΌΠ° Π΄Π° ΡΠ΅ " "ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Ρ" -#: builtin/pack-objects.c:2171 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "ΠΠΎΠΌΠΏΡΠ΅ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" -#: builtin/pack-objects.c:2568 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "Π½Π΅ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ°Π½Π° Π²Π΅ΡΡΠΈΡ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° β%sβ" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° Π²Π΅ΡΡΠΈΡ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° β%sβ" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ°" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ°" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ° Π²ΡΠ² ΡΠ°Π·Π°ΡΠ° Π½Π° Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" -#: builtin/pack-objects.c:2609 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "" "ΡΡΡΠΎΡΠΎ Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ ΠΊΠ°ΡΠΎ ΠΎΠΏΡΠΈΡΡΠ° β--all-progressβ ΠΏΡΠΈ ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ΡΠΎ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ°" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "ΠΠΠ Π‘ΠΠ―[,ΠΠ’ΠΠΠ‘Π’ΠΠΠΠ]" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "" "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π²ΡΠ² ΡΠΎΡΠΌΠ°ΜΡΠ° Ρ ΡΠΊΠ°Π·Π°Π½Π°ΡΠ° Π²Π΅ΡΡΠΈΡ" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»Π΅Π½ ΡΠ°Π·ΠΌΠ΅Ρ Π½Π° Π²ΡΠ΅ΠΊΠΈ ΠΏΠ°ΠΊΠ΅ΡΠ΅Π½ ΡΠ°ΠΉΠ»" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ Π·Π°Π΅ΡΠΈ ΠΎΡ Π΄ΡΡΠ³ΠΈ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ° Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½ΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠ°Π²Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠ·ΠΎΡΠ΅ΡΠ° Π·Π° ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½Π΅ ΠΏΠΎ Π±ΡΠΎΠΉ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" "ΠΎΠ³ΡΠ°Π½ΠΈΡΠ°Π²Π°Π½Π΅ Π½Π° ΠΏΡΠΎΠ·ΠΎΡΠ΅ΡΠ° Π·Π° ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½Π΅ ΠΈ ΠΏΠΎ ΠΏΠ°ΠΌΠ΅Ρ ΠΎΡΠ²Π΅Π½ ΠΏΠΎ Π±ΡΠΎΠΉ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»Π½Π° Π΄ΡΠ»ΠΆΠΈΠ½Π° Π½Π° Π²Π΅ΡΠΈΠ³Π°ΡΠ° ΠΎΡ ΡΠ°Π·Π»ΠΈΠΊΠΈ, ΠΊΠΎΡΡΠΎ Π΅ ΠΏΠΎΠ·Π²ΠΎΠ»Π΅Π½Π° Π² ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΈΡ ΡΠ°ΠΉΠ»" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈΡΠ΅ ΡΠ°Π·Π»ΠΈΠΊΠΈ" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈ βOFS_DELTAβ" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "" "ΡΡΠ°ΡΡΠΈΡΠ°Π½Π΅ Π½Π° Π½ΠΈΡΠΊΠΈ Π·Π° ΠΏΡΠ΅ΡΡΡΡΠ²Π°Π½Π΅ Π½Π° Π½Π°ΠΉ-Π΄ΠΎΠ±ΡΠΈΡΠ΅ ΡΡΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ Π½Π° ΡΠ°Π·Π»ΠΈΠΊΠΈΡΠ΅" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "Π±Π΅Π· ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΏΡΠ°Π·Π΅Π½ ΠΏΠ°ΠΊΠ΅ΡΠ΅Π½ ΡΠ°ΠΉΠ»" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° Π²Π΅ΡΡΠΈΠΈΡΠ΅ ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠ°Π²Π°Π½Π΅ Π΄ΠΎ Π²ΡΠ΅ ΠΎΡΠ΅ Π½Π΅ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½ΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/pack-objects.c:2641 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "" "Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ, ΠΊΠΎΠΈΡΠΎ ΠΌΠΎΠ³Π°Ρ Π΄Π° ΡΠ΅ Π΄ΠΎΡΡΠΈΠ³Π½Π°Ρ ΠΎΡ ΠΏΡΠΎΠΈΠ·Π²ΠΎΠ»Π΅Π½ " "ΡΠΊΠ°Π·Π°ΡΠ΅Π»" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅ ΠΈ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ ΡΠΎΡΠ΅Π½ΠΈ ΠΎΡ Π·Π°ΠΏΠΈΡΠΈΡΠ΅ Π² ΠΆΡΡΠ½Π°Π»Π° Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅ ΠΈ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ ΡΠΎΡΠ΅Π½ΠΈ ΠΎΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/pack-objects.c:2650 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠ° Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ ΠΈΠ·Ρ
ΠΎΠ΄" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "" "Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅ ΠΈ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅-Π΅ΡΠΈΠΊΠ΅ΡΠΈ, ΠΊΠΎΠΈΡΠΎ ΡΠΎΡΠ°Ρ ΠΊΡΠΌ ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΠ΅ Π±ΡΠ΄Π°Ρ " "ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½ΠΈ" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ Π½Π° Π½Π΅Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/pack-objects.c:2655 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "ΠΠ ΠΠΠ" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "ΡΠ°Π·ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½Π΅ Π½Π° Π½Π΅Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ, ΠΊΠΎΠΈΡΠΎ ΡΠ° ΠΏΠΎ-Π½ΠΎΠ²ΠΈ ΠΎΡ ΡΠΎΠ²Π° ΠΠ ΠΠΠ" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° ΡΡΠΊΡΠ°ΡΠ΅Π½ΠΈ ΠΏΠ°ΠΊΠ΅ΡΠΈ" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½Π΅ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΡΡΠΎ Π·Π° ΠΏΠ»ΠΈΡΠΊΠΎ Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΠ° ΠΏΡΠΈΠ΄ΡΡΠΆΠ΅Π½ΠΈ ΠΎΡ ΡΠ°ΠΉΠ» β.keepβ" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "Π½ΠΈΠ²ΠΎ Π½Π° ΠΊΠΎΠΌΠΏΡΠ΅ΡΠΈΡΠ°Π½Π΅ ΠΏΡΠΈ ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½Π΅" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "" "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΠΈ β Π΄ΠΎΡΠΈ ΠΈ ΡΠ΅Π·ΠΈ, ΠΊΠΎΠΈΡΠΎ Π½ΠΎΡΠΌΠ°Π»Π½ΠΎ ΡΠ° ΡΠΊΡΠΈΡΠΈ ΠΏΡΠΈ " "ΠΏΡΠΈΡΠ°ΠΆΠ΄Π°Π½ΠΈΡΡΠ°" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΈ ΠΈΠ½Π΄Π΅ΠΊΡΠΈ Π½Π° Π±Π°Π·Π° Π±ΠΈΡΠΎΠ²ΠΈ ΠΌΠ°ΡΠΊΠΈ Π·Π° ΡΡΠΊΠΎΡΡΠ²Π°Π½Π΅ Π½Π° " "ΠΏΡΠ΅Π±ΡΠΎΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "" "Π·Π°ΠΏΠ°Π·Π²Π°Π½Π΅ ΠΈ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π° Π±Π°Π·Π° ΠΏΠΎΠ±ΠΈΡΠΎΠ²Π° ΠΌΠ°ΡΠΊΠ°, Π·Π°Π΅Π΄Π½ΠΎ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π·Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "ΠΡΠ΅Π±ΡΠΎΡΠ²Π°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" @@ -8968,15 +9562,15 @@ msgstr "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ²ΡΠ°ΡΡΡΠΈΡΠ΅ ΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire ΠΠ ΠΠΠ] [--] [ΠΠ ΠͺΠ₯β¦]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "ΡΠ°ΠΌΠΎ ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π±Π΅Π· Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»Π½ΠΎ ΠΎΠΊΠ°ΡΡΡΡΠ½Π΅" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΠΎΠΊΠ°ΡΡΡΠ΅Π½ΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "ΠΎΠΊΠ°ΡΡΡΡΠ½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ ΠΏΠΎ-ΡΡΠ°ΡΠΈ ΠΎΡ ΡΠΎΠ²Π° ΠΠ ΠΠΠ" @@ -8984,52 +9578,60 @@ msgstr "ΠΎΠΊΠ°ΡΡΡΡΠ½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅ ΠΏΠΎ-ΡΡΠ°ΡΠΈ ΠΎΡ ΡΠΎΠ²Π° Π msgid "cannot prune in a precious-objects repo" msgstr "Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Ρ Π²Π°ΠΆΠ½ΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΎΠΊΠ°ΡΡΡΡ" -#: builtin/pull.c:69 +#: builtin/pull.c:72 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git push [ΠΠΠ¦ΠΠ―β¦] [Π₯Π ΠΠΠΠΠΠ©Π [Π£ΠΠΠΠΠ’ΠΠ_ΠΠ_ΠΠΠ Π‘ΠΠ―β¦]]" -#: builtin/pull.c:113 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "ΠΠΏΡΠΈΠΈ ΠΏΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: builtin/pull.c:116 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "Π²Π½Π°ΡΡΠ½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ ΡΡΠ΅Π· ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅, Π° Π½Π΅ ΡΡΠ΅Π· ΡΠ»ΠΈΠ²Π°Π½Π΅" -#: builtin/pull.c:140 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "ΠΏΠΎΠ·Π²ΠΎΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΈ ΡΠ»ΠΈΠ²Π°Π½ΠΈΡ" -#: builtin/pull.c:146 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ°, ΡΠ΅ ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ Π΅ Ρ ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΏΠΎΠ΄ΠΏΠΈΡ Π½Π° GPG" -#: builtin/pull.c:160 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎ ΡΠΊΠ°ΡΠ°Π²Π°Π½Π΅/ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΡΠΊΠ°ΡΠ°Π½ΠΎΡΠΎ ΠΏΡΠ΅Π΄ΠΈ ΠΈ ΡΠ»Π΅Π΄ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "ΠΠΏΡΠΈΠΈ ΠΏΡΠΈ Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅" -#: builtin/pull.c:268 +#: builtin/pull.c:194 +msgid "number of submodules pulled in parallel" +msgstr "Π±ΡΠΎΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ ΠΈΠ·Π΄ΡΡΠΏΠ°Π½ΠΈ ΠΏΠ°ΡΠ°Π»Π΅Π»Π½ΠΎ" + +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° βpull.ffβ: β%sβ" -#: builtin/pull.c:352 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "ΠΠ΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΈΠ·Π΄ΡΡΠΏΠ²Π°ΡΠ΅ ΠΏΡΠΈ ΡΠΎΠ²Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅, Π·Π°ΡΠΎΡΠΎ ΠΈΠΌΠ° ΠΏΡΠΎΠΌΠ΅Π½ΠΈ, ΠΊΠΎΠΈΡΠΎ Π½Π΅ " "ΡΠ° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/pull.c:358 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "ΠΡΠ²Π΅Π½ ΡΠΎΠ²Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΈΠΌΠ° Π½Π΅ΠΏΠΎΠ΄Π°Π΄Π΅Π½ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ." -#: builtin/pull.c:360 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "ΠΠ΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΈΠ·Π΄ΡΡΠΏΠ²Π°ΡΠ΅ ΠΏΡΠΈ ΡΠΎΠ²Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅, Π·Π°ΡΠΎΡΠΎ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΈΠΌΠ° " "Π½Π΅ΠΏΠΎΠ΄Π°Π΄Π΅Π½ΠΈ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ." -#: builtin/pull.c:436 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9037,14 +9639,14 @@ msgstr "" "ΠΠ΅ΠΆΠ΄Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΠΎΠΊΡ ΡΠΎ Π΄ΠΎΡΡΠ°Π²ΠΈΡ
ΡΠ΅, Π½ΡΠΌΠ° ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΡΡ ΠΊΠ°Π½Π΄ΠΈΠ΄Π°Ρ, Π²ΡΡΡ
Ρ " "ΠΊΠΎΠΉΡΠΎ Π΄Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°ΡΠ΅." -#: builtin/pull.c:438 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "ΠΠ΅ΠΆΠ΄Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΠΎΠΊΡ ΡΠΎ Π΄ΠΎΡΡΠ°Π²ΠΈΡ
ΡΠ΅, Π½ΡΠΌΠ° ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΡΡ ΠΊΠ°Π½Π΄ΠΈΠ΄Π°Ρ, ΠΊΠΎΠΉΡΠΎ " "Π΄Π° ΡΠ»Π΅Π΅ΡΠ΅." -#: builtin/pull.c:439 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9052,7 +9654,7 @@ msgstr "" "ΠΠ°ΠΉ Π²Π΅ΡΠΎΡΡΠ½ΠΎ ΡΡΠ΅ ΠΏΠΎΠ΄Π°Π»ΠΈ ΡΠ°Π±Π»ΠΎΠ½ Π·Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ, ΠΊΠΎΠΉΡΠΎ Π½Π΅ Π΅ Π½Π°ΠΏΠ°ΡΠ½Π°Π» Ρ Π½ΠΈΡΠΎ Π² " "ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅." -#: builtin/pull.c:442 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9063,40 +9665,44 @@ msgstr "" "ΠΠΎΠ½Π΅ΠΆΠ΅ ΡΠΎΠ²Π° Π½Π΅ Π΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ΡΠΎ ΠΏΠΎ ΠΏΠΎΠ΄ΡΠ°Π·Π±ΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ΅ΠΊΡΡΠΈΡ ΠΊΠ»ΠΎΠ½, ΡΡΡΠ±Π²Π°\n" "Π΄Π° ΡΠΊΠ°ΠΆΠ΅ΡΠ΅ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΈΡ ΡΠ΅Π΄." -#: builtin/pull.c:447 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "ΠΠ·Π²ΡΠ½ Π²ΡΠΈΡΠΊΠΈ ΠΊΠ»ΠΎΠ½ΠΈ." -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Π£ΠΊΠ°ΠΆΠ΅ΡΠ΅ Π²ΡΡΡ
Ρ ΠΊΠΎΠΉ ΠΊΠ»ΠΎΠ½ ΠΈΡΠΊΠ°ΡΠ΅ Π΄Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°ΡΠ΅." -#: builtin/pull.c:451 builtin/pull.c:466 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Π£ΠΊΠ°ΠΆΠ΅ΡΠ΅ ΠΊΠΎΠΉ ΠΊΠ»ΠΎΠ½ ΠΈΡΠΊΠ°ΡΠ΅ Π΄Π° ΡΠ»Π΅Π΅ΡΠ΅." -#: builtin/pull.c:452 builtin/pull.c:467 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "ΠΠ° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΏΠΎΠ³Π»Π΅Π΄Π½Π΅ΡΠ΅ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ βgit-pull(1)β" -#: builtin/pull.c:462 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "ΠΠ’ΠΠΠΠΠ§ΠΠΠ_Π₯Π ΠΠΠΠΠΠ©Π" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "ΠΠΠΠ" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ Π½Π΅ ΡΠ»Π΅Π΄ΠΈ Π½ΠΈΠΊΠΎΠΉ." -#: builtin/pull.c:471 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -"ΠΠΊΠΎ Π²ΡΠ΅ ΠΏΠ°ΠΊ ΠΈΡΠΊΠ°ΡΠ΅ Π΄Π° Π·Π°Π΄Π°Π΄Π΅ΡΠ΅ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΡΠ»Π΅Π΄Π΅Π½ ΠΊΠ»ΠΎΠ½,\n" -"ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° Π½Π°ΠΏΡΠ°Π²ΠΈΡΠ΅ ΡΠΎΠ²Π° Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ°:\n" -"\n" -" git branch --set-upstream-to=%s/Π‘ΠΠΠΠΠ_ΠΠΠΠ %s\n" -"\n" +"ΠΠΊΠΎ ΠΈΡΠΊΠ°ΡΠ΅ Π΄Π° Π·Π°Π΄Π°Π΄Π΅ΡΠ΅ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΡΠ»Π΅Π΄Π΅Π½ ΠΊΠ»ΠΎΠ½, ΠΌΠΎΠΆΠ΅ΡΠ΅ Π΄Π° Π½Π°ΠΏΡΠ°Π²ΠΈΡΠ΅ ΡΠΎΠ²Π° Ρ " +"ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ°:" -#: builtin/pull.c:476 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9105,11 +9711,15 @@ msgstr "" "ΠΠ° ΡΠ»ΠΈΠ²Π°Π½Π΅ Π΅ ΡΠΊΠ°Π·Π°Π½ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π» β%sβ,\n" "Π½ΠΎ ΡΠ°ΠΊΡΠ² Π½Π΅ Π΅ Π΄ΠΎΡΡΠ°Π²Π΅Π½." -#: builtin/pull.c:830 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--[no-]autostashβ ΠΈΠ·ΠΈΡΠΊΠ²Π° β--rebaseβ" + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "ΠΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° Π²ΡΠ΅ ΠΎΡΠ΅ Π½Π΅ΡΡΠ·Π΄Π°Π΄Π΅Π½ ΠΊΠ»ΠΎΠ½ Ρ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ ΠΎΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/pull.c:859 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9119,7 +9729,7 @@ msgstr "" "Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ΡΠΎ ΠΎΠ±Π½ΠΎΠ²ΠΈ Π²ΡΡΡ
Π° Π½Π° ΡΠ΅ΠΊΡΡΠΈΡ ΠΊΠ»ΠΎΠ½. Π Π°Π±ΠΎΡΠ½ΠΎΡΠΎ\n" "Π²ΠΈ ΠΊΠΎΠΏΠΈΠ΅ Π±Π΅ ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ ΡΠ»ΡΡΠΎ ΠΎΡ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ β%sβ." -#: builtin/pull.c:864 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9136,11 +9746,11 @@ msgstr "" " $ git reset --hard\n" "Π·Π° Π²ΡΡΡΠ°Π½Π΅ ΠΊΡΠΌ Π½ΠΎΡΠΌΠ°Π»Π½ΠΎ ΡΡΡΡΠΎΡΠ½ΠΈΠ΅." -#: builtin/pull.c:879 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ»ΠΈΠ²Π°ΡΠ΅ ΠΌΠ½ΠΎΠΆΠ΅ΡΡΠ²ΠΎ ΠΊΠ»ΠΎΠ½ΠΈ Π² ΠΏΡΠ°Π·Π΅Π½ Π²ΡΡΡ
ΠΎΠ² ΡΠΊΠ°Π·Π°ΡΠ΅Π»." -#: builtin/pull.c:883 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°ΡΠ΅ Π²ΡΡΡ
Ρ ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ Π΅Π΄ΠΈΠ½ ΠΊΠ»ΠΎΠ½." @@ -9148,15 +9758,15 @@ msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°ΡΠ΅ Π²ΡΡΡ
Ρ ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ Π msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [ΠΠΠ¦ΠΠ―β¦] [Π₯Π ΠΠΠΠΠΠ©Π [Π£ΠΠΠΠΠ’ΠΠ_ΠΠ_ΠΠΠ Π‘ΠΠ―β¦]]" -#: builtin/push.c:88 +#: builtin/push.c:89 msgid "tag shorthand without <tag>" msgstr "ΡΡΠΊΡΠ°ΡΠ΅Π½ΠΈΠ΅ Π·Π° Π΅ΡΠΈΠΊΠ΅Ρ Π±Π΅Π· ΠΠ’ΠΠΠΠ’" -#: builtin/push.c:98 +#: builtin/push.c:99 msgid "--delete only accepts plain target ref names" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--deleteβ ΠΏΡΠΈΠ΅ΠΌΠ° Π·Π° ΡΠ΅Π» ΡΠ°ΠΌΠΎ ΠΏΡΠΎΡΡΠΈ ΠΈΠΌΠ΅Π½Π° Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" -#: builtin/push.c:142 +#: builtin/push.c:143 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -9165,7 +9775,7 @@ msgstr "" "ΠΠ° Π΄Π° Π²ΠΊΠ»ΡΡΠΈΡΠ΅ ΡΠ°Π·ΠΈ ΠΎΠΏΡΠΈΡ Π·Π° ΠΏΠΎΡΡΠΎΡΠ½Π½ΠΎ, ΠΏΠΎΠ³Π»Π΅Π΄Π½Π΅ΡΠ΅ Π΄ΠΎΠΊΡΠΌΠ΅Π½ΡΠ°ΡΠΈΡΡΠ° Π·Π° " "Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βpush.defaultβ Π² βgit help configβ." -#: builtin/push.c:145 +#: builtin/push.c:146 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -9190,7 +9800,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:160 +#: builtin/push.c:161 #, c-format msgid "" "You are not currently on a branch.\n" @@ -9204,7 +9814,7 @@ msgstr "" "\n" " git push %s HEAD:ΠΠΠ_ΠΠ_ΠΠ’ΠΠΠΠΠ§ΠΠΠΠ―_ΠΠΠΠ\n" -#: builtin/push.c:174 +#: builtin/push.c:175 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -9218,14 +9828,14 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:182 +#: builtin/push.c:183 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ β%sβ ΡΠ»Π΅Π΄ΠΈ Π½ΡΠΊΠΎΠ»ΠΊΠΎ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈ ΠΊΠ»ΠΎΠ½Π°, Π½Π΅ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΏΡΠΎΡΡΠΎ Π΄Π° " "ΠΈΠ·ΡΠ»Π°ΡΠΊΠ°ΡΠ΅." -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -9237,67 +9847,14 @@ msgstr "" "Π’ΡΡΠ±Π²Π° Π΄Π° ΡΠΊΠ°ΠΆΠ΅ΡΠ΅ ΠΊΠΎΡ Π²Π΅ΡΡΠΈΡ Π΄Π° ΡΠ΅ ΠΈΠ·ΡΠ»Π°ΡΠΊΠ°, Π·Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ " "ΠΊΠ»ΠΎΠ½." -#: builtin/push.c:208 -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β Π½Π΅ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½Π°. Π‘ΡΠΎΠΉΠ½ΠΎΡΡΡΠ° Ρ ΠΏΠΎ ΠΏΠΎΠ΄ΡΠ°Π·Π±ΠΈΡΠ°Π½Π΅ Π΅ " -"ΡΠΌΠ΅Π½Π΅Π½Π°\n" -"Π² Git 2.0 ΠΎΡ βmatchingβ (Π²ΡΠΈΡΠΊΠΈ ΡΡΠ²ΠΏΠ°Π΄Π°ΡΠΈ ΠΊΠ»ΠΎΠ½ΠΈ) Π½Π° βsimpleβ (ΡΠ°ΠΌΠΎ ΡΠ΅ΠΊΡΡΠΈΡ\n" -"ΠΊΠ»ΠΎΠ½). ΠΠ° Π΄Π° ΠΏΠΎΠ΄ΡΠΈΡΠ½Π΅ΡΠ΅ ΡΠΎΠ²Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈ Π΄Π° ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΡΠ΅ ΡΡΠ°Π΄ΠΈΡΠΈΠΎΠ½Π½ΠΎΡΠΎ " -"ΠΏΠΎΠ²Π΅Π΄Π΅Π½ΠΈΠ΅\n" -"Π½Π° Git 1.x, ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ°:\n" -"\n" -" git config --global push.default matching\n" -"\n" -"ΠΠ° Π΄Π° ΠΏΠΎΠ΄ΡΠΈΡΠ½Π΅ΡΠ΅ ΡΠΎΠ²Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈ Π΄Π° ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΡΠ΅ Π½ΠΎΠ²ΠΎΡΠΎ ΠΏΠΎΠ²Π΅Π΄Π΅Π½ΠΈΠ΅ Π½Π° Git 2." -"x,\n" -"ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ°:\n" -"\n" -" git config --global push.default simple\n" -"\n" -"ΠΠΎΠ³Π°ΡΠΎ Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βpush.defaultβ Π΅ βmatchingβ, git ΡΠ΅ ΠΈΠ·ΡΠ»Π°ΡΠΊΠ° Π²ΡΠΈΡΠΊΠΈ " -"Π»ΠΎΠΊΠ°Π»Π½ΠΈ\n" -"ΠΊΠ»ΠΎΠ½ΠΈ, ΠΊΠΎΠΈΡΠΎ ΠΈΠΌΠ°Ρ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ Π°Π½Π°Π»ΠΎΠ³ ΡΡΡ ΡΡΡΠΎΡΠΎ ΠΈΠΌΠ΅.\n" -"\n" -"ΠΡ Π²Π΅ΡΡΠΈΡ 2.0 Git ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎ Π·Π°ΠΏΠΎΡΠ²Π° Π΄Π° ΠΏΠΎΠ»Π·Π²Π° ΠΏΠΎ-ΠΊΠΎΠ½ΡΠ΅ΡΠ²Π°ΡΠΈΠ²Π½ΠΈΡ Π²Π°ΡΠΈΠ°Π½Ρ\n" -"βsimpleβ, ΠΏΡΠΈ ΠΊΠΎΠΉΡΠΎ βpushβ ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π° ΡΠ°ΠΌΠΎ ΡΠ΅ΠΊΡΡΠΈΡ ΠΊΠ»ΠΎΠ½ ΠΊΡΠΌ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ, " -"ΡΠ»Π΅Π΄Π΅Π½\n" -"ΠΊΠ»ΠΎΠ½ β ΡΡΡΠΈΡ, ΠΊΠΎΠΉΡΠΎ βgit pullβ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°, Π·Π° Π΄Π° ΠΎΠ±Π½ΠΎΠ²ΠΈ ΡΠ΅ΠΊΡΡΠΈΡ.\n" -"\n" -"ΠΠ° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΏΠΎΠ³Π»Π΅Π΄Π½Π΅ΡΠ΅ βgit help configβ ΠΈ ΠΏΠΎΡΡΡΡΠ΅ΡΠ΅ βpush." -"defaultβ.\n" -"ΠΠΎΠ²Π°ΡΠ° ΡΡΠΎΠΉΠ½ΠΎΡΡ βsimpleβ Π±Π΅ Π²ΡΠ²Π΅Π΄Π΅Π½Π° Ρ Π²Π΅ΡΡΠΈΡ 1.7.11 Π½Π° Git. ΠΠΊΠΎ ΠΏΠΎΠ½ΡΠΊΠΎΠ³Π°\n" -"ΠΏΠΎΠ»Π·Π²Π°ΡΠ΅ ΡΡΠ°ΡΠΈ Π²Π΅ΡΡΠΈΠΈ Π½Π° Git, Π·Π°Π΄Π°ΠΉΡΠ΅ ΡΡΠΎΠΉΠ½ΠΎΡΡ βcurrentβ Π²ΠΌΠ΅ΡΡΠΎ βsimpleβ." - -#: builtin/push.c:275 +#: builtin/push.c:242 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "ΠΠ΅ ΡΡΠ΅ ΡΠΊΠ°Π·Π°Π»ΠΈ Π²Π΅ΡΡΠΈΡ Π·Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅, Π° Π½Π°ΡΡΡΠΎΠΉΠΊΠ°ΡΠ° βpush.defaultβ Π΅ " "βnothingβ (Π½ΠΈΡΠΎ Π±Π΅Π· ΠΈΠ·ΡΠΈΡΠ½ΠΎ ΡΠΊΠ°Π·Π°Π½Π° Π²Π΅ΡΡΠΈΡ Π΄Π° Π½Π΅ ΡΠ΅ ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°)" -#: builtin/push.c:282 +#: builtin/push.c:249 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -9311,7 +9868,7 @@ msgstr "" "ΠΏΡΠ΅Π΄ΠΈ ΠΎΡΠ½ΠΎΠ²ΠΎ Π΄Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ°ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅. ΠΠ° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π²ΠΈΠΆΡΠ΅ ΡΠ°Π·Π΄Π΅Π»Π°\n" "βNote about fast-forwardsβ Π² ΡΡΡΠ°Π½ΠΈΡΠ°ΡΠ° ΠΎΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ βgit push --helpβ." -#: builtin/push.c:288 +#: builtin/push.c:255 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" @@ -9324,7 +9881,7 @@ msgstr "" "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΏΠΎΠ³Π»Π΅Π΄Π½Π΅ΡΠ΅ ΡΠ°Π·Π΄Π΅Π»Π° βNote about fast-forwardsβ Π² ΡΡΡΠ°Π½ΠΈΡΠ°ΡΠ° ΠΎΡ\n" "ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ βgit push --helpβ." -#: builtin/push.c:294 +#: builtin/push.c:261 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" @@ -9343,14 +9900,14 @@ msgstr "" "ΡΡΡΠ°Π½ΠΈΡΠ°ΡΠ°\n" "ΠΎΡ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ βgit push --helpβ." -#: builtin/push.c:301 +#: builtin/push.c:268 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "ΠΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ΡΠΎ Π΅ ΠΎΡΡ
Π²ΡΡΠ»Π΅Π½ΠΎ, Π·Π°ΡΠΎΡΠΎ Π² ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° " "Π΅ΡΠΈΠΊΠ΅Ρ,\n" "ΠΊΠΎΠΉΡΠΎ ΡΠ΅ ΠΏΡΠΈΠΏΠΎΠΊΡΠΈΠ΅ΡΠ΅ Ρ Π΅ΡΠΈΠΊΠ΅Ρ ΠΎΡ Π²Π°ΡΠ΅ΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅." -#: builtin/push.c:304 +#: builtin/push.c:271 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" @@ -9360,22 +9917,22 @@ msgstr "" "ΡΠΊΠ°Π·Π°ΡΠ΅Π», ΠΊΠΎΠΉΡΠΎ Π²Π΅ΡΠ΅ ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΎΠ±Π΅ΠΊΡ, ΠΊΠΎΠΉΡΠΎ Π½Π΅ Π΅ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅, ΠΊΠ°ΠΊΡΠΎ ΠΈ ΡΠ΅ΠΏΡΡΠ²Π°\n" "Π΄Π° Π³ΠΎ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ Π΄Π° ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΎΠ±Π΅Π½ ΠΎΠ±Π΅ΠΊΡ.\n" -#: builtin/push.c:363 +#: builtin/push.c:331 #, c-format msgid "Pushing to %s\n" msgstr "ΠΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ ΠΊΡΠΌ β%sβ\n" -#: builtin/push.c:367 +#: builtin/push.c:335 #, c-format msgid "failed to push some refs to '%s'" msgstr "ΡΠ°ΡΡ ΠΎΡ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅ Π½Π΅ Π±ΡΡ
Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ°Π½ΠΈ ΠΊΡΠΌ β%sβ" -#: builtin/push.c:397 +#: builtin/push.c:365 #, c-format msgid "bad repository '%s'" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΡΠΊΠ°Π·Π°Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ" -#: builtin/push.c:398 +#: builtin/push.c:366 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -9397,108 +9954,104 @@ msgstr "" "\n" " git push ΠΠΠ\n" -#: builtin/push.c:413 +#: builtin/push.c:381 msgid "--all and --tags are incompatible" msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--allβ ΠΈ β--tagsβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: builtin/push.c:414 +#: builtin/push.c:382 msgid "--all can't be combined with refspecs" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--allβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ ΡΠΊΠ°Π·Π²Π°Π½Π΅ΡΠΎ Π½Π° Π²Π΅ΡΡΠΈΡ" -#: builtin/push.c:419 +#: builtin/push.c:387 msgid "--mirror and --tags are incompatible" msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--mirrorβ ΠΈ β--tagsβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: builtin/push.c:420 +#: builtin/push.c:388 msgid "--mirror can't be combined with refspecs" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--mirrorβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ ΡΠΊΠ°Π·Π²Π°Π½Π΅ΡΠΎ Π½Π° Π²Π΅ΡΡΠΈΡ" -#: builtin/push.c:425 +#: builtin/push.c:393 msgid "--all and --mirror are incompatible" msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--allβ ΠΈ β--mirrorβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: builtin/push.c:537 +#: builtin/push.c:505 msgid "repository" msgstr "Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/push.c:538 builtin/send-pack.c:161 +#: builtin/push.c:506 builtin/send-pack.c:161 msgid "push all refs" msgstr "ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" -#: builtin/push.c:539 builtin/send-pack.c:163 +#: builtin/push.c:507 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "ΠΎΠ³Π»Π΅Π΄Π°Π»Π½ΠΎ ΠΊΠΎΠΏΠΈΠ΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ" -#: builtin/push.c:541 +#: builtin/push.c:509 msgid "delete refs" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅" -#: builtin/push.c:542 +#: builtin/push.c:510 msgid "push tags (can't be used with --all or --mirror)" msgstr "ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅ (Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΎ Ρ ΠΎΠΏΡΠΈΠΈΡΠ΅ β--allβ ΠΈ β--mirrorβ)" -#: builtin/push.c:545 builtin/send-pack.c:164 +#: builtin/push.c:513 builtin/send-pack.c:164 msgid "force updates" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅" # FIXME double check this -#: builtin/push.c:547 builtin/send-pack.c:175 +#: builtin/push.c:515 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "Π£ΠΠΠΠΠ’ΠΠ>:<ΠΠ§ΠΠΠΠΠΠ_Π‘Π’ΠΠΠΠΠ‘Π’" -#: builtin/push.c:548 builtin/send-pack.c:176 +#: builtin/push.c:516 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "Π£ΠΠΠΠΠ’ΠΠΡΡ ΡΡΡΠ±Π²Π° ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎ Π΄Π° Π΅ Ρ ΡΠ°Π·ΠΈ ΠΠ§ΠΠΠΠΠΠ_Π‘Π’ΠΠΠΠΠ‘Π’" -#: builtin/push.c:550 -msgid "check|on-demand|no" -msgstr "βcheckβ (ΠΏΡΠΎΠ²Π΅ΡΠΊΠ°), βon-demandβ (ΠΏΡΠΈ Π½ΡΠΆΠ΄Π°) ΠΈΠ»ΠΈ βnoβ (Π±Π΅Π·)" - -#: builtin/push.c:551 +#: builtin/push.c:519 msgid "control recursive pushing of submodules" msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ Π½Π° ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎΡΠΎ ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅" -#: builtin/push.c:553 builtin/send-pack.c:169 +#: builtin/push.c:521 builtin/send-pack.c:169 msgid "use thin pack" msgstr "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΡΠΊΡΠ°ΡΠ΅Π½ΠΈ ΠΏΠ°ΠΊΠ΅ΡΠΈ" -#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158 +#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "ΠΏΡΠΎΠ³ΡΠ°ΠΌΠ° Π·Π° ΠΏΠΎΠ»ΡΡΠ°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΠ°ΠΊΠ΅ΡΠΈ" -#: builtin/push.c:556 +#: builtin/push.c:524 msgid "set upstream for git pull/status" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π·Π° ΠΊΠΎΠΌΠ°Π½Π΄ΠΈΡΠ΅ βgit pull/statusβ" -#: builtin/push.c:559 +#: builtin/push.c:527 msgid "prune locally removed refs" msgstr "ΠΎΠΊΠ°ΡΡΡΡΠ½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΠ° ΠΏΡΠ΅ΠΌΠ°Ρ
Π½Π°ΡΠΈ ΠΎΡ Π»ΠΎΠΊΠ°Π»Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/push.c:561 +#: builtin/push.c:529 msgid "bypass pre-push hook" msgstr "Π±Π΅Π· ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° ΠΊΡΠΊΠ°ΡΠ° ΠΏΡΠ΅Π΄ΠΈ ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ (pre-push)" -#: builtin/push.c:562 +#: builtin/push.c:530 msgid "push missing but relevant tags" msgstr "" "ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ Π½Π° Π»ΠΈΠΏΡΠ²Π°ΡΠΈΡΠ΅ Π² ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅, Π½ΠΎ ΡΠ²ΡΡΠ·Π°Π½ΠΈ Ρ ΡΠ΅ΠΊΡΡΠΎΡΠΎ " "ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅, Π΅ΡΠΈΠΊΠ΅ΡΠΈ" -#: builtin/push.c:565 builtin/send-pack.c:166 +#: builtin/push.c:533 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅ΡΠΎ Ρ GPG" -#: builtin/push.c:567 builtin/send-pack.c:170 +#: builtin/push.c:535 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "ΠΈΠ·ΠΈΡΠΊΠ²Π°Π½Π΅ Π½Π° Π°ΡΠΎΠΌΠ°ΡΠ½ΠΈ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ ΠΎΡ ΠΎΡΡΡΠ΅ΡΠ½Π°ΡΠ° ΡΡΡΠ°Π½Π°" -#: builtin/push.c:577 +#: builtin/push.c:549 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "ΠΎΠΏΡΠΈΡΡΠ° β--deleteβ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠ° Ρ ΠΎΠΏΡΠΈΠΈΡΠ΅ β--allβ, β--mirrorβ ΠΈ β--tagsβ" -#: builtin/push.c:579 +#: builtin/push.c:551 msgid "--delete doesn't make sense without any refs" msgstr "ΠΎΠΏΡΠΈΡΡΠ° β--deleteβ ΠΈΠ·ΠΈΡΠΊΠ²Π° ΠΏΠΎΠ½Π΅ Π΅Π΄ΠΈΠ½ ΡΠΊΠ°Π·Π°ΡΠ΅Π» Π½Π° Π²Π΅ΡΡΠΈΡ" @@ -9577,13 +10130,24 @@ msgstr "Π±Π΅Π· ΠΏΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΡΠΈΠ»ΡΡΡΠ° Π·Π° ΡΠ°ΡΡΠΈΡΠ½ΠΎ ΠΈΠ· msgid "debug unpack-trees" msgstr "ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ Π½Π° Π³ΡΠ΅ΡΠΊΠΈ Π² ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βunpack-treesβ" -# FIXME -#: builtin/reflog.c:428 +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack ΠΠΠ ΠΠΠ’ΠΠ ΠΠ―_ΠΠ_GIT" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Π’ΡΡΠ±Π²Π° Π΄Π° ΡΠΊΠ°ΠΆΠ΅ΡΠ΅ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ." + +#: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "β%sβ Π½Π΅ Π΅ ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° Π²ΡΠ΅ΠΌΠ΅ Π·Π° β%sβ" -#: builtin/reflog.c:545 builtin/reflog.c:550 +#: builtin/reflog.c:540 builtin/reflog.c:545 #, c-format msgid "'%s' is not a valid timestamp" msgstr "β%sβ Π½Π΅ Π΅ ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡ Π·Π° Π²ΡΠ΅ΠΌΠ΅" @@ -9730,56 +10294,46 @@ msgstr "" "ΡΠΊΠ°Π·Π²Π°Π½Π΅ΡΠΎ Π½Π° ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΠΊΠ»ΠΎΠ½ΠΈ Π΅ ΡΠΌΠΈΡΠ»Π΅Π½ΠΎ ΡΠ°ΠΌΠΎ Π·Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ°, ΠΎΡ " "ΠΊΠΎΠΈΡΠΎ ΡΠ΅ Π΄ΠΎΡΡΠ°Π²Ρ" -#: builtin/remote.c:193 builtin/remote.c:643 +#: builtin/remote.c:190 builtin/remote.c:633 #, c-format msgid "remote %s already exists." msgstr "Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Ρ ΠΈΠΌΠ΅ β%sβ." -#: builtin/remote.c:197 builtin/remote.c:647 +#: builtin/remote.c:194 builtin/remote.c:637 #, c-format msgid "'%s' is not a valid remote name" msgstr "β%sβ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π·Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/remote.c:241 +#: builtin/remote.c:234 #, c-format msgid "Could not setup master '%s'" msgstr "ΠΡΠ½ΠΎΠ²Π½ΠΈΡΡ ΠΊΠ»ΠΎΠ½ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π½Π°ΡΡΡΠΎΠ΅Π½" -#: builtin/remote.c:341 +#: builtin/remote.c:336 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "ΠΠ±Π΅ΠΊΡΠΈΡΠ΅ Π·Π° Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ Π·Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ β%sβ Π½Π΅ ΠΌΠΎΠ³Π°Ρ Π΄Π° Π±ΡΠ΄Π°Ρ ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈ" -#: builtin/remote.c:442 builtin/remote.c:450 +#: builtin/remote.c:437 builtin/remote.c:445 msgid "(matching)" msgstr "(ΡΡΠ²ΠΏΠ°Π΄Π°ΡΠΈ)" -#: builtin/remote.c:454 +#: builtin/remote.c:449 msgid "(delete)" msgstr "(Π·Π° ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅)" -#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606 -#, c-format -msgid "Could not append '%s' to '%s'" -msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈ ΠΊΡΠΌ β%sβ" - -#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875 +#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "Π’Π°ΠΊΠΎΠ²Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π½ΡΠΌΠ°: %s" -#: builtin/remote.c:653 +#: builtin/remote.c:643 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Π Π°Π·Π΄Π΅Π»ΡΡ β%sβ Π² Π½Π°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠ΅ΠΈΠΌΠ΅Π½ΡΠ²Π°Π½ Π½Π° β%sβ" -#: builtin/remote.c:659 builtin/remote.c:827 -#, c-format -msgid "Could not remove config section '%s'" -msgstr "Π Π°Π·Π΄Π΅Π»ΡΡ β%sβ Π² Π½Π°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ" - # FIXME tabulator -#: builtin/remote.c:674 +#: builtin/remote.c:663 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -9790,27 +10344,17 @@ msgstr "" " %s\n" " ΠΡΠΎΠΌΠ΅Π½Π΅ΡΠ΅ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅ ΡΡΡΠ½ΠΎ, Π°ΠΊΠΎ Π΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎ." -#: 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 +#: builtin/remote.c:699 #, c-format msgid "deleting '%s' failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° β%sβ" -#: builtin/remote.c:747 +#: builtin/remote.c:733 #, c-format msgid "creating '%s' failed" msgstr "Π½Π΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° β%sβ" -#: builtin/remote.c:813 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -9824,125 +10368,132 @@ msgstr[1] "" "ΠΠ΅Π»Π΅ΠΆΠΊΠ°: ΠΡΠΊΠΎΠ»ΠΊΠΎ ΠΊΠ»ΠΎΠ½Π° ΠΈΠ·Π²ΡΠ½ ΠΉΠ΅ΡΠ°ΡΡ
ΠΈΡΡΠ° βrefs/remotes/β Π½Π΅ Π±ΡΡ
Π° ΠΈΠ·ΡΡΠΈΡΠΈ.\n" "ΠΠ·ΡΡΠΈΠΉΡΠ΅ Π³ΠΈ ΡΡΠ΅Π· ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ°:" -#: builtin/remote.c:928 +#: builtin/remote.c:810 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Π Π°Π·Π΄Π΅Π»ΡΡ β%sβ Π² Π½Π°ΡΡΡΠΎΠΉΠΊΠΈΡΠ΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ" + +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " Π½ΠΎΠ² (ΡΠ»Π΅Π΄Π²Π°ΡΠΎΡΠΎ Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ ΡΠ΅ Π³ΠΎ ΡΠ°Π·ΠΏΠΎΠ»ΠΎΠΆΠΈ Π² βremotes/%sβ)" -#: builtin/remote.c:931 +#: builtin/remote.c:914 msgid " tracked" msgstr " ΡΠ»Π΅Π΄Π΅Π½" -#: builtin/remote.c:933 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " ΡΡΠ°Ρ (ΠΈΠ·ΡΡΠΈΠΉΡΠ΅ ΡΡΠ΅Π· βgit remote pruneβ)" # FIXME -#: builtin/remote.c:935 +#: builtin/remote.c:918 msgid " ???" msgstr " Π½Π΅ΡΡΠ½ΠΎ ΡΡΡΡΠΎΡΠ½ΠΈΠ΅" # CHECK -#: builtin/remote.c:976 +#: builtin/remote.c:959 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΊΠ»ΠΎΠ½ Π·Π° ΡΠ»ΠΈΠ²Π°Π½Π΅ β%sβ. ΠΠ΅Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ Π΅ Π΄Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°ΡΠ΅ Π²ΡΡΡ
Ρ ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ " "1 ΠΊΠ»ΠΎΠ½" -#: builtin/remote.c:983 +#: builtin/remote.c:967 #, c-format -msgid "rebases onto remote %s" -msgstr "ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π²ΡΡΡ
Ρ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ" +msgid "rebases interactively onto remote %s" +msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π²ΡΡΡ
Ρ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ" -#: builtin/remote.c:986 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " ΡΠ»ΠΈΠ²Π°Π½Π΅ Ρ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ" -#: builtin/remote.c:987 +#: builtin/remote.c:972 msgid " and with remote" msgstr " ΠΈ Ρ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½" -#: builtin/remote.c:989 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "ΡΠ»ΠΈΠ²Π°Π½Π΅ Ρ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½ β%sβ" -#: builtin/remote.c:990 +#: builtin/remote.c:975 msgid " and with remote" msgstr " ΠΈ Ρ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡ ΠΊΠ»ΠΎΠ½" -#: builtin/remote.c:1036 +#: builtin/remote.c:1021 msgid "create" msgstr "ΡΡΠ·Π΄Π°Π΄Π΅Π½" -#: builtin/remote.c:1039 +#: builtin/remote.c:1024 msgid "delete" msgstr "ΠΈΠ·ΡΡΠΈΡ" -#: builtin/remote.c:1043 +#: builtin/remote.c:1028 msgid "up to date" msgstr "Π°ΠΊΡΡΠ°Π»Π΅Π½" -#: builtin/remote.c:1046 +#: builtin/remote.c:1031 msgid "fast-forwardable" msgstr "ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΠ»Π΅Π΅ ΡΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ" -#: builtin/remote.c:1049 +#: builtin/remote.c:1034 msgid "local out of date" msgstr "Π»ΠΎΠΊΠ°Π»Π½ΠΈΡΡ Π΅ ΠΈΠ·ΠΎΡΡΠ°Π½Π°Π»" -#: builtin/remote.c:1056 +#: builtin/remote.c:1041 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π° ΠΊΡΠΌ %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1044 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π° ΠΊΡΠΌ %-*s (%s)" -#: builtin/remote.c:1063 +#: builtin/remote.c:1048 #, c-format msgid " %-*s forces to %s" msgstr " %-*s ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π° ΠΊΡΠΌ %s" -#: builtin/remote.c:1066 +#: builtin/remote.c:1051 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π° ΠΊΡΠΌ %s" -#: builtin/remote.c:1134 +#: builtin/remote.c:1119 msgid "do not query remotes" msgstr "Π±Π΅Π· Π·Π°ΡΠ²ΠΊΠΈ ΠΊΡΠΌ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΠ΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ°" -#: builtin/remote.c:1161 +#: builtin/remote.c:1146 #, c-format msgid "* remote %s" msgstr "β ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ" -#: builtin/remote.c:1162 +#: builtin/remote.c:1147 #, c-format msgid " Fetch URL: %s" msgstr " ΠΠ΄ΡΠ΅Ρ Π·Π° Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅: %s" -#: builtin/remote.c:1163 builtin/remote.c:1314 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(Π±Π΅Π· Π°Π΄ΡΠ΅Ρ)" # FIXME spaces betwen Push and URL -#: builtin/remote.c:1172 builtin/remote.c:1174 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " ΠΠ΄ΡΠ΅Ρ Π·Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅: %s" -#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " ΠΊΠ»ΠΎΠ½ ΡΠΎΡΠ΅Π½ ΠΎΡ HEAD: %s" -#: builtin/remote.c:1182 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9951,159 +10502,159 @@ msgstr "" "Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π΅\n" " Π½Π΅Π΅Π΄Π½ΠΎΠ·Π½Π°ΡΠ΅Π½ ΠΈ Π΅ Π½ΡΠΊΠΎΠΉ ΠΎΡ ΡΠ»Π΅Π΄Π½ΠΈΡΠ΅):\n" -#: builtin/remote.c:1194 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " ΠΡΠ΄Π°Π»Π΅ΡΠ΅Π½ ΠΊΠ»ΠΎΠ½:%s" msgstr[1] " ΠΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈ ΠΊΠ»ΠΎΠ½ΠΈ:%s" -#: builtin/remote.c:1197 builtin/remote.c:1224 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ Π½Π΅ Π±Π΅ ΠΏΡΠΎΠ²Π΅ΡΠ΅Π½ΠΎ)" -#: builtin/remote.c:1206 +#: builtin/remote.c:1193 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:1214 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " ΠΠΎΠΊΠ°Π»Π½ΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΏΡΠ΅Π½Π΅ΡΠ΅Π½ΠΈ ΡΡΠ΅Π· β pushβ" -#: builtin/remote.c:1221 +#: builtin/remote.c:1208 #, 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:1242 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° refs/remotes/ΠΠΠ/HEAD ΡΠΏΠΎΡΠ΅Π΄ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/remote.c:1244 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° refs/remotes/ΠΠΠ/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΡΡΠ°Π½ΠΎΠ²ΠΈ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΡ Π²ΡΡΡ
" -#: builtin/remote.c:1261 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "ΠΠ½ΠΎΠΆΠ΅ΡΡΠ²ΠΎ ΠΊΠ»ΠΎΠ½ΠΈ Ρ Π²ΡΡΡ
ΠΎΠ²Π΅. ΠΠ·Π±Π΅ΡΠ΅ΡΠ΅ ΠΈΠ·ΡΠΈΡΠ½ΠΎ Π½ΡΠΊΠΎΠΉ ΠΎΡ ΡΡΡ
ΡΡΠ΅Π· ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ°:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ" -#: builtin/remote.c:1279 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠΊΠ°Π·Π°ΡΠ΅Π»: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π½Π°ΡΡΡΠΎΠΈ" -#: builtin/remote.c:1299 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr "β%sβ ΡΠ΅ ΡΠ΅ ΠΏΡΠ΅Π²ΡΡΠ½Π΅ Π² ΠΎΠ±Π΅ΠΊΡ ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr "β%sβ ΡΠ΅ ΠΏΡΠ΅Π²ΡΡΠ½Π° Π² ΠΎΠ±Π΅ΠΊΡ ΠΈΠ·Π²ΡΠ½ ΠΊΠ»ΠΎΠ½ΠΈΡΠ΅!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "ΠΠΊΠ°ΡΡΡΡΠ½Π΅ Π½Π° β%sβ" -#: builtin/remote.c:1311 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "Π°Π΄ΡΠ΅Ρ: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " β [ΡΠ΅ Π±ΡΠ΄Π΅ ΠΎΠΊΠ°ΡΡΡΠ΅Π½ΠΎ] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " β [ΠΎΠΊΠ°ΡΡΡΠ΅Π½ΠΎ] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "ΠΎΠΊΠ°ΡΡΡΡΠ½Π΅ Π½Π° ΠΎΠ³Π»Π΅Π΄Π°Π»Π°ΡΠ° Π½Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΠ΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ° ΡΠ»Π΅Π΄ Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅" -#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "ΠΡΠΌΠ° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π½Π° ΠΈΠΌΠ΅ β%sβ" -#: builtin/remote.c:1461 +#: builtin/remote.c:1441 msgid "add branch" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½" -#: builtin/remote.c:1468 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "Π½Π΅ Π΅ ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: builtin/remote.c:1485 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ ΠΊΡΠΌ Π°Π΄ΡΠ΅ΡΠΈΡΠ΅ Π·Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅, Π° Π½Π΅ Π·Π° Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅" -#: builtin/remote.c:1487 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ Π°Π΄ΡΠ΅ΡΠΈ" -#: builtin/remote.c:1515 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Π½Π΅ Π΅ Π·Π°Π΄Π°Π΄Π΅Π½ Π°Π΄ΡΠ΅Ρ Π·Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ β%sβ" -#: builtin/remote.c:1541 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "ΠΏΡΠΎΠΌΡΠ½Π° Π½Π° Π°Π΄ΡΠ΅ΡΠΈΡΠ΅ Π·Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅" -#: builtin/remote.c:1543 +#: builtin/remote.c:1523 msgid "add URL" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° Π°Π΄ΡΠ΅ΡΠΈ" -#: builtin/remote.c:1545 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° Π°Π΄ΡΠ΅ΡΠΈ" # FIXME message - incompatible -#: builtin/remote.c:1552 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "ΠΎΠΏΡΠΈΠΈΡΠ΅ β--addβ ΠΈ β--deleteβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: builtin/remote.c:1592 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ (ΡΡΠ°Ρ) ΡΠΎΡΠΌΠ°Ρ Π·Π° Π°Π΄ΡΠ΅Ρ: %s" -#: builtin/remote.c:1600 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Π’Π°ΠΊΡΠ² Π°Π΄ΡΠ΅Ρ Π½Π΅ Π΅ ΠΎΡΠΊΡΠΈΡ: %s" # FIXME CHECK MEANING -#: builtin/remote.c:1602 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "ΠΠΈΠΊΠΎΠΉ ΠΎΡ Π°Π΄ΡΠ΅ΡΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π½Π΅ ΡΠ° Π·Π° ΠΈΠ·ΡΠ»Π°ΡΠΊΠ²Π°Π½Π΅, Π½ΡΠΌΠ° Π΄Π° ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅" -#: builtin/remote.c:1616 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΠΎΡΡΠΈ. ΠΠΎΡΡΠ°Π²Ρ ΡΠ΅ ΠΏΡΠ΅Π΄ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°" @@ -10419,7 +10970,7 @@ msgstr "ΠΠ½Π΄Π΅ΠΊΡΡΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°Π½ΡΠ»Π΅Π½ ΠΊΡΠΌ Π²Π΅Ρ msgid "Could not write new index file." msgstr "ΠΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠΈΡΠ°Π½." -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:350 msgid "rev-list does not support display of notes" msgstr "ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βrev-listβ Π½Π΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ° ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ΡΠΎ Π½Π° Π±Π΅Π»Π΅ΠΆΠΊΠΈ" @@ -10634,12 +11185,6 @@ msgstr "" "ΠΈΠ·Ρ
ΠΎΠ΄Π½ΠΈΡΡ ΠΊΠΎΠ΄ Π΄Π° Π΅ 0, Π΄ΠΎΡΠΈ Π°ΠΊΠΎ Π½ΠΈΠΊΠΎΠΉ ΡΠ°ΠΉΠ» Π½e e Π½Π°ΠΏΠ°ΡΠ½Π°Π» Ρ ΡΠ°Π±Π»ΠΎΠ½Π° Π·Π° " "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"ΠΠ° Π΄Π° ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠΈΡΠ΅, ΠΈΠ»ΠΈ Π²ΠΊΠ°ΡΠ°ΠΉΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ ΠΏΠΎ ΡΠ°ΠΉΠ»Π° β.gitmodulesβ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°,\n" -"ΠΈΠ»ΠΈ Π³ΠΈ ΡΠΊΠ°ΡΠ°ΠΉΡΠ΅" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10681,29 +11226,24 @@ msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ ΠΎΡ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½Π° 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 +#: builtin/shortlog.c:242 msgid "sort output according to the number of commits per author" msgstr "ΠΏΠΎΠ΄ΡΠ΅Π΄Π±Π° Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡΡΠ° ΠΏΠΎ Π±ΡΠΎΡ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ ΠΎΡ Π°Π²ΡΠΎΡ" -#: builtin/shortlog.c:232 +#: builtin/shortlog.c:244 msgid "Suppress commit descriptions, only provides commit count" msgstr "ΠΠ΅Π· ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡΡΠ° β Π΄Π° ΡΠ΅ ΠΏΠΎΠΊΠ°Π·Π²Π° ΡΠ°ΠΌΠΎ Π±ΡΠΎΡ ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡ" -#: builtin/shortlog.c:234 +#: builtin/shortlog.c:246 msgid "Show the email address of each author" msgstr "ΠΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π°Π΄ΡΠ΅ΡΠ° Π½Π° Π΅-ΠΏΠΎΡΠ° Π·Π° Π²ΡΠ΅ΠΊΠΈ Π°Π²ΡΠΎΡ" # FIXME why is this so short -#: builtin/shortlog.c:235 +#: builtin/shortlog.c:247 msgid "w[,i1[,i2]]" msgstr "Π¨ΠΠ ΠΠ§ΠΠΠ[,ΠΠ’Π‘Π’ΠͺΠ_1[,ΠΠ’Π‘Π’ΠͺΠ_2]]" -#: builtin/shortlog.c:236 +#: builtin/shortlog.c:248 msgid "Linewrap output" msgstr "" "ΠΡΠ΅Π½Π°ΡΡΠ½Π΅ Π½Π° ΡΠ΅Π΄ΠΎΠ²Π΅ΡΠ΅ Π΄ΠΎ ΡΠ°Π·ΠΈ ΠΎΠ±ΡΠ° Π¨ΠΠ ΠΠ§ΠΠΠ (76), Ρ ΠΠ’Π‘Π’ΠͺΠ_1 (6) Π·Π° ΠΏΡΡΠ²ΠΈΡ " @@ -10853,84 +11393,186 @@ msgid "skip and remove all lines starting with comment character" msgstr "ΠΏΡΠΎΠΏΡΡΠΊΠ°Π½Π΅ Π½Π° Π²ΡΠΈΡΠΊΠΈ ΡΠ΅Π΄ΠΎΠ²Π΅, ΠΊΠΎΠΈΡΠΎ Π·Π°ΠΏΠΎΡΠ²Π°Ρ Ρ β#β" #: builtin/stripspace.c:38 -msgid "prepend comment character and blank to each line" -msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° β# β Π½Π° Π²ΡΠ΅ΠΊΠΈ ΡΠ΅Π΄" +msgid "prepend comment character and space to each line" +msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° β# β Π² Π½Π°ΡΠ°Π»ΠΎΡΠΎ Π½Π° Π²ΡΠ΅ΠΊΠΈ ΡΠ΅Π΄" + +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Π’Π°ΠΊΡΠ² ΡΠΊΠ°Π·Π°ΡΠ΅Π» Π½ΡΠΌΠ°: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "ΠΡΠ°ΠΊΠ²Π° ΡΠ΅ ΠΏΡΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π», Π° Π½Π΅ β%sβ" -#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΌΠ°Ρ
Π½Π΅ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΎΡ Π°Π΄ΡΠ΅ΡΠ° β%sβ" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π·Π° ΠΎΠΏΡΠ΅Π΄Π΅Π»ΡΠ½Π΅ΡΠΎ Π½Π° ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»Π½ΠΈΡΠ΅ ΠΏΡΡΠΈΡΠ°" -#: builtin/submodule--helper.c:84 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ΠΠͺΠ’] [ΠΠͺΠ’β¦]" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "ΠΡΠ² ΡΠ°ΠΉΠ»Π° β.gitmodulesβ Π½Π΅ Π΅ ΠΎΡΠΊΡΠΈΡ Π°Π΄ΡΠ΅Ρ Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β%sβ" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠ°Π½Π΅ Π½Π° Π°Π΄ΡΠ΅Ρ Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β%sβ" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Π Π΅Π³ΠΈΡΡΡΠΈΡΠ°Π½ Π΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β%sβ (%s) Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β%sβ\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "ΠΠ ΠΠΠ£ΠΠ ΠΠΠΠΠΠΠ: ΠΏΡΠ΅ΠΏΠΎΡΡΡΠ²Π° ΡΠ΅ ΡΠ΅ΠΆΠΈΠΌ Π½Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π·Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β%sβ\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" +"ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ΅ΠΆΠΈΠΌΠ° Π½Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β%sβ" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "ΠΠ΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΏΡΠΈ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper name [ΠΠͺΠ’]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name ΠΠͺΠ’" -#: builtin/submodule--helper.c:120 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "ΠΡΠ² ΡΠ°ΠΉΠ»Π° β.gitmodulesβ Π»ΠΈΠΏΡΠ²Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° ΠΏΡΡΡ β%sβ" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "ΠΊΡΠ΄Π΅ Π΄Π° ΡΠ΅ ΠΊΠ»ΠΎΠ½ΠΈΡΠ° Π½ΠΎΠ²ΠΈΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»" -#: builtin/submodule--helper.c:173 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "ΠΈΠΌΠ΅ Π½Π° Π½ΠΎΠ²ΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "Π°Π΄ΡΠ΅Ρ, ΠΎΡ ΠΊΠΎΠΉΡΠΎ Π΄Π° ΡΠ΅ ΠΊΠ»ΠΎΠ½ΠΈΡΠ° Π½ΠΎΠ²ΠΈΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "Π΄ΡΠ»Π±ΠΎΡΠΈΠ½Π° Π½Π° ΠΏΠ»ΠΈΡΠΊΠΈΡΠ΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ°" -#: builtin/submodule--helper.c:188 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=ΠΠͺΠ’] [--quiet] [--reference Π₯Π ΠΠΠΠΠΠ©Π] " -"[--name ΠΠΠ] [--url ΠΠΠ ΠΠ‘][--depth ΠΠͺΠΠΠΠ§ΠΠΠ] [--] ΠΠͺΠ’β¦]" +"[--name ΠΠΠ] [--depth ΠΠͺΠΠΠΠ§ΠΠΠ] --url ΠΠΠ ΠΠ‘ --path ΠΠͺΠ’β¦" -#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208 -#: builtin/submodule--helper.c:216 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "ΠΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: builtin/submodule--helper.c:204 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ Π½Π° Π°Π΄ΡΠ΅ΡΠ° β%sβ Π² ΠΏΡΡΡ β%sβ ΠΊΠ°ΡΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»" -#: builtin/submodule--helper.c:227 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΎΡΠ²ΠΎΡΠ΅Π½" -#: builtin/submodule--helper.c:232 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ Π·Π°ΡΠ²ΠΎΡΠΈ" -#: builtin/submodule--helper.c:247 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½Π°" -#: builtin/submodule--helper.c:273 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "Π€ΠΠ’ΠΠΠΠ ΠΠ ΠΠ¨ΠΠ: βsubmodule--helperβ ΡΡΡΠ±Π²Π° Π΄Π° ΡΠ΅ ΡΡΠ°ΡΡΠΈΡΠ° Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "ΠΡΡΡΡ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β%sβ Π½Π΅ Π΅ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠ°Π½" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "ΠΠ΅ΡΠΎΡΡΠ½ΠΎ ΠΈΡΠΊΠ°Ρ
ΡΠ΅ Π΄Π° ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΡΠ΅ βupdate --initβ?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "ΠΡΠ΅ΡΠΊΠ°ΡΠ°Π½Π΅ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β%sβ" -#: builtin/submodule--helper.c:280 +#: builtin/submodule--helper.c:660 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "Π€ΠΠ’ΠΠΠΠ ΠΠ ΠΠ¨ΠΠ: β%sβ Π½Π΅ Π΅ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π° Π½Π° βsubmodule--helperβ" +msgid "Skipping submodule '%s'" +msgstr "ΠΡΠ΅ΡΠΊΠ°ΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β%sβ" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "ΠΏΡΡ ΠΊΡΠΌ ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "ΠΏΡΡ ΠΊΡΠΌ ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ, ΠΏΡΠ΅Π· Π³ΡΠ°Π½ΠΈΡΠΈΡΠ΅ Π½Π° Π²Π»ΠΎΠΆΠ΅Π½ΠΈΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "" +"βrebaseβ (ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅), βmergeβ (ΡΠ»ΠΈΠ²Π°Π½Π΅), βcheckoutβ (ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅) ΠΈΠ»ΠΈ " +"βnoneβ (Π½ΠΈΡΠΎ Π΄Π° Π½Π΅ ΡΠ΅ ΠΏΡΠ°Π²ΠΈ)" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "ΠΠ»ΠΈΡΠΊΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅, ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½ΠΎ Π΄ΠΎ ΡΠΊΠ°Π·Π°Π½ΠΈΡ Π±ΡΠΎΠΉ Π²Π΅ΡΡΠΈΠΈ" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "Π±ΡΠΎΠΉ ΠΏΠ°ΡΠ°Π»Π΅Π»Π½ΠΈ ΠΏΡΠΎΡΠ΅ΡΠΈ" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "Π±Π΅Π· ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π°ΠΏΡΠ΅Π΄ΡΠΊΠ° Π½Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ°Π½Π΅ΡΠΎ" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=ΠΠͺΠ’] [ΠΠͺΠ’β¦]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ ΠΊΡΠΌ ΠΎΠΏΡΠΈΡΡΠ° β--updateβ" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "βsubmodule--helperβ ΡΡΡΠ±Π²Π° Π΄Π° ΡΠ΅ ΡΡΠ°ΡΡΠΈΡΠ° Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "β%sβ Π½Π΅ Π΅ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π° Π½Π° βsubmodule--helperβ" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10985,27 +11627,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v ΠΠ’ΠΠΠΠ’β¦" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "ΠΈΠΌΠ΅ΡΠΎ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠ° Π΅ ΡΠ²ΡΡΠ΄Π΅ Π΄ΡΠ»Π³ΠΎ: β%.*sββ¦" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "Π΅ΡΠΈΠΊΠ΅ΡΡΡ β%sβ Π½Π΅ Π΅ ΠΎΡΠΊΡΠΈΡ." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "ΠΠ·ΡΡΠΈΡ Π΅ Π΅ΡΠΈΠΊΠ΅ΡΡΡ β%sβ (Π±Π΅ β%sβ)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "Π΅ΡΠΈΠΊΠ΅ΡΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΠ²Π΅ΡΠ΅Π½" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -11018,7 +11655,7 @@ msgstr "" " %s\n" "Π Π΅Π΄ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π·Π°ΠΏΠΎΡΠ²Π°Ρ Ρ β%cβ, ΡΠ΅ Π±ΡΠ΄Π°Ρ ΠΏΡΠΎΠΏΡΡΠ½Π°ΡΠΈ.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -11085,7 +11722,7 @@ msgstr "Π°Π½ΠΎΡΠΈΡΠ°Π½Π΅ΡΠΎ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠΈ ΠΈΠ·ΠΈΡΠΊΠ²Π° ΡΡΠΎΠ±ΡΠ΅Π½ #: builtin/tag.c:350 msgid "tag message" -msgstr "ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π·Π° Π΅ΡΠΈΠΊΠ΅Ρ" +msgstr "Π‘ΠͺΠΠΠ©ΠΠΠΠ Π·Π° Π΅ΡΠΈΠΊΠ΅Ρ" #: builtin/tag.c:352 msgid "annotated and GPG-signed tag" @@ -11125,7 +11762,7 @@ msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° Π½Π΅ΡΠ»Π΅ΡΠΈΡΠ΅ Π΅ΡΠΈΠΊΠ΅ΡΠΈ" #: builtin/tag.c:370 msgid "print only tags of the object" -msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠ°" +msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° Π΅ΡΠΈΠΊΠ΅ΡΠΈΡΠ΅ Π½Π° ΠΠΠΠΠ’Π" #: builtin/tag.c:399 msgid "--column and -n are incompatible" @@ -11145,28 +11782,28 @@ msgstr "ΠΠΏΡΠΈΡΡΠ° β-points-atβ ΠΈΠ·ΠΈΡΠΊΠ²Π° ΠΎΠΏΡΠΈΡΡΠ° β-lβ." #: builtin/tag.c:425 msgid "--merged and --no-merged option are only allowed with -l" -msgstr "ΠΠΏΡΠΈΠΈΠΈΡΠ΅ β--mergedβ ΠΈ β--no-mergedβ ΠΈΠ·ΠΈΡΠΊΠ²Π°Ρ ΠΎΠΏΡΠΈΡΡΠ° β-lβ." +msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β--mergedβ ΠΈ β--no-mergedβ ΠΈΠ·ΠΈΡΠΊΠ²Π°Ρ ΠΎΠΏΡΠΈΡΡΠ° β-lβ." # FIXME message pattern #: builtin/tag.c:433 msgid "only one -F or -m option is allowed." msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β-Fβ ΠΈ β-mβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "ΠΡΠ΅ΠΊΠ°Π»Π΅Π½ΠΎ ΠΌΠ½ΠΎΠ³ΠΎ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΈ" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "β%sβ Π΅ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎ ΠΈΠΌΠ΅ Π·Π° Π΅ΡΠΈΠΊΠ΅Ρ." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "Π΅ΡΠΈΠΊΠ΅ΡΡΡ β%sβ Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "ΠΠ±Π½ΠΎΠ²Π΅Π½ Π΅ΡΠΈΠΊΠ΅Ρ β%sβ (Π±Π΅ β%sβ)\n" @@ -11175,210 +11812,223 @@ msgstr "ΠΠ±Π½ΠΎΠ²Π΅Π½ Π΅ΡΠΈΠΊΠ΅Ρ β%sβ (Π±Π΅ β%sβ)\n" msgid "Unpacking objects" msgstr "Π Π°Π·ΠΏΠ°ΠΊΠ΅ΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" -#: builtin/update-index.c:70 +#: builtin/update-index.c:79 #, c-format msgid "failed to create directory %s" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: builtin/update-index.c:76 +#: builtin/update-index.c:85 #, c-format msgid "failed to stat %s" msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΡΡΠ΅Π· βstatβ Π·Π° β%sβ" -#: builtin/update-index.c:86 +#: builtin/update-index.c:95 #, c-format msgid "failed to create file %s" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½" -#: builtin/update-index.c:94 +#: builtin/update-index.c:103 #, c-format msgid "failed to delete file %s" msgstr "ΡΠ°ΠΉΠ»ΡΡ β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡ" -#: builtin/update-index.c:101 builtin/update-index.c:203 +#: builtin/update-index.c:110 builtin/update-index.c:212 #, c-format msgid "failed to delete directory %s" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡΠ°" -#: builtin/update-index.c:124 +#: builtin/update-index.c:133 #, c-format -msgid "Testing " -msgstr "ΠΡΠΎΠ±Π°" +msgid "Testing mtime in '%s' " +msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° Π½Π° Π²ΡΠ΅ΠΌΠ΅ΡΠΎ Π½Π° ΠΏΡΠΎΠΌΡΠ½Π° (mtime) Π½Π° ΡΠ°ΠΉΠ»Π° β%sβ" -#: builtin/update-index.c:136 +#: builtin/update-index.c:145 msgid "directory stat info does not change after adding a new file" msgstr "" "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΡΡΠ΅Π· βstatβ Π·Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Π½Π΅ ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½Ρ ΡΠ»Π΅Π΄ " "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ΡΠΎ Π½Π° Π½ΠΎΠ² ΡΠ°ΠΉΠ»" -#: builtin/update-index.c:149 +#: builtin/update-index.c:158 msgid "directory stat info does not change after adding a new directory" msgstr "" "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΡΡΠ΅Π· βstatβ Π·Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Π½Π΅ ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½Ρ ΡΠ»Π΅Π΄ " "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ΡΠΎ Π½Π° Π½ΠΎΠ²Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/update-index.c:162 +#: builtin/update-index.c:171 msgid "directory stat info changes after updating a file" msgstr "" "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΡΡΠ΅Π· βstatβ Π·Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½Ρ ΡΠ»Π΅Π΄ " "ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ Π½Π° Π½ΠΎΠ² ΡΠ°ΠΉΠ»" -#: builtin/update-index.c:173 +#: builtin/update-index.c:182 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΡΡΠ΅Π· βstatβ Π·Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½Ρ ΡΠ»Π΅Π΄ Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ΡΠΎ " "Π½Π° ΡΠ°ΠΉΠ» Π² ΠΏΠΎΠ΄Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/update-index.c:184 +#: builtin/update-index.c:193 msgid "directory stat info does not change after deleting a file" msgstr "" "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΡΡΠ΅Π· βstatβ Π·Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Π½Π΅ ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½Ρ ΡΠ»Π΅Π΄ " "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π° ΡΠ°ΠΉΠ»" -#: builtin/update-index.c:197 +#: builtin/update-index.c:206 msgid "directory stat info does not change after deleting a directory" msgstr "" "ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½Π° ΡΡΠ΅Π· βstatβ Π·Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° Π½Π΅ ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½Ρ ΡΠ»Π΅Π΄ " "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ΡΠΎ Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/update-index.c:204 +#: builtin/update-index.c:213 msgid " OK" msgstr " ΠΠΎΠ±ΡΠ΅" -#: builtin/update-index.c:564 +#: builtin/update-index.c:575 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ΠΠΠ¦ΠΠ―β¦] [--] [Π€ΠΠΠβ¦]" -#: builtin/update-index.c:918 +#: builtin/update-index.c:930 msgid "continue refresh even when index needs update" msgstr "" "ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠ°Π²Π°Π½Π΅ Ρ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ, Π΄ΠΎΡΠΈ ΠΊΠΎΠ³Π°ΡΠΎ ΠΈΠ½Π΄Π΅ΠΊΡΡΡ ΡΡΡΠ±Π²Π° Π΄Π° Π±ΡΠ΄Π΅ ΠΎΠ±Π½ΠΎΠ²Π΅Π½" -#: builtin/update-index.c:921 +#: builtin/update-index.c:933 msgid "refresh: ignore submodules" msgstr "ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈΡΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Ρ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ΡΠΎ" -#: builtin/update-index.c:924 +#: builtin/update-index.c:936 msgid "do not ignore new files" msgstr "Π½ΠΎΠ²ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π΄Π° Π½Π΅ ΡΠ΅ ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Ρ" -#: builtin/update-index.c:926 +#: builtin/update-index.c:938 msgid "let files replace directories and vice-versa" msgstr "ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π΄Π° ΠΌΠΎΠ³Π°Ρ Π΄Π° Π·Π°ΠΌΠ΅Π½ΡΡ Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈ ΠΈ ΠΎΠ±ΡΠ°ΡΠ½ΠΎ" -#: builtin/update-index.c:928 +#: builtin/update-index.c:940 msgid "notice files missing from worktree" msgstr "ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π°Π²Π°Π½Π΅ ΠΏΡΠΈ Π»ΠΈΠΏΡΠ²Π°ΡΠΈ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/update-index.c:930 +#: builtin/update-index.c:942 msgid "refresh even if index contains unmerged entries" msgstr "ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π΄ΠΎΡΠΈ ΠΈ ΠΈΠ½Π΄Π΅ΠΊΡΡΡ Π΄Π° ΡΡΠ΄ΡΡΠΆΠ° Π½Π΅ΡΠ»Π΅ΡΠΈ ΠΎΠ±Π΅ΠΊΡΠΈ" -#: builtin/update-index.c:933 +#: builtin/update-index.c:945 msgid "refresh stat information" msgstr "ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡΡΠ° ΠΎΡ ΡΡΠ½ΠΊΡΠΈΡΡΠ° βstatβ" -#: builtin/update-index.c:937 +#: builtin/update-index.c:949 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "ΠΊΠ°ΡΠΎ ΠΎΠΏΡΠΈΡΡΠ° β--refreshβ, Π½ΠΎ Π΄Π° ΡΠ΅ ΠΏΡΠΎΠ²Π΅ΡΡΡ ΠΈ ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅, ΠΊΠΎΠΈΡΠΎ ΡΠ° Π±ΠΈΠ»ΠΈ ΠΏΡΠΈΠ΅ΡΠΈ " "Π·Π° Π½Π΅ΠΏΡΠΎΠΌΠ΅Π½Π΅Π½ΠΈ" -#: builtin/update-index.c:941 +#: builtin/update-index.c:953 msgid "<mode>,<object>,<path>" msgstr "Π ΠΠΠΠ,ΠΠΠΠΠ’,ΠΠͺΠ’" -#: builtin/update-index.c:942 +#: builtin/update-index.c:954 msgid "add the specified entry to the index" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΠΈΠ·Π±ΡΠΎΠ΅Π½ΠΈΡΠ΅ ΠΎΠ±Π΅ΠΊΡΠΈ ΠΊΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/update-index.c:946 +#: builtin/update-index.c:958 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:947 +#: builtin/update-index.c:959 msgid "override the executable bit of the listed files" msgstr "ΠΈΠ·ΡΠΈΡΠ½ΠΎ Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΡΡΠΎΠΉΠ½ΠΎΡΡΡΠ° Π½Π° ΡΠ»Π°Π³Π° Π΄Π°Π»ΠΈ ΡΠ°ΠΉΠ»ΡΡ Π΅ ΠΈΠ·ΠΏΡΠ»Π½ΠΈΠΌ" -#: builtin/update-index.c:951 +#: builtin/update-index.c:963 msgid "mark files as \"not changing\"" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΡΠ»Π°Π³, ΡΠ΅ ΡΠ°ΠΉΠ»ΡΡ Π½Π΅ ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½Ρ" -#: builtin/update-index.c:954 +#: builtin/update-index.c:966 msgid "clear assumed-unchanged bit" msgstr "ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ»Π°Π³Π°, ΡΠ΅ ΡΠ°ΠΉΠ»ΡΡ Π½Π΅ ΡΠ΅ ΠΏΡΠΎΠΌΠ΅Π½Ρ" -#: builtin/update-index.c:957 +#: builtin/update-index.c:969 msgid "mark files as \"index-only\"" msgstr "Π·Π°Π΄Π°Π²Π°Π½Π΅ Π½Π° ΡΠ»Π°Π³, ΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ ΡΠ° ΡΠ°ΠΌΠΎ Π·Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/update-index.c:960 +#: builtin/update-index.c:972 msgid "clear skip-worktree bit" msgstr "ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ»Π°Π³Π°, ΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅ ΡΠ° ΡΠ°ΠΌΠΎ Π·Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/update-index.c:963 +#: builtin/update-index.c:975 msgid "add to index only; do not add content to object database" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ ΡΠ°ΠΌΠΎ ΠΊΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π±Π΅Π· Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ ΠΊΡΠΌ Π±Π°Π·Π°ΡΠ° ΠΎΡ Π΄Π°Π½Π½ΠΈ Π·Π° ΠΎΠ±Π΅ΠΊΡΠΈΡΠ΅" -#: builtin/update-index.c:965 +#: builtin/update-index.c:977 msgid "remove named paths even if present in worktree" msgstr "ΠΈΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° ΡΠΊΠ°Π·Π°Π½ΠΈΡΠ΅ ΠΏΡΡΠΈΡΠ°, Π΄ΠΎΡΠΈ ΠΈ Π΄Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°Ρ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/update-index.c:967 +#: builtin/update-index.c:979 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "ΠΏΡΠΈ ΠΊΠΎΠΌΠ±ΠΈΠ½ΠΈΡΠ°Π½Π΅ Ρ ΠΎΠΏΡΠΈΡΡΠ° β--stdinβ β Π²Ρ
ΠΎΠ΄Π½ΠΈΡΠ΅ ΡΠ΅Π΄ΠΎΠ²Π΅ ΡΠ° ΡΠ°Π·Π΄Π΅Π»Π΅Π½ΠΈ Ρ Π½ΡΠ»Π΅Π²ΠΈΡ " "Π±Π°ΠΉΡ" -#: builtin/update-index.c:969 +#: builtin/update-index.c:981 msgid "read list of paths to be updated from standard input" msgstr "ΠΈΠ·ΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠΏΠΈΡΡΠΊΠ° Ρ ΠΏΡΡΠΈΡΠ° Π·Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄" -#: builtin/update-index.c:973 +#: builtin/update-index.c:985 msgid "add entries from standard input to the index" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° Π΅Π»Π΅ΠΌΠ΅Π½ΡΠΈΡΠ΅ ΠΎΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ Π²Ρ
ΠΎΠ΄ ΠΊΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/update-index.c:977 +#: builtin/update-index.c:989 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "Π²ΡΠ·ΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ ΠΏΡΠ΅Π΄ΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅ ΠΈΠ»ΠΈ Π½ΡΠΆΠ΄Π° ΠΎΡ ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π·Π° " "ΠΈΠ·Π±ΡΠΎΠ΅Π½ΠΈΡΠ΅ ΠΏΡΡΠΈΡΠ°" -#: builtin/update-index.c:981 +#: builtin/update-index.c:993 msgid "only update entries that differ from HEAD" msgstr "Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ, ΠΊΠΎΠ΅ΡΠΎ ΡΠ΅ ΡΠ°Π·Π»ΠΈΡΠ°Π²Π° ΠΎΡ ΡΠΎΠ²Π° Π² βHEADβ" -#: builtin/update-index.c:985 +#: builtin/update-index.c:997 msgid "ignore files missing from worktree" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ΡΠ΅, ΠΊΠΎΠΈΡΠΎ Π»ΠΈΠΏΡΠ²Π°Ρ Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/update-index.c:988 +#: builtin/update-index.c:1000 msgid "report actions to standard output" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π΄Π΅ΠΉΡΡΠ²ΠΈΡΡΠ° Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΈΡ ΠΈΠ·Ρ
ΠΎΠ΄" -#: builtin/update-index.c:990 +#: builtin/update-index.c:1002 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "Π·Π°Π±ΡΠ°Π²ΡΠ½Π΅ Π½Π° Π·Π°ΠΏΠΈΡΠ°Π½Π°ΡΠ° ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π·Π° Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈ β Π·Π° ΠΊΠΎΠΌΠ°Π½Π΄ΠΈΡΠ΅ " "ΠΎΡ ΠΏΠΎΡΡΠ΅Π±ΠΈΡΠ΅Π»ΡΠΊΠΎ Π½ΠΈΠ²ΠΎ" -#: builtin/update-index.c:994 +#: builtin/update-index.c:1006 msgid "write index in this format" msgstr "Π·Π°ΠΏΠΈΡΠ²Π°Π½Π΅ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π² ΡΠΎΠ·ΠΈ ΡΠΎΡΠΌΠ°Ρ" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1008 msgid "enable or disable split index" msgstr "Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅ ΠΈΠ»ΠΈ ΠΈΠ·ΠΊΠ»ΡΡΠ²Π°Π½Π΅ Π½Π° ΡΠ°Π·Π΄Π΅Π»ΡΠ½Π΅ΡΠΎ Π½Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1010 msgid "enable/disable untracked cache" msgstr "Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅/ΠΈΠ·ΠΊΠ»ΡΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠ΅ΡΠ° Π·Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1012 +msgid "test if the filesystem supports untracked cache" +msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΊΠ° Π΄Π°Π»ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π°ΡΠ° ΡΠΈΡΡΠ΅ΠΌΠ° ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ° ΠΊΠ΅Ρ Π·Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅" + +#: builtin/update-index.c:1014 msgid "enable untracked cache without testing the filesystem" msgstr "" "Π²ΠΊΠ»ΡΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠ΅ΡΠ° Π·Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π±Π΅Π· ΠΏΡΠΎΠ²Π΅ΡΠΊΠ° Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²Π°ΡΠ° ΡΠΈΡΡΠ΅ΠΌΠ°" +#: builtin/update-index.c:1134 +msgid "Untracked cache disabled" +msgstr "ΠΠ΅ΡΡΡ Π·Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½" + +#: builtin/update-index.c:1146 +#, c-format +msgid "Untracked cache enabled for '%s'" +msgstr "ΠΠ΅ΡΡΡ Π·Π° Π½Π΅ΡΠ»Π΅Π΄Π΅Π½ΠΈΡΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²Π΅ Π΅ ΠΈΠ·ΠΊΠ»ΡΡΠ΅Π½ Π·Π° β%sβ" + #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [ΠΠΠ¦ΠΠ―β¦] -d ΠΠΠ_ΠΠ_Π£ΠΠΠΠΠ’ΠΠ [Π‘Π’ΠΠ Π_Π‘Π’ΠΠΠΠΠ‘Π’]" @@ -11426,7 +12076,7 @@ msgstr "git verify-tag [-v | --verbose] ΠΠΠΠΠΠΠΠβ¦" msgid "print commit contents" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ΅Π½ΠΈΡ ΠΈΠ·Ρ
ΠΎΠ΄ ΠΎΡ ΡΡΡΡΠΎΡΠ½ΠΈΠ΅ΡΠΎ Π½Π° βgpgβ" @@ -11446,7 +12096,7 @@ msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ ΡΠ°ΠΌΠΎ Π½Π° ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°ΡΠ°" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] ΠΠ’ΠΠΠΠ’β¦" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠ΄ΡΡΠΆΠ°Π½ΠΈΠ΅ΡΠΎ Π½Π° ΠΠ’ΠΠΠΠ’ΠΈ" @@ -11462,71 +12112,75 @@ msgstr "git worktree prune [ΠΠΠ¦ΠΠ―β¦]" msgid "git worktree list [<options>]" msgstr "git worktree list [ΠΠΠ¦ΠΠ―β¦]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° βworktrees/%sβ: Π½Π΅ Π΅ ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΠΏΠΎΠ΄Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° βworktrees/%sβ: ΡΠ°ΠΉΠ»ΡΡ βgitdirβ Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° βworktrees/%sβ: ΡΠ°ΠΉΠ»ΡΡ βgitdirβ (%s) Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° βworktrees/%sβ: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π΅Π½ ΡΠ°ΠΉΠ» βgitdirβ" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "ΠΠ·ΡΡΠΈΠ²Π°Π½Π΅ Π½Π° βworktrees/%sβ: ΡΠ°ΠΉΠ»ΡΡ βgitdirβ ΡΠΎΡΠΈ Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΎ " "ΠΌΠ΅ΡΡΠΎΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΈΠ·ΡΡΠΈΠ΅" +msgid "failed to remove '%s'" +msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡΠ°" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "β%sβ Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β%sβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: builtin/worktree.c:271 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "ΠΠΎΠ΄Π³ΠΎΡΠ²ΡΠ½Π΅ Π½Π° %s (ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ %s)" -#: builtin/worktree.c:319 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "ΠΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ ΠΠΠΠΠ°, Π΄ΠΎΡΠΈ ΠΈ Π΄Π° Π΅ ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½ Π² Π΄ΡΡΠ³ΠΎ ΡΠ°Π±ΠΎΡΠ½ΠΎ Π΄ΡΡΠ²ΠΎ" -#: builtin/worktree.c:321 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° Π½ΠΎΠ² ΠΊΠ»ΠΎΠ½" -#: builtin/worktree.c:323 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ ΠΈΠ»ΠΈ Π·Π°Π½ΡΠ»ΡΠ²Π°Π½Π΅ Π½Π° ΠΊΠ»ΠΎΠ½ΠΈ" -#: builtin/worktree.c:324 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "ΠΎΡΠ΄Π΅Π»ΡΠ½Π΅ Π½Π° ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ βHEADβ ΠΊΡΠΌ ΡΠΊΠ°Π·Π°Π½ΠΎΡΠΎ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: builtin/worktree.c:331 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "ΠΏΠΎΠ΄Π³ΠΎΡΠ²ΡΠ½Π΅ Π½Π° Π½ΠΎΠ²ΠΎΡΠΎ ΡΠ°Π±ΠΎΡΠ½ΠΎ Π΄ΡΡΠ²ΠΎ" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β-bβ, β-Bβ ΠΈ β--detachβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ Π΅Π΄Π½Π° Ρ Π΄ΡΡΠ³Π°" @@ -11546,7 +12200,7 @@ msgstr "Π·Π°ΠΏΠΈΡ Π½Π° ΠΎΠ±Π΅ΠΊΡ-Π΄ΡΡΠ²ΠΎ Π·Π° ΠΏΠΎΠ΄Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ msgid "only useful for debugging" msgstr "ΡΠ°ΠΌΠΎ Π·Π° ΠΈΠ·ΡΠΈΡΡΠ²Π°Π½Π΅ Π½Π° Π³ΡΠ΅ΡΠΊΠΈ" -#: credential-cache--daemon.c:255 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "ΠΈΠ·Π²Π΅ΠΆΠ΄Π°Π½Π΅ Π½Π° ΡΡΠΎΠ±ΡΠ΅Π½ΠΈΡΡΠ° Π·Π° ΡΡΠ°ΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½Π°ΡΠ° Π³ΡΠ΅ΡΠΊΠ°" @@ -11562,6 +12216,10 @@ msgstr "" "Π·Π°\n" "Π½ΡΠΊΠΎΠ΅ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΎ ΠΠΠΠ―Π’ΠΠ ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ βgit help ΠΠΠΠ―Π’ΠΠβ." +#: http.c:322 +msgid "Public key pinning not supported with cURL < 7.44.0" +msgstr "ΠΠ°Π΄Π°Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΠΎΡΡΠΎΡΠ½Π΅Π½ ΠΏΡΠ±Π»ΠΈΡΠ΅Π½ ΠΊΠ»ΡΡ Π½Π΅ ΡΠ΅ ΠΏΠΎΠ΄Π΄ΡΡΠΆΠ° ΠΎΡ cURL < 7.44.0" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "ΡΡΠ·Π΄Π°Π²Π°Π½Π΅ Π½Π° ΡΠ°Π±ΠΎΡΠ½ΠΎ Π΄ΡΡΠ²ΠΎ (ΠΏΠΎΠ³Π»Π΅Π΄Π½Π΅ΡΠ΅: βgit help tutorialβ)" @@ -11645,8 +12303,8 @@ msgid "Update remote refs along with associated objects" msgstr "ΠΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΠΈ ΠΈ ΡΠ²ΡΡΠ·Π°Π½ΠΈΡΠ΅ Ρ ΡΡΡ
ΠΎΠ±Π΅ΠΊΡΠΈ" #: common-cmds.h:32 -msgid "Forward-port local commits to the updated upstream head" -msgstr "ΠΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΡΠΎΠΌΠ΅Π½ΠΈ ΠΊΡΠΌ Π½ΠΎΠ²Π° ΠΎΡΠ½ΠΎΠ²Π°" +msgid "Reapply commits on top of another base tip" +msgstr "ΠΡΠΈΠ»Π°Π³Π°Π½Π΅ Π½Π° ΠΏΠΎΠ΄Π°Π²Π°Π½ΠΈΡΡΠ° Π²ΡΡΡ
Ρ Π΄ΡΡΠ³ Π²ΡΡΡ
" #: common-cmds.h:33 msgid "Reset current HEAD to the specified state" @@ -11690,7 +12348,7 @@ msgstr "ΠΏΠΎ-ΠΌΠ°Π»ΠΊΠΎ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΠΎΡΡΠΈ" msgid "use <n> digits to display SHA-1s" msgstr "Π΄Π° ΡΠ΅ ΠΏΠΎΠΊΠ°Π·Π²Π°Ρ ΡΠ°ΠΊΡΠ² ΠΠ ΠΠ ΡΠΈΡΡΠΈ ΠΎΡ ΡΡΠΌΠΈΡΠ΅ ΠΏΠΎ SHA1" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "ΠΏΡΠΈ Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡ ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°Π½Π΅ Π½Π° ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ΡΠΎ Π½Π° ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ° Π·Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π½Π° " @@ -11853,7 +12511,6 @@ msgstr "" msgid "bisect run cannot continue any more" msgstr "Π΄Π²ΠΎΠΈΡΠ½ΠΎΡΠΎ ΡΡΡΡΠ΅Π½Π΅ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΠΏΡΠΎΠ΄ΡΠ»ΠΆΠΈ" -# FIXME initial space #: git-bisect.sh:531 #, sh-format msgid "" @@ -11919,16 +12576,16 @@ msgstr "" "ΠΠ° Π΄Π° ΠΎΡΠΊΠ°ΠΆΠ΅ΡΠ΅ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ΡΠΎ ΠΈ Π΄Π° ΡΠ΅ Π²ΡΡΠ½Π΅ΡΠ΅ ΠΊΡΠΌ ΠΏΡΡΠ²ΠΎΠ½Π°ΡΠ°Π»Π½ΠΎΡΠΎ ΡΡΡΡΠΎΡΠ½ΠΈΠ΅,\n" "ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ βgit rebase --abortβ." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "ΠΠ²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎ ΡΠΊΠ°ΡΠ°Π½ΠΎΡΠΎ Π΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½ΠΎ." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "β${stash_sha1}β Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ Π·Π°ΠΏΠ°Π·Π΅Π½" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11938,34 +12595,30 @@ msgstr "" "Π½Π°Π΄Π΅ΠΆΠ΄Π½ΠΎ ΡΠΊΠ°ΡΠ°Π½ΠΈ. ΠΠΎΠΆΠ΅ΡΠ΅ Π΄Π° ΠΏΡΠΎΠ±Π²Π°ΡΠ΅ Π΄Π° Π³ΠΈ ΠΏΡΠΈΠ»ΠΎΠΆΠΈΡΠ΅ ΡΡΠ΅Π· βgit stash popβ\n" "ΠΈΠ»ΠΈ Π΄Π° Π³ΠΈ ΠΈΠ·Ρ
Π²ΡΡΠ»ΠΈΡΠ΅ ΡΡΠ΅Π· βgit stash dropβ, ΠΊΠΎΠ³Π°ΡΠΎ ΠΏΠΎΠΈΡΠΊΠ°ΡΠ΅.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "ΠΡΠΊΠ°ΡΠ° Π·Π° ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ ΠΏΡΠ΅Π΄ΠΈ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ ΠΎΡΡ
Π²ΡΡΠ»ΠΈ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ΡΠΎ." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" "ΠΠ·Π³Π»Π΅ΠΆΠ΄Π°, ΡΠ΅ ΡΠ΅Π³Π° ΡΠ΅ ΠΏΡΠΈΠ»Π°Π³Π°Ρ ΠΊΡΡΠΏΠΊΠΈ ΡΡΠ΅Π· ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit-amβ. ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° " "ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°ΡΠ΅ Π² ΠΌΠΎΠΌΠ΅Π½ΡΠ°." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "ΠΠΏΡΠΈΡΡΠ° β--execβ Π·Π°Π΄ΡΠ»ΠΆΠΈΡΠ΅Π»Π½ΠΎ ΠΈΠ·ΠΈΡΠΊΠ²Π° ΠΎΠΏΡΠΈΡΡΠ° β--interactiveβ" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "ΠΠ·Π³Π»Π΅ΠΆΠ΄Π° Π² ΠΌΠΎΠΌΠ΅Π½ΡΠ° Π½Π΅ ΡΠ΅ΡΠ΅ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "ΠΠΏΡΠΈΡΡΠ° β--edit-todoβ Π΅ Π΄ΠΎΡΡΡΠΏΠ½Π° ΡΠ°ΠΌΠΎ ΠΏΠΎ Π²ΡΠ΅ΠΌΠ΅ Π½Π° ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΏΡΠΎΡΠ΅ΡΠ΅Π½" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11973,12 +12626,12 @@ msgstr "" "Π’ΡΡΠ±Π²Π° Π΄Π° ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠ°ΡΠ΅ Π²ΡΠΈΡΠΊΠΈ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΈ ΠΏΡΠΈ ΡΠ»ΠΈΠ²Π°Π½Π΅ΡΠΎ. Π‘Π»Π΅Π΄ ΡΠΎΠ²Π°\n" "ΠΎΡΠ±Π΅Π»Π΅ΠΆΠ΅ΡΠ΅ ΠΊΠΎΡΠΈΠ³ΠΈΡΠ°Π½Π΅ΡΠΎ ΠΈΠΌ ΡΡΠ΅Π· ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit addβ" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "ΠΡΡΡΠ°Π½Π΅ΡΠΎ ΠΊΡΠΌ β${head_name}β Π΅ Π½Π΅Π²ΡΠ·ΠΌΠΎΠΆΠ½ΠΎ" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11998,69 +12651,69 @@ msgstr "" "ΠΈ ΠΎΡΠ½ΠΎΠ²ΠΎ Π·Π°ΠΏΠΎΡΠ½Π΅ΡΠ΅ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ΡΠΎ. Π’Π΅ΠΊΡΡΠΎΡΠΎ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ ΡΠ΅ ΠΏΡΠ΅ΡΡΡΠ°Π½ΠΎΠ²ΡΠ²Π°, Π·Π°\n" "Π΄Π° Π½Π΅ Π·Π°Π³ΡΠ±ΠΈΡΠ΅ ΡΠ»ΡΡΠ°ΠΉΠ½ΠΎ ΠΏΡΠΎΠΌΠ΅Π½ΠΈ." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»Π½Π° ΠΎΡΠ½ΠΎΠ²Π° Π·Π° ΡΡΠ°Π²Π½Π΅Π½ΠΈΠ΅ β${upstream_name}β" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ β${onto_name}β ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΎΡ Π΅Π΄Π½Π° ΠΎΡΠ½ΠΎΠ²Π° Π·Π° " "ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ΡΠΎ" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ β${onto_name}β Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ Π½ΠΈΠΊΠ°ΠΊΠ²Π° ΠΎΡΠ½ΠΎΠ²Π° Π·Π° ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ΡΠΎ" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Π£ΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ β${onto_name}β Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "Π€ΠΠ’ΠΠΠΠ ΠΠ ΠΠ¨ΠΠ: Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° ΠΊΠ»ΠΎΠ½ β${branch_name}β" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "ΠΠ΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΡΠΊΠ°ΡΠ°Π΅ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎ" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "ΠΠ²ΡΠΎΠΌΠ°ΡΠΈΡΠ½ΠΎ ΡΠΊΠ°ΡΠ°Π½ΠΎ: β${stash_abbrev}β" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "ΠΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ ΡΡΡΠ±Π²Π° ΠΈΠ»ΠΈ Π΄Π° ΡΠ΅ ΠΏΠΎΠ΄Π°Π΄Π°Ρ, ΠΈΠ»ΠΈ Π΄Π° ΡΠ΅ ΡΠΊΠ°ΡΠ°ΡΡ." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ β${branch_name}β Π΅ Π½Π°ΠΏΡΠ»Π½ΠΎ Π°ΠΊΡΡΠ°Π»Π΅Π½." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Π’Π΅ΠΊΡΡΠΈΡΡ ΠΊΠ»ΠΎΠ½ β${branch_name}β Π΅ Π½Π°ΠΏΡΠ»Π½ΠΎ Π°ΠΊΡΡΠ°Π»Π΅Π½. ΠΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ΡΠΎ Π΅ " "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»Π½ΠΎ." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "ΠΡΠΎΠΌΠ΅Π½ΠΈΡΠ΅ ΠΎΡ β${mb}β ΠΊΡΠΌ β${onto}β:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "ΠΡΡΠ²ΠΎ, ΡΠΊΠ°Π·Π°ΡΠ΅Π»ΡΡ βHEADβ Π·Π°ΠΏΠΎΡΠ²Π° Π΄Π° ΡΠΎΡΠΈ ΠΊΡΠΌ Π±Π°Π·Π°ΡΠ°, Π²ΡΡΡ
Ρ ΠΊΠΎΡΡΠΎ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°ΡΠ΅β¦" -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Π’ΡΠΈΠ²ΠΈΠ°Π»Π½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° β${branch_name}β Π²ΡΡΡ
Ρ β${onto_name}β." @@ -12207,31 +12860,26 @@ msgstr "ΠΠ΅ Π΅ ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΈΠΌΠ΅ Π½Π° ΠΊΠ»ΠΎΠ½" msgid "(To restore them type \"git stash apply\")" msgstr "(ΠΠ° Π΄Π° Π³ΠΈ Π²ΡΠ·ΡΡΠ°Π½ΠΎΠ²ΠΈΡΠ΅, ΠΈΠ·ΠΏΡΠ»Π½Π΅ΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βgit stash applyβ)" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΌΠ°Ρ
Π½Π΅ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΎΡ Π°Π΄ΡΠ΅ΡΠ° β${remoteurl}β" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "ΠΡΠ½ΠΎΡΠΈΡΠ΅Π»Π΅Π½ ΠΏΡΡ ΠΌΠΎΠΆΠ΅ Π΄Π° ΡΠ΅ ΠΏΠΎΠ»Π·Π²Π° ΡΠ°ΠΌΠΎ ΠΎΡ ΠΎΡΠ½ΠΎΠ²Π½Π°ΡΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π° ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ " "Π΄ΡΡΠ²ΠΎ" # FIXME - what is this regex? -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "Π°Π΄ΡΠ΅Ρ Π½Π° Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅: β${repo}β ΡΡΡΠ±Π²Π° ΠΈΠ»ΠΈ Π΄Π° Π΅ Π°Π±ΡΠΎΠ»ΡΡΠ΅Π½, ΠΈΠ»ΠΈ Π΄Π° Π·Π°ΠΏΠΎΡΠ²Π° Ρ " "β./β ΠΈΠ»ΠΈ β../β" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "β${sm_path}β Π²Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12242,24 +12890,24 @@ msgstr "" "${sm_path}\n" "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΎΠΏΡΠΈΡΡΠ° β-fβ, Π°ΠΊΠΎ Π·Π° Π΄Π° Π³ΠΎ Π΄ΠΎΠ±Π°Π²ΠΈΡΠ΅ Π½Π°ΠΈΡΡΠΈΠ½Π°." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "ΠΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°ΡΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π² β${sm_path}β ΠΊΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "β${sm_path}β ΡΡΡΠ΅ΡΡΠ²ΡΠ²Π°, Π° Π½Π΅ Π΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π½Π° Git" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "ΠΡΠΊΡΠΈΡΠ° Π΅ Π»ΠΎΠΊΠ°Π»Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π° Git β β${sm_name}β, ΠΊΠΎΡΡΠΎ ΡΠΎΡΠΈ ΠΊΡΠΌ " "ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΈΡΠ΅ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ°:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -12267,7 +12915,7 @@ msgstr "" "ΠΠΊΠΎ ΠΈΡΠΊΠ°ΡΠ΅ Π΄Π° ΠΏΡΠ΅ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΡΠ΅ ΡΠ°Π·ΠΈ Π»ΠΎΠΊΠ°Π»Π½Π° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π° Git Π²ΠΌΠ΅ΡΡΠΎ Π΄Π° ΠΎΡΠ½ΠΎΠ²ΠΎ " "Π΄Π° ΠΊΠ»ΠΎΠ½ΠΈΡΠ°ΡΠ΅:" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" @@ -12275,7 +12923,7 @@ msgstr "" "ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΎΠΏΡΠΈΡΡΠ° β--forceβ. ΠΠΊΠΎ Π»ΠΎΠΊΠ°Π»Π½Π°ΡΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π½Π΅ ΡΠΎΡΠΈ ΠΊΡΠΌ " "ΠΏΡΠ°Π²ΠΈΠ»Π½ΠΎΡΠΎ ΠΎΡΠ΄Π°Π»Π΅ΡΠ΅Π½ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -12285,77 +12933,55 @@ msgstr "" "Π°ΡΠ³ΡΠΌΠ΅Π½Ρ Π½Π° ΠΎΠΏΡΠΈΡΡΠ° β--nameβ." # FIXME Π°ΠΊΡΠΈΠ²ΠΈΡΠ°Π½Π΅ - ΠΊΠ°ΠΊΠ²ΠΎ Π²ΡΡΡΠ½ΠΎΡΡ ΡΡΠ°Π²Π° -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "ΠΠΊΡΠΈΠ²ΠΈΡΠ°Π½Π΅ Π½Π° Π»ΠΎΠΊΠ°Π»Π½ΠΎΡΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ΅ Π·Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β${sm_name}β Π½Π°Π½ΠΎΠ²ΠΎ." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ β${sm_path}β Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ Π΄ΠΎΠ±Π°Π²ΡΠ½Π΅ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β${sm_path}β" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠ°Π½Π΅ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β${sm_path}β" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "ΠΠ»ΠΈΠ·Π°Π½Π΅ Π² β${prefix}${displaypath}β" +msgid "Entering '$displaypath'" +msgstr "ΠΠ»ΠΈΠ·Π°Π½Π΅ Π² β${displaypath}β" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -"Π‘ΠΏΠΈΡΠ°Π½Π΅ ΠΏΡΠΈ β${prefix}${displaypath}β β ΠΈΠ·Ρ
ΠΎΠ΄Π½ΠΈΡΡ ΠΊΠΎΠ΄ ΠΎΡ ΡΠΊΡΠΈΠΏΡΠ° Π±Π΅ ΡΠ°Π·Π»ΠΈΡΠ΅Π½ " -"ΠΎΡ 0." +"Π‘ΠΏΠΈΡΠ°Π½Π΅ ΠΏΡΠΈ β${displaypath}β β ΠΈΠ·Ρ
ΠΎΠ΄Π½ΠΈΡΡ ΠΊΠΎΠ΄ ΠΎΡ ΡΠΊΡΠΈΠΏΡΠ° Π±Π΅ ΡΠ°Π·Π»ΠΈΡΠ΅Π½ ΠΎΡ 0." -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"ΠΡΠ² ΡΠ°ΠΉΠ»Π° β.gitmodulesβ Π½Π΅ Π΅ ΠΎΡΠΊΡΠΈΡ Π°Π΄ΡΠ΅Ρ Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» " -"β${displaypath}β" - -#: git-submodule.sh:492 -#, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠ°Π½Π΅ Π½Π° Π°Π΄ΡΠ΅Ρ Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β" +msgid "pathspec and --all are incompatible" +msgstr "ΡΠΊΠ°Π·Π²Π°Π½Π΅ΡΠΎ Π½Π° ΠΏΡΡ Π΅ Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΎ Ρ ΠΎΠΏΡΠΈΡΡΠ° β--allβ" -#: git-submodule.sh:494 +#: git-submodule.sh:453 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "" -"Π Π΅Π³ΠΈΡΡΡΠΈΡΠ°Π½ Π΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${name}β, ΡΠΎΡΠ΅Ρ ΠΊΡΠΌ Π°Π΄ΡΠ΅Ρ β${url}β, Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ " -"ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ β--allβ, Π·Π° Π΄Π° ΠΏΡΠ΅ΠΌΠ°Ρ
Π½Π΅ΡΠ΅ Π²ΡΠΈΡΠΊΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ" -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠ°Π½Π΅ Π½Π° ΡΠ΅ΠΆΠΈΠΌΠ° Π½Π° ΠΎΠ±Π½ΠΎΠ²ΡΠ²Π°Π½Π΅ Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» " -"β${displaypath}β" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "ΠΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ β.β, Π·Π° Π΄Π° ΠΏΡΠ΅ΠΌΠ°Ρ
Π½Π΅ΡΠ΅ Π²ΡΠΈΡΠΊΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "ΠΡΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ ΡΡΠ΄ΡΡΠΆΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ β." "gitβ" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -12363,7 +12989,7 @@ msgstr "" "(ΠΈΠ·ΠΏΠΎΠ»Π·Π²Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βrm -rfβ, Π·Π° Π΄Π° Π³ΠΎ ΠΈΠ·ΡΡΠΈΠ΅ΡΠ΅ Π·Π°Π΅Π΄Π½ΠΎ Ρ ΡΡΠ»Π°ΡΠ° ΠΌΡ " "ΠΈΡΡΠΎΡΠΈΡ)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12372,147 +12998,142 @@ msgstr "" "ΠΡΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β Π² ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ ΡΡΠ΄ΡΡΠΆΠ° Π»ΠΎΠΊΠ°Π»Π½ΠΈ " "ΠΏΡΠΎΠΌΠ΅Π½ΠΈ. ΠΠΎΠΆΠ΅ΡΠ΅ Π΄Π° Π³ΠΈ ΠΏΡΠ΅Π½Π΅Π±ΡΠ΅Π³Π½Π΅ΡΠ΅ ΠΈ ΠΎΡΠΌΠ΅Π½ΠΈΡΠ΅ Ρ ΠΎΠΏΡΠΈΡΡΠ° β-fβ" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "ΠΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° β${displaypath}β Π΅ ΠΈΠ·ΡΠΈΡΡΠ΅Π½Π°" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "ΠΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡΡΠ° ΠΊΡΠΌ ΡΠ°Π±ΠΎΡΠ½ΠΎΡΠΎ Π΄ΡΡΠ²ΠΎ Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β${displaypath}β Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° " "Π±ΡΠ΄Π΅ ΠΈΠ·ΡΡΠΈΡΠ°" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" "ΠΡΠ°Π·Π½Π°ΡΠ° Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΡ Π·Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° β${displaypath}β Π½Π΅ ΠΌΠΎΠΆΠ΅ Π΄Π° Π±ΡΠ΄Π΅ ΡΡΠ·Π΄Π°Π΄Π΅Π½Π°" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "ΠΡΠ΅ΠΌΠ°Ρ
Π½Π°ΡΠ° Π΅ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΡΡΠ° Π½Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${name}β, ΡΠΎΡΠ΅Ρ ΠΊΡΠΌ Π°Π΄ΡΠ΅Ρ β${url}β, " "Π·Π° ΠΏΡΡΡ β${displaypath}β" -#: git-submodule.sh:705 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"ΠΡΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β Π½Π΅ Π΅ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠ°Π½.\n" -"ΠΡΠΎΠ±Π²Π°ΠΉΡΠ΅ Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° βupdate --initβ." - -#: git-submodule.sh:718 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Π’Π΅ΠΊΡΡΠ°ΡΠ° Π²Π΅ΡΡΠΈΡ Π·Π° ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π° Π² β${displaypath}β Π»ΠΈΠΏΡΠ²Π°" -#: git-submodule.sh:727 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ Π² ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${sm_path}β" -#: git-submodule.sh:751 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ Π΄ΠΎΡΡΠ°Π²ΡΠ½Π΅ Π² ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β" -#: git-submodule.sh:765 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΡΠ΅Π³Π»ΡΠ½Π΅ Π½Π° Π²Π΅ΡΡΠΈΡ β${sha1}β Π² ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β'" -#: git-submodule.sh:766 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ΠΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β: ΠΈΠ·ΡΠ΅Π³Π»Π΅Π½Π° Π΅ Π²Π΅ΡΡΠΈΡ β${sha1}β" -#: git-submodule.sh:770 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π½Π° Π²Π΅ΡΡΠΈΡ β${sha1}β Π² ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» " "β${displaypath}β" -#: git-submodule.sh:771 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "ΠΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β: ΠΏΡΠ΅Π±Π°Π·ΠΈΡΠ°Π½Π΅ Π²ΡΡΡ
Ρ Π²Π΅ΡΡΠΈΡ β${sha1}β" -#: git-submodule.sh:776 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΡΠ»ΠΈΠ²Π°Π½Π΅ Π½Π° Π²Π΅ΡΡΠΈΡ β${sha1}β Π² ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β" -#: git-submodule.sh:777 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "ΠΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β: ΡΠ»ΠΈΠ²Π°Π½Π΅ Ρ Π²Π΅ΡΡΠΈΡ β${sha1}β" -#: git-submodule.sh:782 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΈΠ·ΠΏΡΠ»Π½Π΅Π½ΠΈΠ΅ Π½Π° ΠΊΠΎΠΌΠ°Π½Π΄Π°ΡΠ° β${command} ${sha1}β Π² ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» " -"β${prefix}${sm_path}β" +"β${displaypath}β" -#: git-submodule.sh:783 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "ΠΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${prefix}${sm_path}β: β${command} ${sha1}β" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "ΠΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β: β${command} ${sha1}β" -#: git-submodule.sh:813 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½Π° ΠΎΠ±ΡΠ°Π±ΠΎΡΠΊΠ° Π½Π° ΠΏΠΎΠ΄Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈΡΠ΅ Π² ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β" -#: git-submodule.sh:921 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "ΠΠΏΡΠΈΠΈΡΠ΅ β--cachedβ ΠΈ β--filesβ ΡΠ° Π½Π΅ΡΡΠ²ΠΌΠ΅ΡΡΠΈΠΌΠΈ" -#: git-submodule.sh:973 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "Π½Π΅ΠΎΡΠ°ΠΊΠ²Π°Π½ ΡΠ΅ΠΆΠΈΠΌ β${mod_dst}β" -#: git-submodule.sh:993 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" " ΠΠ ΠΠΠ£ΠΠ ΠΠΠΠΠΠΠ: β${display_name}β Π½Π΅ ΡΡΠ΄ΡΡΠΆΠ° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β${sha1_src}β" -#: git-submodule.sh:996 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" " ΠΠ ΠΠΠ£ΠΠ ΠΠΠΠΠΠΠ: β${display_name}β Π½Π΅ ΡΡΠ΄ΡΡΠΆΠ° ΠΏΠΎΠ΄Π°Π²Π°Π½Π΅ΡΠΎ β${sha1_dst}β" -#: git-submodule.sh:999 +#: git-submodule.sh:915 #, 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:1024 +#: git-submodule.sh:940 msgid "blob" msgstr "ΠΎΠ±Π΅ΠΊΡ BLOB" -#: git-submodule.sh:1142 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" "ΠΠ΅ΡΡΠΏΠ΅ΡΠ½Π° ΠΎΠ±ΡΠ°Π±ΠΎΡΠΊΠ° Π½Π° ΠΏΠΎΠ΄Π΄ΠΈΡΠ΅ΠΊΡΠΎΡΠΈΠΈΡΠ΅ Π² ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${sm_path}β" -#: git-submodule.sh:1206 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Π‘ΠΈΠ½Ρ
ΡΠΎΠ½ΠΈΠ·ΠΈΡΠ°Π½Π΅ Π½Π° Π°Π΄ΡΠ΅ΡΠ° Π·Π° ΠΏΡΡΡ ΠΊΡΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ» β${displaypath}β" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "ΠΠ° ΠΏΠΎΠ²Π΅ΡΠ΅ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΏΠΎΠ³Π»Π΅Π΄Π½Π΅ΡΠ΅ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²ΠΎΡΠΎ Π½Π° βgit-${cmd}(1)β" @@ -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: 2016-03-16 00:16+0800\n" +"POT-Creation-Date: 2016-05-24 23:42+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" @@ -31,7 +31,7 @@ msgstr "" "dann 'git add/rm <Datei>', um die AuflΓΆsung entsprechend zu markieren\n" "und zu committen." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." @@ -75,7 +75,7 @@ msgstr "Format" msgid "archive format" msgstr "Archivformat" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "PrΓ€fix" @@ -83,11 +83,11 @@ 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:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 -#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549 +#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989 +#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561 +#: builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "Datei" @@ -119,7 +119,8 @@ msgstr "besser komprimieren" msgid "list supported archive formats" msgstr "unterstΓΌtzte Archivformate auflisten" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "Repository" @@ -277,11 +278,16 @@ msgstr "mehrdeutiger Objekt-Name: '%s'" msgid "Not a valid branch point: '%s'." msgstr "UngΓΌltiger Branchpunkt: '%s'" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ist bereits in '%s' ausgecheckt" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert." + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -292,7 +298,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:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht ΓΆffnen" @@ -301,10 +307,10 @@ msgstr "Konnte '%s' nicht ΓΆffnen" msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -343,21 +349,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:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurΓΌckgewiesen." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" @@ -366,8 +372,8 @@ msgstr "Erstellung der Paketindexdatei abgebrochen" msgid "invalid color value: %.*s" msgstr "UngΓΌltiger Farbwert: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "konnte %s nicht parsen" @@ -401,22 +407,22 @@ msgstr "UngΓΌltiger numerischer Wert '%s' fΓΌr Konfiguration '%s': %s" msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "ungΓΌltiger zlib Komprimierungsgrad %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "UngΓΌltiger Modus fΓΌr Objekterstellung: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "" "Konnte die ΓΌber die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." @@ -438,24 +444,27 @@ msgstr "ungΓΌltige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2226 +#: config.c:2224 #, c-format -msgid "Could not set '%s' to '%s'" +msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." +#: config.c:2226 +#, c-format +msgid "could not unset '%s'" +msgstr "Konnte '%s' nicht aufheben." + #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Konnte 'git rev-list' nicht ausfΓΌhren" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "Fehler beim Schreiben nach rev-list: %s" +msgid "failed write to rev-list" +msgstr "Fehler beim Schreiben nach rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "Fehler beim SchlieΓen von rev-list's Standard-Eingabe: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "Fehler beim SchlieΓen von rev-list's Standard-Eingabe" #: date.c:95 msgid "in the future" @@ -530,27 +539,27 @@ msgstr[1] "vor %lu Jahren" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "FΓΌhre Erkennung fΓΌr ungenaue Umbenennung aus" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -559,16 +568,16 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -577,22 +586,22 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "" "Cache fΓΌr unversionierte Dateien ist auf diesem System oder\n" "fΓΌr dieses Verzeichnis deaktiviert." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "konnte gpg nicht ausfΓΌhren" @@ -606,28 +615,28 @@ msgstr "gpg beim Signieren der Daten fehlgeschlagen" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "konnte temporΓ€re Datei '%s' nicht erstellen: %s" +msgid "could not create temporary file '%s'" +msgstr "konnte temporΓ€re Datei '%s' nicht erstellen" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "Fehler beim Schreiben der Signatur nach '%s': %s" +msgid "failed writing detached signature to '%s'" +msgstr "Fehler beim Schreiben der losgelΓΆsten Signatur nach '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s': %s" +msgid "failed to stat '%s'" +msgstr "Konnte '%s' nicht lesen" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s': read() zu kurz %s" +msgid "'%s': short read" +msgstr "'%s': read() zu kurz" #: help.c:205 #, c-format @@ -693,12 +702,37 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Konnte '%s.lock' nicht erstellen: %s.\n" +"\n" +"Ein anderer Git-Prozess scheint in diesem Repository ausgefΓΌhrt\n" +"zu werden, zum Beispiel ein noch offener Editor von 'git commit'.\n" +"Bitte stellen Sie sicher, dass alle Prozesse beendet wurden und\n" +"versuchen Sie es erneut. Falls es immer noch fehlschlΓ€gt, kΓΆnnte\n" +"ein frΓΌherer Git-Prozess in diesem Repository abgestΓΌrzt sein:\n" +"LΓΆschen Sie die Datei manuell um fortzufahren." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Konnte '%s.lock' nicht erstellen: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." @@ -745,7 +779,7 @@ msgstr "kann Objekt %s '%s' nicht lesen" msgid "blob expected for %s '%s'" msgstr "Blob erwartet fΓΌr %s '%s'" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Γffnen von '%s'" @@ -882,7 +916,7 @@ msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "Submodul" @@ -911,50 +945,50 @@ msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. FΓΌge %s als %s " "hinzu." -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "FΓΌge %s hinzu" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Fataler Merge-Fehler. Sollte nicht passieren." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "ZusammenfΓΌhren der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "unverarbeiteter Pfad??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, 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:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurΓΌckgegeben" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." @@ -986,28 +1020,28 @@ msgstr "UngΓΌltiger %s Wert: '%s'" msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" @@ -1016,7 +1050,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht fΓΌr %s nicht setzen." @@ -1088,7 +1122,7 @@ msgstr "" ":(exclude) Muster, aber keine anderen Pfadspezifikationen angegeben.\n" "Vielleicht haben Sie vergessen entweder ':/' oder '.' hinzuzufΓΌgen?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." @@ -1114,23 +1148,23 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungΓΌltig.\n" "Verwende Version %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben ΓΆffnen." -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "Konnte Referenz %s nicht entfernen: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "Konnte Referenzen nicht entfernen: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "Konnte Referenz %s nicht lΓΆschen" @@ -1269,96 +1303,96 @@ msgstr "Format: %%(end) Atom fehlt" msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kann 'fetch' nicht fΓΌr sowohl %s als auch %s nach %s ausfΓΌhren." -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt ΓΌblicherweise %s, nicht %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Interner Fehler" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "Kein solcher Branch: '%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Kein Upstream-Branch fΓΌr Branch '%s' konfiguriert." -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "Ziel fΓΌr \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten " "Branch" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Push-Refspecs fΓΌr '%s' beinhalten nicht '%s'" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "kein Ziel fΓΌr \"push\" (push.default ist 'nothing')" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "kann einzelnes Ziel fΓΌr \"push\" im Modus 'simple' nicht auflΓΆsen" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n" -#: remote.c:2084 +#: remote.c:2085 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Ihr Branch ist vor '%s' um %d Commit.\n" msgstr[1] "Ihr Branch ist vor '%s' um %d Commits.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1368,12 +1402,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist zu '%s' um %d Commits hinterher, und kann vorgespult werden.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1388,22 +1422,22 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzufΓΌhren)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." @@ -1455,7 +1489,7 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Konnte nicht nach %s schreiben" @@ -1467,12 +1501,11 @@ msgstr "Fehler bei Nachbereitung von %s" #: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." -msgstr "" -"Ihre lokalen Γnderungen wΓΌrden von \"cherry-pick\" ΓΌberschrieben werden." +msgstr "Ihre lokalen Γnderungen wΓΌrden durch den Cherry-Pick ΓΌberschrieben werden." #: sequencer.c:210 msgid "Your local changes would be overwritten by revert." -msgstr "Ihre lokalen Γnderungen wΓΌrden von \"revert\" ΓΌberschrieben werden." +msgstr "Ihre lokalen Γnderungen wΓΌrden durch den Revert ΓΌberschrieben werden." #: sequencer.c:213 msgid "Commit your changes or stash them to proceed." @@ -1615,12 +1648,12 @@ msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Fehler beim Einpacken von %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" @@ -1632,63 +1665,72 @@ msgstr "kann HEAD nicht auflΓΆsen" msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "Kann %s nicht ΓΆffnen: %s" +msgid "cannot open %s" +msgstr "kann '%s' nicht ΓΆffnen" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "Kann %s nicht lesen: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:888 +#: sequencer.c:887 #, 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:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Konnte %s nicht formatieren." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: ungΓΌltiger Commit" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausfΓΌhren." -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausfΓΌhren." -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "Unbekannte Repository-Erweiterungen gefunden:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "Offset vor Beginn des Pack-Index fΓΌr %s (beschΓ€digter Index?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Offset hinter Ende des Pack-Index fΓΌr %s (abgeschnittener Index?)" @@ -1718,31 +1760,40 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausfΓΌhren." -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kann nicht zusammengefΓΌhrte .gitmodules-Datei nicht Γ€ndern, lΓΆsen\n" "Sie zuerst die Konflikte auf" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "Negative Werte fΓΌr submodule.fetchJobs nicht erlaubt" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "UngΓΌltiger Wert fΓΌr %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1802,7 +1853,240 @@ msgstr "konnte temporΓ€re Datei nicht zu %s umbenennen" msgid "Could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"Ihre lokalen Γnderungen in den folgenden Dateien wΓΌrden beim Auschecken\n" +"ΓΌberschrieben werden:\n" +"%%sBitte committen oder stashen Sie Ihre Γnderungen, bevor Sie Branches wechseln." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Ihre lokalen Γnderungen in den folgenden Dateien wΓΌrden beim Auschecken\n" +"ΓΌberschrieben werden:\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"Ihre lokalen Γnderungen in den folgenden Dateien wΓΌrden durch den Merge\n" +"ΓΌberschrieben werden:\n" +"%%sBitte committen oder stashen Sie Ihre Γnderungen, bevor sie mergen." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Ihre lokalen Γnderungen in den folgenden Dateien wΓΌrden durch den Merge\n" +"ΓΌberschrieben werden:\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"Ihre lokalen Γnderungen in den folgenden Dateien wΓΌrden durch %s\n" +"ΓΌberschrieben werden:\n" +"%%sBitte committen oder stashen Sie Ihre Γnderungen, bevor Sie %s ausfΓΌhren." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Ihre lokalen Γnderungen wΓΌrden durch %s ΓΌberschrieben werden.\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"Durch die Aktualisierung der folgenden Verzeichnisse wΓΌrden unversionierte\n" +"Dateien in diesen Verzeichnissen verloren gehen:\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch\n" +"den Checkout entfernt werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"Checkout entfernt werden:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"Merge entfernt werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"Merge entfernt werden:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"%s entfernt werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausfΓΌhren." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"%s entfernt werden:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"Checkout ΓΌberschrieben werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"Checkout ΓΌberschrieben werden:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"Merge ΓΌberschrieben werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"Merge ΓΌberschrieben werden:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"%s ΓΌberschrieben werden:\n" +"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausfΓΌhren." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Die folgenden unversionierten Dateien im Arbeitsverzeichnis wΓΌrden durch den\n" +"%s ΓΌberschrieben werden:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Eintrag '%s' ΓΌberschneidet sich mit '%s'. Kann nicht verbinden." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Kann partiellen Checkout nicht aktualisieren: die folgenden EintrΓ€ge sind nicht\n" +"aktuell:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Die folgenden Dateien im Arbeitsbereich wΓΌrden durch die Aktualisierung\n" +"des partiellen Checkouts ΓΌberschrieben werden:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Die folgenden Dateien im Arbeitsbereich wΓΌrden durch die Aktualisierung\n" +"des partiellen Checkouts entfernt werden:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Abbruch\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Checke Dateien aus" @@ -1840,210 +2124,206 @@ msgstr "ungΓΌltiges '..' Pfadsegment" msgid "could not open '%s' for reading and writing" msgstr "Konnte '%s' nicht zum Lesen und Schreiben ΓΆffnen." -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben ΓΆffnen." -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen ΓΆffnen." -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "konnte nicht auf '%s' zugreifen: %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "Konnte '%s' nicht zum Schreiben ΓΆffnen." -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "Konnte nicht nach '%s' schreiben." -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "Konnte '%s' nicht schlieΓen." -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Nicht zusammengefΓΌhrte Pfade:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die AuflΓΆsung zu markieren)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die AuflΓΆsung entsprechend zu " "markieren)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die AuflΓΆsung zu markieren)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Γnderungen:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Γnderungen, die nicht zum Commit vorgemerkt sind:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add <Datei>...\", um die Γnderungen zum Commit " "vorzumerken)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Γnderungen zum Commit " "vorzumerken)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (benutzen Sie \"git checkout -- <Datei>...\", um die Γnderungen im " "Arbeitsverzeichnis zu verwerfen)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (committen oder verwerfen Sie den unversionierten oder geΓ€nderten Inhalt " "in den Submodulen)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (benutzen Sie \"git %s <Datei>...\", um die Γnderungen zum Commit " "vorzumerken)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "beide gelΓΆscht:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "von uns hinzugefΓΌgt:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "von denen gelΓΆscht:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "von denen hinzugefΓΌgt:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "von uns gelΓΆscht:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "von beiden hinzugefΓΌgt:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "von beiden geΓ€ndert:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "Bug: unbehandelter Unmerged-Status %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "neue Datei:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "kopiert:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "gelΓΆscht:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "geΓ€ndert:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "umbenannt:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "TypΓ€nderung:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "unbekannt:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "nicht gemerged:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "neue Commits, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "geΓ€nderter Inhalt, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "unversionierter Inhalt, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Submodule geΓ€ndert, aber nicht aktualisiert:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Γnderungen in Submodul zum Committen:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2051,40 +2331,40 @@ msgstr "" "Γndern Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird entfernt." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengefΓΌhrte Pfade." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und fΓΌhren Sie \"git commit\" aus)" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschlieΓen)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:974 +#: wt-status.c:976 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:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\", um den ursprΓΌnglichen Branch " @@ -2249,43 +2529,43 @@ msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprΓΌnglichen Branch " "zurΓΌckzukehren)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD losgelΓΆst bei " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD losgelΓΆst von " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2296,32 +2576,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:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Keine Γnderungen" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "keine Γnderungen zum Commit vorgemerkt\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2330,56 +2610,56 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen " "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, 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:1525 +#: wt-status.c:1547 #, 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:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, 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:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverΓ€ndert\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Initialer Commit auf " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "entfernt" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "hinterher " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "voraus " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." @@ -2393,7 +2673,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" @@ -2407,7 +2687,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Γnderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" @@ -2445,14 +2725,14 @@ msgstr "" "ignoriert:\n" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "erweiterte Ausgaben" @@ -2460,7 +2740,7 @@ msgstr "erweiterte Ausgaben" msgid "interactive picking" msgstr "interaktives AuswΓ€hlen" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "BlΓΆcke interaktiv auswΓ€hlen" @@ -2532,16 +2812,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Meinten Sie vielleicht 'git add .'?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "Index-Datei beschΓ€digt" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" @@ -2569,16 +2849,6 @@ msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" msgid "fseek failed" msgstr "\"fseek\" fehlgeschlagen" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "Konnte '%s' nicht zum Lesen ΓΆffnen: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "Konnte '%s' nicht zum Schreiben ΓΆffnen: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2588,82 +2858,82 @@ msgstr "konnte Patch '%s' nicht parsen" msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "ungΓΌltiger Zeitstempel" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "UngΓΌltige \"Date\"-Zeile" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "UngΓΌltiger Offset in der Zeitzone" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "Konnte Index-Datei nicht schreiben." -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" "Wenn Sie das Problem aufgelΓΆst haben, fΓΌhren Sie \"%s --continue\" aus." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Falls Sie diesen Patch auslassen mΓΆchten, fΓΌhren Sie stattdessen \"%s --skip" "\" aus." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Um den ursprΓΌnglichen Branch wiederherzustellen und die Anwendung der " "Patches abzubrechen, fΓΌhren Sie \"%s --abort\" aus." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Patch ist leer. War dessen Aufteilung falsch?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "UngΓΌltige Identifikationszeile: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "Konnte Commit '%s' nicht parsen." -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge " "zurΓΌckzufallen." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2671,39 +2941,39 @@ msgstr "" "Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurΓΌck zum Patchen der Basis und zum 3-Wege-Merge ..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Merge der Γnderungen fehlgeschlagen." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "Kann nicht fortsetzen: %s existiert nicht" -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " "Terminal verbunden ist." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" @@ -2711,35 +2981,35 @@ msgstr "Commit-Beschreibung ist:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "GeΓ€nderter Index: kann Patches nicht anwenden (geΓ€ndert: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Wende an: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Keine Γnderungen -- Patches bereits angewendet." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2750,7 +3020,7 @@ msgstr "" "diese bereits anderweitig eingefΓΌgt worden sein; Sie kΓΆnnten diesen Patch\n" "auslassen." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2758,17 +3028,17 @@ msgstr "" "Sie haben immer noch nicht zusammengefΓΌhrte Pfade im Index.\n" "Haben Sie vergessen 'git add' zu benutzen?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "Fehler beim Bereinigen des Index" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2776,153 +3046,155 @@ msgstr "" "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geΓ€ndert zu haben.\n" "Keine ZurΓΌcksetzung zu ORIG_HEAD." -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "UngΓΌltiger Wert fΓΌr --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<Optionen>] [(<mbox>|<E-Mail-Verzeichnis>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<Optionen>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "interaktiv ausfΓΌhren" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "historische Option -- kein Effekt" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das ZurΓΌckfallen auf einen 3-Wege-Merge" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufΓΌgen" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "nach UTF-8 umkodieren (Standard)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "-k an git-mailinfo ΓΌbergeben" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "-b an git-mailinfo ΓΌbergeben" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "-m an git-mailinfo ΓΌbergeben" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "--keep-cr an git-mailsplit fΓΌr mbox-Format ΓΌbergeben" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "kein --keep-cr an git-mailsplit ΓΌbergeben, unabhΓ€ngig von am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "alles vor einer Scheren-Zeile entfernen" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "Aktion" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "an git-apply ΓΌbergeben" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "Pfad" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 -#: parse-options.h:132 parse-options.h:134 parse-options.h:244 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 +#: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "Anzahl" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "Format" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "Patch-Format" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "Meldung bei fehlerhafter Patch-Anwendung ΓΌberschreiben" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "Anwendung der Patches nach AuflΓΆsung eines Konfliktes fortsetzen" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "Synonyme fΓΌr --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "den aktuellen Patch auslassen" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" "ursprΓΌnglichen Branch wiederherstellen und Anwendung der Patches abbrechen" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "Autor-Datum als Commit-Datum verwenden" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "GPG-SchlΓΌsselkennung" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "Commits mit GPG signieren" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(intern fΓΌr git-rebase verwendet)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2930,16 +3202,16 @@ msgstr "" "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" "entfernt. Bitte verwenden Sie diese nicht mehr." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "Fehler beim Lesen des Index" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2948,7 +3220,7 @@ msgstr "" "Stray %s Verzeichnis gefunden.\n" "Benutzen Sie \"git am --abort\", um es zu entfernen." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "Es ist keine AuflΓΆsung im Gange, es wird nicht fortgesetzt." @@ -2981,41 +3253,41 @@ msgstr "AusfΓΌhrung des regulΓ€ren Ausdrucks gab %d zurΓΌck. Eingabe: %s" msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, 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:944 +#: builtin/apply.c:942 #, 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:945 +#: builtin/apply.c:943 #, 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:952 +#: builtin/apply.c:949 #, 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -3030,65 +3302,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:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "neue Datei hΓ€ngt von alten Inhalten ab" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hΓ€ngt von alten Inhalten ab" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter BinΓ€r-Patch bei Zeile %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter BinΓ€r-Patch bei Zeile %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische VerknΓΌpfung %s nicht lesen" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht ΓΆffnen oder lesen" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "UngΓΌltiger Zeilenanfang: '%c'" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -3096,12 +3368,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:2908 +#: builtin/apply.c:2906 #, 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:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3110,337 +3382,347 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in BinΓ€r-Patch fΓΌr '%s'" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte BinΓ€r-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, 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:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' ist hinter einer symbolischen VerknΓΌpfung" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelΓΆscht" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht im Index" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version im Index" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "LΓΆsch-Patch hinterlΓ€sst Dateiinhalte" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "UngΓΌltiger Pfad '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, 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:3774 +#: builtin/apply.c:3772 #, 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:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "betroffene Datei '%s' ist hinter einer symbolischen VerknΓΌpfung" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "PrΓΌfe Patch %s ..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry fΓΌr Pfad '%s' fehlgeschlagen" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus dem Index entfernen" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch fΓΌr Submodul %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, 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:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, 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:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "schlieΓe Datei '%s'" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "interner Fehler" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, 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:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "VerkΓΌrze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "Kann %s nicht ΓΆffnen: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurΓΌckgewiesen." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Patch '%s' ausgelassen." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "Konnte Index-Datei nicht lesen" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "keine Γnderungen im angegebenen Pfad anwenden" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "Γnderungen nur im angegebenen Pfad anwenden" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte SchrΓ€gstriche von herkΓΆmmlichen Differenzpfaden " "entfernen" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "hinzugefΓΌgte Zeilen des Patches ignorieren" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 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:4522 +#: builtin/apply.c:4524 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:4524 +#: builtin/apply.c:4526 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:4526 +#: builtin/apply.c:4528 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:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Γnderungen im Arbeitsverzeichnis vorzunehmen" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der Γnderungen auΓerhalb des Arbeitsverzeichnisses vornimmt" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 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:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "einen temporΓ€ren Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes ΓΌbereinstimmen" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geΓ€nderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "Γnderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurΓΌckgewiesene Patch-BlΓΆcke in entsprechenden *.rej Dateien hinterlassen" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "sich ΓΌberlappende Patch-BlΓΆcke erlauben" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht auΓerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht auΓerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht auΓerhalb eines Repositories verwendet werden." -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht ΓΆffnen" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, 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:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3506,102 +3788,102 @@ msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" msgid "Blaming lines" msgstr "Verarbeite Zeilen" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-EintrΓ€ge schrittweise anzeigen, wΓ€hrend wir sie generieren" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 fΓΌr Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Ausgabebewertung fΓΌr \"blame\"-EintrΓ€ge anzeigen" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "ursprΓΌnglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "ursprΓΌngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format fΓΌr maschinelle Auswertung" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format fΓΌr Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrΓΌcken (Standard: aus)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 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:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "LΓ€nger arbeiten, um bessere Γbereinstimmungen zu finden" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgΓΌltiges Abbild benutzen" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezΓ€hlt von 1" @@ -3611,31 +3893,31 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren, und 11 Monaten" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<Optionen>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3644,7 +3926,7 @@ msgstr "" "entferne Branch '%s', der zusammengefΓΌhrt wurde mit\n" " '%s', aber noch nicht mit HEAD zusammengefΓΌhrt wurde." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3653,12 +3935,12 @@ msgstr "" "entferne Branch '%s' nicht, der noch nicht zusammengefΓΌhrt wurde mit\n" " '%s', obwohl er mit HEAD zusammengefΓΌhrt wurde." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Konnte Commit-Objekt fΓΌr '%s' nicht nachschlagen." -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3668,303 +3950,323 @@ msgstr "" "Wenn Sie sicher sind diesen Branch zu entfernen, fΓΌhren Sie 'git branch -D " "%s' aus." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Commit-Objekt fΓΌr HEAD nicht nachschlagen." -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "" -"Kann Branch '%s' nicht entfernen, da Sie sich gerade auf diesem befinden." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'." -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "Remote-Tracking-Branch '%s' nicht gefunden" -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Fehler beim Entfernen des Branches '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: entfernt]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: %d hinterher]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[%d hinterher]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: %d voraus]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[%d voraus]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: %d voraus, %d hinterher]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[%d voraus, %d hinterher]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** ungΓΌltige Referenz ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binΓ€re Suche begonnen bei %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD losgelΓΆst bei %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD losgelΓΆst von %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(kein Branch)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "Branch %s wird auf %s umgesetzt" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "BinΓ€re Suche von Branch %s zu %s im Gange" + +#: builtin/branch.c:560 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:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "UngΓΌltiger Branchname: '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, 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:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "Konnte Beschreibungsvorlage fΓΌr Branch nicht schreiben: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "Konnte Beschreibungsvorlage fΓΌr Branch nicht schreiben." -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusΓ€tzlich Upstream-Branch" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrΓΌcken" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "den Γbernahmemodus einstellen (siehe git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "Informationen zum Upstream-Branch Γ€ndern" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "Upstream" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "Informationen zum Upstream-Branch Γ€ndern" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, welche diesen Commit beinhalten" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen fΓΌr \"git-branch\":" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "vollstΓ€ndig zusammengefΓΌhrten Branch entfernen" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "Branch lΓΆschen (auch wenn nicht zusammengefΓΌhrt)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "die Beschreibung fΓΌr den Branch bearbeiten" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder LΓΆschung erzwingen" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "nur zusammengefΓΌhrte Branches ausgeben" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "nur nicht zusammengefΓΌhrte Branches ausgeben" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "SchΓΌssel" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "Objekt" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gΓΌltige Referenz auflΓΆsen." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "zu losgelΓΆstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "zu viele Branches fΓΌr eine Umbenennen-Operation angegeben" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3972,43 +4274,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:784 +#: builtin/branch.c:820 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:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:810 +#: builtin/branch.c:846 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:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -4017,7 +4319,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -4028,16 +4330,6 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, fΓΌhren " "Sie aus:\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4140,7 +4432,7 @@ msgstr "Dateinamen von der Standard-Eingabe lesen" msgid "terminate input and output records by a NUL character" msgstr "EintrΓ€ge von Ein- und Ausgabe mit NUL-Zeichen abschlieΓen" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrΓΌcken" @@ -4233,8 +4525,9 @@ msgid "write the content to temporary files" msgstr "den Inhalt in temporΓ€re Dateien schreiben" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "Zeichenkette" @@ -4285,80 +4578,80 @@ msgstr "Pfad '%s': kann nicht zusammenfΓΌhren" msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufΓΌgen." -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln" -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "beschΓ€digte Index-Datei" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengefΓΌhrt." -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "Sie mΓΌssen zuerst die Konflikte in Ihrem aktuellen Index auflΓΆsen." -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kann \"reflog\" fΓΌr '%s' nicht durchfΓΌhren: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4381,7 +4674,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4408,152 +4701,152 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch geboren wird" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "UngΓΌltige Referenz: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "Pfade kΓΆnnen nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "das Reflog fΓΌr den neuen Branch erzeugen" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "HEAD zu benanntem Commit setzen" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch fΓΌr den neuen Branch setzen" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "unsere Variante fΓΌr nicht zusammengefΓΌhrte Dateien auschecken" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "ihre Variante fΓΌr nicht zusammengefΓΌhrte Dateien auschecken" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Γnderungen)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausfΓΌhren" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "keine EinschrΓ€nkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "second guess 'git checkout <no-such-branch>'" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" "PrΓΌfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis " "ausgecheckt wurde, deaktivieren" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schlieΓen sich gegenseitig aus." -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Vermisse Branchnamen; versuchen Sie -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "ungΓΌltige Pfadspezifikation" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4563,12 +4856,12 @@ msgstr "" "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelΓΆst " "werden kann?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4720,8 +5013,8 @@ msgstr "interaktives Clean" msgid "remove whole directories" msgstr "ganze Verzeichnisse lΓΆschen" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "Muster" @@ -4761,105 +5054,113 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "Anzahl der parallel zu klonenden Submodule" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "--reference nur wΓ€hrend des Klonens benutzen" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "Name" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "<Name> statt 'origin' fΓΌr Upstream-Repository verwenden" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollstΓ€ndiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "jedes geklonte Submodul mit unvollstΓ€ndiger Historie (shallow)" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "SchlΓΌssel=Wert" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4867,62 +5168,57 @@ msgstr "" "Konnte keinen Verzeichnisnamen erraten.\n" "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an." -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Referenziertes Repository '%s' wird noch nicht als verknΓΌpftes\n" "Arbeitsverzeichnis unterstΓΌtzt." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollstΓ€ndige Historie (shallow)." -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit kΓΌnstlichen VorgΓ€ngern (\"grafts\") " "eingehΓ€ngt." -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "Konnte '%s' nicht lesen" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4932,132 +5228,132 @@ msgstr "" "Sie kΓΆnnen mit 'git status' prΓΌfen, was ausgecheckt worden ist\n" "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "PrΓΌfe KonnektivitΓ€t ... " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " "nicht ausgecheckt werden.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum AufrΓ€umen nicht aufrufen" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "Kann temporΓ€re \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Sie mΓΌssen ein Repository zum Klonen angeben." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte fΓΌhrende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 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:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollstΓ€ndiger Historie (shallow),ignoriere --" "local" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "WeiΓ nicht wie %s zu klonen ist." -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -5200,67 +5496,67 @@ msgstr "" "Benutzen Sie anschlieΓend \"git cherry-pick --continue\", um die\n" "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "Konnte temporΓ€ren Index nicht erstellen." -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "interaktives HinzufΓΌgen fehlgeschlagen" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "Konnte temporΓ€ren Index nicht aktualisieren." -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:445 +#: builtin/commit.c:447 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:447 +#: builtin/commit.c:449 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:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "Konnte temporΓ€re Index-Datei nicht schreiben." -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "UngΓΌltiges Datumsformat: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5268,38 +5564,38 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswΓ€hlen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "Konnte MERGE_MSG nicht lesen" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "Konnte MERGE_MSG nicht lesen" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5314,7 +5610,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5329,7 +5625,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5339,7 +5635,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5352,157 +5648,157 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem " "vorhandenen Autor ΓΌberein" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "UngΓΌltiger Modus '%s' fΓΌr unversionierte Dateien" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 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:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Sie haben nichts fΓΌr \"--amend\"." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 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:1151 +#: builtin/commit.c:1162 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:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup kΓΆnnen nicht gemeinsam verwendet werden." -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 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:1166 +#: builtin/commit.c:1177 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:1174 +#: builtin/commit.c:1185 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:1191 +#: builtin/commit.c:1202 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:1193 +#: builtin/commit.c:1204 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:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Klug ... den letzten Commit mit einem geΓ€nderten Index nachbessern." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 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:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "UngΓΌltiger \"cleanup\" Modus %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "EintrΓ€ge mit NUL-Zeichen abschlieΓen" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 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:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "ignorierte Dateien anzeigen" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "wann" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5510,203 +5806,203 @@ msgstr "" "Γnderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellten Commit nicht analysieren." -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "losgelΓΆster HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrΓΌcken" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Optionen fΓΌr Commit-Beschreibung" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "Autor" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "Autor eines Commits ΓΌberschreiben" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "Datum" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "Datum eines Commits ΓΌberschreiben" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "Commit-Beschreibung" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "Commit" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 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:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufΓΌgen" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "Standard" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfΓΌgen" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Optionen fΓΌr Commit-Inhalt" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "alle geΓ€nderten Dateien committen" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusΓ€tzlich zum Commit vormerken" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "interaktives HinzufΓΌgen von Dateien" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "interaktives HinzufΓΌgen von Γnderungen" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "\"pre-commit hook\" umgehen" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "anzeigen, was committet werden wΓΌrde" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "vorherigen Commit Γ€ndern" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Γnderung erlauben" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Γnderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "BeschΓ€digte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, 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:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5855,7 +6151,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "konnte Standard-Farbwert nicht parsen" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5870,7 +6166,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." @@ -5906,7 +6202,7 @@ msgstr "annotiertes Tag %s hat keinen eingebetteten Namen" msgid "tag '%s' is really '%s' here" msgstr "Tag '%s' ist eigentlich '%s' hier" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gΓΌltiger Objekt-Name" @@ -5999,7 +6295,7 @@ msgstr "die jΓΌngsten <n> Tags betrachten (Standard: 10)" msgid "only consider tags matching <pattern>" msgstr "nur Tags, die <Muster> entsprechen, betrachten" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "gekΓΌrztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" @@ -6035,21 +6331,21 @@ msgstr "'%s': keine regulΓ€re Datei oder symbolische VerknΓΌpfung" msgid "invalid option: %s" msgstr "UngΓΌltige Option: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungΓΌltig." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" @@ -6122,19 +6418,19 @@ msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhΓ€ngen, anstatt zu ΓΌberschreiben" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "das Γberschreiben von lokalen Branches erzwingen" @@ -6142,7 +6438,7 @@ msgstr "das Γberschreiben von lokalen Branches erzwingen" msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" @@ -6154,21 +6450,21 @@ msgstr "nicht alle Tags anfordern (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 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:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" @@ -6176,16 +6472,16 @@ msgstr "heruntergeladenes Paket behalten" msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollstΓ€ndiger Historie (shallow) vertiefen" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "zu einem vollstΓ€ndigen Repository konvertieren" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "Verzeichnis" @@ -6197,15 +6493,15 @@ msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" msgid "default mode for recursion" msgstr "Standard-Modus fΓΌr Rekursion" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "Refmap fΓΌr 'fetch' angeben" @@ -6264,11 +6560,6 @@ msgstr "Aktualisierung erzwungen" msgid "(non-fast-forward)" msgstr "(kein Vorspulen)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "kann %s nicht ΓΆffnen: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6479,55 +6770,55 @@ msgstr "PrΓΌfe KonnektivitΓ€t" msgid "Checking object directories" msgstr "PrΓΌfe Objekt-Verzeichnisse" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "Index-Objekte in ErreichbarkeitsprΓΌfung einbeziehen" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "Reflogs in ErreichbarkeitsprΓΌfung einbeziehen (Standard)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "nur KonnektivitΓ€t prΓΌfen" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "genauere PrΓΌfung aktivieren" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "PrΓΌfe Objekte" @@ -6637,226 +6928,226 @@ msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchfΓΌhren" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht ΓΆffnen" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "im Index anstatt im Arbeitsverzeichnis suchen" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "Dateien, die ΓΌber '.gitignore' angegeben sind, ignorieren" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "Zeilen ohne Γbereinstimmungen anzeigen" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "Γbereinstimmungen unabhΓ€ngig von GroΓ- und Kleinschreibung finden" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "nur ganze WΓΆrter suchen" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "binΓ€re Dateien als Text verarbeiten" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "keine Muster in BinΓ€rdateien finden" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "binΓ€re Dateien mit \"textconv\"-Filtern verarbeiten" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "hΓΆchstens <Tiefe> Ebenen durchlaufen" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "erweiterte regulΓ€re AusdrΓΌcke aus POSIX verwenden" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "grundlegende regulΓ€re AusdrΓΌcke aus POSIX verwenden (Standard)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "Muster als feste Zeichenketten interpretieren" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "Perl-kompatible regulΓ€re AusdrΓΌcke verwenden" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "Zeilennummern anzeigen" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "keine Dateinamen anzeigen" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "Dateinamen anzeigen" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "nur Dateinamen anzeigen anstatt ΓΌbereinstimmende Zeilen" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "Synonym fΓΌr --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "nur die Dateinamen ohne Γbereinstimmungen anzeigen" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "NUL-Zeichen nach Dateinamen ausgeben" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "anstatt der Zeilen, die Anzahl der ΓΌbereinstimmenden Zeilen anzeigen" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "Γbereinstimmungen hervorheben" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" "eine Leerzeile zwischen Γbereinstimmungen in verschiedenen Dateien ausgeben" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "den Dateinamen nur einmal oberhalb der Γbereinstimmungen aus dieser Datei " "anzeigen" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "<n> Zeilen vor und nach den Γbereinstimmungen anzeigen" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "<n> Zeilen vor den Γbereinstimmungen anzeigen" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "<n> Zeilen nach den Γbereinstimmungen anzeigen" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "<n> Threads benutzen" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "Kurzform fΓΌr -C NUM" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "eine Zeile mit dem Funktionsnamen vor Γbereinstimmungen anzeigen" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "die umgebende Funktion anzeigen" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "Muster von einer Datei lesen" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "<Muster> finden" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "Muster kombinieren, die mit -e angegeben wurden" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "Γbereinstimmungen nur durch Beendigungsstatus anzeigen" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" "nur Γbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "geparstes Verzeichnis fΓΌr \"grep\"-Ausdruck anzeigen" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "Anzeigeprogramm" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "Dateien mit Γbereinstimmungen im Anzeigeprogramm anzeigen" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "keine Muster angegeben" -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungΓΌltige Anzahl von Threads angegeben (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "" "Die Option --open-files-in-pager kann nur innerhalb des " "Arbeitsverzeichnisses verwendet werden." -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "Die Optionen --cached und --untracked kΓΆnnen nicht mit --no-index verwendet " "werden." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "Die Optionen --no-index und --untracked kΓΆnnen nicht mit Commits verwendet " "werden." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten " "verwendet werden." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." @@ -6947,8 +7238,8 @@ msgstr "Version des emacsclient '%d' ist zu alt (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "Fehler beim AusfΓΌhren von '%s': %s" +msgid "failed to exec '%s'" +msgstr "Fehler beim AusfΓΌhren von '%s'" #: builtin/help.c:205 #, c-format @@ -7207,107 +7498,109 @@ msgstr "Fehler beim AuflΓΆsen der Unterschiede" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "abgeschlossen mit %d lokalen Objekten" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "abgeschlossen mit %d lokalem Objekt" +msgstr[1] "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete PrΓΌfsumme fΓΌr %s (Festplattenfehler?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelΓΆste Unterschied" msgstr[1] "Paket hat %d unaufgelΓΆste Unterschiede" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehΓ€ngtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschΓ€digt" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "Fehler beim SchlieΓen der Paketdatei" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schlieΓen" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungΓΌltig" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "keine UnterstΓΌtzung von Threads, '%s' wird ignoriert" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht ΓΆffnen" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, 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:1587 +#: builtin/index-pack.c:1589 #, 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:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "Kann nicht zurΓΌck zu Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "%s ist ungΓΌltig" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." @@ -7346,27 +7639,27 @@ msgstr "kann '%s' nicht nach '%s' kopieren" msgid "ignoring template %s" msgstr "ignoriere Vorlage %s" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "keine Vorlagen in '%s' gefunden" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'" +msgid "not copying templates from '%s': %s" +msgstr "kopiere keine Vorlagen von '%s': %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "Konnte %s nicht nach %s verschieben" @@ -7374,24 +7667,24 @@ msgstr "Konnte %s nicht nach %s verschieben" #. 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-Repository in %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "Reinitialisierte existierendes" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "Initialisierte leeres" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " gemeinsames" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7399,25 +7692,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" "shared[=<Berechtigungen>]] [<Verzeichnis>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "Berechtigungen" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7426,7 +7719,7 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." @@ -7472,266 +7765,318 @@ msgstr "git show [<Optionen>] <Objekt>..." msgid "invalid --decorate option: %s" msgstr "UngΓΌltige Option fΓΌr --decorate: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "Ausgabe der Unterschiede unterdrΓΌcken" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezΓ€hlt von 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungΓΌltige Datei" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht ΓΆffnen" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Kein Commit-Bereich." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "Anschreiben benΓΆtigt E-Mail-Format" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "ungΓΌltiges in-reply-to: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Unbekannter Commit %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Konnte '%s' nicht als gΓΌltige Referenz auflΓΆsen." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Konnte keine exakte Merge-Basis finden." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"Fehler beim Bestimmen des Upstream-Branches. Wenn Sie den Basis-Commit\n" +"automatisch speichern lassen mΓΆchten, benutzen Sie bitte\n" +"'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n" +"Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Fehler beim Finden einer exakten Merge-Basis." + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "Basis-Commit sollte der VorgΓ€nger der Revisionsliste sein." + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "kann Patch-Id nicht lesen" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge fΓΌr die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[<PrΓ€fix>] anstatt [PATCH] verwenden" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufΓΌgen" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "keine binΓ€ren Unterschiede ausgeben" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "" "keine Patches einschlieΓen, die einem Commit im Upstream-Branch entsprechen" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "Header" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "E-Mail-Header hinzufΓΌgen" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "\"To:\"-Header hinzufΓΌgen" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufΓΌgen" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "Ident" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn " "fehlend)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "den Patch anhΓ€ngen" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfΓΌgen" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "eine Signatur hinzufΓΌgen" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "Basis-Commit" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufΓΌgen" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufΓΌgen" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "Die Optionen -n und -k schlieΓen sich gegenseitig aus." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "Die Optionen --subject-prefix und -k schlieΓen sich gegenseitig aus." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7739,11 +8084,6 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Unbekannter Commit %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<Optionen>] [<Datei>...]" @@ -7943,175 +8283,179 @@ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "VerfΓΌgbare Strategien sind:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "VerfΓΌgbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(Synonym fΓΌr --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "(hΓΆchstens <n>) EintrΓ€ge von \"shortlog\" zur Beschreibung des Merge-Commits " "hinzufΓΌgen" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchfΓΌhren, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen mΓΆglich ist" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gΓΌltige GPG-Signatur ΓΌberprΓΌfen" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "Option fΓΌr ausgewΓ€hlte Merge-Strategie" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "Commit-Beschreibung zusammenfΓΌhren (fΓΌr einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "erlaube das ZusammenfΓΌhren von nicht zusammenhΓ€ngenden Historien" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausfΓΌhren." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "kein gΓΌltiges Objekt: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Schreibe SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "SchlieΓe SQUASH_MSG ab" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "UngΓΌltiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option fΓΌr merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge " "abzuschlieΓen.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8127,55 +8471,55 @@ msgstr "" "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ist kein Commit" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Kein Remote-Repository fΓΌr den aktuellen Branch." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch fΓΌr den aktuellen Branch definiert." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch fΓΌr %s von %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schlieΓen" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8183,7 +8527,7 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Γnderungen, bevor Sie den Merge ausfΓΌhren." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8191,105 +8535,109 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Γnderungen, bevor Sie den Merge ausfΓΌhren." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Sie kΓΆnnen --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "" "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausfΓΌhren." -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenfΓΌhren kΓΆnnen" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenfΓΌhren." -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Commit %s hat eine nicht vertrauenswΓΌrdige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s hat eine ungΓΌltige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s hat eine gΓΌltige GPG-Signatur von %s\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "Verweigere den Merge von nicht zusammenhΓ€ngenden Historien." + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht mΓΆglich, breche ab." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "RΓΌcklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\", um die AuflΓΆsung per Hand vorzubereiten.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8400,7 +8748,7 @@ msgstr "git mv [<Optionen>] <Quelle>... <Ziel>" msgid "Directory %s is in index and no submodule?" msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Bitte merken Sie Ihre Γnderungen in .gitmodules zum Commit vor oder " @@ -8481,48 +8829,48 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<Optionen>] <Commit>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<Optionen>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<Optionen>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "nur Namen anzeigen (keine SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "nur Tags verwenden, um die Commits zu benennen" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "nur Referenzen verwenden die <Muster> entsprechen" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "von der Standard-Eingabe lesen" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" @@ -8671,24 +9019,16 @@ msgstr "Konnte Notiz-Objekt nicht schreiben" msgid "The note contents have been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht ΓΆffnen oder lesen" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Konnte '%s' nicht als gΓΌltige Referenz auflΓΆsen." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8701,7 +9041,7 @@ msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen." #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "zu viele Parameter" @@ -8748,7 +9088,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Γberschreibe existierende Notizen fΓΌr Objekt %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz fΓΌr Objekt %s\n" @@ -8790,15 +9130,15 @@ msgstr "" "Die Optionen -m/-F/-c/-C sind fΓΌr den Unterbefehl 'edit' veraltet.\n" "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Allgemeine Optionen" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Merge-Optionen" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8806,51 +9146,51 @@ msgstr "" "lΓΆst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "nicht zusammengefΓΌhrte Notizen eintragen" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" "Merge von Notizen abschlieΓen, in dem nicht zusammengefΓΌhrte Notizen " "committet werden" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "KonfliktauflΓΆsung beim Merge von Notizen abbrechen" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "Merge von Notizen abbrechen" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "der Versuch, eine nicht existierende Notiz zu lΓΆschen, ist kein Fehler" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "Objektnamen von der Standard-Eingabe lesen" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "Notiz-Referenz" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -8874,176 +9214,182 @@ msgstr "" msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" +"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n" +"aufgetrennt." + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 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" +"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-Datei\n" +"geschrieben wurden." -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstΓΌtzte Index-Version %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "UngΓΌltige Index-Version '%s'" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "" "Forschrittsanzeige wΓ€hrend der Phase des Schreibens der Objekte anzeigen" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "Γ€hnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 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:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "maximale GrΓΆΓe fΓΌr jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusΓ€tzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 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:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 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:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "Argumente bezΓΌglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 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:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "Objekte einschlieΓen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschlieΓen, die von EintrΓ€gen des Reflogs referenziert werden" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "Objekte einschlieΓen, die vom Index referenziert werden" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 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:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "Zeit" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "dΓΌnnere Pakete erzeugen" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet fΓΌr Abholung mit unvollstΓ€ndiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "Komprimierungsgrad fΓΌr Paketierung" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "keine kΓΌnstlichen VorgΓ€nger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 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:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "ZΓ€hle Objekte" @@ -9071,15 +9417,15 @@ msgstr "LΓΆsche doppelte Objekte" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "nicht lΓΆschen, nur anzeigen" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "gelΓΆschte Objekte melden" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "Objekte Γ€lter als <Zeit> verfallen lassen" @@ -9091,52 +9437,56 @@ msgstr "kann \"prune\" in precious-objects Repository nicht ausfΓΌhren" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Optionen bezogen auf Merge" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Γnderungen durch Rebase statt Merge" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "Vorspulen erlauben" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gΓΌltige GPG-Signatur ΓΌberprΓΌfen" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Optionen bezogen auf Fetch" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "UngΓΌltiger Wert fΓΌr pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "Kann \"pull\" mit \"rebase\" nicht ausfΓΌhren: Sie haben Γnderungen, die " "nicht zum Commit vorgemerkt sind." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "ZusΓ€tzlich beinhaltet die Staging-Area nicht committete Γnderungen." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Kann \"pull\" mit \"rebase\" nicht ausfΓΌhren: Die Staging-Area beinhaltet " "nicht committete Γnderungen." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9144,14 +9494,14 @@ msgstr "" "Es gibt keinen Kandidaten fΓΌr Rebase innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Es gibt keine Kandidaten fΓΌr Merge innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9159,7 +9509,7 @@ msgstr "" "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n" "haben, der auf der Gegenseite mit keinen Referenzen ΓΌbereinstimmt." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9171,42 +9521,46 @@ msgstr "" "Repository fΓΌr den aktuellen Branch ist, mΓΌssen Sie einen Branch auf\n" "der Befehlszeile angeben." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Im Moment auf keinem Branch." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausfΓΌhren " "mΓΆchten." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenfΓΌhren mΓΆchten." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Siehe git-pull(1) fΓΌr weitere Details." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<Remote-Repository>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<Branch>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Es gibt keine Tracking-Informationen fΓΌr den aktuellen Branch." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -"Wenn Sie Tracking-Informationen fΓΌr diesen Branch setzen mΓΆchten, kΓΆnnen " -"Sie\n" -"dies tun mit:\n" -"\n" -" git branch --set-upstream-to=%s/<Branch> %s\n" +"Wenn Sie Tracking-Informationen fΓΌr diesen Branch setzen mΓΆchten, kΓΆnnen Sie\n" +"dies tun mit:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9216,13 +9570,17 @@ msgstr "" "des Remote-Repositories durchzufΓΌhren, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash ist nur mit --rebase zulΓ€ssig." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Aktualisiere einen ungeborenen Branch mit Γnderungen, die zum Commit " "vorgemerkt sind." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9232,7 +9590,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9249,11 +9607,11 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenfΓΌhren." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausfΓΌhren." @@ -9623,12 +9981,24 @@ msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren" #: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" -msgstr "Anwendung des Filters fΓΌr spΓ€rliches Auschecken ΓΌberspringen" +msgstr "Anwendung des Filters fΓΌr partielles Auschecken ΓΌberspringen" #: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "Entpacken der BΓ€ume protokollieren" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <Git-Verzeichnis>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "weniger Ausgaben" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Sie mΓΌssen ein Repository angeben." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9960,21 +10330,23 @@ msgstr "* Remote-Repository %s" msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(keine URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9982,159 +10354,159 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, kΓΆnnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokaler Branch konfiguriert fΓΌr 'git pull':" msgstr[1] " Lokale Branches konfiguriert fΓΌr 'git pull':" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert fΓΌr 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert fΓΌr 'git push'%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemÀà dem Remote-Repository" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Mehrere Hauptbranches im Remote-Repository. Bitte wΓ€hlen Sie explizit einen " "aus mit:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "keine gΓΌltige Referenz: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [wΓΌrde veralteten Branch entfernen] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "Branch hinzufΓΌgen" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "nur URLs fΓΌr Push ausgeben" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "alle URLs ausgeben" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Keine URLs fΓΌr Remote-Repository '%s' konfiguriert." -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "URLs fΓΌr \"push\" manipulieren" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "URL hinzufΓΌgen" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "URLs lΓΆschen" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete kΓΆnnen nicht gemeinsam verwendet werden." -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungΓΌltiges altes URL Format: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht fΓΌr \"push\" bestimmt sind" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" @@ -10652,13 +11024,6 @@ msgstr "rekursive Entfernung erlauben" msgid "exit with a zero status even if nothing matched" msgstr "mit RΓΌckgabewert 0 beenden, wenn keine Γbereinstimmung gefunden wurde" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Bitte merken Sie Ihre Γnderungen in .gitmodules zum Commit vor oder " -"benutzen\n" -"Sie \"stash\", um fortzufahren." - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10869,81 +11234,182 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Referenz nicht gefunden: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "VollstΓ€ndiger Referenzname erwartet, %s erhalten" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "Alternativer Anker fΓΌr relative Pfade" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "Keine URL fΓΌr Submodul-Pfad '%s' in .gitmodules gefunden" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Fehler beim Eintragen der URL fΓΌr Submodul-Pfad '%s' in die Konfiguration." + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Submodul '%s' (%s) fΓΌr Pfad '%s' in die Konfiguration eingetragen.\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "Warnung: 'update'-Modus fΓΌr Submodul '%s' vorgeschlagen\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" +"Fehler bei Γnderung des Aktualisierungsmodus fΓΌr Submodul-Pfad '%s' in der\n" +"Konfiguration." + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrΓΌcken" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<Pfad>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <Pfad>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Keine Submodul-Zuordnung in .gitmodules fΓΌr Pfad '%s' gefunden" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "Pfad fΓΌr neues Submodul" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "Name des neuen Submoduls" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "URL von der das Submodul geklont wird" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollstΓ€ndiger Historie (shallow)" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" -msgstr "" -"git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference " -"<Repository>] [--name <Name>] [--url <URL>][--depth <Tiefe>] [--] [<Pfad>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference <Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth <Tiefe>] --url <URL> --path <Pfad>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "Kann Datei '%s' nicht ΓΆffnen" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "Konnte Datei '%s' nicht schlieΓen." -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "fatal: submodule--helper muss mit einem Unterbefehl aufgerufen werden" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Submodul-Pfad '%s' nicht initialisiert" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Meinten Sie vielleicht 'update --init'?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Γberspringe nicht zusammengefΓΌhrtes Submodul %s" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Γberspringe Submodul '%s'" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "Pfad zum Arbeitsverzeichnis" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "Pfad zum Arbeitsverzeichnis, ΓΌber verschachtelte Submodul-Grenzen hinweg" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout oder none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "" +"Erstellung eines Klons mit unvollstΓ€ndiger Historie (shallow), abgeschnitten bei\n" +"der angegebenen Anzahl von Commits." + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "Parallele AusfΓΌhrungen" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "keine Fortschrittsanzeige beim Klonen" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "Fehlerhafter Wert fΓΌr --update Parameter" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden" + +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "fatal: '%s' ist kein gΓΌltiger Unterbefehl von submodule--helper" +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' ist kein gΓΌltiger Unterbefehl von submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10998,27 +11464,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <Tagname>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "Tagname zu lang: %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "Tag '%s' nicht gefunden." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' gelΓΆscht (war %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "Konnte Tag '%s' nicht verifizieren" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -11031,7 +11492,7 @@ msgstr "" " %s\n" "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -11163,21 +11624,21 @@ msgstr "Die Optionen --merged und --no-merged sind nur mit -l erlaubt." msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gΓΌltiger Tagname." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" @@ -11445,7 +11906,7 @@ msgstr "git verify-commit [-v | --verbose] <Commit>..." msgid "print commit contents" msgstr "Commit-Inhalte ausgeben" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben" @@ -11465,7 +11926,7 @@ msgstr "nur Statistiken anzeigen" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <Tag>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "Tag-Inhalte ausgeben" @@ -11481,70 +11942,74 @@ msgstr "git worktree prune [<Optionen>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<Optionen>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "LΓΆsche worktrees/%s: kein gΓΌltiges Verzeichnis" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "LΓΆsche worktrees/%s: gitdir-Datei existiert nicht" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "LΓΆsche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "LΓΆsche worktrees/%s: ungΓΌltige gitdir-Datei" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "LΓΆsche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "Fehler beim LΓΆschen: %s" +msgid "failed to remove '%s'" +msgstr "Fehler beim LΓΆschen von '%s'" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Bereite %s vor (Identifikation %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "<Branch> auschecken, auch wenn dieser bereits in einem anderen " "Arbeitsverzeichnis ausgecheckt ist" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslΓΆsen" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "das neue Arbeitsverzeichnis auschecken" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schlieΓen sich gegenseitig aus" @@ -11564,7 +12029,7 @@ msgstr "das \"Tree\"-Objekt fΓΌr ein Unterverzeichnis <PrΓ€fix> schreiben" msgid "only useful for debugging" msgstr "nur nΓΌtzlich fΓΌr Fehlersuche" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben" @@ -11579,7 +12044,7 @@ msgstr "" "oder 'git help <Konzept>', um mehr ΓΌber einen spezifischen Befehl oder\n" "Konzept zu erfahren." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" "Das Anheften des ΓΆffentlichen SchlΓΌssels wird mit cURL < 7.44.0\n" @@ -11719,7 +12184,7 @@ msgstr "weniger Ausgaben" msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "Index, wenn mΓΆglich, mit wiederverwendeter KonfliktauflΓΆsung aktualisieren" @@ -11941,16 +12406,16 @@ msgstr "" "Um den ursprΓΌnglichen Branch wiederherzustellen und den Rebase abzubrechen,\n" "fΓΌhren Sie \"git rebase --abort\" aus." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "\"autostash\" angewendet." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kann $stash_sha1 nicht speichern." -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11960,33 +12425,29 @@ msgstr "" "Ihre Γnderungen sind im Stash sicher.\n" "Sie kΓΆnnen jederzeit \"git stash pop\" oder \"git stash drop\" ausfΓΌhren.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurΓΌckgewiesen." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchfΓΌhren." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "Die Option --exec muss mit --interactive verwendet werden." - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Die --edit-todo Aktion kann nur wΓ€hrend eines interaktiven Rebase verwendet " "werden." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11994,12 +12455,12 @@ msgstr "" "Sie mΓΌssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelΓΆst markieren" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Konnte nicht zu $head_name zurΓΌckgehen" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -12020,67 +12481,67 @@ msgstr "" "und fΓΌhren Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas SchΓΌtzenswertes vorhanden ist." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ungΓΌltiger Upstream-Branch $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: es gibt mehr als eine Merge-Basis" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: es gibt keine Merge-Basis" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "$onto_name zeigt auf keinen gΓΌltigen Commit" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: Branch $branch_name nicht gefunden" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Kann \"autostash\" nicht ausfΓΌhren." -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "\"autostash\" erzeugt: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Γnderungen oder benutzen Sie \"stash\"." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Γnderungen von $mb zu $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "ZunΓ€chst wird der Branch zurΓΌckgespult, um Ihre Γnderungen\n" "darauf neu anzuwenden ..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name zu $onto_name vorgespult." @@ -12225,28 +12686,23 @@ msgstr "Kein Branchname spezifiziert" msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Relative Pfade kΓΆnnen nur von der obersten Ebene des Arbeitsverzeichnisses " "benutzt werden." -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12257,24 +12713,24 @@ msgstr "" "$sm_path\n" "Benutzen Sie -f wenn Sie diesen wirklich hinzufΓΌgen mΓΆchten." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "FΓΌge existierendes Repository in '$sm_path' dem Index hinzu." -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existiert bereits und ist kein gΓΌltiges Git-Repository" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Ein Git-Verzeichnis fΓΌr '$sm_name' wurde lokal gefunden mit den Remote-" "Repositories:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -12282,7 +12738,7 @@ msgstr "" "Wenn Sie dieses lokale Git-Verzeichnis wiederverwenden mΓΆchtest, anstatt " "erneut zu klonen" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" @@ -12290,7 +12746,7 @@ msgstr "" "benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das " "korrekte Repository ist" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -12299,77 +12755,56 @@ msgstr "" "oder Sie sich unsicher sind, was das bedeutet, wΓ€hlen Sie einen anderen " "Namen mit der Option '--name'." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reaktiviere lokales Git-Verzeichnis fΓΌr Submodul '$sm_name'." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kann Submodul '$sm_path' nicht auschecken" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "HinzufΓΌgen von Submodul '$sm_path' fehlgeschlagen" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Betrete '$prefix$displaypath'" - -#: git-submodule.sh:437 -#, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "Stoppe bei '$prefix$displaypath'; Skript gab nicht-Null Status zurΓΌck." - -#: git-submodule.sh:483 -#, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "Keine URL fΓΌr Submodul-Pfad '$displaypath' in .gitmodules gefunden" - -#: git-submodule.sh:492 +#: git-submodule.sh:355 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "" -"Fehler beim Eintragen der URL fΓΌr Submodul-Pfad '$displaypath' in die " -"Konfiguration." +msgid "Entering '$displaypath'" +msgstr "Betrete '$displaypath'" -#: git-submodule.sh:494 +#: git-submodule.sh:375 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "" -"Submodul '$name' ($url) fΓΌr Pfad '$displaypath' in die Konfiguration " -"eingetragen." +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurΓΌck." -#: git-submodule.sh:511 +#: git-submodule.sh:448 #, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Fehler bei Γnderung des Aktualisierungsmodus fΓΌr Submodul-Pfad " -"'$displaypath' in der Konfiguration." +msgid "pathspec and --all are incompatible" +msgstr "Pfadspezifikationen und --all sind inkompatibel." -#: git-submodule.sh:549 +#: git-submodule.sh:453 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" +msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -"Verwenden Sie '.' wenn Sie wirklich alle Submodule\n" -"deinitialisieren mΓΆchten." +"Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n" +"mΓΆchten." -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Arbeitsverzeichnis des Submoduls in '$displaypath' enthΓ€lt ein .git-" "Verzeichnis" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -12377,7 +12812,7 @@ msgstr "" "(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n" "seiner Historie lΓΆschen mΓΆchten)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12386,142 +12821,178 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '$displaypath' enthΓ€lt lokale Γnderungen; " "verwenden Sie '-f', um diese zu verwerfen" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Verzeichnis '$displaypath' bereinigt." -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht lΓΆschen." -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" "Konnte kein leeres Verzeichnis fΓΌr Submodul in '$displaypath' erstellen." -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Submodul '$name' ($url) fΓΌr Pfad '$displaypath' wurde aus der Konfiguration " "entfernt." -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Submodul-Pfad '$displaypath' ist nicht initialisiert.\n" -"Vielleicht mΓΆchten Sie 'update --init' benutzen?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausfΓΌhren" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausfΓΌhren" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht mΓΆglich" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengefΓΌhrt in '$sha1'" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "" -"AusfΓΌhrung von '$command $sha1' in Submodul-Pfad '$prefix$sm_path' " -"fehlgeschlagen" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "AusfΓΌhrung von '$command $sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Submodul-Pfad '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "" "Die Optionen --cached und --files kΓΆnnen nicht gemeinsam verwendet werden." -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "Blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL fΓΌr '$displaypath'" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Siehe git-${cmd}(1) fΓΌr weitere Details." + +#~ msgid "'%s': %s" +#~ msgstr "'%s': %s" + +#~ msgid "unable to access '%s': %s" +#~ msgstr "konnte nicht auf '%s' zugreifen: %s" + +#~ msgid "could not open '%s' for reading: %s" +#~ msgstr "Konnte '%s' nicht zum Lesen ΓΆffnen: %s" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "Konnte '%s' nicht zum Schreiben ΓΆffnen: %s" + +#~ msgid " git branch -d %s\n" +#~ msgstr " git branch -d %s\n" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "kann %s nicht ΓΆffnen: %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "Bitte merken Sie Ihre Γnderungen in .gitmodules zum Commit vor oder " +#~ "benutzen\n" +#~ "Sie \"stash\", um fortzufahren." + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "Konnte Tag '%s' nicht verifizieren" + +#~ msgid "failed to remove: %s" +#~ msgstr "Fehler beim LΓΆschen: %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "Die Option --exec muss mit --interactive verwendet werden." + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Submodul-Pfad '$displaypath' ist nicht initialisiert.\n" +#~ "Vielleicht mΓΆchten Sie 'update --init' benutzen?" + #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "lokale Commits auf einem aktuellerem Upstream-Branch neu aufbauen" @@ -12592,9 +13063,6 @@ msgstr "Synchronisiere Submodul-URL fΓΌr '$displaypath'" #~ msgid "Could not append '%s'" #~ msgstr "Konnte '%s' nicht anhΓ€ngen." -#~ msgid "Could not set '%s'" -#~ msgstr "Konnte '%s' nicht setzen" - #~ msgid "Missing author: %s" #~ msgstr "fehlender Autor: %s" @@ -12732,13 +13200,6 @@ msgstr "Synchronisiere Submodul-URL fΓΌr '$displaypath'" #~ msgstr "" #~ "\"pull\" ist nicht mΓΆglich, weil Sie nicht zusammengefΓΌhrte Dateien haben." -#~ msgid "" -#~ "You have not concluded your merge (MERGE_HEAD exists).\n" -#~ "Please, commit your changes before you can merge." -#~ msgstr "" -#~ "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" -#~ "Bitte committen Sie Ihre Γnderungen, bevor Sie \"merge\" ausfΓΌhren kΓΆnnen." - #~ msgid "no branch specified" #~ msgstr "Kein Branch spezifiziert" @@ -12951,13 +13412,6 @@ msgstr "Synchronisiere Submodul-URL fΓΌr '$displaypath'" #~ msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "Die folgenden unbeobachteten Dateien wΓΌrden NICHT gespeichert werden,\n" -#~ "mΓΌssen aber durch \"stash save\" entfernt werden:" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "" #~ "Abgebrochen. Benutzen Sie entweder die Option --force oder --include-" @@ -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: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-14 20:26+0100\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-26 22:46+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" @@ -96,7 +96,7 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nΓ©cessaire pour marquer la rΓ©solution et valider." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminΓ© votre fusion (MERGE_HEAD existe)." @@ -140,7 +140,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "prΓ©fixe" @@ -148,9 +148,9 @@ msgstr "prΓ©fixe" msgid "prepend prefix to each pathname in the archive" msgstr "prΓ©fixer chaque chemin de fichier dans l'archive" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549 #: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459 #: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561 #: builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -184,7 +184,8 @@ msgstr "compression efficace" msgid "list supported archive formats" msgstr "afficher les formats d'archive supportΓ©s" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "dΓ©pΓ΄t" @@ -343,11 +344,16 @@ msgstr "Nom d'objet ambigu : '%s'." msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est dΓ©jΓ extrait dans '%s'" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "la HEAD de la copie de travail %s n'est pas mise Γ jour" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -358,7 +364,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:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -367,10 +373,10 @@ 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 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "Γ©chec de la prΓ©paration du parcours des rΓ©visions" @@ -409,21 +415,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:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Refus de crΓ©er un colis vide." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "impossible de crΓ©er '%s'" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -432,8 +438,8 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -468,21 +474,21 @@ msgstr "valeur numΓ©rique de configuration invalide '%s' pour '%s' : %s" msgid "failed to expand user dir in: '%s'" msgstr "impossible d'Γ©tendre le rΓ©pertoire utilisateur dans : '%s'" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la crΓ©ation d'objet : %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" @@ -503,24 +509,27 @@ msgstr "" msgid "%s has multiple values" msgstr "%s a des valeurs multiples" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "impossible de rΓ©gler '%s' Γ '%s'" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "Impossible de rΓ©gler '%s' Γ '%s'" +msgid "could not unset '%s'" +msgstr "impossible de dΓ©sinitialiser '%s'" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "impossible d'Γ©crire dans la rev-list : %s" +msgid "failed write to rev-list" +msgstr "impossible d'Γ©crire dans la rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "impossible de fermer l'entrΓ©e standard du rev-list : %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "impossible de fermer l'entrΓ©e standard du rev-list" #: date.c:95 msgid "in the future" @@ -595,28 +604,28 @@ 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:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "DΓ©tection de renommage inexact en cours" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " ParamΓ¨tre dirstat inconnu '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -625,16 +634,16 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrΓͺt Γ %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spΓ©cification de chemin unique" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -643,20 +652,20 @@ msgstr "" "Impossible d'analyser le paramΓ¨tre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramΓ¨tre de l'option --submodule : '%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "Le cache non suivi est dΓ©sactivΓ© sur ce systΓ¨me ou sur cet endroit." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "impossible de lancer gpg." @@ -670,28 +679,28 @@ msgstr "gpg n'a pas pu signer les donnΓ©es" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "impossible de crΓ©er un fichier temporaire '%s' : %s" +msgid "could not create temporary file '%s'" +msgstr "impossible de crΓ©er un fichier temporaire '%s'" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "impossible d'Γ©crire la signature dΓ©tachΓ©e dans '%s' : %s" +msgid "failed writing detached signature to '%s'" +msgstr "impossible d'Γ©crire la signature dΓ©tachΓ©e dans '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s' : %s" +msgid "failed to stat '%s'" +msgstr "Γ©chec du stat de '%s'" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s' : lecture tronquΓ©e %s" +msgid "'%s': short read" +msgstr "'%s' : lecture tronquΓ©e" #: help.c:205 #, c-format @@ -758,12 +767,36 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Impossible de crΓ©er '%s.lock'Β : %s.\n" +"\n" +"Il semble qu'un autre processus git est dΓ©jΓ lancΓ© dans ce dΓ©pΓ΄t,\n" +"par exemple un Γ©diteur ouvert par 'git commit'. Veuillez vous assurer\n" +"que tous les processus sont terminΓ©s et rΓ©essayez. Si l'echec persiste,\n" +"un processus git peut avoir planté :\n" +"supprimez le fichier manuellement pour poursuivre." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Impossible de crΓ©er '%s.lock'Β : %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "impossible d'Γ©crire le nouveau fichier d'index" @@ -810,7 +843,7 @@ msgstr "impossible de lire l'objet %s '%s'" msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "Γ©chec Γ l'ouverture de '%s'" @@ -946,7 +979,7 @@ msgstr "%s sautΓ© (fusion identique Γ l'existant)" msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "sous-module" @@ -974,50 +1007,50 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un rΓ©pertoire nommΓ© %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Γchec fatal de fusion, qui ne devrait jamais arriver." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "DΓ©jΓ Γ jour !" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "Γ©chec de fusion des arbres %s et %s" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Chemin non traitΓ© ??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, 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:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "la fusion n'a pas retournΓ© de commit" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Impossible d'Γ©crire l'index." @@ -1047,28 +1080,28 @@ msgstr "Mauvaise valeur de %s : '%s'" msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" @@ -1077,7 +1110,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nom d'objet malformΓ© '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" @@ -1150,7 +1183,7 @@ msgstr "" "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n" "Peut-Γͺtre avez-vous oubliΓ© d'ajouter ':/' ou '.' ?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" @@ -1176,23 +1209,23 @@ msgstr "" "GIT_INDEX_VERSION est renseignΓ©, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en Γ©criture" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la rΓ©fΓ©rence %sΒ : %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les rΓ©fΓ©rencesΒ : %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "impossible de supprimer la rΓ©fΓ©rence %s" @@ -1331,96 +1364,96 @@ msgstr "format: atome %%(end) manquant" msgid "malformed object name %s" msgstr "nom d'objet malformΓ© %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de rΓ©cupΓ©rer Γ la fois %s et %s pour %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit Γ la fois %s et %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurΓ©e pour la branche '%s'" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branche amont '%s' n'est pas stockΓ©e comme branche de suivi" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destination de poussΓ©e '%s' sur le serveur distant '%s' n'a pas de " "branche locale de suivi" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussΓ©e" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les rΓ©fΓ©rences de spec pour '%s' n'incluent pas '%s'" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussΓ©e n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de rΓ©soudre une poussΓ©e 'simple' pour une destination unique" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basΓ©e sur '%s', mais la branche amont a disparu.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Votre branche est Γ jour avec '%s'.\n" -#: remote.c:2084 +#: remote.c:2085 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1432,11 +1465,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut Γͺtre mise Γ jour " "en avance rapide.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre Γ jour votre branche locale)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1451,21 +1484,21 @@ msgstr[1] "" "Votre branche et '%s' ont divergΓ©,\n" "et ont %d et %d commits diffΓ©rents chacune respectivement.\n" -#: remote.c:2114 +#: remote.c:2115 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" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassΓ©e" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" @@ -1516,7 +1549,7 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le rΓ©sultat avec 'git commit'" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Impossible d'Γ©crire dans %s" @@ -1676,12 +1709,12 @@ msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" msgid "Could not create sequencer directory %s" msgstr "Impossible de crΓ©er le rΓ©pertoire de sΓ©quenceur %s" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" @@ -1693,63 +1726,72 @@ msgstr "impossible de rΓ©soudre HEAD" msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "impossible d'ouvrir %s : %s" +msgid "cannot open %s" +msgstr "impossible d'ouvrir %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:888 +#: sequencer.c:887 #, 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:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise rΓ©vision" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "Γ©chec de la lecture de %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Version attendue du dΓ©pΓ΄t git <= %d, %d trouvΓ©e" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "extensions de dΓ©pΓ΄t inconnues trouvΓ©esΒ :" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le dΓ©but de l'index de paquet pour %s (index corrompuΒ ?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -1780,32 +1822,41 @@ msgstr "" "message\n" "en lanΓ§ant \"git config advice.objectNameWarning false\"" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Modification impossible de .gitmodules non fusionnΓ©, rΓ©solvez les conflits " "d'abord" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Impossible de trouver une section oΓΉ path=%s dans .gitmodules" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre Γ jour l'Γ©lΓ©ment %s de .gitmodules" # ici %s est un chemin -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Impossible de supprimer l'Γ©lΓ©ment de .gitmodules pour %s" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "Γ©chec de la mise en index du .gitmodules mis Γ jour" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "les valeurs nΓ©gatives ne sont pas permises pour submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "Valeur invalide pour %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1865,7 +1916,219 @@ msgstr "impossible de renommer un fichier temporaire en %s" msgid "Could not read ref %s" msgstr "impossible de lire la rΓ©f %s" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"Vos modifications locales aux fichiers suivants seraient Γ©crasΓ©es par l'extractionΒ :\n" +"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient Γ©crasΓ©es par l'extractionΒ :\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"Vos modifications locales aux fichiers suivants seraient Γ©crasΓ©es par la fusionΒ :\n" +"%%sVeuillez valider ou remiser vos modifications avant la fusion." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient Γ©crasΓ©es par la fusionΒ :\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"Vos modifications locales aux fichiers suivants seraient Γ©crasΓ©es par %sΒ :\n" +"%%sVeuillez valider ou remiser vos modifications avant %s." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient Γ©crasΓ©es par %sΒ :\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"La mise Γ jour des rΓ©pertoires suivants effacerait les fichiers non suivis contenusΒ :\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Les fichiers suivants non suivis seraient effacΓ©s par l'extractionΒ :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacΓ©s par l'extractionΒ :\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Les fichiers suivants non suivis seraient effacΓ©s par la fusionΒ :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant la fusion." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacΓ©s par la fusionΒ :\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Les fichiers suivants non suivis seraient effacΓ©s par %sΒ :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacΓ©s par %sΒ :\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Les fichiers suivants non suivis seraient Γ©crasΓ©s par l'extractionΒ :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient Γ©crasΓ©s par l'extractionΒ :\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Les fichiers suivants non suivis seraient effacΓ©s par la fusionΒ :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant la fusion." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient Γ©crasΓ©s par la fusionΒ :\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Les fichiers suivants non suivis seraient Γ©crasΓ©s par %sΒ :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient Γ©crasΓ©s par %sΒ :\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "L'entrΓ©e '%s' surcharge avec '%s'. Affectation impossible." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Mise Γ jour d'extraction creuse impossibleΒ : les entrΓ©es suivantes ne sont pas Γ jourΒ :\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Les fichiers suivants de la copie de travail seraient Γ©crasΓ©s par la mise Γ jour par extraction creuseΒ :\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Les fichiers suivants de la copie de travail seraient supprimΓ©s par la mise Γ jour par extraction creuseΒ :\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Abandon\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -1903,201 +2166,197 @@ msgstr "segment de chemin '..' invalide" msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/Γ©criture" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en Γ©criture" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "impossible d'accΓ©der Γ '%s' : %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accΓ©der Γ '%s'" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "impossible d'accΓ©der au rΓ©pertoire de travail courant" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "Impossible d'ouvrir '%s' en Γ©criture" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "Impossible d'Γ©crire dans %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "impossible de fermer %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Chemins non fusionnΓ©s :" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (utilisez \"git reset %s <fichier>...\" pour dΓ©sindexer)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour dΓ©sindexer)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme rΓ©solu)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm <fichier>...\" si nΓ©cessaire pour marquer comme " "rΓ©solu)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme rΓ©solu)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Modifications qui seront validΓ©es :" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validΓ©es :" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add <fichier>...\" pour mettre Γ jour ce qui sera validΓ©)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm <fichier>...\" pour mettre Γ jour ce qui sera " "validΓ©)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " "dans la copie de travail)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifiΓ© dans les sous-modules)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validΓ©)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "supprimΓ© des deux cΓ΄tΓ©s :" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "ajoutΓ© par nous :" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "supprimΓ© par eux :" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "ajoutΓ© par eux :" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "supprimΓ© par nous :" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "ajoutΓ© de deux cΓ΄tΓ©s :" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "modifiΓ© des deux cΓ΄tΓ©s :" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "bogue : Γ©tat de non-fusion non gΓ©rΓ© %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "nouveau fichierΒ :" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "copié :" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "supprimé :" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "modifié :" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "renommé :" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "modif. typeΒ :" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "inconnuΒ :" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "non fusionné :" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "nouveaux commits, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "contenu modifiΓ©, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "bogue : Γ©tat de diff non gΓ©rΓ© %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiΓ©s mais non mis Γ jour :" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module Γ valider :" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2105,39 +2364,39 @@ msgstr "" "Ne touchez pas Γ la ligne ci-dessus\n" "Tout ce qui suit sera Γ©liminΓ©." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnΓ©s." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (rΓ©glez les conflits puis lancez \"git commit\")" -#: wt-status.c:954 +#: wt-status.c:956 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:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Vous Γͺtes au milieu d'une session am." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rΓ©glez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" @@ -2286,43 +2545,43 @@ msgstr "Vous Γͺtes en cours de bissection." msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir Γ la branche d'origine)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD dΓ©tachΓ©e sur " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD dΓ©tachΓ©e depuis " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Fichiers ignorΓ©s" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2334,32 +2593,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-mΓͺme (voir 'git help " "status')." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichΓ©s%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutΓ©e Γ la validation\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2368,57 +2627,57 @@ 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:1522 +#: wt-status.c:1544 #, 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:1525 +#: wt-status.c:1547 #, 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:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "rien Γ valider\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, 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:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien Γ valider, la copie de travail est propre\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Validation initiale sur " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" # Γ priori on parle d'une branche ici -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "disparue" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "derriΓ¨re " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "devant " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "Γ©chec lors de l'unlink de '%s'" @@ -2432,7 +2691,7 @@ msgstr "git add [<options>] [--] <chemin>..." msgid "unexpected diff status %c" msgstr "status de diff inattendu %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "Γ©chec de la mise Γ jour des fichiers" @@ -2445,7 +2704,7 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexΓ©es aprΓ¨s rafraΓchissement de l'index :" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -2482,14 +2741,14 @@ msgstr "" "Les chemins suivants sont ignorΓ©s par un de vos fichiers .gitignore :\n" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "mode verbeux" @@ -2497,7 +2756,7 @@ msgstr "mode verbeux" msgid "interactive picking" msgstr "sΓ©lection interactive" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "sΓ©lection interactive des sections" @@ -2569,16 +2828,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sΓ»rement dire 'git add .' ?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Impossible d'Γ©crire le nouveau fichier d'index" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" @@ -2606,16 +2865,6 @@ msgstr "Impossible de copier les notes de '%s' vers '%s'" msgid "fseek failed" msgstr "Γ©chec de fseek" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "impossible d'ouvrir '%s' en lectureΒ : %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "impossible d'ouvrir '%s' en Γ©critureΒ : %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2625,78 +2874,78 @@ msgstr "impossible d'analyser le patch '%s'" msgid "Only one StGIT patch series can be applied at once" msgstr "Seulement une sΓ©rie de patchs StGIT peut Γͺtre appliquΓ©e Γ la fois" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "dΓ©calage horaire invalide" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Γchec de dΓ©tection du format du patch." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "Γ©chec de la crΓ©ation du rΓ©pertoire '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Γchec de dΓ©coupage des patchs." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "impossible d'Γ©crire le fichier d'index" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez rΓ©solu ce problΓ¨me, lancez \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous prΓ©fΓ©rez plutΓ΄t sauter ce patch, lancez \"%s --skip\"." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Pour restaurer la branche originale et arrΓͺter de patcher, lancez \"%s --" "abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Le patch est vide. Le dΓ©coupage Γ©tait-il bonΒ ?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Le dΓ©pΓ΄t n'a pas les blobs nΓ©cessaires pour un retour Γ une fusion Γ 3 " "points." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2704,38 +2953,38 @@ msgstr "" "Avez-vous Γ©ditΓ© le patch Γ la main ?\n" "Il ne s'applique pas aux blobs enregistrΓ©s dans son index." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour Γ un patch de la base et fusion Γ 3 points..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Γchec d'intΓ©gration des modifications." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree a Γ©chouΓ© Γ Γ©crire un arbre" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "application Γ un historique vide" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "Γ©chec de l'Γ©criture de l'objet commit" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "impossible d'Γͺtre interactif sans entrΓ©e standard connectΓ©e Γ un terminal." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -2743,35 +2992,35 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept allΒ : " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch dΓ©jΓ appliquΓ©." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a Γ©chouΓ© Γ %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La copie du patch qui a Γ©chouΓ© se trouve dans : %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2782,7 +3031,7 @@ msgstr "" "introduit les mΓͺmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2790,17 +3039,17 @@ msgstr "" "Vous avez toujours des chemins non fusionnΓ©s dans votre index\n" "Auriez-vous oubliΓ© de faire 'git add' ?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "Γ©chec du nettoyage de l'index" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2808,154 +3057,156 @@ msgstr "" "Vous semblez avoir dΓ©placΓ© la HEAD depuis le dernier Γ©chec de 'am'.\n" "Pas de retour Γ ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<options>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --quit | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "exΓ©cution interactive" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir Γ une fusion Γ 3 points si nΓ©cessaire" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "Γͺtre silencieux" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par dΓ©faut)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k Γ git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b Γ git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m Γ git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr Γ git-mailsplit fpour le format mbox" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr Γ git-mailsplit indΓ©pendamment de am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "action" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "le passer jusqu'Γ git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "racine" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "chemin" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 #: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "num" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "format" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "format de prΓ©sentation des patchs" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un Γ©chec d'application de patch" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "continuer Γ appliquer les patchs aprΓ¨s rΓ©solution d'un conflit" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "id-clΓ©" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2963,17 +3214,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimΓ©e. Veuillez ne plus l'utiliser." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "Γ©chec Γ la lecture de l'index" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le rΓ©pertoire prΓ©cΓ©dent de rebasage %s existe toujours mais mbox donnΓ©e." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2982,7 +3233,7 @@ msgstr "" "RΓ©pertoire abandonnΓ© %s trouvΓ©.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de rΓ©solution de l'opΓ©ration en cours, nous ne sommes pas dans une " @@ -3017,44 +3268,44 @@ msgstr "regexec a retournΓ© %d pour l'entrΓ©e : %s" msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable Γ la ligne %d" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, 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:944 +#: builtin/apply.c:942 #, 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:945 +#: builtin/apply.c:943 #, 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:952 +#: builtin/apply.c:949 #, 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, 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:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -3069,77 +3320,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:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "le nouveau fichier dΓ©pend de contenus anciens" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "le fichier supprimΓ© a encore du contenu" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu Γ la ligne %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dΓ©pend de contenus anciens" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimΓ© %s a encore du contenu" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, 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:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu Γ la ligne %d : %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu Γ la ligne %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incomprΓ©hensible Γ la ligne %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "dΓ©but de ligne invalide : '%c'" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, 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:2908 +#: builtin/apply.c:2906 #, 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:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3148,330 +3399,340 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "donnΓ©es de patch binaire manquantes pour '%s'" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement Γ '%s'" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, 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:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a Γ©chouΓ© : %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "Γ©chec de la lecture de %s" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delΓ d'un lien symbolique" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a Γ©tΓ© renommΓ©/supprimΓ©" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas Γ l'index" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s : type erronΓ©" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s : existe dΓ©jΓ dans l'index" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe dΓ©jΓ dans la copie de travail" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, 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:3774 +#: builtin/apply.c:3772 #, 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:3794 +#: builtin/apply.c:3792 #, 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:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "VΓ©rification du patch %s..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "Γ©chec de make_cache_entry pour le chemin '%s'" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, 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:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'Γ©lΓ©ment de cache %s impossible" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "Γ©criture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliquΓ© proprement." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "erreur interne" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, 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:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "impossible d'ouvrir %s : %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section nΒ°%d appliquΓ©e proprement." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Section nΒ°%d rejetΓ©e." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Chemin '%s' non traitΓ©." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "entrΓ©e non reconnue" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donnΓ©" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donnΓ©" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ignorer les additions rΓ©alisΓ©es par le patch" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 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:4522 +#: builtin/apply.c:4524 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:4524 +#: builtin/apply.c:4526 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:4526 +#: builtin/apply.c:4528 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:4528 +#: builtin/apply.c:4530 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:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher Γ la copie de travail" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 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:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (Γ utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 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:4538 +#: builtin/apply.c:4540 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:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "les chemins sont sΓ©parΓ©s par un caractΓ¨re NUL" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 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:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre Γ au moins une ligne de contexte" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetΓ©es dans les fichiers *.rej correspondants" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 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:4566 +#: builtin/apply.c:4568 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:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "prΓ©fixer tous les noms de fichier avec <root>" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way hors d'un dΓ©pΓ΄t" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index hors d'un dΓ©pΓ΄t" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached hors d'un dΓ©pΓ΄t" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, 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:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3537,104 +3798,104 @@ msgstr "<options-de-rΓ©vision> sont documentΓ©s dans git-rev-list(1)" msgid "Blaming lines" msgstr "Assignation de blΓ’me au lignes" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 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:2531 +#: builtin/blame.c:2532 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:2532 +#: builtin/blame.c:2533 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:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coΓ»t d'activitΓ©" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'Γ©tat d'avancement" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les Γ©lΓ©ments de blΓ’me" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (DΓ©faut : auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numΓ©ros de lignes originaux (DΓ©faut : dΓ©sactivΓ©)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice Γ la consommation par machine" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 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:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (DΓ©faut : dΓ©sactivΓ©)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (DΓ©faut : dΓ©sactivΓ©)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 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:2544 +#: builtin/blame.c:2545 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:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Ignorer les diffΓ©rences d'espace" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "" "DΓ©penser des cycles supplΓ©mentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 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:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "score" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 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" @@ -3645,32 +3906,32 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 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:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<options>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3679,7 +3940,7 @@ msgstr "" "suppression de la branche '%s' qui a Γ©tΓ© fusionnΓ©e dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3688,12 +3949,12 @@ msgstr "" "branche '%s' non supprimΓ©e car elle n'a pas Γ©tΓ© fusionnΓ©e dans\n" " '%s', mΓͺme si elle est fusionnΓ©e dans HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3702,301 +3963,322 @@ msgstr "" "La branche '%s' n'est pas totalement fusionnΓ©e.\n" "Si vous Γͺtes sur que vous voulez la supprimer, lancez 'git branch -D %s'." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Γchec de la mise Γ jour du fichier de configuration" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Impossible de supprimer la branche '%s' sur laquelle vous Γͺtes." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvΓ©e." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvΓ©e." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Erreur lors de la suppression de la branche de suivi '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche de suivi %s supprimΓ©e (prΓ©cΓ©demment %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimΓ©e (prΓ©cΓ©demment %s).\n" # fΓ©minin pour une branche -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: disparue]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s : en avance de %d, en retard de %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** rΓ©fΓ©rence invalide ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a dΓ©marrΓ© sur %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD dΓ©tachΓ©e sur %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD dΓ©tachΓ©e depuis %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "La branche %s est en cours de rebasage sur %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "La branche %s est en cours de bissection sur %s" + +#: builtin/branch.c:560 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:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Γchec de renommage de la branche" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommΓ©e '%s'" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, 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:564 +#: builtin/branch.c:601 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:586 -#, 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:623 +msgid "could not write branch description template" +msgstr "impossible d'Γ©crire le modΓ¨le de description de branche" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Options gΓ©nΓ©riques" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublΓ© pour la branche amont" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "rΓ©gler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "amont" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "modifier l'information amont" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Actions spΓ©cifiques Γ git-branch :" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "afficher Γ la fois les branches de suivi et les branches locales" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnΓ©e" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (mΓͺme non fusionnΓ©e)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "dΓ©placer/renommer une branche et son reflog" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "dΓ©placer/renommer une branche, mΓͺme si la cible existe" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "crΓ©er le reflog de la branche" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "Γ©diter la description de la branche" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "forcer la crΓ©ation, le dΓ©placement/renommage, ou la suppression" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnΓ©es" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnΓ©es" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "clΓ©" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "nom du champ servant Γ trier" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "objet" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Γchec de rΓ©solution de HEAD comme rΓ©fΓ©rence valide." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvΓ©e sous refs/heads !" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Impossible de dΓ©crire une HEAD dΓ©tachΓ©e" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "impossible d'Γ©diter la description de plus d'une branche" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommΓ©e '%s'." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opΓ©ration de renommage" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "trop de branches pour spΓ©cifier une branche amont" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -4004,41 +4286,41 @@ msgstr "" "impossible de spΓ©cifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "trop de branches pour dΓ©sactiver un amont" -#: builtin/branch.c:784 +#: builtin/branch.c:820 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:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "crΓ©er manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:810 +#: builtin/branch.c:846 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:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -4047,7 +4329,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:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -4058,16 +4340,6 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faΓtes ceci :\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4169,7 +4441,7 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrΓ©e et en sortie par un caractΓ¨re NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "supprimer l'Γ©tat d'avancement" @@ -4261,8 +4533,9 @@ msgid "write the content to temporary files" msgstr "Γ©crire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "chaΓne" @@ -4312,81 +4585,81 @@ msgstr "chemin '%s' : impossible de fusionner" msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le rΓ©sultat de fusion pour '%s'" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas Γͺtre utilisΓ© avec des mises Γ jour de chemins" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas Γͺtre utilisΓ© avec %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre Γ jour les chemins et basculer sur la branche '%s' en " "mΓͺme temps." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "fichier d'index corrompu" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionnΓ©" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "vous devez d'abord rΓ©soudre votre index courant" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s'Β : %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "impossible de mettre Γ jour HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise Γ zΓ©ro de la branche '%s'\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "DΓ©jΓ sur '%s'\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise Γ zΓ©ro de la branche '%s'\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4409,7 +4682,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4438,151 +4711,151 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des rΓ©visions" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "La position prΓ©cΓ©dente de HEAD Γ©tait sur" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Vous Γͺtes sur une branche qui doit encore naΓtre" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "une seule rΓ©fΓ©rence attendue, %d fournies." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "rΓ©fΓ©rence invalide : %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "la rΓ©fΓ©rence n'est pas un arbre : %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas Γͺtre utilisΓ© avec un basculement de branches" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas Γͺtre utilisΓ© avec '%s'" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "crΓ©er et extraire une nouvelle branche" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "crΓ©er/rΓ©initialiser et extraire une branche" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "crΓ©er un reflog pour une nouvelle branche" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "dΓ©tacher la HEAD Γ la validation nommΓ©e" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "paramΓ©trer les coordonnΓ©es de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnΓ©s" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnΓ©s" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion Γ 3 points avec la nouvelle branche" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "mettre Γ jour les fichiers ignorΓ©s (par dΓ©faut)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "style" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 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:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "rΓ©essayer d'interprΓ©ter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" "ne pas vΓ©rifier si une autre copie de travail contient le rΓ©fΓ©rence fournie" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "forcer l'affichage de l'Γ©tat d'avancement" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "spΓ©cification de chemin invalide" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4592,12 +4865,12 @@ msgstr "" "en mΓͺme temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut Γͺtre rΓ©solu comme commit ?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4749,8 +5022,8 @@ msgstr "nettoyage interactif" msgid "remove whole directories" msgstr "supprimer les rΓ©pertoires entiers" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "motif" @@ -4790,103 +5063,112 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dΓ©pΓ΄t> [<rΓ©pertoire>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "ne pas crΓ©er d'extraction" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "crΓ©er un dΓ©pΓ΄t nu" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "crΓ©er un dΓ©pΓ΄t miroir (implique dΓ©pΓ΄t nu)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "pour cloner depuis un dΓ©pΓ΄t local" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "rΓ©gler comme dΓ©pΓ΄t partagΓ©" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "nombre de sous-modules clonΓ©s en parallΓ¨le" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "rΓ©pertoire-modΓ¨le" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "rΓ©pertoire depuis lequel les modΓ¨les vont Γͺtre utilisΓ©s" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "dΓ©pΓ΄t de rΓ©fΓ©rence" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du rΓ©pertoire distant" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "crΓ©er un clone superficiel de cette profondeur" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "tous les sous-modules clonΓ©s seront superficiels" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "sΓ©parer le rΓ©pertoire git de la copie de travail" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "clΓ©=valeur" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "rΓ©gler la configuration dans le nouveau dΓ©pΓ΄t" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4894,59 +5176,54 @@ msgstr "" "Aucun nom de rΓ©pertoire n'a pu Γͺtre devinΓ©\n" "Veuillez spΓ©cifier un rΓ©pertoire dans la ligne de commande" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "extraire le dΓ©pΓ΄t de rΓ©fΓ©rence '%s' comme une extraction liΓ©e n'est pas " "encore supportΓ©." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dΓ©pΓ΄t de rΓ©fΓ©rence '%s' n'est pas un dΓ©pΓ΄t local." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dΓ©pΓ΄t de rΓ©fΓ©rence '%s' est superficiel" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dΓ©pΓ΄t de rΓ©fΓ©rence '%s' est greffΓ©" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "Γ©chec du stat de '%s'" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un rΓ©pertoire" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "Γ©chec du stat de %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "Γ©chec de la crΓ©ation du lien '%s'" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "Γ©chec de la copie vers '%s'" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4956,130 +5233,130 @@ msgstr "" "Vous pouvez inspecter ce qui a Γ©tΓ© extrait avec 'git status'\n" "et rΓ©essayer l'extraction avec 'git checkout -f HEAD'\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' Γ cloner." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "VΓ©rification de la connectivitΓ©... " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyΓ© tous les objets nΓ©cessaires" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "impossible de mettre Γ jour %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante rΓ©fΓ¨re Γ une rΓ©fΓ©rence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "impossible d'Γ©crire les paramΓ¨tres dans le fichier de configuration" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Vous devez spΓ©cifier un dΓ©pΓ΄t Γ cloner." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "le dΓ©pΓ΄t '%s' n'existe pas" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe dΓ©jΓ et n'est pas un rΓ©pertoire vide." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe dΓ©jΓ ." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, 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:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de crΓ©er le rΓ©pertoire de la copie de travail '%s'" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dΓ©pΓ΄t nu '%s'\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 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:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "le dΓ©pΓ΄t source est superficiel, option --local ignorΓ©e" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local est ignorΓ©" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, 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:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir clonΓ© un dΓ©pΓ΄t vide." @@ -5222,66 +5499,66 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "Γ©chec du dΓ©paquetage de l'objet arbre HEAD" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "impossible de crΓ©er l'index temporaire" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "Γ©chec de l'ajout interactif" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "impossible de mettre Γ jour l'index temporaire" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Impossible de mettre Γ jour l'arbre de cache principal" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "impossible d'Γ©crire le fichier new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "impossible d'Γ©crire le fichier d'index temporaire" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "entΓͺte d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformΓ©e" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "paramΓ¨tre --author mal formΓ©" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5289,38 +5566,38 @@ msgstr "" "impossible de sΓ©lectionner un caractΓ¨re de commentaire\n" "qui n'est pas utilisΓ© dans le message de validation actuel" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, 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:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrΓ©e standard" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "impossible de lire MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "impossible de lire MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "impossible d'Γ©crire le modΓ¨le de commit" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5335,7 +5612,7 @@ msgstr "" "\t%s\n" "et essayez Γ nouveau.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5350,7 +5627,7 @@ msgstr "" "\t%s\n" "et essayez Γ nouveau.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5360,7 +5637,7 @@ msgstr "" "commenΓ§ant par '%c' seront ignorΓ©es, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5371,150 +5648,150 @@ 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:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond Γ aucun " "auteur existant" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 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:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Il n'y a rien Γ corriger." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous Γͺtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 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:1154 +#: builtin/commit.c:1165 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:1164 +#: builtin/commit.c:1175 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:1166 +#: builtin/commit.c:1177 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:1174 +#: builtin/commit.c:1185 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:1191 +#: builtin/commit.c:1202 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:1193 +#: builtin/commit.c:1204 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:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 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:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 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:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par dΓ©faut)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "terminer les Γ©lΓ©ments par NUL" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "mode" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 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:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "afficher les fichiers ignorΓ©s" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "quand" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5522,201 +5799,201 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (DΓ©faut : all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "HEAD dΓ©tachΓ©e" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "supprimer le rΓ©sumΓ© aprΓ¨s une validation rΓ©ussie" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "afficher les diff dans le modΓ¨le de message de validation" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "auteur" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "date" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "message" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "commit" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "rΓ©utiliser et Γ©diter le message du commit spΓ©cifiΓ©" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "rΓ©utiliser le message du commit spΓ©cifiΓ©" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 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:1586 +#: builtin/commit.c:1602 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:1587 +#: builtin/commit.c:1603 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:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrΓ©e Signed-off-by :" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "utiliser le fichier de modΓ¨le spΓ©cifiΓ©" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "forcer l'Γ©dition du commit" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "dΓ©faut" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "comment Γ©liminer les espaces et les commentaires # du message" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "inclure le statut dans le modΓ¨le de message de validation" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "valider tous les fichiers modifiΓ©s" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spΓ©cifiΓ©s Γ l'index pour la validation" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "valider seulement les fichiers spΓ©cifiΓ©s" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "Γ©viter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "afficher ce qui serait validΓ©" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "corriger la validation prΓ©cΓ©dente" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "Γ©viter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, 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:1740 +#: builtin/commit.c:1760 #, 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:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5865,7 +6142,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par dΓ©faut" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5880,7 +6157,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "crΓ©ation impossible du fichier de configuration '%s'" @@ -5916,7 +6193,7 @@ msgstr "l'Γ©tiquette annotΓ©e %s n'a pas de nom embarquΓ©" msgid "tag '%s' is really '%s' here" msgstr "l'Γ©tiquette '%s' est en fait '%s'" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" @@ -6011,7 +6288,7 @@ msgstr "" msgid "only consider tags matching <pattern>" msgstr "ne considΓ©rer que les Γ©tiquettes correspondant Γ <motif>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrΓ©gΓ©s en dernier recours" @@ -6045,21 +6322,21 @@ msgstr "'%s' : n'est pas un fichier rΓ©gulier ni un lien symbolique" msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Ce n'est pas un dΓ©pΓ΄t git !" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "objet spΓ©cifiΓ© '%s' invalide." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spΓ©cifiΓ©s : '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "objet non gΓ©rΓ© '%s' spΓ©cifiΓ©." @@ -6133,19 +6410,19 @@ msgstr "git fetch --multiple [<options>] [(<dΓ©pΓ΄t> | <groupe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" -msgstr "rΓ©cupΓ©rer depuis tous le dΓ©pΓ΄ts distants" +msgstr "rΓ©cupΓ©rer depuis tous les dΓ©pΓ΄ts distants" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter Γ .git/FETCH_HEAD au lieu de l'Γ©craser" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "chemin vers lequel tΓ©lΓ©charger le paquet sur le poste distant" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "forcer l'Γ©crasement de la branche locale" @@ -6153,7 +6430,7 @@ msgstr "forcer l'Γ©crasement de la branche locale" msgid "fetch from multiple remotes" msgstr "rΓ©cupΓ©rer depuis plusieurs dΓ©pΓ΄ts distants" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "rΓ©cupΓ©rer toutes les Γ©tiquettes et leurs objets associΓ©s" @@ -6165,21 +6442,21 @@ msgstr "ne pas rΓ©cupΓ©rer toutes les Γ©tiquettes (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules rΓ©cupΓ©rΓ©s en parallΓ¨le" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 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:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "Γ la demande" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "contrΓ΄ler la rΓ©cupΓ©ration rΓ©cursive dans les sous-modules" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "conserver le paquet tΓ©lΓ©chargΓ©" @@ -6187,15 +6464,15 @@ msgstr "conserver le paquet tΓ©lΓ©chargΓ©" msgid "allow updating of HEAD ref" msgstr "permettre la mise Γ jour de la rΓ©fΓ©rence HEAD" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "convertir en un dΓ©pΓ΄t complet" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "rΓ©pertoire" @@ -6207,15 +6484,15 @@ msgstr "prΓ©fixer ceci Γ la sortie du chemin du sous-module" msgid "default mode for recursion" msgstr "mode par dΓ©faut pour la rΓ©cursion" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "accepter les rΓ©fΓ©rences qui mettent Γ jour .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "correspondance de rΓ©fΓ©rence" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "spΓ©cifier une correspondance de rΓ©fΓ©rence pour la rΓ©cupΓ©ration" @@ -6273,11 +6550,6 @@ msgstr "mise Γ jour forcΓ©e" msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "impossible d'ouvrir %s : %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6480,56 +6752,56 @@ msgstr "VΓ©rification de la connectivitΓ©" msgid "Checking object directories" msgstr "VΓ©rification des rΓ©pertoires d'objet" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "afficher les Γ©tiquettes" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "signaler les nΕuds racines" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "considΓ©rer les objets de l'index comme nΕuds tΓͺte" # translated from man page -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "considΓ©rer les reflogs comme nΕuds tΓͺte (par dΓ©faut)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "ne vΓ©rifier que la connectivitΓ©" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "activer une vΓ©rification plus strict" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "Γ©crire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "VΓ©rification des objets" @@ -6637,223 +6909,223 @@ msgstr "impossible de lire l'arbre (%s)" msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend un valeur numΓ©rique" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutΓ΄t que dans la copie de travail" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gΓ©rΓ©s par git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spΓ©cifiΓ©s via '.gitignore'" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "correspondance insensible Γ la casse" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux sΓ©parateurs de mots" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions rΓ©guliΓ¨res Γ©tendues POSIX" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions rΓ©guliΓ¨res basiques POSIX (par dΓ©faut)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "interprΓ©ter les motifs comme de chaΓnes fixes" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions rΓ©guliΓ¨res compatibles avec Perl" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "afficher les numΓ©ros de ligne" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au rΓ©pertoire de base" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "imprimer une caractΓ¨re NUL aprΓ¨s le noms de fichier" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "mettre en Γ©vidence les correspondances" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers diffΓ©rents" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du mΓͺme " "fichier" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et aprΓ¨s les correspondances" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte aprΓ¨s les correspondances" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "combiner les motifs spΓ©cifiΓ©s par -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent Γ tous les " "motifs" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignorΓ© par ce build)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "aucun motif fourni." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spΓ©cifiΓ© invalide (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ou --untracked ne peuvent pas Γͺtre utilisΓ©s avec --no-index." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "--no-index ou --untracked ne peuvent pas Γͺtre utilisΓ©s avec des rΓ©visions." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard ne peut pas Γͺtre utilisΓ© avec du contenu suivi." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en mΓͺme temps." @@ -6944,8 +7216,8 @@ msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "Γ©chec de l'exΓ©cution de '%s' : %s" +msgid "failed to exec '%s'" +msgstr "Γ©chec de l'exΓ©cution de '%s'" #: builtin/help.c:205 #, c-format @@ -7204,108 +7476,110 @@ msgstr "confusion extrΓͺme" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "complΓ©tΓ© avec %d objets locaux" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "complΓ©tΓ© avec %d objet local" +msgstr[1] "complΓ©tΓ© avec %d objets locaux" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrΓ΄le de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non rΓ©solu" msgstr[1] "le paquet a %d deltas non rΓ©solus" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajoutΓ© (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'Γ©crire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, 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:1587 +#: builtin/index-pack.c:1589 #, 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:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, 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:1638 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au rΓ©pertoire de travail courant" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas Γͺtre utilisΓ© sans --stdin" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, 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:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donnΓ©" @@ -7344,28 +7618,27 @@ msgstr "impossible de copier '%s' vers '%s'" msgid "ignoring template %s" msgstr "modΓ¨le %s ignorΓ©" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "modΓ¨les non trouvΓ©s %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "" -"pas de copie des modΓ¨les Γ©tant dans une mauvaise version du format %d de '%s'" +msgid "not copying templates from '%s': %s" +msgstr "pas de copie des modΓ¨les depuis '%s'Β : %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s existe dΓ©jΓ " -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "impossible de dΓ©placer %s vers %s" @@ -7373,24 +7646,24 @@ msgstr "impossible de dΓ©placer %s vers %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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "DΓ©pΓ΄t Git%2$s %1$s dans %3$s%4$s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "existant rΓ©initialisΓ©" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "vide initialisΓ©" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " partagΓ©" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7398,25 +7671,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<rΓ©pertoire-modΓ¨le>] [--" "shared[=<permissions>]] [<rΓ©pertoire>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "spΓ©cifier que le dΓ©pΓ΄t git sera partagΓ© entre plusieurs utilisateurs" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "impossible de crΓ©er le rΓ©pertoire (mkdir) %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se dΓ©placer vers le rΓ©pertoire (chdir) %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7425,7 +7698,7 @@ msgstr "" "%s (ou --work-tree=<rΓ©pertoire>) n'est pas autorisΓ© sans spΓ©cifier %s (ou --" "git-dir=<rΓ©pertoire>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accΓ©der Γ l'arbre de travail '%s'" @@ -7471,268 +7744,319 @@ msgstr "git show [<options>] <objet>..." msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "supprimer la sortie des diffΓ©rences" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "dΓ©corer les options" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commenΓ§ant le " "compte Γ 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Type inconnu : %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "le nom du rΓ©pertoire de sortie est trop long" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Exactement une plage nΓ©cessaire." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Ceci n'est pas une plage." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "La lettre de motivation doit Γͺtre au format e-mail" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de rΓ©visions>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Deux rΓ©pertoires de sortie ?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit inconnu %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Impossible de rΓ©soudre '%s' comme une rΓ©fΓ©rence valide." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Impossible de trouver la base de fusion exacte." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"Impossible de rΓ©cupΓ©rer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n" +"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante\n" +"ou vous pouvez spΓ©cifier le commit de base par --base=<id-du-commit-de-base> manuellement." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Impossible de trouver la base de fusion exacte" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "le commit de base devrait Γͺtre l'ancΓͺtre de la liste de rΓ©visions" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "le commit de base ne devrait pas faire partie de la liste de rΓ©visions" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "impossible d'obtenir l'id du patch" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] mΓͺme avec un patch unique" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] mΓͺme avec des patchs multiples" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "gΓ©nΓ©rer une lettre de motivation" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "" "utiliser une sΓ©quence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "dΓ©marrer la numΓ©rotation des patchs Γ <n> au lieu de 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "marquer la sΓ©rie comme une NiΓ¨me réédition" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<prΓ©fixe>] au lieu de [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "stocker les fichiers rΓ©sultats dans <rΓ©pertoire>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "Γ©crire une empreinte Γ zΓ©ro dans l'entΓͺte From" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant Γ un commit amont" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du dΓ©faut (patch + stat)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "en-tΓͺte" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "ajouter l'en-tΓͺte d'e-mail" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "e-mail" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "ajouter l'en-tΓͺte \"To:\"" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "ajouter l'en-tΓͺte \"Cc:\"" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "ident" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From Γ <ident> (ou Γ l'ident du validateur si absent)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "rΓ©pondre dans le premier message Γ <id-message>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "limite" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "patch Γ l'intΓ©rieur" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "signature" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "commit-de-base" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "Ajouter un arbre prΓ©requis Γ la sΓ©rie de patchs" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n et -k sont mutuellement exclusifs." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix et -k sont mutuellement exclusifs." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou rΓ©pertoire, lequel ?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Impossible de crΓ©er le rΓ©pertoire '%s'" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Γchec de crΓ©ation des fichiers en sortie" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7740,11 +8064,6 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spΓ©cifier " "<branche_amont> manuellement.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Commit inconnu %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" @@ -7942,175 +8261,179 @@ msgstr "git merge [<options>] <message> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratΓ©gie de fusion '%s'.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Les stratΓ©gies disponibles sont :" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "Les stratΓ©gies personnalisΓ©es sont :" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat Γ la fin de la fusion" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat Γ la fin de la fusion" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) Γ©lΓ©ments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "crΓ©er une validation unique au lieu de faire une fusion" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion rΓ©ussit (dΓ©faut)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "Γ©diter le message avant la validation" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (dΓ©faut)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "VΓ©rifier que la validation a une signature GPG valide" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "stratΓ©gie" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "stratΓ©gie de fusion Γ utiliser" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "option pour la stratΓ©gie de fusion sΓ©lectionnΓ©e" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "permettre la fusion d'historiques sans rapport" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "Γ©chec du remisage" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree a Γ©chouΓ©" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (rien Γ compresser)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressΓ©e -- HEAD non mise Γ jour\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "Impossible d'Γ©crire dans '%s'" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Γcriture de SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Finition de SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise Γ jour de HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaΓne branch.%s.mergeoptions : %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gΓ©rer autre chose que la fusion de deux tΓͺtes." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "impossible d'Γ©crire %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8127,54 +8450,54 @@ msgstr "" "Les lignes commenΓ§ant par '%c' seront ignorΓ©es, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a Γ©chouΓ© ; rΓ©glez les conflits et validez le " "rΓ©sultat.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' n'est pas une validation" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par dΓ©faut dΓ©finie pour la branche courante." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion Γ abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8182,7 +8505,7 @@ msgstr "" "Vous n'avez pas terminΓ© votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8190,102 +8513,106 @@ msgstr "" "Vous n'avez pas terminΓ© votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminΓ© votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spΓ©cifiΓ©e et merge.defaultToUpstream n'est pas dΓ©fini." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressΓ©e vers une tΓͺte vide n'est pas encore supportΓ©e" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tΓͺte vide" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tΓͺte vide" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prΓ©tendument par %s." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prΓ©tendument par %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "refus de fusionner des historiques sans relation" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Mise Γ jour %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre Γ l'original...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratΓ©gie de fusion %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratΓ©gie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratΓ©gie %s a Γ©chouΓ©.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour prΓ©parer la rΓ©solution Γ la main.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8396,7 +8723,7 @@ msgstr "git mv [<options>] <source>... <destination>" msgid "Directory %s is in index and no submodule?" msgstr "Le rΓ©pertoire %s est dans l'index et pourtant aucun sous-module ?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Veuillez indexer vos modifications de .gitmodules ou les remiser pour " @@ -8476,49 +8803,49 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a Γ©chouΓ©" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "utiliser seulement les Γ©tiquettes pour nommer les validations" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les rΓ©fΓ©rences correspondant Γ <motif>" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les rΓ©fΓ©rences" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "lire depuis l'entrΓ©e standard" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non dΓ©finis` (par dΓ©faut)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "dΓ©rΓ©fΓ©rencer les Γ©tiquettes en entrΓ©e (usage interne)" @@ -8666,24 +8993,16 @@ msgstr "impossible d'Γ©crire l'objet note" msgid "The note contents have been left in %s" msgstr "Le contenu de la note a Γ©tΓ© laissΓ© dans %s" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Impossible de rΓ©soudre '%s' comme une rΓ©fΓ©rence valide." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8696,7 +9015,7 @@ msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'." #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "trop de paramΓ¨tres" @@ -8743,7 +9062,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Γcrasement des notes existantes pour l'objet %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Suppression de la note pour l'objet %s\n" @@ -8784,15 +9103,15 @@ msgstr "" "Les options -m/-F/-c/-C sont obsolΓ¨tes pour la sous-commande 'edit'.\n" "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' Γ la place.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Options gΓ©nΓ©rales" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Options de fusion" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8800,50 +9119,50 @@ msgstr "" "rΓ©soudre les conflits de notes en utilisant la stratΓ©gie donnΓ©e (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Validation des notes non fusionnΓ©es" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "finaliser la fusion de notes en validant les notes non fusionnΓ©es" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Abandon de la rΓ©solution de fusion des notes" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "abandonner la fusion de notes" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Une fusion de notes dans %s est dΓ©jΓ en cours avec %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "L'objet %s n'a pas de note\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "" "la tentative de suppression d'une note non existante n'est pas une erreur" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrΓ©e standard" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "rΓ©fΓ©rences-notes" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <rΓ©fΓ©rences-notes>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" @@ -8867,175 +9186,179 @@ msgstr "" msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "dΓ©sactivation de l'Γ©criture en bitmap, les fichiers paquets sont scindΓ©s Γ cause de pack.packSizeLimit" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "Γcriture des objets" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 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:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportΓ©e %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 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:2599 +#: builtin/pack-objects.c:2604 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:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 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:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntΓ©s Γ un autre magasin d'objets" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ignorer les objets empaquetΓ©s" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "limiter la fenΓͺtre d'empaquetage par objets" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 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:2614 +#: builtin/pack-objects.c:2619 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:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "rΓ©utiliser les deltas existants" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "rΓ©utiliser les objets existants" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 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:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "ne pas crΓ©er un paquet vide" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "lire les paramΓ¨tres de rΓ©vision depuis l'entrΓ©e standard" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 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:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute rΓ©fΓ©rence" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 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:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "inclure les objets rΓ©fΓ©rencΓ©s par l'index" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 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:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "dΓ©paqueter les objets inaccessibles plus rΓ©cents que <heure>" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "crΓ©er des paquets lΓ©gers" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "crΓ©er des paquets permettant des rΓ©cupΓ©rations superficielles" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 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:2661 +#: builtin/pack-objects.c:2666 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:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "DΓ©compte des objets" @@ -9063,15 +9386,15 @@ msgstr "Suppression des objets dupliquΓ©s" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "afficher les objets Γ©liminΓ©s" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" @@ -9083,51 +9406,55 @@ msgstr "impossible de nettoyer dans un dΓ©pΓ΄t d'objets prΓ©cieux" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dΓ©pΓ΄t> [<spΓ©cification-de-rΓ©fΓ©rence>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Options relatives Γ la fusion" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutΓ΄t qu'en fusionnant" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "vΓ©rifier que le commit nommΓ© a une signature GPG valide" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "remiser avant et rΓ©appliquer aprΓ¨s le rebasage automatiquement" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirΓ©s en parallΓ¨le" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "impossible de tirer avec rebasage. Vous avez des modifications non indexΓ©es." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "De plus, votre index contient des modifications non validΓ©es." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "impossible de tirer avec rebasageΒ : votre index contient des modifications " "non validΓ©es." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9135,14 +9462,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les rΓ©fΓ©rences que vous " "venez de rΓ©cupΓ©rer." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les rΓ©fΓ©rences que " "vous venez de rΓ©cupΓ©rer." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9150,7 +9477,7 @@ msgstr "" "GΓ©nΓ©ralement, cela signifie que vous avez indiquΓ© un spΓ©cificateur\n" "de rΓ©fΓ©rence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9162,39 +9489,42 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spΓ©cifier la branche avec la commande." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'Γͺtes actuellement sur aucune branche." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spΓ©cifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spΓ©cifier une branche avec laquelle fusionner." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "RΓ©fΓ©rez-vous Γ git-pull(1) pour de plus amples dΓ©tails." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<distant>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<branche>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "" -"Si vous souhaitez indiquer l'information de suivi distant pour cette " -"branche, vous pouvez le faire avec :\n" -"\n" -" git branch --set-upstream-to=%s/<branche> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avecΒ :" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9204,13 +9534,17 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette rΓ©fΓ©rence n'a pas Γ©tΓ© rΓ©cupΓ©rΓ©e." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise Γ jour d'une branche non encore créée avec les changements ajoutΓ©s dans " "l'index." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9221,7 +9555,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9239,11 +9573,11 @@ msgstr "" "$ git reset --hard\n" "pour rΓ©gΓ©nΓ©rer." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tΓͺte vide." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." @@ -9622,6 +9956,18 @@ msgstr "sauter l'application du filtre d'extraction creuse" msgid "debug unpack-trees" msgstr "dΓ©boguer unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <rΓ©pertoire-git>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "quiet" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Vous devez spΓ©cifier un rΓ©pertoire." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9953,21 +10299,23 @@ msgstr "* distante %s" msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(pas d'URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9975,158 +10323,158 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguΓ«, peut Γͺtre l'une des " "suivantes) :\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (statut non demandΓ©)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branche locale configurΓ©e pour 'git pull' :" msgstr[1] " Branches locales configurΓ©es pour 'git pull' :" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Les rΓ©fΓ©rences locales seront reflΓ©tΓ©es par 'git push'" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " RΓ©fΓ©rence locale configurΓ©e pour 'git push'%s :" msgstr[1] " RΓ©fΓ©rences locales configurΓ©es pour 'git push'%s :" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "dΓ©finir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Impossible de dΓ©terminer la HEAD distante" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Il y a de multiples branches HEAD distantes. Veuillez en choisir une " "explicitement avec :" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "RΓ©fΓ©rence non valide : %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramΓ©trer %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Γlimination de %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [serait Γ©liminΓ©] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [Γ©liminΓ©] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "Γ©liminer les distants aprΓ¨s le rapatriement" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "pas de serveur distant spΓ©cifiΓ©" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "interroger les URLs de poussΓ©e plutΓ΄t que les URLs de rΓ©cupΓ©ration" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "retourner toutes les URLs" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "aucune URL configurΓ©e pour le dΓ©pΓ΄t distant '%s'" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvΓ©e : %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "Γͺtre verbeux : doit Γͺtre placΓ© avant une sous-commande" @@ -10642,12 +10990,6 @@ msgstr "autoriser la suppression rΓ©cursive" msgid "exit with a zero status even if nothing matched" msgstr "sortir avec un statut zΓ©ro mΓͺme si rien ne correspondait" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Veuillez indexer vos modifications de .gitmodules ou remisez-les pour " -"continuer" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10862,86 +11204,180 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractΓ¨re de commentaire et un espace" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "RΓ©fΓ©rence inexistanteΒ : %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Nom de rΓ©fΓ©rence complet attendu, %s obtenu" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "impossible de supprimer un composant de l'URL '%s'" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "URL non trouvΓ©e pour le chemin de sous-module '%s' dans .gitmodules" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Γchec d'enregistrement de l'URL pour le chemin de sous-module '%s'" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Sous-module '%s' (%s) enregistrΓ© pour le chemin '%s'\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "attentionΒ : nous vous suggΓ©rons de spΓ©cifier une commande de mode de mise Γ jour pour le sous-module '%s'\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "Γchec d'enregistrement du mode de mise Γ jour pour le chemin de sous-module '%s'" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<chemin>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Pas de mise en correspondance du sous-module trouvΓ© dans .gitmodules pour le " "chemin '%s'" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "emplacement oΓΉ le sous-module sera clonΓ©" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" -msgstr "" -"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " -"<dΓ©pΓ΄t>] [--name <nom>] [--url <url>][--depth <profondeur>] [--] " -"[<chemin>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dΓ©pΓ΄t>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "impossible de crΓ©er le rΓ©pertoire '%s'" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a Γ©chouΓ©" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "impossible de fermer le fichier %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de crΓ©er le rΓ©pertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "" -"fatalΒ : la sous-commande submodule--helper doit Γͺtre appelΓ©e avec une sous-" -"commande" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Le chemin de sous-module '%s' n'est pas initialisΓ©" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Vous voudriez sΓ»rement utiliser 'update --init'Β ?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Sous-module non fusionnΓ© %s non traitΓ©" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Sous-module '%s' non traitΓ©" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "chemin dans la copie de travail" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "chemin dans la copie de travail, traversant les frontiΓ¨res de sous-modules" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "valeurs possiblesΒ : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "CrΓ©er un clone superficiel tronquΓ© au nombre de rΓ©visions spΓ©cifiΓ©" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "jobs parallΓ¨les" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "ne pas afficher la progression du clonage" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "valeur invalide pour la mise Γ jour du paramΓ¨tre" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "la sous-commande submodule--helper doit Γͺtre appelΓ©e avec une sous-commande" + +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "fatalΒ : '%s' n'est pas une sous-commande valide de submodule--helper" +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10996,27 +11432,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <nomΓ©tiquette>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "nom d'Γ©tiquette trop long : %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "Γ©tiquette '%s' non trouvΓ©e." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Γtiquette '%s' supprimΓ©e (elle Γ©tait sur %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "impossible de vΓ©rifier l'Γ©tiquette '%s'" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -11029,7 +11460,7 @@ msgstr "" " %s\n" "Les lignes commenΓ§ant par '%c' seront ignorΓ©es.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -11161,21 +11592,21 @@ msgstr "les options --merged et --no-merged ne sont autorisΓ©es qu'avec -l" msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisΓ©e." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "trop de paramΓ¨tres" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'Γ©tiquette valide." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "l'Γ©tiquette '%s' existe dΓ©jΓ " -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Γtiquette '%s' mise Γ jour (elle Γ©tait sur %s)\n" @@ -11438,7 +11869,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..." msgid "print commit contents" msgstr "afficher le contenu du commit" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "afficher les messages bruts de gpg" @@ -11458,7 +11889,7 @@ msgstr "afficher seulement les statistiques" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <Γ©tiquette>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "afficher le contenu de l'Γ©tiquette" @@ -11474,73 +11905,77 @@ msgstr "git worktree prune [<options>]" msgid "git worktree list [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%sΒ : rΓ©pertoire invalide" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Suppression de worktrees/%sΒ : le fichier gitdir n'existe pas" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%sΒ : echec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%sΒ : fichier gitdir invalide" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Suppression de worktrees/%sΒ : le fichier gitdir point sur un endroit " "inexistant" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "Γ©chec de la suppression de %s" +msgid "failed to remove '%s'" +msgstr "Γ©chec de la suppression de '%s'" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' existe dΓ©jΓ " -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de crΓ©er le rΓ©pertoire de '%s'" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "PrΓ©paration de %s (identifiant %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> mΓͺme si elle est dΓ©jΓ extraite dans une autre copie de " "travail" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "crΓ©er une nouvelle branche" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "crΓ©er ou rΓ©initialiser une branche" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "dΓ©tacher la HEAD au commit nommΓ©" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "remplissage de la nouvelle copie de travail" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" @@ -11560,7 +11995,7 @@ msgstr "Γ©crire l'objet arbre pour un sous-rΓ©pertoire <prΓ©fixe>" msgid "only useful for debugging" msgstr "seulement utile pour le dΓ©bogage" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "afficher les messages de debug sur stderr" @@ -11574,7 +12009,7 @@ msgstr "" "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n" "pour en lire plus Γ propos d'une commande spΓ©cifique ou d'un concept." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'Γ©pinglage de clΓ© publique n'est pas supportΓ© avec cuRL < 7.44.0" @@ -11706,7 +12141,7 @@ msgstr "Γͺtre plus silencieux" msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "met Γ jour l'index avec les rΓ©solutions de conflit rΓ©utilisΓ©es si possible" @@ -11926,16 +12361,16 @@ msgstr "" "Pour extraire la branche d'origine et stopper le rebasage, lancez \"git " "rebase --abort\"." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "Autoremisage appliquΓ©." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11945,33 +12380,29 @@ msgstr "" "Vos modifications sont Γ l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" Γ tout moment.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusΓ© de rebaser." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Il semble que git-am soit en cours. Impossible de rebaser." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "L'option --exec doit Γͺtre utilisΓ©e avec l'option --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement Γͺtre utilisΓ©e lors d'un rebasage " "interactif." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11979,12 +12410,12 @@ msgstr "" "Vous devez Γ©diter tous les conflits de fusion et\n" "les marquer comme rΓ©solus avec git add" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir Γ $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -12006,65 +12437,65 @@ msgstr "" "chose\n" "d'important ici." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "invalide $upstream_name en amont" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name : il y a plus d'une base de fusion" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name : il n'y a pas de base de fusion" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Ne pointe pas sur une validation valide : $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal : pas de branche : $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est Γ jour." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branche courante $branch_name est Γ jour, rebasage forcΓ©." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "PremiΓ¨rement, rembobinons head pour rejouer votre travail par-dessus..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise Γ jour en avance rapide sur $onto_name." @@ -12208,28 +12639,23 @@ msgstr "Aucune branche spΓ©cifiΓ©e" msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "impossible de supprimer un composant de l'URL '$remoteurl'" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Un chemin relatif ne peut Γͺtre utilisΓ© que depuis la racine de la copie de " "travail" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "L'URL de dΓ©pΓ΄t '$repo' doit Γͺtre absolu ou commencer par ./|../" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe dΓ©jΓ dans l'index" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12240,24 +12666,24 @@ msgstr "" "$sm_path\n" "Utilisez -f si vous voulez vraiment l'ajouter." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Ajout du dΓ©pΓ΄t existant Γ '$sm_path' dans l'index" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existe dΓ©jΓ et n'est pas un dΓ©pΓ΄t git valide" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Un rΓ©pertoire git pour '$sm_name' est trouvΓ© en local avec le(s) serveur(s) " "distant(s) :" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -12265,7 +12691,7 @@ msgstr "" "Si vous voulez rΓ©utiliser ce rΓ©pertoire git local au lieu de cloner Γ " "nouveau depuis" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" @@ -12273,7 +12699,7 @@ msgstr "" "utilisez l'option '--force'. Si le rΓ©pertoire local git n'est pas le dΓ©pΓ΄t " "correct" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -12282,74 +12708,53 @@ msgstr "" "ou vous ne savez pas ce que cela signifie de choisir un autre nom avec " "l'option '--name'." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "RΓ©activation du rΓ©pertoire git local pour le sous-module '$sm_name'." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Γchec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Γchec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "EntrΓ©e dans '$prefix$displaypath'" +msgid "Entering '$displaypath'" +msgstr "EntrΓ©e dans '$displaypath'" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "" -"ArrΓͺt sur '$prefix$displaypath' ; le script a retournΓ© un statut non nul." +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "ArrΓͺt sur '$displaypath' ; le script a retournΓ© un statut non nul." -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"URL non trouvΓ©e pour le chemin de sous-module '$displaypath' dans .gitmodules" +msgid "pathspec and --all are incompatible" +msgstr "un spΓ©cificateur de chemin et --all sont incompatibles" -#: git-submodule.sh:492 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "" -"Γchec d'enregistrement de l'URL pour le chemin de sous-module '$displaypath'" - -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "Sous-module '$name' ($url) enregistrΓ© pour le chemin '$displaypath'" - -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Γchec d'enregistrement du mode de mise Γ jour pour le chemin de sous-module " -"'$displaypath'" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "" -"Utilisez '.' si vous voulez vraiment rΓ©initialiser tous les sous-modules" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "Utilisez '--all' si vous voulez vraiment rΓ©initialiser tous les sous-modules" -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "La copie de travail du sous-module '$displaypath' contient un rΓ©pertoire .git" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -12357,7 +12762,7 @@ msgstr "" "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12366,146 +12771,181 @@ msgstr "" "La copie de travail du sous-module '$displaypath' contient des modifications " "locales ; utilisez '-f' pour les annuler" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "RΓ©pertoire '$displaypath' nettoyΓ©" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Impossible de supprimer la copie de travail du sous-module '$displaypath'" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Impossible de crΓ©er le rΓ©pertoire vide du sous-module '$displaypath'" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Le sous-module '$name' ($url) n'est pas enregistrΓ© pour le chemin " "'$displaypath'" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Chemin de sous-module '$displaypath' non initialisΓ©\n" -"Peut-Γͺtre souhaitez-vous utiliser 'update --init' ?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossible de trouver la rΓ©vision courante dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasΓ© dans '$sha1'" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionnΓ© dans '$sha1'" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "" -"L'exΓ©cution de '$command $sha1' a Γ©chouΓ© dans le chemin de sous-module " -"'$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "L'exΓ©cution de '$command $sha1' a Γ©chouΓ© dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Γchec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas Γͺtre utilisΓ©e avec l'option --files" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Attention : $display_name ne contient pas les validations $sha1_src et " "$sha1_dst" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Γchec de parcours dans le chemin du sous-module '$sm_path'" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "RΓ©fΓ©rez-vous Γ git-${cmd}(1) pour de plus amples dΓ©tails." + +#~ msgid "'%s': %s" +#~ msgstr "'%s' : %s" + +#~ msgid "unable to access '%s': %s" +#~ msgstr "impossible d'accΓ©der Γ '%s' : %s" + +#~ msgid "could not open '%s' for reading: %s" +#~ msgstr "impossible d'ouvrir '%s' en lectureΒ : %s" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "impossible d'ouvrir '%s' en Γ©critureΒ : %s" + +#~ msgid " git branch -d %s\n" +#~ msgstr " git branch -d %s\n" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "impossible d'ouvrir %s : %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour " +#~ "continuer" + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "impossible de vΓ©rifier l'Γ©tiquette '%s'" + +#~ msgid "failed to remove: %s" +#~ msgstr "Γ©chec de la suppression de %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "L'option --exec doit Γͺtre utilisΓ©e avec l'option --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Chemin de sous-module '$displaypath' non initialisΓ©\n" +#~ "Peut-Γͺtre souhaitez-vous utiliser 'update --init' ?" + #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "" #~ "Reporter les validations locales sur le sommet mis Γ jour d'une branche " @@ -12578,9 +13018,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgid "Could not append '%s'" #~ msgstr "Impossible d'ajouter '%s'" -#~ msgid "Could not set '%s'" -#~ msgstr "Impossible de dΓ©finir '%s'" - #~ msgid "Missing author: %s" #~ msgstr "Auteur manquant : %s" @@ -12923,12 +13360,5 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgstr "les chemins en entrΓ©e sont terminΓ©s par le caractΓ¨re nul" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "Les fichiers suivants non suivis ne seront PAS sauvΓ©s mais doivent Γͺtre " -#~ "supprimΓ©s par le remisage :" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked." @@ -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: 2016-03-16 00:16+0800\n" +"POT-Creation-Date: 2016-05-24 23:42+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" @@ -29,7 +29,7 @@ msgid "" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -71,7 +71,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "" @@ -79,9 +79,9 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -115,7 +115,8 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "" @@ -251,11 +252,16 @@ msgstr "" msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -266,7 +272,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "" @@ -275,10 +281,10 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "" @@ -317,21 +323,21 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "" @@ -340,8 +346,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "" @@ -375,21 +381,21 @@ msgstr "" msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "" @@ -408,9 +414,14 @@ msgstr "" msgid "%s has multiple values" msgstr "" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" +msgid "could not unset '%s'" msgstr "" #: connected.c:69 @@ -418,13 +429,11 @@ msgid "Could not run 'git rev-list'" msgstr "" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" +msgid "failed write to rev-list" msgstr "" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" msgstr "" #: date.c:95 @@ -500,62 +509,62 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "" -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "" @@ -569,12 +578,12 @@ msgstr "" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" +msgid "could not create temporary file '%s'" msgstr "" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" +msgid "failed writing detached signature to '%s'" msgstr "" #: grep.c:1718 @@ -582,14 +591,14 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" +msgid "failed to stat '%s'" msgstr "" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" +msgid "'%s': short read" msgstr "" #: help.c:205 @@ -648,12 +657,29 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "" + #: merge.c:41 msgid "failed to read the cache" msgstr "" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "" @@ -700,7 +726,7 @@ msgstr "" msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "" @@ -827,7 +853,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "" @@ -854,50 +880,50 @@ msgstr "" msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "" @@ -927,28 +953,28 @@ msgstr "" msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr "" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "" @@ -957,7 +983,7 @@ msgstr "" msgid "malformed object name '%s'" msgstr "" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -1022,7 +1048,7 @@ msgid "" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "" @@ -1044,23 +1070,23 @@ msgid "" "Using version %i" msgstr "" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "" @@ -1199,93 +1225,93 @@ msgstr "" msgid "malformed object name %s" msgstr "" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:2084 +#: remote.c:2085 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1293,11 +1319,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1308,20 +1334,20 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "" @@ -1365,7 +1391,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "" @@ -1523,12 +1549,12 @@ msgstr "" msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "" @@ -1540,63 +1566,72 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" +msgid "cannot open %s" msgstr "" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -1614,29 +1649,38 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1696,7 +1740,175 @@ msgstr "" msgid "Could not read ref %s" msgstr "" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "" + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "" @@ -1734,230 +1946,226 @@ msgstr "" msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "" -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "" -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "" -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "" -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" @@ -2096,43 +2304,43 @@ msgstr "" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "" -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2140,82 +2348,82 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "" -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "" -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "" -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -2229,7 +2437,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "" @@ -2242,7 +2450,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "" @@ -2278,14 +2486,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "" @@ -2293,7 +2501,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" @@ -2361,16 +2569,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "" @@ -2398,16 +2606,6 @@ msgstr "" msgid "fseek failed" msgstr "" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2417,109 +2615,109 @@ msgstr "" msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "" @@ -2527,231 +2725,233 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -2784,37 +2984,37 @@ msgstr "" msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2825,396 +3025,406 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, 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:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "" + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3280,99 +3490,99 @@ msgstr "" msgid "Blaming lines" msgstr "" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -3382,392 +3592,413 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." +msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, 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:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3775,16 +4006,6 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr "" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr "" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -3880,7 +4101,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "" @@ -3970,8 +4191,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "" @@ -4021,79 +4243,79 @@ msgstr "" msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4108,7 +4330,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4125,162 +4347,162 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4410,8 +4632,8 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "" @@ -4447,286 +4669,290 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "" @@ -4829,103 +5055,103 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" +#: builtin/commit.c:737 builtin/commit.c:745 +msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:734 -msgid "could not read SQUASH_MSG" +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:785 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -4935,7 +5161,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -4945,14 +5171,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4960,341 +5186,341 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5437,7 +5663,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5447,7 +5673,7 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "" @@ -5483,7 +5709,7 @@ msgstr "" msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "" @@ -5570,7 +5796,7 @@ msgstr "" msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "" @@ -5604,21 +5830,21 @@ msgstr "" msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -5691,19 +5917,19 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "" @@ -5711,7 +5937,7 @@ msgstr "" msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "" @@ -5723,19 +5949,19 @@ msgstr "" msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "" @@ -5743,15 +5969,15 @@ msgstr "" msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "" @@ -5763,15 +5989,15 @@ msgstr "" msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "" @@ -5829,11 +6055,6 @@ msgstr "" msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6028,55 +6249,55 @@ msgstr "" msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "" @@ -6170,214 +6391,214 @@ msgstr "" msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "" -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "" @@ -6464,7 +6685,7 @@ msgstr "" #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" +msgid "failed to exec '%s'" msgstr "" #: builtin/help.c:205 @@ -6719,107 +6940,109 @@ msgstr "" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "" +msgstr[1] "" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "" @@ -6858,27 +7081,27 @@ msgstr "" msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" +msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "" @@ -6886,55 +7109,55 @@ msgstr "" #. 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr "" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -6978,273 +7201,316 @@ msgstr "" msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "" -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "" + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "" @@ -7432,170 +7698,174 @@ msgstr "" msgid "git merge --abort" msgstr "" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "" -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7605,157 +7875,161 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "" -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7863,7 +8137,7 @@ msgstr "" msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" @@ -7941,48 +8215,48 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "" @@ -8123,24 +8397,16 @@ msgstr "" msgid "The note contents have been left in %s" msgstr "" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "" - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8153,7 +8419,7 @@ msgstr "" #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "" @@ -8198,7 +8464,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "" @@ -8234,63 +8500,63 @@ msgid "" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -8310,165 +8576,169 @@ msgstr "" msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "" @@ -8496,15 +8766,15 @@ msgstr "" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "" @@ -8516,65 +8786,69 @@ msgstr "" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "" -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8582,46 +8856,57 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "" + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8629,7 +8914,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8640,11 +8925,11 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "" @@ -8950,6 +9235,18 @@ msgstr "" msgid "debug unpack-trees" msgstr "" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "" + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9261,176 +9558,178 @@ msgstr "" msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "" @@ -9916,10 +10215,6 @@ msgstr "" msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10112,78 +10407,177 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "" + +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" +msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" #: builtin/symbolic-ref.c:7 @@ -10234,27 +10628,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10263,7 +10652,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10390,21 +10779,21 @@ msgstr "" msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -10652,7 +11041,7 @@ msgstr "" msgid "print commit contents" msgstr "" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "" @@ -10672,7 +11061,7 @@ msgstr "" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "" @@ -10688,68 +11077,72 @@ msgstr "" msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" +msgid "failed to remove '%s'" msgstr "" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" @@ -10769,7 +11162,7 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "" @@ -10780,7 +11173,7 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" @@ -10908,7 +11301,7 @@ msgstr "" msgid "use <n> digits to display SHA-1s" msgstr "" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" @@ -11101,58 +11494,54 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "" -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:169 +#: git-rebase.sh:172 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 "" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11165,64 +11554,64 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -11364,26 +11753,21 @@ msgstr "" msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11391,235 +11775,217 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "" - -#: git-submodule.sh:437 +#: git-submodule.sh:355 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Entering '$displaypath'" msgstr "" -#: git-submodule.sh:483 +#: git-submodule.sh:375 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:492 +#: git-submodule.sh:448 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" +msgid "pathspec and --all are incompatible" msgstr "" -#: git-submodule.sh:494 +#: git-submodule.sh:453 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "" @@ -57,8 +57,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-16 10:30+0900\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-06-12 01:20+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-" "ko>\n" @@ -81,7 +81,7 @@ msgstr "" "μμ
ν΄λμμ λ¬Έμ λ₯Ό λ°λ‘μ‘μ λ€μ, 'git add/rm <νμΌ>'μ μ μ ν\n" "μ¬μ©ν΄ ν΄κ²° νμνκ³ μ»€λ°νμμμ€." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "λ³ν© μμ
μ λ€ λ§μΉμ§ μμμ΅λλ€ (MERGE_HEAD νμΌμ΄ μμ΅λλ€)." @@ -125,7 +125,7 @@ msgstr "νμ" msgid "archive format" msgstr "μμΆ νμ" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "μ λμ΄" @@ -133,9 +133,9 @@ msgstr "μ λμ΄" msgid "prepend prefix to each pathname in the archive" msgstr "μμΉ΄μ΄λΈμ κ° κ²½λ‘ μ΄λ¦μ μμ μ§μ ν κ²½λ‘λ₯Ό λΆμ
λλ€" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549 #: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459 #: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561 #: builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -169,7 +169,8 @@ msgstr "λ μκ² μμΆ" msgid "list supported archive formats" msgstr "μ§μνλ μμΆ νμμ λͺ©λ‘μ νμν©λλ€" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "μ μ₯μ" @@ -323,11 +324,16 @@ msgstr "μ 맀ν μ€λΈμ νΈ μ΄λ¦: '%s'." msgid "Not a valid branch point: '%s'." msgstr "μ¬λ°λ₯Έ λΈλμΉ μμΉκ° μλλλ€: '%s'." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s'μ(λ) μ΄λ―Έ '%s' μμΉμ λ°μμ Έ μμ΅λλ€" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "μμ
ν΄λ %sμ ν€λκ° μ
λ°μ΄νΈλμ§ μμμ΅λλ€" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -338,7 +344,7 @@ msgstr "'%s' νμΌμ΄ λ²μ 2 λ²λ€ νμΌλ‘ 보μ΄μ§ μμ΅λλ€" msgid "unrecognized header: %s%s (%d)" msgstr "μΈμν μ μλ ν€λ: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "'%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" @@ -347,10 +353,10 @@ msgstr "'%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" msgid "Repository lacks these prerequisite commits:" msgstr "μ μ₯μμ νμμ μΈ λ€μ 컀λ°μ΄ μμ΅λλ€:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "리λΉμ walk μ€λΉκ° μ€ν¨νμ΅λλ€" @@ -387,21 +393,21 @@ msgstr "rev-list λͺ
λ Ήμ΄ μ£½μμ΅λλ€" msgid "ref '%s' is excluded by the rev-list options" msgstr "rev-list μ΅μ
μμ '%s' λ νΌλ°μ€κ° μ μΈλμμ΅λλ€" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "μ μ μλ μΈμ: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "λΉ λ²λ€μ λ§λ€μ§ μμ΅λλ€." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "'%s'μ(λ₯Ό) λ§λ€ μ μμ΅λλ€" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack λͺ
λ Ήμ΄ μ£½μμ΅λλ€" @@ -410,8 +416,8 @@ msgstr "index-pack λͺ
λ Ήμ΄ μ£½μμ΅λλ€" msgid "invalid color value: %.*s" msgstr "μλͺ»λ μ κ°: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "parse %sμ(λ₯Ό) νμ±ν μ μμ΅λλ€" @@ -445,21 +451,21 @@ msgstr "μλͺ»λ μμΉ μ€μ κ° '%s' (ν€ '%s'): %s" msgid "failed to expand user dir in: '%s'" msgstr "λ€μμ μ¬μ©μ λλ ν°λ¦¬ νμ₯μ μ€ν¨: '%s'" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "%dλ²μ μ¬λ°λ₯Έ zlib μμΆ λ¨κ³κ° μλλλ€" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "μ€λΈμ νΈ μμ± λͺ¨λκ° μ¬λ°λ₯΄μ§ μμ΅λλ€: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "λͺ
λ Ήν μ€μ μ νμ±ν μ μμ΅λλ€" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "μ€μ νμΌμ μ½λ μ€ μ μ μλ μ€λ₯κ° μκ²Όμ΅λλ€" @@ -478,24 +484,27 @@ msgstr "'%2$s' νμΌμ %3$dλ² μ€ '%1$s' μ€μ λ³μκ° μλͺ»λμμ΅λλ msgid "%s has multiple values" msgstr "%sμ(λ) μ¬λ¬ κ° κ°μ΄ μμ΅λλ€" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "'%s'μ(λ₯Ό) '%s'(μΌ)λ‘ μ€μ ν μ μμ΅λλ€" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "'%s'μ(λ₯Ό) '%s'μ μ€μ ν μ μμ΅λλ€" +msgid "could not unset '%s'" +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" +msgid "failed write to rev-list" +msgstr "rev-list μ°κΈ°μ μ€ν¨νμ΅λλ€" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "rev-listμ νμ€μ
λ ₯μ λ«λλ° μ€ν¨νμ΅λλ€: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "rev-listμ νμ€μ
λ ₯μ λ«λλ° μ€ν¨νμ΅λλ€" #: date.c:95 msgid "in the future" @@ -561,26 +570,26 @@ msgstr[0] "%luλ
μ " msgid "failed to read orderfile '%s'" msgstr "'%s' μμ νμΌμ μ½λλ° μ€ν¨νμ΅λλ€" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "λΆμ νν μ΄λ¦ λ°κΎΈκΈ° νμμ μννλ μ€" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " dirstat μλ¦ νΌμΌνΈ κ° '%s' νμ±μ μ€ν¨νμ΅λλ€\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " μ μ μλ dirstat νλΌλ―Έν° '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "'diff.submodule' μ€μ λ³μμ μ μ μλ κ°: '%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -589,16 +598,16 @@ msgstr "" "'diff.submodule' μ€μ λ³μμ μ€λ₯:\n" "%s'" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "μΈλΆ diff νλ‘κ·Έλ¨μ΄ μ£½μ, %s μμΉμμ λ©μΆ€" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow μ΅μ
μλ μ νν νλμ κ²½λ‘λͺ
μΈκ° νμν©λλ€" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -607,20 +616,20 @@ msgstr "" "--dirstat/-X μ΅μ
νλΌλ―Έν°λ₯Ό νμ±νλλ° μ€ν¨νμ΅λλ€:\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "--submodule μ΅μ
νλΌλ―Έν° νμ±μ μ€ν¨νμ΅λλ€: '%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "컀λ μ΄λ¦κ³Ό μ 보λ₯Ό κ°μ Έμ€λλ° μ€ν¨νμ΅λλ€" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "μ΄ μμ€ν
λλ μμΉμμλ μΆμ λμ§ μλ μΊμλ₯Ό μ¬μ©νμ§ μμ΅λλ€." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "gpgλ₯Ό μ€νν μ μμ΅λλ€." @@ -634,28 +643,28 @@ msgstr "gpgμμ λ°μ΄ν°λ₯Ό μλͺ
νλλ° μ€ν¨νμ΅λλ€." #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "μμ νμΌ '%s'μ(λ₯Ό) λ§λ€ μ μμ΅λλ€: %s" +msgid "could not create temporary file '%s'" +msgstr "'%s' μμ νμΌμ λ§λ€ μ μμ΅λλ€" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "λΆλ¦¬λ μλͺ
μ '%s'μ μ°λλ° μ€ν¨νμ΅λλ€: %s" +msgid "failed writing detached signature to '%s'" +msgstr "λΆλ¦¬λ μλͺ
μ '%s'μ μ°λλ° μ€ν¨νμ΅λλ€" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %sμ(λ₯Ό) μ½μ μ μμ΅λλ€" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s': %s" +msgid "failed to stat '%s'" +msgstr "'%s'μ λν΄ stat()μ΄ μ€ν¨νμ΅λλ€" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s': %sμμ μ½λ€κ° μλ¦Ό" +msgid "'%s': short read" +msgstr "'%s': μ½λ€κ° μλ¦Ό" #: help.c:205 #, c-format @@ -718,12 +727,36 @@ msgstr[0] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"'%s.lock' νμΌμ λ§λ€ μ μμ΅λλ€: %s.\n" +"\n" +"μ΄ μ μ₯μμμ λ€λ₯Έ κΉ νλ‘μΈμ€κ° μ€ν μ€μΈ κ²μΌλ‘ 보μ
λλ€. (μλ₯Ό\n" +"λ€μ΄ 'git commit' λͺ
λ ΉμΌλ‘ νΈμ§κΈ°κ° μ΄λ € μλ€λ μ§.) λͺ¨λ νλ‘μΈμ€λ₯Ό\n" +"λλλμ§ νμΈνμκ³ λ€μ μλν΄ λ³΄μμμ€. κ·Έλλ κ³μ μ€ν¨νλ©΄, μ΄\n" +"μ μ₯μμμ κΉ νλ‘μΈμ€κ° μ μ μ΄μ μ’
λ£νμ μλ μμ΅λλ€:\n" +"μλμΌλ‘ ν΄λΉ νμΌμ μ κ±°νκ³ κ³μνμμμ€." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "'%s.lock'μ λ§λ€ μ μμ΅λλ€: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "μΊμλ₯Ό μ½λλ° μ€ν¨νμ΅λλ€" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "μ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" @@ -770,7 +803,7 @@ msgstr "%s '%s' μ€λΈμ νΈλ₯Ό μ½μ μ μμ" msgid "blob expected for %s '%s'" msgstr "%s '%s'μ λν΄ λΈλ‘μ μμ" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "'%s'μ(λ₯Ό) μ¬λλ° μ€ν¨" @@ -904,7 +937,7 @@ msgstr "건λλ°κΈ°: %s (κΈ°μ‘΄κ³Ό κ°κ² λ³ν©)" msgid "Auto-merging %s" msgstr "μλ λ³ν©: %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "νμ λͺ¨λ" @@ -933,49 +966,49 @@ msgstr "" "μΆ©λ! (%s): μ΄λ¦μ΄ %sμΈ λλ ν°λ¦¬κ° %sμ μμ΅λλ€. %sμ(λ₯Ό) %s(μΌ)λ‘ μΆκ°ν©λ" "λ€" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "μΆκ°: %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "μΉλͺ
μ μΈ λ³ν© μ€ν¨, μΌμ΄λ μ μλ μν©." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "μ΄λ―Έ μ
λ°μ΄νΈ μνμ
λλ€!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s λ° %s νΈλ¦¬μ λ³ν©μ΄ μ€ν¨νμ΅λλ€" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "μ²λ¦¬λμ§ μμ κ²½λ‘??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "λ³ν©:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "κ³Όκ±°μ κ³΅ν΅ μ»€λ° %uκ° λ°κ²¬:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "λ³ν© κ²°κ³Όμ 컀λ°μ΄ μμ΅λλ€" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' μ€λΈμ νΈλ₯Ό νμ±ν μ μμ΅λλ€" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "μΈλ±μ€λ₯Ό μΈ μ μμ΅λλ€." @@ -1005,28 +1038,28 @@ msgstr "μλͺ»λ %s κ°: '%s'" msgid "unable to parse object: %s" msgstr "μ€λΈμ νΈλ₯Ό νμ±ν μ μμ΅λλ€: %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "μ¬μ©λ²: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " λλ: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" @@ -1035,7 +1068,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "μλͺ»λ νμμ μ€λΈμ νΈ μ΄λ¦ '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "%sμ(λ₯Ό) κ·Έλ£Ήμμ μ°κΈ° κ°λ₯νλλ‘ λ§λ€ μ μμ΅λλ€" @@ -1103,7 +1136,7 @@ msgstr "" ":(exclude) ν¨ν΄μΌλ‘ μ μΈν μ¬νμ΄ μμ΅λλ€.\n" "':/' λλ '.' μΆκ°λ₯Ό μμΌμ κ² μλλκΉ?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "--pretty νμμ νμ±ν μ μμ΅λλ€" @@ -1129,23 +1162,23 @@ msgstr "" "GIT_INDEX_VERSIONμ΄ μ€μ λμμ§λ§, μ΄ κ°μ΄ μλͺ»λμμ΅λλ€.\n" "%i λ²μ μ μ¬μ©ν©λλ€" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "'%s'μ(λ₯Ό) μ°κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "%s λ νΌλ°μ€λ₯Ό μμ ν μ μμ΅λλ€: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "λ νΌλ°μ€λ₯Ό μμ ν μ μμ΅λλ€: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "%s λ νΌλ°μ€λ₯Ό μ κ±°ν μ μμ΅λλ€" @@ -1284,103 +1317,103 @@ msgstr "νμ: %%(end) μν°μ΄ μμ΅λλ€" msgid "malformed object name %s" msgstr "μλͺ»λ νμμ μ€λΈμ νΈ μ΄λ¦ %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "%s λ° %sμ(λ₯Ό) λͺ¨λ %sμ κ°μ Έμ¬ μ μμ΅λλ€" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%sμ(λ) λ³΄ν΅ %sμ(λ₯Ό) μΆμ νκ³ , %sμ(λ₯Ό) μΆμ νμ§ μμ΅λλ€" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%sμ(λ) %s λ° %s λͺ¨λ μΆμ ν©λλ€" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "λ΄λΆ μ€λ₯" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEADκ° λΈλμΉλ₯Ό κ°λ¦¬ν€μ§ μμ΅λλ€" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "κ·Έλ° λΈλμΉκ° μμ΅λλ€: '%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "'%s' λΈλμΉμ λν΄ μ
μ€νΈλ¦Όμ μ€μ νμ§ μμμ΅λλ€" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "μ
μ€νΈλ¦Ό '%s' λΈλμΉκ° 리λͺ¨νΈ μΆμ λΈλμΉλ‘ μ μ₯λμ§ μμμ΅λλ€" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "리λͺ¨νΈ '%2$s'μ νΈμ λμ '%1$s'μ λ‘컬 μΆμ λΈλμΉκ° μμ΅λλ€" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "'%s' λΈλμΉμ νΈμ 리λͺ¨νΈκ° μμ΅λλ€" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "'%s'μ λν νΈμ λ νΌλ°μ€λͺ
μΈμ '%s'μ΄(κ°) λ€μ΄ μμ§ μμ΅λλ€" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "νΈμμ λμμ΄ μμ΅λλ€ (push.defaultκ° 'nothing'μ
λλ€)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "νλμ λμμ λν΄ 'simple' νΈμλ₯Ό μ²λ¦¬ν μ μμ΅λλ€" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "νμ¬ λΈλμΉκ° '%s' κΈ°λ°μ΄μ§λ§, μ
μ€νΈλ¦Όμ΄ μμ΄μ‘μ΅λλ€.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (λ°λ‘μ‘μΌλ €λ©΄ \"git branch --unset-upstream\"μ μ¬μ©νμμμ€)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "λΈλμΉκ° '%s'μ λ§κ² μ
λ°μ΄νΈλ μνμ
λλ€.\n" -#: remote.c:2084 +#: remote.c:2085 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "λΈλμΉκ° '%s'λ³΄λ€ %dκ° μ»€λ°λ§νΌ μμ μμ΅λλ€.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (λ‘컬μ μλ 컀λ°μ μ μΆνλ €λ©΄ \"git push\"λ₯Ό μ¬μ©νμμμ€)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "λΈλμΉκ° '%s'λ³΄λ€ %dκ° μ»€λ° λ€μ μκ³ , μμΌλ‘ λ릴 μ μμ΅λλ€.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (λ‘컬 λΈλμΉλ₯Ό μ
λ°μ΄νΈνλ €λ©΄ \"git pull\"μ μ¬μ©νμμμ€)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1392,21 +1425,21 @@ msgstr[0] "" "νμ¬ λΈλμΉμ '%s'μ΄(κ°) κ°λΌμ‘μ΅λλ€,\n" "λ€λ₯Έ 컀λ°μ΄ κ°κ° %dκ°μ %dκ° μμ΅λλ€.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (리λͺ¨νΈμ λΈλμΉλ₯Ό νμ¬ λΈλμΉλ‘ λ³ν©νλ €λ©΄ \"git pull\"μ μ¬μ©νμμμ€)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "νμ¬ λΈλμΉκ° λ§κ°μ§ κ²μ²λΌ 보μ
λλ€" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "νμ¬ '%s' λΈλμΉμ μμ§ μ무 컀λ°λ μμ΅λλ€" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent μ΅μ
μ --bisect μ΅μ
κ³Ό νΈνλμ§ μμ΅λλ€" @@ -1456,7 +1489,7 @@ msgstr "" "'git add <κ²½λ‘>' λλ 'git rm <κ²½λ‘>'λ‘ νμνμμμ€.\n" "κ·Έλ¦¬κ³ κ²°κ³Όλ¬Όμ 'git commit'μΌλ‘ 컀λ°νμμμ€" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "%sμ μΈ μ μμ΅λλ€" @@ -1615,12 +1648,12 @@ msgstr "\"git cherry-pick (--continue | --quit | --abort)\" λͺ
λ Ήμ ν΄ λ³΄μ msgid "Could not create sequencer directory %s" msgstr "%s μνμ λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "%s μ κ·Έλλ° μ€λ₯." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "λΉΌμ€κΈ°(cherry-pick) λλ λλ리기(revert)κ° μ§ν μ€μ΄μ§ μμ΅λλ€" @@ -1632,63 +1665,72 @@ msgstr "HEADλ₯Ό κ΅¬ν΄ μ¬ μ μμ΅λλ€" msgid "cannot abort from a branch yet to be born" msgstr "μλ‘ λ§λ€κ³ μλ λΈλμΉμμ μ€μ§ν μ μμ΅λλ€" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€: %s" +msgid "cannot open %s" +msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "%sμ(λ₯Ό) μ½μ μ μμ΅λλ€: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "μμμΉ λͺ»νκ² νμΌμ΄ λλ¬μ΅λλ€" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "λΉΌμ€κΈ° μ μ μ μ₯ν HEAD νμΌμ΄('%s') μμλμμ΅λλ€" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "%sμ ν¬λ§€ν
ν μ μμ΅λλ€." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s 컀λ°μ λΉΌμ¬ μ μμ΅λλ€" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: μλͺ»λ 리λΉμ " -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "μ΅μ΄μ 컀λ°μ λλ릴 μ μμ΅λλ€" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "λΉ ν€λλ‘ μ»€λ°μ λΉΌμ¬ μ μμ΅λλ€." -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "%sμ(λ₯Ό) μ½λλ° μ€ν¨νμ΅λλ€" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "κΉ μ μ₯μ λ²μ <= %d λ²μ μ κΈ°λνμ§λ§, %d λ²μ μ΄ λ°κ²¬λμμ΅λλ€" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "μ μ μλ μ μ₯μ νμ₯μ΄ μμ΅λλ€:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "μ€νμ
μ΄ λ¬Άμ νμΌ μμ
λλ€ (λ§κ°μ§ .idx?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "μ€νμ
μ΄ %sμ λ¬Άμ μΈλ±μ€ μμλ³΄λ€ μμ
λλ€ (λ§κ°μ§ μΈλ±μ€?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "μ€νμ
μ΄ %sμ λ¬Άμ μΈλ±μ€ λλ³΄λ€ λ€μ
λλ€ (λ§κ°μ§ μΈλ±μ€?)" @@ -1715,30 +1757,39 @@ msgstr "" "νμΈν΄ 보μκ³ μλͺ» λ§λ€μ΄μ§ κ²μ΄λ©΄ μ§μ°μμμ€. μ΄ λ©μμ§λ₯Ό λ³΄κ³ μΆμ§\n" "μμΌλ©΄ \"git config advice.objectNameWarning false\" λͺ
λ Ήμ μ¬μ©νμμμ€." -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "λ³ν©νμ§ μμ .gitmodulesλ₯Ό λ°κΏ μ μμ΅λλ€. λ³ν© μΆ©λμ λ¨Όμ ν΄κ²°νμμμ€" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "κ²½λ‘κ° %sμΌ λ .gitmodulesμ μΉμ
μ μ°Ύμ μ μμ΅λλ€" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr ".gitmodules νλͺ© %sμ(λ₯Ό) μ
λ°μ΄νΈν μ μμ΅λλ€" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "%sμ λν .gitmodules νλͺ©μ μ κ±°ν μ μμ΅λλ€" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "μ
λ°μ΄νΈν .gitmodulesλ₯Ό 컀λ°ν μ¬νμΌλ‘ νμνλλ° μ€ν¨" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "submodule.fetchJobs κ°μ μμλ₯Ό μΈ μ μμ΅λλ€" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "%sμ κ°μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1798,7 +1849,217 @@ msgstr "μμ νμΌ μ΄λ¦μ '%s'(μΌ)λ‘ λ°κΏ μ μμ΅λλ€" msgid "Could not read ref %s" msgstr "%s λ νΌλ°μ€λ₯Ό μ½μ μ μμ΅λλ€" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"λ€μ νμΌμ λ‘컬 λ³κ²½ μ¬νμ 체ν¬μμ λλ¬Έμ λμ΄ μ°κ² λ©λλ€:\n" +"%%sλΈλμΉλ₯Ό μ ννκΈ° μ μ λ³κ²½ μ¬νμ 컀λ°νκ±°λ μ€νμνμμμ€." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"λ€μ νμΌμ λ‘컬 λ³κ²½ μ¬νμ 체ν¬μμ λλ¬Έμ λμ΄ μ°κ² λ©λλ€:\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"λ€μ νμΌμ λ‘컬 λ³κ²½ μ¬νμ λ³ν© λλ¬Έμ λμ΄ μ°κ² λ©λλ€:\n" +"%%sλ³ν©νκΈ° μ μ λ³κ²½ μ¬νμ 컀λ°νκ±°λ μ€νμνμμμ€." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "λ€μ νμΌμ λ‘컬 λ³κ²½ μ¬νμ λ³ν© λλ¬Έμ λμ΄ μ°κ² λ©λλ€." + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"λ€μ νμΌμ λ‘컬 λ³κ²½ μ¬νμ %s λλ¬Έμ λμ΄ μ°κ² λ©λλ€:\n" +"%%s%s μ μ λ³κ²½ μ¬νμ 컀λ°νκ±°λ μ€νμνμμμ€." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"λ€μ νμΌμ λ‘컬 λ³κ²½ μ¬νμ %s λλ¬Έμ λμ΄ μ°κ² λ©λλ€:\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"λ€μ λλ ν°λ¦¬λ₯Ό μ
λ°μ΄νΈνλ©΄ κ·Έ μμ μΆμ νμ§ μλ νμΌμ μμ΄λ²λ¦½λλ€:\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"체ν¬μμ λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ΄ μ κ±°λ©λλ€:\n" +"%%sλΈλμΉλ₯Ό μ ννκΈ° μ μ μ΄ νμΌμ μκΈ°κ±°λ μ κ±°νμμμ€." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"체ν¬μμ λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ΄ μ κ±°λ©λλ€:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"λ³ν© λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ΄ μ κ±°λ©λλ€:\n" +"%%sλ³ν©νκΈ° μ μ μ΄ νμΌμ μκΈ°κ±°λ μ κ±°νμμμ€." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"λ³ν© λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ΄ μ κ±°λ©λλ€:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"%s λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ΄ μ κ±°λ©λλ€:\n" +"%%s%s νκΈ° μ μ μ΄ νμΌμ μκΈ°κ±°λ μ κ±°νμμμ€." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"%s λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ΄ μ κ±°λ©λλ€:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"체ν¬μμ λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ λμ΄μλλ€:\n" +"%%sλΈλμΉλ₯Ό μ ννκΈ° μ μ μ΄ νμΌμ μκΈ°κ±°λ μ κ±°νμμμ€." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"체ν¬μμ λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ λμ΄μλλ€:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"λ³ν© λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ λμ΄μλλ€:\n" +"%%sλ³ν©νκΈ° μ μ μ΄ νμΌμ μκΈ°κ±°λ μ κ±°νμμμ€." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"λ³ν© λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ λμ΄μλλ€:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"%s λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ λμ΄μλλ€:\n" +"%%s%s νκΈ° μ μ μ΄ νμΌμ μκΈ°κ±°λ μ κ±°νμμμ€." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"%s λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ λμ΄μλλ€:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "'%s' νλͺ©μ΄ '%s'μ(κ³Ό) κ²ΉμΉ©λλ€. λ¬Άμ μ μμ΅λλ€." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"λλ¬Έ 체ν¬μμμ μ
λ°μ΄νΈν μ μμ΅λλ€; λ€μ νλͺ©μ΄ μ΅μ μΌλ‘ μ
λ°μ΄νΈλμ§ μμμ΅λλ€:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"λλ¬Έ 체ν¬μμ μ
λ°μ΄νΈ λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ λμ΄μλλ€:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"λλ¬Έ 체ν¬μμ μ
λ°μ΄νΈ λλ¬Έμ μΆμ νμ§ μλ λ€μ μμ
ν΄λ νμΌμ μ κ±°ν©λλ€:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "μ€μ§ν¨\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "νμΌμ κ°μ Έμ΅λλ€" @@ -1836,196 +2097,192 @@ msgstr "κ²½λ‘μμ μλͺ»λ '..' λΆλΆ" msgid "could not open '%s' for reading and writing" msgstr "μ½κΈ°μ μ°κΈ°μ©μΌλ‘ '%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "'%s'μ(λ₯Ό) μ°κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "'%s'μ(λ₯Ό) μ½κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "'%s'μ μ κ·Όν μ μμ΅λλ€: %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "'%s'μ μ κ·Όν μ μμ΅λλ€" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "νμ¬ μμ
λλ ν°λ¦¬λ₯Ό κ°μ Έμ¬ μ μμ΅λλ€" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "%sμ(λ₯Ό) μ°κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "%sμ μΈ μ μμ΅λλ€" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "%sμ(λ₯Ό) λ«μ μ μμ΅λλ€" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "λ³ν©νμ§ μμ κ²½λ‘:" -#: wt-status.c:176 wt-status.c:203 +#: 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:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (μ€ν
μ΄μ§ ν΄μ νλ €λ©΄ \"git rm --cached <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (ν΄κ²°νλ€κ³ νμνλ €λ©΄ \"git add <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:184 wt-status.c:188 +#: 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:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (ν΄κ²°νλ€κ³ νμνλ €λ©΄ \"git rm <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "컀λ°ν λ³κ²½ μ¬ν:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "컀λ°νλλ‘ μ νμ§ μμ λ³κ²½ μ¬ν:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (무μμ 컀λ°ν μ§ λ°κΎΈλ €λ©΄ \"git add <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (무μμ 컀λ°ν μ§ λ°κΎΈλ €λ©΄ \"git add/rm <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (μμ
ν΄λμ λ³κ²½ μ¬νμ λ²λ¦¬λ €λ©΄ \"git checkout -- <νμΌ>...\"μ μ¬μ©νμ" "μμ€)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (νμ λͺ¨λμ μΆμ λμ§ μλ νμΌμ΄λ μμ λ λ΄μ©μ 컀λ°νκ±°λ λ²λ¦¬μμμ€)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (컀λ°ν μ¬νμ ν¬ν¨νλ €λ©΄ \"git %s <νμΌ>...\"μ μ¬μ©νμμμ€)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "μμͺ½μμ μμ :" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "μ΄ μͺ½μμ μΆκ°:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "μ μͺ½μμ μμ :" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "μ μͺ½μμ μΆκ°:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "μ΄ μͺ½μμ μμ :" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "μμͺ½μμ μΆκ°:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "μμͺ½μμ μμ :" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "bug: λ³ν©νμ§ μμ μν %x μ²λ¦¬λμ§ μμ" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "μ νμΌ:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "볡μ¬ν¨:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "μμ ν¨:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "μμ ν¨:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "μ΄λ¦ λ°κΏ:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "μ’
λ₯ λ°λ:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "μ μ μμ:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "λ³ν©νμ§ μμ:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "μ 컀λ°, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "μμ ν λ΄μ©, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "μΆμ νμ§ μμ λ΄μ©, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "λ²κ·Έ: μ²λ¦¬λμ§ μμ diff μν %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "λ³κ²½λμμ§λ§ μ
λ°μ΄νΈνμ§ μμ νμ λͺ¨λ:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "컀λ°ν νμ λͺ¨λμ λ³κ²½ μ¬ν:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2033,39 +2290,39 @@ msgstr "" "μμ μ€μ λ°κΎΈμ§ λ§μμμ€.\n" "μλ μλ λ΄μ©μ λͺ¨λ μ κ±°λ©λλ€." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "λ³ν©νμ§ μμ κ²½λ‘κ° μμ΅λλ€." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (μΆ©λμ λ°λ‘μ‘κ³ \"git commit\"μ μ€ννμμμ€)" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "λͺ¨λ μΆ©λμ λ°λ‘μ‘μμ§λ§ μμ§ λ³ν©νλ μ€μ
λλ€." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (λ³ν©μ λ§λ¬΄λ¦¬νλ €λ©΄ \"git commit\"μ μ¬μ©νμμμ€)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "am μΈμ
μ€κ°μ μμ΅λλ€." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "νμ¬ ν¨μΉκ° λΉμ΄ μμ΅λλ€." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (μΆ©λμ λ°λ‘μ‘μ λ€μ \"git am --continue\"λ₯Ό μ¬μ©νμμμ€)" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (μ΄ ν¨μΉλ₯Ό 건λ λ°λ €λ©΄ \"git am --skip\"μ μ¬μ©νμμμ€)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (μλ³Έ λΈλμΉλ₯Ό 볡ꡬνλ €λ©΄ \"git am --abort\"λ₯Ό μ¬μ©νμμμ€)" @@ -2205,43 +2462,43 @@ msgstr "'μ΄λ±λΆνλ μ€μ
λλ€." msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (μλ λΈλμΉλ‘ λμκ°λ €λ©΄ \"git bisect reset\"μ μ¬μ©νμμμ€)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "νμ¬ λΈλμΉ " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "λνν λ¦¬λ² μ΄μ€ μ§ν μ€. κ° μμΉλ " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "λ¦¬λ² μ΄μ€ μ§ν μ€. κ° μμΉλ " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEADκ° λ€μ μμΉμμ λΆλ¦¬: " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEADκ° λ€μμΌλ‘λΆν° λΆλ¦¬: " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "νμ¬ μ΄λ€ λΈλμΉλ μ¬μ©νμ§ μμ." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "μ΅μ΄ 컀λ°" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "μΆμ νμ§ μλ νμΌ" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "무μν νμΌ" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2252,20 +2509,20 @@ msgstr "" "'status -uno' μ΅μ
μ μ°λ©΄ λΉ¨λΌμ§ μλ μμ§λ§, μ νμΌμ\n" "μ§μ μ°Ύμμ μΆκ°ν΄μΌ ν©λλ€. ('git help status' μ°Έκ³ )" -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "μΆμ νμ§ μλ νμΌμ λ³΄μ§ μμ΅λλ€%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (μΆμ νμ§ μλ νμΌμ λ³΄λ €λ©΄ -u μ΅μ
μ μ¬μ©νμμμ€)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "λ³κ²½ μ¬ν μμ" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" @@ -2273,12 +2530,12 @@ msgstr "" "\"λ₯Ό\n" "μ¬μ©νμμμ€)\n" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "컀λ°ν λ³κ²½ μ¬νμ μΆκ°νμ§ μμμ΅λλ€\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2288,55 +2545,55 @@ msgstr "" "\"git\n" "add\"λ₯Ό μ¬μ©νμμμ€)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "컀λ°ν μ¬νμ μΆκ°νμ§ μμμ§λ§ μΆμ νμ§ μλ νμΌμ΄ μμ΅λλ€\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "컀λ°ν μ¬ν μμ (νμΌμ λ§λ€κ±°λ 볡μ¬νκ³ \"git add\"λ₯Ό μ¬μ©νλ©΄ μΆμ ν©λ" "λ€)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "컀λ°ν μ¬ν μμ\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "컀λ°ν μ¬ν μμ (μΆμ νμ§ μλ νμΌμ λ³΄λ €λ©΄ -u μ΅μ
μ μ¬μ©νμμμ€)\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "컀λ°ν μ¬ν μμ, μμ
ν΄λ κΉ¨λν¨\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "μ΅μ΄ 컀λ°, λΈλμΉ: " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (λΈλμΉ μμ)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "μμ" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "λ€μ λ€μ: " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "λ€μ μμ: " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "'%s' νμΌ μμ μ μ€ν¨νμ΅λλ€" @@ -2350,7 +2607,7 @@ msgstr "git add [<μ΅μ
>] [--] <κ²½λ‘λͺ
μΈ>..." msgid "unexpected diff status %c" msgstr "μμμΉ λͺ»ν diff μν %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "νμΌ μ
λ°μ΄νΈκ° μ€ν¨νμ΅λλ€" @@ -2363,7 +2620,7 @@ msgstr "'%s' μ κ±°\n" msgid "Unstaged changes after refreshing the index:" msgstr "μΈλ±μ€λ₯Ό μλ‘ κ³ μΉ λ€μ μ»€λ° νμνμ§ μμ λ³κ²½ μ¬ν:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "μΈλ±μ€λ₯Ό μ½μ μ μμ΅λλ€" @@ -2399,14 +2656,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "λ€μ κ²½λ‘λ .gitignore νμΌ μ€ νλ λλ¬Έμ 무μν©λλ€:\n" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "κ°μ§λ‘ μ€ν" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "μμΈν νμ" @@ -2414,7 +2671,7 @@ msgstr "μμΈν νμ" msgid "interactive picking" msgstr "λνμμΌλ‘ κ³ λ¦
λλ€" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "λνμμΌλ‘ λ³κ²½λ λΆλΆμ μ νν©λλ€" @@ -2483,16 +2740,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "'git add .' λͺ
λ Ήμ μ€ννλ €κ³ ν κ² μλμμ΅λκΉ?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "μΈλ±μ€ νμΌμ΄ μμλμμ΅λλ€" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "μ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "'%s'μμ μ½μ μ μμ΅λλ€" @@ -2520,16 +2777,6 @@ msgstr "'%s'μμ '%s'(μΌ)λ‘ λ
ΈνΈλ₯Ό 볡μ¬νλλ° μ€ν¨νμ΅λλ€" msgid "fseek failed" msgstr "fseek μ€ν¨" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "'%s'μ(λ₯Ό) μ½κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "'%s'μ(λ₯Ό) μ°κΈ°μ©μΌλ‘ μ΄ μ μμ΅λλ€: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2539,74 +2786,74 @@ msgstr "'%s' ν¨μΉλ₯Ό νμ±ν μ μμ΅λλ€" msgid "Only one StGIT patch series can be applied at once" msgstr "νλ²μ νλμ StGIT ν¨μΉ μ리μ¦λ§ μ μ©ν μ μμ΅λλ€" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "μκ°μ΄ μλͺ»λμμ΅λλ€" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "Date μ€μ΄ μλͺ»λμμ΅λλ€" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "μκ°λ μ€νμ
μ΄ μλͺ»λμμ΅λλ€" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "ν¨μΉ νμ κ²μμ΄ μ€ν¨νμ΅λλ€." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "'%s' λλ ν°λ¦¬ λ§λ€κΈ°κ° μ€ν¨νμ΅λλ€" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "ν¨μΉλ₯Ό μͺΌκ°λλ° μ€ν¨νμ΅λλ€." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "μ΄ λ¬Έμ λ₯Ό ν΄κ²°νμ λ \"%s --continue\"λ₯Ό μ€ννμμμ€." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "μ΄ ν¨μΉλ₯Ό 건λλ°λ €λ©΄, κ·Έ λμ \"%s --skip\"μ μ€ννμμμ€." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "μλ λΈλμΉλ₯Ό 볡ꡬνκ³ ν¨μΉ μ μ©μ μ€μ§νλ €λ©΄ \"%s --abort\"λ₯Ό μ€ννμμμ€." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "ν¨μΉκ° λΉμ΄ μμ΅λλ€. μλͺ» μͺΌκ°μ§μ§ μμλμ?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "μλͺ»λ μ μ μ€: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "%s 컀λ°μ νμ±ν μ μμ΅λλ€" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "μ μ₯μμ 3-λ°©ν₯ λ³ν©μΌλ‘ λμ ν λ νμν λΈλ‘μ΄ μμ΅λλ€." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "μΈλ±μ€ μ 보λ₯Ό μ¬μ©ν΄ κΈ°λ³Έ νΈλ¦¬λ₯Ό λ€μ λ§λλλ€..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2614,38 +2861,38 @@ msgstr "" "ν¨μΉλ₯Ό μ§μ νΈμ§νμ
¨μ΅λκΉ?\n" "μ΄ ν¨μΉλ μΈλ±μ€μ κΈ°λ‘λ λΈλ‘μλ μ μ©λμ§ μμ΅λλ€." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "λ² μ΄μ€ ν¨μΉ μ μ© λ° 3-λ°©ν₯ λ³ν©μΌλ‘ λμ ν©λλ€..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "λ³κ²½ μ¬νμμ λ³ν©νλλ° μ€ν¨νμ΅λλ€." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-treeκ° νΈλ¦¬λ₯Ό μ°λλ° μ€ν¨νμ΅λλ€" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "λΉ μ»€λ° λ΄μμ λν΄ μ μ©ν©λλ€" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "μ»€λ° μ€λΈμ νΈλ₯Ό μ°λλ° μ€ν¨νμ΅λλ€" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "λ€μ μμν μ μμ΅λλ€: %sμ΄(κ°) μμ΅λλ€." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "ν°λ―Έλμ νμ€ μ
λ ₯μ΄ μ°κ²°λμ§ μμ μνμμ λννμΌλ‘ μ€νν μ μμ΅λλ€." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "μ»€λ° λ³Έλ¬Έμ:" @@ -2653,35 +2900,35 @@ msgstr "μ»€λ° λ³Έλ¬Έμ:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "μ μ©? μ[y]/μλμ€[n]/νΈμ§[e]/ν¨μΉ 보기[v]/λͺ¨λ μ μ©[a]: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "λ³κ²½λ μΈλ±μ€: ν¨μΉλ₯Ό μ μ©ν μ μμ΅λλ€ (dirty: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "μ μ©νλ μ€: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "λ³κ²½ μ¬ν μμ -- ν¨μΉκ° μ΄λ―Έ μ μ©λμμ΅λλ€." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "ν¨μΉκ° %s %.*s μμΉμμ μ€ν¨νμ΅λλ€" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "μ€ν¨ν ν¨μΉμ 볡μ¬λ³Έμ΄ λ€μ μμΉμ μμ΅λλ€: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2691,7 +2938,7 @@ msgstr "" "컀λ°μΌλ‘ νμν μ¬νμ΄ λ¨μ μμ§ μμΌλ©΄, μ΄λ―Έ κ°μ ν¨μΉμμ μ μ©λ\n" "κ²½μ°μΌ μλ μμ΅λλ€. κ·Έλ° κ²½μ°μλ μ΄ ν¨μΉλ₯Ό 건λλ°λ©΄ λ©λλ€." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2699,17 +2946,17 @@ msgstr "" "μΈλ±μ€μ λ³ν©νμ§ μμ κ²½λ‘κ° λ¨μ μμ΅λλ€.\n" "'git add' μ¬μ©μ μμ§ μμΌμ
¨μ΅λκΉ?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "'%s' μ€λΈμ νΈλ₯Ό νμ±ν μ μμ΅λλ€." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "μΈλ±μ€ μ§μ°κΈ°μ μ€ν¨νμ΅λλ€" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2717,155 +2964,157 @@ msgstr "" "λ§μ§λ§ 'am' μ€ν¨ μ΄ν HEADλ₯Ό μκΈ΄ κ² κ°μ΅λλ€.\n" "ORIG_HEADλ‘ λλλ¦¬μ§ μμ΅λλ€." -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "--patch-format μ΅μ
μ λν΄ μλͺ»λ κ°: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<μ΅μ
>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<μ΅μ
>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "λννμΌλ‘ μ€νν©λλ€" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "μ무 λμλ νμ§ μμ΅λλ€ (κ³Όκ±°λΆν° μμλ μ΅μ
)" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "νμνλ©΄ 3-λ°©ν₯ λ³ν©μΌλ‘ λμ νλλ‘ νμ©ν©λλ€" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "κ°λ΅ν νμν©λλ€" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "μ»€λ° λ©μμ§μ Signed-off-by μ€μ λ¨κΉλλ€" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "UTF-8 μΈμ½λ©μΌλ‘ λ³νν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "git-mailinfoμ -k μ΅μ
μ μλλ€" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "git-mailinfoμ -b μ΅μ
μ μλλ€" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "git-mailinfoμ -m μ΅μ
μ μλλ€" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "mbox νμμ λν΄ git-mailsplitμ --keep-cr μ΅μ
μ μ¬μ©ν©λλ€" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "am.keepcrμ 무κ΄νκ² git-mailsplitμ --keep-cr μ΅μ
μ μ¬μ©νμ§ μμ΅λλ€." -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "μ μ·¨μ μμ λͺ¨λ μ¬νμ 무μν©λλ€" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "λμ" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "git-applyμ λκΉλλ€" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "μ΅μμ" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "κ²½λ‘" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 #: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "κ°μ" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "νμ" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "ν¨μΉμ νμ" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "ν¨μΉ μ€ν¨κ° λ°μνμ λ μ€λ₯ λ©μμ§ λμ μ¬μ©ν©λλ€" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "μΆ©λμ ν΄κ²°ν λ€μ ν¨μΉ μ μ©μ κ³μν©λλ€" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "--continue μ΅μ
κ³Ό λμΌ" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "νμ¬ ν¨μΉ 건λλ°κΈ°" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "μλ λΈλμΉλ₯Ό 볡ꡬνκ³ ν¨μΉ μ μ© μμ
μ μ€μ§ν©λλ€." # NOTE: μ΅μ
μ μλ―Έλ μ΄κ² λ§λ€. μλ¬Έμμλ μ¬μ©μκ° # --committer-date-is-author-dateλΌλ μ΅μ
μ λ³΄κ³ μλ―Έλ₯Ό μ μ μλ€κ³ κ°μ νκ³ μλ€. -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "μ»€λ―Έν° μκ°μ μμ±μ μκ°μΌλ‘ λ£μ΅λλ€" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "νμ¬ μκ°μ μμ±μ μκ°μΌλ‘ μ¬μ©ν©λλ€" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "ν€-ID" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "GPG μλͺ
컀λ°" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(git-rebaseλ₯Ό μν λ΄λΆ μ©λ)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2873,16 +3122,16 @@ msgstr "" "-b/--binary μ΅μ
μ μ€λ μκ° λμ μ무 λμλ νμ§ μμμΌλ―λ‘, μ΄\n" "μ΅μ
μ μ κ±°λ μμ μ
λλ€. μ΄μ μ¬μ©νμ§ λ§μμμ€." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "μΈλ±μ€ μ½κΈ°μ μ€ν¨νμ΅λλ€" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "μ΄μ λ¦¬λ² μ΄μ€ λλ ν°λ¦¬ %sμ΄(κ°) μμ§ μκ³ mboxλ₯Ό μ§μ νμ΅λλ€." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2891,7 +3140,7 @@ msgstr "" "λ²μ΄λ %s λλ ν°λ¦¬κ° λ°κ²¬λμμ΅λλ€.\n" "μ κ±°νλ €λ©΄ \"git am --abort\"λ₯Ό μ¬μ©νμμμ€." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "ν΄μ μμ
μ΄ μ§ν μ€μ
λλ€. λ€μ μμνμ§ μμ΅λλ€." @@ -2924,41 +3173,41 @@ msgstr "regexec()μμ λ€μ μ
λ ₯μ λν΄ %dλ²μ 리ν΄νμ΅λλ€: %s" msgid "unable to find filename in patch at line %d" msgstr "ν¨μΉμ %dλ² μ€μ νμΌ μ΄λ¦μ μ°Ύμ μ μμ΅λλ€" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: μλͺ»λ git-diff - %2$dλ² μ€μμ /dev/nullμ κΈ°λνμ§λ§, '%1$s'μ΄" "(κ°) μμ΅λλ€" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: μλͺ»λ git-diff - %dλ² μ€μ μ νμΌ μ΄λ¦μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: μλͺ»λ git-diff - %dλ² μ€μ μμ νμΌ μ΄λ¦μ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: μμμΉ λͺ»ν μ€: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "%dλ² μ€μ ν€λ μλ ν¨μΉ λΆλΆ: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2970,76 +3219,76 @@ msgstr[0] "" "κ²½λ‘ μ΄λ¦ λΆλΆμμ %dκ°λ₯Ό μ κ±°λΌ λ git diff ν€λμ νμΌ μ΄λ¦ μ λ³΄κ° μμ΅λ" "λ€. (%dλ² μ€)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "μ νμΌμ΄ μμ λ΄μ©μ μμ‘΄ν©λλ€" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "μμ ν νμΌμ μμ§ λ΄μ©μ΄ λ€μ΄ μμ΅λλ€" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "ν¨μΉκ° %dλ² μ€μμ λ§κ°μ‘μ΅λλ€" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "μ νμΌ %sμ΄(κ°) μμ λ΄μ©μ μμ‘΄ν©λλ€" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "μμ ν νμΌ %sμ΄(κ°) μμ§ λ΄μ©μ΄ λ€μ΄ μμ΅λλ€" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** κ²½κ³ : %s νμΌμ λ΄μ©μ΄ λΉμ΄ μμ§λ§ μμ λμ§ μμμ΅λλ€" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "%dλ² μ€μ λ°μ΄λ리 ν¨μΉκ° μμλμμ΅λλ€: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "%dλ² μ€μ λ°μ΄λ리 ν¨μΉκ° μ΄ν΄ν μ μμ΅λλ€" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "%dλ² μ€μ μ°λ κΈ° λ°μ΄ν°λ§ μλ ν¨μΉ" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "%s μ¬λ³Όλ¦ λ§ν¬λ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "%sμ(λ₯Ό) μ΄κ±°λ μ½μ μ μμ΅λλ€" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "μ€ μμμ΄ μλͺ»λ¨: '%c'" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "ν¨μΉ %dλ² λΆλΆ %dλ² μ€μμ μ±κ³΅ (μ€νμ
%dμ€)" -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "컨ν
μ€νΈκ° (%ld/%ld)λ‘ μ€μ΄λλλ€. (%dλ² μ€μμ μ μ©)" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3048,319 +3297,329 @@ msgstr "" "λ€μμ κ²μνλ μ€:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "'%s'μ λν λ°μ΄λ리 ν¨μΉ λ°μ΄ν°κ° μμ΅λλ€" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "λ°μ΄λ리 ν¨μΉλ₯Ό '%s'μ μ μ©ν μ μμ΅λλ€" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "'%s'μ λν λ°μ΄λ리 ν¨μΉκ° μ¬λ°λ₯΄μ§ μμ κ²°κ³Όλ₯Ό λ§λλλ€. (κΈ°λν κ° %s, μ€" "μ %s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "ν¨μΉ μ€ν¨: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "%sμ(λ₯Ό) κ°μ Έμ¬ μ μμ΅λλ€" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "%s μ½κΈ°κ° μ€ν¨νμ΅λλ€" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "μ¬λ³Όλ¦ λ§ν¬ λ€μ μλ '%s' μ½κΈ°" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "%s κ²½λ‘κ° μ΄λ¦μ΄ λ°λμκ±°λ μμ λμμ΅λλ€" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: μΈλ±μ€μ μμ΅λλ€" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: μΈλ±μ€μ λ§μ§ μμ΅λλ€" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "μ κ±°νλ ν¨μΉ λ€μμ νμΌ λ΄μ©μ΄ λ¨μμ΅λλ€" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: μλͺ»λ μ’
λ₯" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%sμ μ’
λ₯κ° %oμ΄μ§λ§ %oμ΄(κ°) λμ΄μΌ ν©λλ€" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "μλͺ»λ κ²½λ‘ '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: μ΄λ―Έ μΈλ±μ€μ μμ΅λλ€" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: μ΄λ―Έ μμ
λλ ν°λ¦¬μ μμ΅λλ€" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$sμ μ λͺ¨λ(%1$o)κ° μμ λͺ¨λ(%3$o)μ λ€λ¦
λλ€" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, 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:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "μν₯ λ°λ '%s' νμΌμ΄ μ¬λ³Όλ¦ λ§ν¬ λ€μ μμ΅λλ€" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: ν¨μΉλ₯Ό μ μ©νμ§ μμ΅λλ€" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "%s ν¨μΉλ₯Ό νμΈνλ μ€μ
λλ€..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "κ²½λ‘ '%s'μ λν΄ make_cache_entry μ€ν¨" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "μΈλ±μ€μμ %sμ(λ₯Ό) μ κ±°ν μ μμ΅λλ€" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "νμ λͺ¨λ %sμ λν΄ μμλ ν¨μΉ" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "μλ‘ λ§λ νμΌ '%s'μ λν΄ stat()ν μ μμ΅λλ€" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "μλ‘ λ§λ νμΌ '%s'μ λν΄ μλΉ μ μ₯μλ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "%sμ λν΄ μΊμ νλͺ©μ μΆκ°ν μ μμ΅λλ€" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "'%s' νμΌμ λ«λ μ€μ
λλ€" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "'%s' νμΌμ μΈ μ μμ΅λλ€ ('%o' λͺ¨λ)" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "%s ν¨μΉ κΉλνκ² μ μ©." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "λ΄λΆ μ€λ₯" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "%%s ν¨μΉλ₯Ό (%dκ° κ±°λΆ) μ μ©..." -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncating .rej νμΌ μ΄λ¦μ '%.*s.rej'(μΌ)λ‘ μλ¦" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "ν¨μΉ λΆμ #%d κΉλνκ² μ μ©." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "ν¨μΉ λΆμ #%d κ±°λΆλ¨." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "ν¨μΉ '%s' 건λλ." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "μΈμν μ μλ μ
λ ₯" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "μΈλ±μ€ νμΌμ μ½μ μ μμ΅λλ€" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "μ£Όμ΄μ§ κ²½λ‘μ ν΄λΉνλ λ³κ²½ μ¬νμ μ μ©νμ§ μμ΅λλ€" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "μ£Όμ΄μ§ κ²½λ‘μ ν΄λΉνλ λ³κ²½ μ¬νμ μ μ©ν©λλ€" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "μ ν΅μ μΈ diff κ²½λ‘ μμ <κ°μ>κ°μ μ μ¬λμ(/)λ₯Ό μ κ±°ν©λλ€" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ν¨μΉμμ μΆκ°νλ νμΌμ 무μν©λλ€" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , μ
λ ₯μ λν diffstatμ μΆλ ₯ν©λλ€" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "μμ§μλ‘ μΆκ° λ° μμ ν μ€ μλ₯Ό νμν©λλ€" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , μ
λ ₯μ λν μμ½μ μΆλ ₯ν©λλ€" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ν¨μΉλ₯Ό μ μ©νλ λμ , ν¨μΉλ₯Ό μ μ© κ°λ₯νμ§ νμΈν©λλ€" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "νμ¬ μΈλ±μ€μμ ν¨μΉκ° μ μ© κ°λ₯νμ§ νμΈν©λλ€" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "μμ
ν΄λλ₯Ό λ°κΎΈμ§ μκ³ ν¨μΉλ₯Ό μ μ©ν©λλ€" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "μμ
μμ λ°μ νμΌμ λ°κΎΈλ ν¨μΉλ₯Ό νμ©ν©λλ€" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "κ·Έλ¦¬κ³ ν¨μΉλ μ μ©ν©λλ€ (--stat/--summary/--check μ΅μ
κ³Ό κ°μ΄ μ¬μ©)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "ν¨μΉλ₯Ό μ μ©νμ§ μμΌλ©΄ 3-λ°©ν₯ λ³ν©μ μλν©λλ€" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "λ΄μ₯ μΈλ±μ€ μ 보λ₯Ό μ¬μ©ν΄ μμ μΈλ±μ€λ₯Ό λ§λλλ€" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "κ²½λ‘λ₯Ό NUL λ¬Έμλ‘ κ΅¬λΆν©λλ€" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "μ΅μν <n>μ€μ΄ 컨ν
μ€νΈμ μΌμΉνλμ§ νμΈν©λλ€" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "곡백 μ€λ₯κ° μλ μΆκ°λκ±°λ μμ λ μ€μ μ°Ύμ΅λλ€" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "컨ν
μ€νΈλ₯Ό μ°Ύμ λ 곡백 λ³κ²½ μ¬νμ 무μν©λλ€" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "ν¨μΉλ₯Ό λ°λ μμλ‘ μ μ©ν©λλ€" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "μ΅μνμ 컨ν
μ€νΈ ν μ€λ μμ΄ μ μ©ν©λλ€" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "κ±°λΆλ ν¨μΉ λΆλΆμ λμλλ *.rej νμΌμ λ¨κ²¨λ‘λλ€" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "ν¨μΉ λΆλΆμ΄ κ²Ήμ³λ νμ©ν©λλ€" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "νμΌ λμ μ€λ°κΏμ΄ λΉ μ‘μμ μλͺ» κ²μν κ²½μ°μ 무μν©λλ€" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "ν¨μΉ λΆλΆμ ν€λμ μ€ μλ₯Ό μ μ©νμ§ μμ΅λλ€" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "λͺ¨λ νμΌ μ΄λ¦μ <μ΅μμ>λ₯Ό μμ λΆμ
λλ€" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "μ μ₯μ λ°μμ --3way μ΅μ
μ¬μ©" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "μ μ₯μ λ°μμ --index μ΅μ
μ¬μ©" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "μ μ₯μ λ°μμ --cached μ΅μ
μ¬μ©" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "'%s' ν¨μΉλ₯Ό μ΄ μ μμ΅λλ€" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "곡백 μ€λ₯ %dκ°λ₯Ό λμ΄κ°λλ€" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3425,99 +3684,99 @@ msgstr "<리λΉμ -μ΅μ
>μ git-rev-list(1)μ μ€λͺ
λμ΄ μμ΅λλ€" msgid "Blaming lines" msgstr "λΈλ μ μ€" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "λΈλ μ νλͺ©μ μ°Ύμλ§μ μ μ§μ μΌλ‘ νμν©λλ€" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "κ°μ₯μ리 컀λ°μ λν΄ λΉ SHA-1μ νμν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "μ΅μμ 컀λ°μ κ°μ₯μ리 컀λ°μΌλ‘ μ·¨κΈνμ§ μμ΅λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "μμ
λΉμ© ν΅κ³λ₯Ό νμν©λλ€" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "κ°μ λ‘ μ§ν μν©μ νμν©λλ€" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "λΈλ μ νλͺ©μ λν΄ μΆλ ₯ μ μλ₯Ό νμν©λλ€" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "μλ νμΌ μ΄λ¦ νμ (κΈ°λ³Έκ°: μλ)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "μλ μ€ λ²νΈ νμ (κΈ°λ³Έκ°: νμ§ μμ)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "μ»΄ν¨ν° μ²λ¦¬μ©μΌλ‘ μ€κ³λ νμμΌλ‘ νμν©λλ€" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "μ€λ§λ€ μ»€λ° μ λ³΄κ° νμλλ μ¬μ©μμ© νμμΌλ‘ νμν©λλ€" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "git-annotateμ λμΌν νμμ μ¬μ©ν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "λ΄λΆ νμμΌλ‘ μκ°μ νμν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "κΈΈκ² μ»€λ° SHA1μ νμν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "μμ±μ μ΄λ¦κ³Ό μκ°μ νμνμ§ μμ΅λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "μμ±μ μ΄λ¦ λμ μ μ μλ©μΌμ νμν©λλ€ (κΈ°λ³Έκ°: κΊΌμ§)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "곡백 λ¬Έμ μ°¨μ΄μ μ 무μν©λλ€" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "λ μΌμΉνλ νλͺ©μ μ°Ύλλ° λ μκ°μ μλͺ¨ν©λλ€" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "git-rev-listλ₯Ό νΈμΆνλ λμ <νμΌ>μμ 리λΉμ μ μ¬μ©ν©λλ€" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "<νμΌ>μ λ΄μ©μ μ΅μ’
μ΄λ―Έμ§λ‘ μ¬μ©ν©λλ€" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "μ μ" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "νμΌ λ΄λΆμ νμΌ μ¬μ΄μ 볡μ¬λ μ€μ μ°Ύμ΅λλ€" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "νμΌ λ΄λΆμ νμΌ μ¬μ΄μ μκ²¨μ§ μ€μ μ°Ύμ΅λλ€" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "n,mμ€ (1λ² μ€λΆν° μμ) μ¬μ΄μ λ²μλ§ μ²λ¦¬" @@ -3527,31 +3786,31 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4λ
11λ¬ μ " -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<μ΅μ
>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<μ΅μ
>] [-l] [-f] <λΈλμΉ-μ΄λ¦> [<μμ-μ§μ >]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<μ΅μ
>] [-r] (-d | -D) <λΈλμΉ-μ΄λ¦>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<μ΅μ
>] (-m | -M) [<κ³Όκ±°-λΈλμΉ>] <μ-λΈλμΉ>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<μ΅μ
>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3560,7 +3819,7 @@ msgstr "" "'%s' λΈλμΉλ₯Ό μμ ν©λλ€. μ΄ λΈλμΉλ '%s'μ\n" " λ³ν©λμμ§λ§, HEADμλ λ³ν©λμ§ μμμ΅λλ€." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3569,12 +3828,12 @@ msgstr "" "'%s' λΈλμΉλ₯Ό μμ νμ§ μμ΅λλ€. μ΄ λΈλμΉλ '%s'μ\n" " λ³ν©λμ§ μμμ§λ§, HEADμλ λ³ν©λμμ΅λλ€." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "'%s'μ λν μ»€λ° μ€λΈμ νΈλ₯Ό μ°Ύμλ³Ό μ μμ΅λλ€" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3583,299 +3842,320 @@ msgstr "" "'%s' λΈλμΉκ° μμ ν λ³ν©λμ§ μμμ΅λλ€.\n" "μ λ§λ‘ μμ νλ €λ©΄ 'git branch -D %s' λͺ
λ Ήμ μ€ννμμμ€." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "config-file μ
λ°μ΄νΈκ° μ€ν¨νμ΅λλ€" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "-a μ΅μ
μ -d μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "HEADμ λν μ»€λ° μ€λΈμ νΈλ₯Ό μ°Ύμλ³Ό μ μμ΅λλ€" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "'%s' λΈλμΉλ νμ¬ μμΉν λΈλμΉμ΄κΈ° λλ¬Έμ μμ ν μ μμ΅λλ€." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "'%2$s' μμΉμ 체ν¬μμν '%1$s' λΈλμΉλ₯Ό μμ ν μ μμ΅λλ€" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "리λͺ¨νΈ μΆμ '%s' λΈλμΉκ° μμ΅λλ€." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "'%s' λΈλμΉκ° μμ΅λλ€." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "리λͺ¨νΈ μΆμ '%s' λΈλμΉλ₯Ό μμ νλλ° μ€λ₯" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "'%s' λΈλμΉλ₯Ό μμ νλλ° μ€λ₯" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "리λͺ¨νΈ μΆμ '%s' λΈλμΉλ₯Ό μμ ν©λλ€. (κ³Όκ±° %s)\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "%s λΈλμΉ μμ (κ³Όκ±° %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: μ¬λΌμ§]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: %dκ° λ€]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[%dκ° λ€]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: %dκ° μ]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[%dκ° μ]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: %dκ° μ, %dκ° λ€]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[%dκ° μ, %dκ° λ€]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** μλͺ»λ λ νΌλ°μ€ ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(λΈλμΉ μμ, %s λ¦¬λ² μ΄μ€)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(λΈλμΉ μμ, μ΄λ±λΆ %sμμ μμ)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD %s μμΉμμ λΆλ¦¬λ¨)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD %s(μΌ)λ‘λΆν° λΆλ¦¬λ¨)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(λΈλμΉ μμ)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "%s λΈλμΉλ₯Ό %s μμΉμ λ¦¬λ² μ΄μ€ν©λλ€" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "%s λΈλμΉλ₯Ό %s μμΉμμ bisectν©λλ€" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "λΈλμΉ μμ μμΌλ©΄μ νμ¬ λΈλμΉ μ΄λ¦μ λ°κΏ μ μμ΅λλ€." -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "μλͺ»λ λΈλμΉ μ΄λ¦: '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "λΈλμΉ μ΄λ¦ λ°κΎΈκΈ° μ€ν¨" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "μ΄λ¦μ΄ μλͺ»λ '%s' λΈλμΉμ μ΄λ¦μ λ€λ₯΄κ² λ°κΏλλ€" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "λΈλμΉ μ΄λ¦μ %s(μΌ)λ‘ λ°κΎΈμ§λ§, HEADλ₯Ό μ
λ°μ΄νΈνμ§ μμ΅λλ€!" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "λΈλμΉμ μ΄λ¦μ λ°κΎΈμ§λ§, config-file μ
λ°μ΄νΈκ° μ€ν¨νμ΅λλ€" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "λΈλμΉ μ€λͺ
μμμ μΈ μ μμ΅λλ€: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "λΈλμΉ μ€λͺ
μμμ μΈ μ μμ΅λλ€" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "μΌλ° μ΅μ
" # FIXME: give twice? -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "ν΄μμ μ λͺ©μ νμνκ³ , μ
μ€νΈλ¦Ό λΈλμΉμ λν μμΉλ₯Ό νμν©λλ€" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "μ¬λ¬κ°μ§ μλ΄ λ©μμ§λ₯Ό νμνμ§ μμ΅λλ€" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "μΆμ λͺ¨λλ₯Ό μ€μ ν©λλ€ (git-pull(1) μ°Έκ³ )" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "μ
μ€νΈλ¦Ό μ 보λ₯Ό λ°κΏλλ€" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "μ
μ€νΈλ¦Ό" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "μ
μ€νΈλ¦Ό μ 보λ₯Ό λ°κΏλλ€" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "μ¬λ¬ μμΌλ‘ μΆλ ₯ν©λλ€" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "리λͺ¨νΈ μΆμ λΈλμΉμ λν΄ λμν©λλ€" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "컀λ°μ΄ μλ λΈλμΉλ§ νμν©λλ€" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "νΉμ git-branch λμ:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "리λͺ¨νΈμ λ‘컬μ λΈλμΉ λͺ©λ‘μ λͺ¨λ νμν©λλ€" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "μμ ν λ³ν©λ λΈλμΉλ₯Ό μμ ν©λλ€" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "λΈλμΉλ₯Ό μμ ν©λλ€ (λ³ν©λμ§ μμλλΌλ)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "λΈλμΉμ κ·Έ reflogλ₯Ό μκΈ°κ±°λ μ΄λ¦μ λ°κΏλλ€" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "λμμ΄ μ΄λ―Έ μλλΌλ λΈλμΉλ₯Ό μκΈ°κ±°λ μ΄λ¦μ λ°κΏλλ€" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "λΈλμΉ μ΄λ¦ λͺ©λ‘μ νμν©λλ€" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "λΈλμΉμ reflogλ₯Ό λ§λλλ€" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "λΈλμΉμ μ€λͺ
μ νΈμ§ν©λλ€" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "κ°μ λ‘ λ§λ€κ³ , μκΈ°κ±°λ μ΄λ¦μ λ°κΎΈκ³ , μμ ν©λλ€" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "λ³ν©λλ λΈλμΉλ§ νμν©λλ€" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "λ³ν©λμ§ μλ λΈλμΉλ§ νμν©λλ€" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "λͺ©λ‘μ μ¬λ¬ μ΄λ‘ νμν©λλ€" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "ν€" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "μ λ ¬ν κΈ°μ€μ΄ λλ νλ μ΄λ¦" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "μ€λΈμ νΈ" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "ν΄λΉ μ€λΈμ νΈμ λΈλμΉλ§ νμν©λλ€" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "HEADλ₯Ό μ¬λ°λ₯Έ λ νΌλ°μ€λ‘ ꡬν΄λ΄λλ° μ€ν¨νμ΅λλ€." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "λ νΌλ°μ€/ν€λ μλμ HEADκ° μμ΅λλ€!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column λ° --verbose μ΅μ
μ νΈνλμ§ μμ΅λλ€" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "λΈλμΉ μ΄λ¦μ΄ νμν©λλ€" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "λΆλ¦¬λ HEADμ λν μ€λͺ
μ λΆμ¬ν μ μμ΅λλ€" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "μ¬λ¬ λΈλμΉμ λν μ€λͺ
μ νΈμ§ν μ μμ΅λλ€" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "μμ§ '%s' λΈλμΉμ 컀λ°μ΄ μμ΅λλ€." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "μ΄λ¦μ΄ '%s'μΈ λΈλμΉκ° μμ΅λλ€." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "μ΄λ¦ λ°κΎΈκΈ° μμ
μ λν΄ λΈλμΉκ° λ무 λ§μ΅λλ€" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "μ μ
μ€νΈλ¦Όμ μ€μ νλλ° λΈλμΉκ° λ무 λ§μ΅λλ€" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3883,41 +4163,41 @@ msgstr "" "HEADμ μ
μ€νΈλ¦Όμ %s(μΌ)λ‘ μ€μ ν μ μμ΅λλ€. μ΄λ€ λΈλμΉλ κ°λ¦¬ν€μ§ μμ΅λ" "λ€." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "κ·Έλ° λΈλμΉκ° ('%s') μμ΅λλ€" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "'%s' λΈλμΉκ° μμ΅λλ€" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "μ
μ€νΈλ¦Ό μ€μ μ ν΄μ νλλ° λΈλμΉκ° λ무 λ§μ΅λλ€" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "HEADμ μ
μ€νΈλ¦Ό μ€μ μ ν΄μ ν μ μμ΅λλ€. μ΄λ€ λΈλμΉλ κ°λ¦¬ν€μ§ μμ΅λλ€." -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "'%s' λΈλμΉμ μ
μ€νΈλ¦Ό μ λ³΄κ° μμ΅λλ€" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD'λ₯Ό μλμΌλ‘ λ§λλ 건 μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "'git branch'μ λν΄ -a λ° -r μ΅μ
μ λΈλμΉ μ΄λ¦κ³Ό κ°μ΄ μ°λ©΄ μλ€κ° λ§μ§ μμ΅" "λλ€" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3926,7 +4206,7 @@ msgstr "" "--set-upstream μ΅μ
μ λ μ΄μ μ¬μ©λμ§ μκ³ μ κ±°λ μμ μ
λλ€. --track λλ " "--set-upstream-to μ΅μ
μ μ¬μ©ν΄ 보μμμ€\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3936,16 +4216,6 @@ msgstr "" "\n" "'%s'μ(λ₯Ό) λ§λ€κ³ '%s'μ(λ₯Ό) μΆμ νκ² νλ €λ©΄, λ€μμ νμμμ€:\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4044,7 +4314,7 @@ msgstr "νμ€ μ
λ ₯μμ νμΌ μ΄λ¦μ μ½μ΅λλ€" msgid "terminate input and output records by a NUL character" msgstr "NUL λ¬Έμλ₯Ό κΈ°μ€μΌλ‘ μλ£ μ
λ ₯ λ° μΆλ ₯μ λ©μΆ₯λλ€" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "μ§ν μν© νμλ₯Ό νμ§ μμ΅λλ€" @@ -4134,8 +4404,9 @@ msgid "write the content to temporary files" msgstr "λ΄μ©μ μμ νμΌμ μλλ€" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "λ¬Έμμ΄" @@ -4185,79 +4456,79 @@ msgstr "'%s' κ²½λ‘: λ³ν©ν μ μμ΅λλ€" msgid "Unable to add merge result for '%s'" msgstr "'%s'μ λν λ³ν© κ²°κ³Όλ₯Ό μΆκ°ν μ μμ΅λλ€" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' μ΅μ
μ μ
λ°μ΄νΈνλ κ²½λ‘μμ μΈ μ μμ΅λλ€" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' μ΅μ
μ %s μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "κ²½λ‘λ₯Ό μ
λ°μ΄νΈνκ³ '%s' λΈλμΉλ‘ μ ννλ μΌμ λμμ ν μ μμ΅λλ€." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "μμλ μΈλ±μ€ νμΌ" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "'%s' κ²½λ‘λ₯Ό λ³ν©νμ§ μμμ΅λλ€" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "νμ¬ μΈλ±μ€λ₯Ό λ¨Όμ ν΄κ²°ν΄μΌ ν©λλ€" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s'μ λν΄ reflogν μ μμ΅λλ€: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEADμ νμ¬ μμΉλ" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "HEADλ₯Ό μ
λ°μ΄νΈν μ μμ΅λλ€" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "'%s' λΈλμΉ λ¦¬μ
\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "μ΄λ―Έ '%s'μ μμ΅λλ€\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "'%s' λΈλμΉλ‘ μ ννκ³ λ¦¬μ
ν©λλ€\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "μλ‘ λ§λ '%s' λΈλμΉλ‘ μ νν©λλ€\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "'%s' λΈλμΉλ‘ μ νν©λλ€\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... κ·Έλ¦¬κ³ %dκ° λ.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4275,7 +4546,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4296,151 +4567,151 @@ msgstr[0] "" " git branch <μ-λΈλμΉ-μ΄λ¦> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "리λΉμ walkμ λ΄λΆ μ€λ₯" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "μ΄μ HEAD μμΉλ" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "νμ¬ μμΉκ° λ§λ€ μμ μΈ λΈλμΉμ μμ΅λλ€" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "νλμ λ νΌλ°μ€λ§ μ§μ ν΄μΌ νμ§λ§ %dκ°λ₯Ό μ§μ νμ΅λλ€." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "μλͺ»λ λ νΌλ°μ€: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "λ νΌλ°μ€κ° νΈλ¦¬κ° μλλλ€: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "λΈλμΉλ₯Ό μ ννλλ° κ²½λ‘λ₯Ό μ¬μ©ν μ μμ΅λλ€" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' μ΅μ
μ λΈλμΉλ₯Ό μ νν λ μΈ μ μμ΅λλ€" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' μ΅μ
μ '%s' μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "λΈλμΉλ₯Ό 컀λ°μ΄ μλ '%s'(μΌ)λ‘ μ νν μ μμ΅λλ€" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "λΈλμΉ" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "μ λΈλμΉλ₯Ό λ§λ€κ³ κ°μ Έμ΅λλ€" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "λΈλμΉλ₯Ό λ§λ€κ±°λ 리μ
νκ³ κ°μ Έμ΅λλ€" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "μ λΈλμΉμ λν reflogλ₯Ό λ§λλλ€" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "μ§μ ν 컀λ°μμ HEADλ₯Ό λΆλ¦¬ν©λλ€" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "μ λΈλμΉμ λν μ
μ€νΈλ¦Ό μ 보λ₯Ό μ€μ ν©λλ€" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "μ-λΈλμΉ" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "μμ λΈλμΉκ° μλ μ λΈλμΉ" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "λ³ν©λμ§ μμ νμΌμ λν΄ μ°λ¦¬μͺ½ λ²μ μ κ°μ Έμ΅λλ€" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "λ³ν©λμ§ μμ νμΌμ λν΄ μλνΈ λ²μ μ κ°μ Έμ΅λλ€" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "κ°μ λ‘ μ²΄ν¬μμν©λλ€ (λ‘컬μμ μμ ν μ¬νμ λ²λ¦½λλ€)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "μ λΈλμΉμ λν΄ 3-λ°©ν₯ λ³ν©μ μνν©λλ€" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "무μνλ νμΌμ μ
λ°μ΄νΈν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "μ€νμΌ" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "μΆ©λ μ€νμΌ (merge λλ diff3)" # FIXME: μλ―Έ λΆλͺ
-#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "κ²½λ‘λͺ
μΈλ₯Ό λλ¬Έ νλͺ©μλ§ μ ννμ§ μμ΅λλ€" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "'git checkout <μλ-λΈλμΉ>'μ λν΄ μΆμΈ‘ν©λλ€" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "λ€λ₯Έ μμ
ν΄λμ μ£Όμ΄μ§ λ νΌλ°μ€κ° μλμ§ νμΈνμ§ μμ΅λλ€" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "κ°μ λ‘ μ§ν μν©μ νμν©λλ€" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B λ° --orphan μ΅μ
μ μλ‘ νΈνλμ§ μμ΅λλ€" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track μ΅μ
μ λΈλμΉ μ΄λ¦μ΄ νμν©λλ€" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "λΈλμΉ μ΄λ¦μ΄ μμ΅λλ€. -b μ΅μ
μ μ¬μ©ν΄ 보μμμ€" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "κ²½λ‘ λͺ
μΈκ° μλͺ»λμμ΅λλ€" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4449,12 +4720,12 @@ msgstr "" "λμμ κ²½λ‘λ₯Ό μ
λ°μ΄νΈνκ³ '%s' λΈλμΉλ‘ μ νν μ μμ΅λλ€.\n" "컀λ°μ νμΈν μ μλ '%s'μ(λ₯Ό) κ°μ Έμ€λ €κ³ νμ
¨μ΅λκΉ?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach μ΅μ
μ κ²½λ‘ μΈμλ₯Ό λ°μ§ μμ΅λλ€ '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4605,8 +4876,8 @@ msgstr "λνν μ§μ°κΈ°" msgid "remove whole directories" msgstr "μ 체 λλ ν°λ¦¬ μ κ±°" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "ν¨ν΄" @@ -4646,103 +4917,112 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<μ΅μ
>] [--] <μ μ₯μ> [<λλ ν°λ¦¬>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "체ν¬μμμ λ§λ€μ§ μμ΅λλ€" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "κ°λ΅ν μ μ₯μλ₯Ό λ§λλλ€" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "λ―Έλ¬ μ μ₯μλ₯Ό λ§λλλ€ (κ°λ΅ν μ μ₯μλ‘ μ·¨κΈ)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "λ‘컬 μ μ₯μμμ 볡μ ν©λλ€" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "λ‘컬 νλλ§ν¬λ₯Ό μ¬μ©νμ§ μκ³ , νμ 볡μ¬ν©λλ€" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "곡μ μ μ₯μλ‘ μ€μ ν©λλ€" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "볡μ ν κ²°κ³Όλ¬Όμμ νμ λͺ¨λμ μ΄κΈ°νν©λλ€" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "λ³λ ¬μ μΌλ‘ 볡μ νλ νμλͺ¨λ κ°μ" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "μμ-λλ ν°λ¦¬" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "μμμ μ¬μ©ν λλ ν°λ¦¬ μμΉ" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "λ νΌλ°μ€ μ μ₯μ" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "볡μ ν κ²½μ°μλ§ --referenceλ₯Ό μ¬μ©ν©λλ€" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "μ΄λ¦" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "μ
μ€νΈλ¦Ό μΆμ μ 'origin' λμ <μ΄λ¦>μ μ¬μ©ν©λλ€" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "리λͺ¨νΈμ HEAD λμ <λΈλμΉ>λ₯Ό κ°μ Έμ΅λλ€" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "리λͺ¨νΈμ git-upload-pack κ²½λ‘" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "κΉμ΄" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "μ§μ ν κΉμ΄μ μμ 볡μ λ₯Ό λ§λλλ€" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "νλμ λΈλμΉλ§ 볡μ ν©λλ€ (HEAD λλ --branchλ‘ μ§μ )" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "λͺ¨λ 볡μ ν νμ λͺ¨λμ μμ λͺ¨λμ
λλ€" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "κΉ λλ ν°λ¦¬λ₯Ό μμ
ν΄λμ λ³κ°μ μμΉμ λμ΅λλ€" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "ν€=κ°" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "μ μ μ₯μ μμμ μ€μ ν©λλ€" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "IPv4 μ£Όμλ§ μ¬μ©ν©λλ€" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "IPv6 μ£Όμλ§ μ¬μ©ν©λλ€" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4750,58 +5030,53 @@ msgstr "" "λλ ν°λ¦¬ μ΄λ¦μ μμλΌ μ μμ΅λλ€.\n" "λͺ
λ Ήνμμ λλ ν°λ¦¬λ₯Ό μ§μ νμμμ€" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "λ νΌλ°μ€ '%s' μ μ₯μλ₯Ό μ°κ²°λ 체ν¬μμμΌλ‘ μ°κΈ°λ μμ§ μ§μνμ§ μμ΅λλ€." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° λ‘컬 μ μ₯μκ° μλλλ€." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° μμ μ μ₯μμ
λλ€" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "λ νΌλ°μ€ '%s' μ μ₯μκ° λΆμ΄ μλ μ μ₯μμ
λλ€" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "'%s'μ λν΄ stat()μ΄ μ€ν¨νμ΅λλ€" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "'%s'μ΄(κ°) μμ§λ§ λλ ν°λ¦¬κ° μλλλ€" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "'%s'μ λν΄ stat()μ΄ μ€ν¨νμ΅λλ€\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "'%s' λ§ν¬λ₯Ό λ§λλλ° μ€ν¨νμ΅λλ€" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "νμΌμ '%s'(μΌ)λ‘ λ³΅μ¬νλλ° μ€ν¨νμ΅λλ€" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "μλ£.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4811,127 +5086,127 @@ msgstr "" "'git status' λͺ
λ ΉμΌλ‘ 무μμ 체ν¬μμνλμ§ μ΄ν΄λ³Ό μ μκ³ \n" "'git checkout -f HEAD'λ‘ μ²΄ν¬μμμ λ€μ ν μ μμ΅λλ€\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "볡μ ν 리λͺ¨νΈμ %s λΈλμΉλ₯Ό μ°Ύμ μ μμ΅λλ€." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "μ°κ²°μ νμΈνλ μ€μ
λλ€..." -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "리λͺ¨νΈμμ νμν μ€λΈμ νΈλ₯Ό λͺ¨λ 보λ΄μ§ μμμ΅λλ€" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "%sμ(λ₯Ό) μ
λ°μ΄νΈν μ μμ΅λλ€" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "리λͺ¨νΈ HEADκ° μλ λ νΌλ°μ€λ₯Ό μ°Έκ³ νλ―λ‘, 체ν¬μμν μ μμ΅λλ€.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "μμ
ν΄λλ₯Ό 체ν¬μμν μ μμ΅λλ€" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "νλΌλ―Έν°λ₯Ό μ€μ νμΌμ μΈ μ μμ΅λλ€" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "μ 리μ©μΌλ‘ repackν μ μμ΅λλ€" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "보쑰 μμ νμΌμ μμ ν μ μμ΅λλ€" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "λ무 μΈμκ° λ§μ΅λλ€." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "볡μ ν μ μ₯μλ₯Ό μ§μ ν΄μΌ ν©λλ€." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare λ° --origin %s μ΅μ
μ νΈνλμ§ μμ΅λλ€." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare λ° --separate-git-dir μ΅μ
μ νΈνλμ§ μμ΅λλ€." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "'%s' μ μ₯μκ° μμ΅λλ€" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "κΉμ΄κ°(%s) 0λ³΄λ€ ν° μκ° μλλλ€" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "λμ κ²½λ‘κ°('%s') μ΄λ―Έ μκ³ λΉ λλ ν°λ¦¬κ° μλλλ€." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "μμ
ν΄λκ°('%s') μ΄λ―Έ μμ΅λλ€." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "'%s'μ μ λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "μμ
λλ ν°λ¦¬λ₯Ό('%s') λ§λ€ μ μμ΅λλ€" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "κ°λ΅ν μ μ₯μλ‘('%s') 볡μ ν©λλ€...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "'%s'μ 볡μ ν©λλ€...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth μ΅μ
μ λ‘컬 볡μ μμ 무μλ©λλ€. λμ μ 'file://'μ μ¬μ©νμμμ€." -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "μλ³Έ μ μ₯μκ° μμ μ μ₯μμ΄λ―λ‘, --local μ΅μ
μ 무μν©λλ€" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local μ΅μ
μ 무μλ©λλ€" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "%sμ 볡μ λ°©λ²μ μμ§ λͺ»ν©λλ€" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "리λͺ¨νΈμ %s λΈλμΉκ° μ
μ€νΈλ¦Ό %sμ μμ΅λλ€" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "λΉ μ μ₯μλ₯Ό 볡μ ν κ²μ²λΌ 보μ
λλ€." @@ -5071,66 +5346,66 @@ msgstr "" "κ·Έ λ€μμ \"git cherry-pick --continue\"λ₯Ό νλ©΄ λλ¨Έμ§ μ»€λ°μ\n" "λν΄ μ»€λ° λΉΌμ€κΈ°λ₯Ό λ€μ μμν©λλ€.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "HEAD νΈλ¦¬ μ€λΈμ νΈμ λ¬Άμμ νΈλλ° μ€ν¨νμ΅λλ€" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "μμ μΈλ±μ€λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "λνν μΆκ°κ° μ€ν¨νμ΅λλ€" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "μμ μΈλ±μ€λ₯Ό μ
λ°μ΄νΈν μ μμ΅λλ€" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "μ£Όμ μΊμ νΈλ¦¬λ₯Ό μ
λ°μ΄νΈνλλ° μ€ν¨νμ΅λλ€" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "new_index νμΌμ μΈ μ μμ΅λλ€" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "λ³ν©νλ μ€ λΆλΆ 컀λ°μ ν μ μμ΅λλ€." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "μ»€λ° λΉΌμ€κΈ°λ₯Ό νλ μ€ λΆλΆ 컀λ°μ ν μ μμ΅λλ€." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "μΈλ±μ€λ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "μμ μΈλ±μ€ νμΌμ μΈ μ μμ΅λλ€" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "'%s' 컀λ°μ μμ±μ ν€λκ° μμ΅λλ€" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "'%s' 컀λ°μ μμ±μ ν€λ νμμ΄ μλͺ»λμμ΅λλ€" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "--author νλΌλ―Έν° νμμ΄ μλͺ»λμμ΅λλ€" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "μκ° νμμ΄ μλͺ»λμμ΅λλ€: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5138,38 +5413,38 @@ msgstr "" "νμ¬ μ»€λ° λ©μμ§μμ μ¬μ©λμ§ μλ μ£Όμ λ¬Έμλ₯Ό\n" "μ νν μ μμ΅λλ€" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "%s 컀λ°μ μ°Ύμλ³Ό μ μμ΅λλ€" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(νμ€ μ
λ ₯μμ λ‘κ·Έ λ©μμ§λ₯Ό μ½μ)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "νμ€ μ
λ ₯μμ λ‘κ·Έ λ©μμ§λ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, 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 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "SQUASH_MSGλ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "MERGE_MSGλ₯Ό μ½μ μ μμ΅λλ€" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "μ»€λ° μμμ μΈ μ μμ΅λλ€" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5184,7 +5459,7 @@ msgstr "" "\t%s\n" "λ€μ μλνμμμ€.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5199,7 +5474,7 @@ msgstr "" "\t%s\n" "λ€μ μλνμμμ€.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5208,7 +5483,7 @@ msgstr "" "λ³κ²½ μ¬νμ λν μ»€λ° λ©μμ§λ₯Ό μ
λ ₯νμμμ€. '%c' λ¬Έμλ‘ μμνλ\n" "μ€μ 무μλκ³ , λ©μμ§λ₯Ό μ
λ ₯νμ§ μμΌλ©΄ 컀λ°μ΄ μ€μ§λ©λλ€.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5219,149 +5494,149 @@ msgstr "" "μ€μ 보쑴λλ, νμνλ©΄ μ§μ μ κ±°νμμμ€. λ©μμ§λ₯Ό μ
λ ₯νμ§\n" "μμΌλ©΄ 컀λ°μ΄ μ€μ§λ©λλ€.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sμμ±μ: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sμκ°: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s컀미ν°: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "μΈλ±μ€λ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "νΈλ¦¬λ₯Ό λ§λλλ° μ€λ₯" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "λ©μμ§λ₯Ό -m λλ -F μ΅μ
μΌλ‘ μ
λ ₯νμμμ€.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, 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 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "μΆμ λμ§ μλ νμΌ λͺ¨λκ° ('%s') μλͺ»λμμ΅λλ€" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long λ° -z μ΅μ
μ νΈνλμ§ μμ΅λλ€" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "--reset-author λ° --author μ΅μ
μ λͺ¨λ μ¬μ©νλ©΄ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "λ°κΏ μ¬νμ΄ μμ΅λλ€." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "λ³ν© μ€μ μμ΅λλ€ -- 컀λ°μ λ°κΏ μ μμ΅λλ€." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "μ»€λ° λΉΌμ€κΈ° μ€μ μμ΅λλ€ -- 컀λ°μ λ°κΏ μ μμ΅λλ€." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "--squash λ° --fixup μ΅μ
μ κ°μ΄ μΈ μ μμ΅λλ€" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "-c/-C/-F/--fixup μ΅μ
μ€μ νλλ§ μ¬μ©ν μ μμ΅λλ€." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "-m μ΅μ
μ -c/-C/-F/--fixup μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author μ΅μ
μ -C, -c λλ --amend μ΅μ
κ³Ό κ°μ΄ μ¨μΌ ν©λλ€." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "--include/--only/--all/--interactive/--patch μ΅μ
μ€ νλλ§ μ¬μ©ν μ μμ΅λ" "λ€." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "κ²½λ‘κ° μμ΄ --include/--only μ΅μ
μ μ°λ©΄ μλ€κ° λ§μ§ μμ΅λλ€." -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "κΈ°λ°νλ€μ... λ§μ§λ§μ λ³κ²½λ μΈλ±μ€λ‘ λ°κΏλλ€." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "-i λλ -o μμ΄ λͺ
μμ μΈ κ²½λ‘λ₯Ό μ§μ νμ΅λλ€. --only κ²½λ‘λ₯Ό κ°μ ν©λλ€..." -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "μλͺ»λ μ 리 λͺ¨λ %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "-a μ΅μ
κ³Ό κ²½λ‘λ₯Ό κ°μ΄ μ¬μ©νλ©΄ μλ€κ° λ§μ§ μμ΅λλ€." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "μνλ₯Ό κ°λ΅νκ² νμν©λλ€" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "λΈλμΉ μ 보λ₯Ό νμν©λλ€" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "μ»΄ν¨ν°κ° μ½μ μ μλ νμ" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "κΈ΄ νμμΌλ‘ μνλ₯Ό νμν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "NUL λ¬Έμλ‘ νλͺ©μ λλ
λλ€" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "λͺ¨λ" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "μΆμ λμ§ μλ νμΌμ νμν©λλ€. μΆκ° μ΅μ
: all, normal, no (κΈ°λ³Έκ°: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "무μλλ νμΌμ νμν©λλ€" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "μΈμ " -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5369,198 +5644,198 @@ msgstr "" "νμ λͺ¨λμ λ³κ²½μ 무μν©λλ€. μΆκ° μ΅μ
: all, dirty, untracked. (κΈ°λ³Έκ°: " "all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "μΆμ λμ§ μλ νμΌμ λͺ©λ‘μ μ¬λ¬ μ΄λ‘ νμν©λλ€" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "μλ‘ λ§λ 컀λ°μ μ°Ύμλ³Ό μ μμ΅λλ€" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "μλ‘ λ§λ 컀λ°μ νμ±ν μ μμ΅λλ€" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "HEAD λΆλ¦¬λ¨" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (μ΅μμ-컀λ°)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "μ±κ³΅μ μΈ μ»€λ° νμ μμ½μ νμνμ§ μμ΅λλ€" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "μ»€λ° λ©μμ§ μμμ diffλ₯Ό νμν©λλ€" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "μ»€λ° λ©μμ§ μ΅μ
" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "νμΌμμ λ©μμ§λ₯Ό μ½μ΅λλ€" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "μμ±μ" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "컀λ°μ μμ±μλ₯Ό μ§μ ν©λλ€" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "μκ°" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "컀λ°μ μκ°μ μ§μ ν©λλ€" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "λ©μμ§" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "μ»€λ° λ©μμ§" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "컀λ°" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "μ§μ ν 컀λ°μ λ©μμ§λ₯Ό μ¬μ¬μ©νκ³ νΈμ§ν©λλ€" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "μ§μ ν 컀λ°μμ λ©μμ§λ₯Ό μ¬μ¬μ©ν©λλ€" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "μ§μ ν 컀λ°μ μμ νλλ° autosquash νμ λ©μμ§λ₯Ό μ¬μ©ν©λλ€" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "μ§μ ν 컀λ°μ ν©μΉλλ° autosquash νμ λ©μμ§λ₯Ό μ¬μ©ν©λλ€" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "컀λ°μ λ΄κ° μμ±ν κ²μΌλ‘ λ§λλλ€ (-C/-c/--amendμ κ°μ΄ μ¬μ©)" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "Signed-off-by: μ€μ μΆκ°ν©λλ€" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "μ§μ ν μμ νμΌμ μ¬μ©ν©λλ€" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "μ»€λ° νΈμ§μ κ°μ ν©λλ€" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "κΈ°λ³Έκ°" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "λ©μμ§μμ 곡백과 #μ£Όμμ μ§μλλ€" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "μ»€λ° λ©μμ§ μμμ μνλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG μλͺ
컀λ°" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "μ»€λ° λ΄μ© μ΅μ
" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "λ³κ²½λ νμΌμ λͺ¨λ 컀λ°ν©λλ€" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "μ§μ ν νμΌμ 컀λ°ν μΈλ±μ€μ μΆκ°ν©λλ€" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "λννμΌλ‘ νμΌμ μΆκ°ν©λλ€" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "λννμΌλ‘ λ³κ²½ μ¬νμ μΆκ°ν©λλ€" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "μ§μ ν νμΌλ§ 컀λ°ν©λλ€" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "μ»€λ° μ νν¬λ₯Ό 건λλλλ€" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "무μμ 컀λ°ν μ§ νμν©λλ€" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "λ°λ‘ μ 컀λ°μ λ°κΏλλ€" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "λ€μμ°κΈ° ν νν¬λ₯Ό 건λλλλ€" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "λΉ λ³κ²½ μ¬νμ κΈ°λ‘νλλ‘ νμ©ν©λλ€" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "λΉ λ©μμ§μ κ°μ΄ λ³κ²½ μ¬νμ κΈ°λ‘νλλ‘ νμ©ν©λλ€" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "HEAD 컀λ°μ νμ±ν μ μμ΅λλ€" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "μμλ MERGE_HEAD νμΌ (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "MERGE_MODEλ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "μ»€λ° λ©μμ§λ₯Ό μ½μ μ μμ΅λλ€: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "컀λ°μ μ€μ§ν©λλ€. λ©μμ§λ₯Ό νΈμ§νμ§ μμμ΅λλ€.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "컀λ°μ μ€μ§ν©λλ€. μ»€λ° λ©μμ§κ° λΉμ΄ μμ΅λλ€.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5706,7 +5981,7 @@ msgstr "μ€μ μ μΆμ²λ₯Ό νμν©λλ€ (νμΌ, νμ€ μ
λ ₯, λΈλ‘, λͺ
λ msgid "unable to parse default color value" msgstr "κΈ°λ³Έ μ κ°μ νμ±ν μ μμ΅λλ€" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5721,7 +5996,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "%s μ€μ νμΌμ λ§λ€ μ μμ΅λλ€" @@ -5757,7 +6032,7 @@ msgstr "μ£Όμ λ¬λ¦° %s νκ·Έμ λ΄μ₯λ μ΄λ¦μ΄ μμ΅λλ€" msgid "tag '%s' is really '%s' here" msgstr "'%s' νκ·Έκ° μ€μ μ¬κΈ° '%s'μ
λλ€" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "μ¬λ°λ₯Έ μ€λΈμ νΈ μ΄λ¦μ΄ μλλλ€ (%s)" @@ -5850,7 +6125,7 @@ msgstr "<n>κ°μ κ°μ₯ μ΅κ·Όμ νκ·Έλ§ κ³ λ €ν©λλ€ (κΈ°λ³Έκ°: 10)" msgid "only consider tags matching <pattern>" msgstr "<ν¨ν΄>κ³Ό μΌμΉνλ νκ·Έλ§ κ³ λ €ν©λλ€" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "λμμΌλ‘ μμ½ν μ»€λ° μ€λΈμ νΈλ₯Ό νμν©λλ€" @@ -5884,21 +6159,21 @@ msgstr "'%s': μΌλ° νμΌμ΄λ μ¬λ³Όλ¦ λ§ν¬κ° μλλλ€" msgid "invalid option: %s" msgstr "μλͺ»λ μ΅μ
: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "κΉ μ μ₯μκ° μλλλ€" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "μλͺ»λ '%s' μ€λΈμ νΈκ° μ£Όμ΄μ‘μ΅λλ€." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "λ κ°λ³΄λ€ λ§μ λΈλ‘μ΄ μ£Όμ΄μ‘μ΅λλ€: '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "μ²λ¦¬νμ§ μμ '%s' μ€λΈμ νΈκ° μ£Όμ΄μ‘μ΅λλ€." @@ -5971,19 +6246,19 @@ msgstr "git fetch --multiple [<μ΅μ
>] [(<μ μ₯μ> | <κ·Έλ£Ή>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<μ΅μ
>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "λͺ¨λ 리λͺ¨νΈμμ κ°μ Έμ΅λλ€" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "λμ΄μ°μ§ λ§κ³ .git/FETCH_HEADμ λ§λΆμ
λλ€" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "리λͺ¨νΈ μͺ½μ λ¬Άμμ μ
λ‘λν κ²½λ‘" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "λ‘컬 λΈλμΉλ₯Ό κ°μ λ‘ λμ΄μλλ€" @@ -5991,7 +6266,7 @@ msgstr "λ‘컬 λΈλμΉλ₯Ό κ°μ λ‘ λμ΄μλλ€" msgid "fetch from multiple remotes" msgstr "μ¬λ¬ 리λͺ¨νΈμμ κ°μ Έμ΅λλ€" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "λͺ¨λ νκ·Έμ κ΄λ ¨ μ€λΈμ νΈλ₯Ό κ°μ Έμ΅λλ€" @@ -6003,19 +6278,19 @@ msgstr "λͺ¨λ νκ·Έλ₯Ό κ°μ Έμ€μ§ μμ΅λλ€ (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "λ³λ ¬μ μΌλ‘ λ°μμ€λ νμλͺ¨λ κ°μ" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "리λͺ¨νΈμ μ΄μ μλ 리λͺ¨νΈ μΆμ λΈλμΉλ₯Ό μλΌλ
λλ€" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "μ£Όλ¬Έν" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "νμ λͺ¨λ μ¬κ·μ μΌλ‘ κ°μ Έμ€κΈ° λ°©μμ μ€μ ν©λλ€" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "λ€μ΄λ‘λν λ¬Άμμ 보쑴ν©λλ€" @@ -6023,15 +6298,15 @@ msgstr "λ€μ΄λ‘λν λ¬Άμμ 보쑴ν©λλ€" msgid "allow updating of HEAD ref" msgstr "HEAD λ νΌλ°μ€ μ
λ°μ΄νΈλ₯Ό νμ©ν©λλ€" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "μμ 볡μ μ μ»€λ° λ΄μμ κΉκ² λ§λλλ€" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "μμ ν μ μ₯μλ‘ μ νν©λλ€" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "λλ ν°λ¦¬" @@ -6043,15 +6318,15 @@ msgstr "νμ λͺ¨λ κ²½λ‘ μΆλ ₯μ μμ μ΄ λλ ν°λ¦¬λ₯Ό λΆμ
λλ€" msgid "default mode for recursion" msgstr "μ¬κ· κΈ°λ³Έ λͺ¨λ" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr ".git/shallowλ₯Ό μ
λ°μ΄νΈνλ λ νΌλ°μ€λ₯Ό νμ©ν©λλ€" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "λ νΌλ°μ€λ§΅" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "λ νΌλ°μ€λ§΅ κ°μ Έμ€κΈ°λ₯Ό μ§μ ν©λλ€" @@ -6109,11 +6384,6 @@ msgstr "κ°μ μ
λ°μ΄νΈ" msgid "(non-fast-forward)" msgstr "(μ λ°©ν₯ μ§νμ΄ μλ)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "%sμ(λ₯Ό) μ΄ μ μμ΅λλ€: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6314,55 +6584,55 @@ msgstr "μ°κ²°μ νμΈνλ μ€μ
λλ€" msgid "Checking object directories" msgstr "μ€λΈμ νΈ λλ ν°λ¦¬λ₯Ό νμΈνλ μ€μ
λλ€" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<μ΅μ
>] [<μ€λΈμ νΈ>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "μ κ·Όν μ μλ μ€λΈμ νΈλ₯Ό νμν©λλ€" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "μ°κ²°μ΄ λμ΄μ§ μ€λΈμ νΈλ₯Ό νμν©λλ€" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "νκ·Έλ₯Ό μ립λλ€" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "μ΅μμ λ
Έλλ₯Ό μ립λλ€" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "μΈλ±μ€ μ€λΈμ νΈ ν€λ λ
Έλλ₯Ό λ§λλλ€" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "reflog ν€λ λ
Έλλ₯Ό λ§λλλ€ (κΈ°λ³Έκ°)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "λ¬Άμκ³Ό 보쑰 μ€λΈμ νΈλ λ§λλλ€" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "μ°κ²°λ§ νμΈν©λλ€" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "λ μ격νκ² νμΈν©λλ€" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr ".git/lost-found μμ μ°κ²°μ΄ λμ΄μ§ μ€λΈμ νΈλ₯Ό μλλ€" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "μ§ν μν©μ νμν©λλ€" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "μ€λΈμ νΈλ₯Ό νμΈν©λλ€" @@ -6464,215 +6734,215 @@ msgstr "νΈλ¦¬λ₯Ό μ½μ μ μμ΅λλ€ (%s)" msgid "unable to grep from object of type %s" msgstr "μ’
λ₯κ° %sμΈ μ€λΈμ νΈμμ grepμ ν μ μμ΅λλ€" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "`%c' μ΅μ
μλ μ«μ κ°μ΄ μμΌ ν©λλ€" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "'%s'μ(λ₯Ό) μ΄ μ μμ΅λλ€" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "μμ
ν΄λ λμ μ μΈλ±μ€μμ κ²μν©λλ€" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "κΉμΌλ‘ κ΄λ¦¬νμ§ μμ λ΄μ©μμ μ°Ύμ΅λλ€" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "μΆμ λλ νμΌκ³Ό μΆμ λμ§ μλ νμΌ λͺ¨λμμ κ²μν©λλ€" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "'.gitignore'λ‘ μ§μ ν νμΌμ 무μν©λλ€" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "μΌμΉνμ§ μλ μ€μ νμν©λλ€" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "λμλ¬Έμ ꡬλ³νμ§ μκ³ λ§μΆ₯λλ€" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "λ¨μ΄ κ²½κ³ λΆλΆμ λν΄μλ§ ν¨ν΄μ λ§μΆ₯λλ€" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "λ°μ΄λ리 νμΌμ ν
μ€νΈλ‘ μ²λ¦¬ν©λλ€" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "λ°μ΄λ리 νμΌμμ ν¨ν΄μ λ§μΆμ§ μμ΅λλ€" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "textconv νν°λ₯Ό μ¬μ©ν΄ λ°μ΄λ리 νμΌμ μ²λ¦¬ν©λλ€" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "μ΅λ <κΉμ΄> λ¨κ³λ§νΌ λ΄λ €κ°λλ€" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "POSIX νμ₯ μ κ·μμ μ¬μ©ν©λλ€" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "κΈ°λ³Έ POSIX μ κ·μμ μ¬μ©ν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "ν¨ν΄μ κ³ μ λ¬Έμμ΄λ‘ ν΄μν©λλ€" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "νκ³Ό νΈνλλ μ κ·μμ μ¬μ©ν©λλ€" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "μ€ λ²νΈλ₯Ό νμν©λλ€" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "νμΌ μ΄λ¦μ νμνμ§ μμ΅λλ€" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "νμΌ μ΄λ¦μ νμν©λλ€" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "νμΌ μ΄λ¦μ μ΅μμ λλ ν°λ¦¬ μλ κ²½λ‘λ‘ νμν©λλ€" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "μΌμΉνλ μ€μ νμνμ§ μκ³ νμΌ μ΄λ¦λ§ νμν©λλ€" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "--files-with-matches μ΅μ
κ³Ό λμΌ" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "μΌμΉνμ§ μλ νμΌμ μ΄λ¦λ§ νμν©λλ€" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "νμΌ μ΄λ¦ λ€μμ NULμ μΆλ ₯ν©λλ€" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "μΌμΉνλ μ€μ νμνμ§ μκ³ μΌμΉνλ μλ₯Ό νμν©λλ€" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "μΌμΉνλ λΆλΆμ κ°μ‘°ν©λλ€" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "λ€λ₯Έ νμΌ μ¬μ΄μ μΌμΉνλ λΆλΆμ μ¬μ΄μ λΉ μ€μ μΆλ ₯ν©λλ€" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "κ°μ νμΌμμ μ¬λ¬ κ°κ° μΌμΉνλ©΄ νμΌ μ΄λ¦μ ν λ²λ§ νμν©λλ€" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "μΌμΉνλ λΆλΆ μλ€μ 컨ν
μ€νΈλ₯Ό <n>μ€ νμν©λλ€" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "μΌμΉνλ λΆλΆ μμ 컨ν
μ€νΈλ₯Ό <n>μ€ νμν©λλ€" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "μΌμΉνλ λΆλΆ λ€μ 컨ν
μ€νΈλ₯Ό <n>μ€ νμν©λλ€" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "<n>κ°μ μμ
μ€λ λλ₯Ό μ¬μ©ν©λλ€" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "-C NUM μ΅μ
μ μ€μ" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "μΌμΉ νλͺ© μμ ν¨μ μ΄λ¦ μ€μ νμν©λλ€" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "λ€μ΄ μλ ν¨μλ₯Ό νμν©λλ€" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "νμΌμμ ν¨ν΄μ μ½μ΅λλ€" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "<ν¨ν΄>κ³Ό μΌμΉ" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "-e μ΅μ
μΌλ‘ μ§μ ν ν¨ν΄μ κ²°ν©ν©λλ€" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "μΆλ ₯νμ§ μκ³ μΌμΉνλ νλͺ©μ exit() μν λ²νΈλ‘ 리ν΄ν©λλ€" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "λͺ¨λ ν¨ν΄κ³Ό μΌμΉνλ νμΌμ μΌμΉνλ λΆλΆλ§ νμν©λλ€" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "grep ννμμ λν νμ± νΈλ¦¬λ₯Ό νμν©λλ€" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "νμ΄μ " -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "μΌμΉνλ νμΌμ νμ΄μ νλ‘κ·Έλ¨μμ νμν©λλ€" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1) μ€νμ νμ©ν©λλ€ (μ΄ λΉλμμλ 무μ)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "ν¨ν΄μ μ§μ νμ§ μμμ΅λλ€." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "μλͺ»λ μ€λ λ μλ₯Ό μ§μ νμ΅λλ€ (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager μ΅μ
μ μμ
ν΄λμμλ§ λμν©λλ€" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "--cached λλ --untracked μ΅μ
μ --no-index μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index λλ --untracked μ΅μ
μ 리λΉμ κ³Ό κ°μ΄ μΈ μ μμ΅λλ€." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard μ΅μ
μ μΆμ λλ λ΄μ©μ λν΄ μΈ μ μμ΅λλ€." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "--cached μ΅μ
κ³Ό νΈλ¦¬λ₯Ό λͺ¨λ μ§μ νμ΅λλ€." @@ -6761,8 +7031,8 @@ msgstr "emacsclient '%d' λ²μ μ λ무 κ³Όκ±° (< 22) λ²μ μ
λλ€." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "μ€ν μ€ν¨: '%s': %s" +msgid "failed to exec '%s'" +msgstr "μ€ν μ€ν¨: '%s'" #: builtin/help.c:205 #, c-format @@ -7018,104 +7288,105 @@ msgstr "κ·Ήμ¬ν νΌλ" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "λ‘컬 μ€λΈμ νΈ %dκ° λ§μΉ¨" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "λ‘컬 μ€λΈμ νΈ %dκ° λ§μΉ¨" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "%sμ λν΄ μμμΉ λͺ»ν ν
μΌ μ²΄ν¬μ¬ (λμ€ν¬ μμ?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "λ¬Άμμ μμλ΄μ§ λͺ»ν λΈν %dκ°κ° μμ΅λλ€" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "μΆκ°ν μ€λΈμ νΈλ₯Ό deflateν μ μμ΅λλ€ (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "%s λ‘컬 μ€λΈμ νΈκ° μμλμμ΅λλ€" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "λ¬Άμ νμΌμ λ«λλ° μ€λ₯" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "'%s' 보쑴 νμΌμ μΈ μ μμ΅λλ€" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "μ΄ '%s' 보쑴 νμΌμ λ«μ§ λͺ»νμ΅λλ€" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "λ¬Άμ νμΌμ μ μ₯ν μ μμ΅λλ€" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "μΈλ±μ€ νμΌμ μ μ₯ν μ μμ΅λλ€" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "μλͺ»λ pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "μ€λ λ κΈ°λ₯μ΄ μμ΅λλ€. %s 무μ" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "κΈ°μ‘΄ '%s' λ¬Άμ νμΌμ μ΄ μ μμ΅λλ€" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "'%s'μ λν κΈ°μ‘΄ λ¬Άμ idx νμΌμ μ΄ μ μμ΅λλ€" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "λΈν μλ: μ€λΈμ νΈ %dκ°" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "μ²΄μΈ κΈΈμ΄ = %d: μ€λΈμ νΈ %luκ°" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "'%s' λ¬ΆμνμΌ μ΄λ¦μ΄ '.pack'μΌλ‘ λλμ§ μμ΅λλ€" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "νμ¬ λλ ν°λ¦¬λ‘ λμμ¬ μ μμ΅λλ€" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "μλͺ»λ %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin μ΅μ
μ --stdin μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "'%s' λ¬ΆμνμΌ μ΄λ¦μ΄ '.pack'μΌλ‘ λλμ§ μμ΅λλ€" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify μ΅μ
μ λ¬ΆμνμΌ μ΄λ¦μ μ§μ νμ§ μμμ΅λλ€" @@ -7154,27 +7425,27 @@ msgstr "'%s'μ(λ₯Ό) '%s'μ 볡μ¬ν μ μμ΅λλ€" msgid "ignoring template %s" msgstr "%s μμμ 무μν©λλ€" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "%sμ μμμ΄ μμ΅λλ€" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "'%2$s'μμ μλͺ»λ νμ λ²μ %1$dμ μμμ 볡μ¬νμ§ μμ΅λλ€" +msgid "not copying templates from '%s': %s" +msgstr "'%s'μμ μμμ 볡μ¬νμ§ μμ΅λλ€: %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s νμΌμ΄ μ΄λ―Έ μμ΅λλ€" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "νμΌ μ’
λ₯ %dλ²μ μ²λ¦¬ν μ μμ΅λλ€" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "%sμ(λ₯Ό) %s(μΌ)λ‘ μκΈΈ μ μμ΅λλ€" @@ -7182,24 +7453,24 @@ 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s κΉ μ μ₯μ, μμΉ %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "λ€μ μ΄κΈ°ν: κΈ°μ‘΄" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "μ΄κΈ°ν: λΉ" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " 곡μ " -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7207,25 +7478,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<μμ-λλ ν°λ¦¬>] [--shared[=<κΆ" "ν>]] [<λλ ν°λ¦¬>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "κΆν" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "κΉ μ μ₯μλ₯Ό λ€λ₯Έ μ¬μ©μκ° κ³΅μ ν μ μκ² μ§μ " -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "%sμ λν΄ mkdirλ₯Ό ν μ μμ΅λλ€" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "%sμ λν΄ chdirλ₯Ό ν μ μμ΅λλ€" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7234,7 +7505,7 @@ msgstr "" "%s (λλ --work-tree=<λλ ν°λ¦¬>) νμ©λμ§ μμ. %s (λλ --git-" "dir=<directory>) μ§μ μ΄ μμΌλ©΄" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "μμ
ν΄λ '%s'μ μ κ·Όν μ μμ΅λλ€" @@ -7280,263 +7551,315 @@ msgstr "git show [<μ΅μ
>] <μ€λΈμ νΈ>..." msgid "invalid --decorate option: %s" msgstr "μλͺ»λ --decorate μ΅μ
: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "diffλ₯Ό μΆλ ₯νμ§ μμ΅λλ€" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "μμ€λ₯Ό νμν©λλ€" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "λ©μΌ 맡 νμΌμ μ¬μ©ν©λλ€" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "κΎΈλ―ΈκΈ° μ΅μ
" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "νμΌμμ n,m λ²μμ μ€μ μ²λ¦¬ν©λλ€ (1λΆν° μμ)" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "μ΅μ’
μΆλ ₯: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: μλͺ»λ νμΌ" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "%s μ€λΈμ νΈλ₯Ό μ½μ μ μμ΅λλ€" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "μ μ μλ μ’
λ₯: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers μ€μ μ κ°μ΄ μμ" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "μΆλ ₯ λλ ν°λ¦¬μ μ΄λ¦μ΄ λ무 κΉλλ€" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "%s ν¨μΉ νμΌμ μ΄ μ μμ΅λλ€" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "μ νν νλμ λ²μκ° νμν©λλ€." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "λ²μκ° μλλλ€." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "컀λ²λ ν°λ μ μλ©μΌ νμμ΄μ΄μΌ ν©λλ€" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "μ μ λκ° in-reply-to ν€λ: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<μ΅μ
>] [<μμμκ°> | <리λΉμ -λ²μ>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "μΆλ ₯ λλ ν°λ¦¬κ° λκ°?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "μ μ μλ μ»€λ° %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "'%s'μ(λ₯Ό) μ¬λ°λ₯Έ λ νΌλ°μ€λ‘ μμλ΄λλ° μ€ν¨νμ΅λλ€." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "μ νν λ³ν© κΈ°μ€μ μ μ°Ύμ μ μμ΅λλ€." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"μ
μ€νΈλ¦Όμ κ°μ Έμ€λλ° μ€ν¨νμ΅λλ€. λ² μ΄μ€ 컀λ°μ μλμΌλ‘ κΈ°λ‘νλ €λ©΄,\n" +"'git branch --set-upstream-to' λͺ
λ ΉμΌλ‘ μ격 λΈλμΉλ₯Ό μΆμ νμμμ€.\n" +"μλλ©΄ μ§μ '--base=<κΈ°μ€μ -컀λ°-ID>' μ΅μ
μΌλ‘ κΈ°μ€μ 컀λ°μ μ§μ ν \n" +"μλ μμ΅λλ€." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "μ νν λ³ν© κΈ°μ€μ μ μ°Ύλλ° μ€ν¨νμ΅λλ€" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "κΈ°μ€μ 컀λ°μ 리λΉμ λͺ©λ‘μ μμ 컀λ°μ΄μ΄μΌ ν©λλ€" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "κΈ°μ€μ 컀λ°μ 리λΉμ λͺ©λ‘μ λ€μ΄ μμΌλ©΄ μ λ©λλ€" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "ν¨μΉ IDλ₯Ό μμλΌ μ μμ΅λλ€" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "νλμ ν¨μΉμ λν΄μλ [PATCh n/m]μ λΆμ
λλ€" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "μ¬λ¬ κ° ν¨μΉμ λν΄μλ [PATCH]λ₯Ό λΆμ
λλ€" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "ν¨μΉλ₯Ό νμ€ μΆλ ₯μΌλ‘ νμν©λλ€" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "컀λ²λ ν°λ₯Ό λ§λλλ€" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "μΆλ ₯ νμΌ μ΄λ¦μ κ°λ¨ν μΌλ ¨ λ²νΈλ₯Ό μ¬μ©ν©λλ€" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "νμ₯μ" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "'.patch' λμ <νμ₯μ>λ₯Ό μ¬μ©ν©λλ€" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "ν¨μΉ λ²νΈλ₯Ό 1 λμ <n>μμ μμν©λλ€" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "μ리μ¦λ₯Ό Nλ²μ§Έ re-rollλ‘ νμν©λλ€" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[PATCH] λμ [<μ λμ΄>]λ₯Ό μ¬μ©ν©λλ€" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "κ²°κ³Ό νμΌμ <λλ ν°λ¦¬>μ μ μ₯ν©λλ€" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "[PATCH]λ₯Ό μλ₯΄κ±°λ μΆκ°νμ§ μμ΅λλ€" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "λ°μ΄λ리 diffλ₯Ό λ§λ€μ§ μμ΅λλ€" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "From ν€λμμ λͺ¨λ 0μΈ ν΄μλ₯Ό μΆλ ₯ν©λλ€" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "μ
μ€νΈλ¦Όμ μλ ν¨μΉλ₯Ό ν¬ν¨νμ§ μμ΅λλ€" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "κΈ°λ³Έκ° (ν¨μΉ + ν΅κ³) λμ ν¨μΉ νμμ νμν©λλ€" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "λ©μμ§" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "ν€λ" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "μ μλ©μΌ ν€λ" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "μ μλ©μΌ" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "To: ν€λλ₯Ό μΆκ°ν©λλ€" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "Cc: ν€λλ₯Ό μΆκ°ν©λλ€" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "μ μ" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "<μ μ>μμ From μ£Όμλ₯Ό μ€μ ν©λλ€ (μμΌλ©΄ μ»€λ―Έν° μ£Όμ μ μ μ¬μ©)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "λ©μμ§-ID" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "첫 λ©μΌμ <λ©μμ§-ID>μ λν λ΅μ₯ λ©μΌλ‘ λ§λλλ€" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "κ²½κ³" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "ν¨μΉλ₯Ό 첨λΆν©λλ€" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "ν¨μΉλ₯Ό λ³Έλ¬Έμ ν¬ν¨ν©λλ€" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "λ©μμ§μ μ€λ λλ₯Ό μ¬μ©, μ€νμΌ: shallow, deep" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "μλͺ
" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "μλͺ
μ μΆκ°ν©λλ€" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "λ² μ΄μ€-컀λ°" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "μ μ 쑰건 νΈλ¦¬ μ 보λ₯Ό ν¨μΉ μ리μ¦μ μΆκ°ν©λλ€" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "νμΌμμ μλͺ
μ μΆκ°ν©λλ€" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "ν¨μΉ νμΌ μ΄λ¦μ νμνμ§ μμ΅λλ€" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n λ° -k μ΅μ
μ νλλ§ μ¨μΌ ν©λλ€." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix λ° -k μ΅μ
μ νλλ§ μ¨μΌ ν©λλ€." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only μ΅μ
μ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status μ΅μ
μ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check μ΅μ
μ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "νμ€ μΆλ ₯μ΄λ λλ ν°λ¦¬ μ€μ νλλ§ μ§μ ν΄μΌ ν©λλ€." -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "'%s' λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "'%s' μλͺ
νμΌμ μ½μ μ μμ΅λλ€" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "μΆλ ₯ νμΌμ λ§λλλ° μ€ν¨νμ΅λλ€" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<μ
μ€νΈλ¦Ό> [<ν€λ> [<νκ³κ°>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7544,11 +7867,6 @@ msgstr "" "μΆμ λλ 리λͺ¨νΈ λΈλμΉλ₯Ό μ°Ύμ μ μμ΅λλ€. <μ
μ€νΈλ¦Ό>μ μλμΌλ‘ μ§μ νμμ" "μ€.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "μ μ μλ μ»€λ° %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<μ΅μ
>] [<νμΌ>...]" @@ -7739,171 +8057,175 @@ msgstr "git merge [<μ΅μ
>] <λ©μμ§> HEAD <컀λ°>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "`m' μ΅μ
μλ κ°μ΄ νμν©λλ€" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "'%s' λ³ν© μ λ΅μ μ°Ύμ μ μμ΅λλ€.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "μ¬μ© κ°λ₯ν μ λ΅μ:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "μ¬μ© κ°λ₯ν μ¬μ©μ μ€μ μ λ΅μ:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "λ³ν©μ΄ λλ λ diffstatμ νμνμ§ μμ΅λλ€" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "λ³ν©μ΄ λλ λ diffstatμ νμν©λλ€" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(--stat μ΅μ
κ³Ό λμΌ)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "λ³ν© 컀λ°μ λ©μμ§μ shortlog νλͺ©μ (μ΅λ <n>κ°) μΆκ°ν©λλ€" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "λ³ν©νλ λμ νλμ 컀λ°μ λ§λλλ€" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "λ³ν©μ΄ μ±κ³΅νλ©΄ 컀λ°μ ν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "μ»€λ° μ μ λ©μμ§λ₯Ό νΈμ§ν©λλ€" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "μ λ°©ν₯ μ§νμ νμ©ν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "μ λ°©ν₯ μ§νμ΄ λΆκ°λ₯νλ©΄ μ€μ§ν©λλ€" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "μ΄λ¦ λΆμΈ 컀λ°μ μ¬λ°λ₯Έ GPG μλͺ
μ΄ μλμ§ κ²μ¦ν©λλ€" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "μ λ΅" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "μ¬μ©ν λ³ν© μ λ΅" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "μ΅μ
=κ°" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "μ νν λ³ν© μ λ΅μ λν μ΅μ
" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "λ³ν© μ»€λ° λ©μμ§ (μ λ°©ν₯μ΄ μλ λ³ν©μ λν΄)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "νμ¬ μ§ν μ€μΈ λ³ν©μ μ€μ§ν©λλ€" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "κ΄κ³ μλ μ»€λ° λ΄μμ λ³ν©μ νμ©ν©λλ€" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "stashλ₯Ό μ€νν μ μμ΅λλ€." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" -msgstr "stash μ€ν¨" +msgstr "μ€νμ μ€ν¨" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "μ¬λ°λ₯Έ μ€λΈμ νΈκ° μλλλ€: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree μ€ν¨" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (ν©μΉ λ΄μ©μ΄ μμ΅λλ€)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "μ»€λ° ν©μΉκΈ° -- HEADλ₯Ό μ
λ°μ΄νΈνμ§ μμ΅λλ€\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "'%s'μ μΈ μ μμ΅λλ€" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "SQUASH_MSGλ₯Ό μ°λ μ€" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "SQUASH_MSGλ₯Ό λ§μΉλ μ€" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "λ³ν© λ©μμ§κ° μμ΅λλ€ -- HEADλ₯Ό μ
λ°μ΄νΈνμ§ μμ΅λλ€\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s'μ΄(κ°) 컀λ°μ κ°λ¦¬ν€μ§ μμ΅λλ€" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "μλͺ»λ branch.%s.mergeoptions λ¬Έμμ΄: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "λ κ°μ ν€λ λ³ν© μΈμλ μ²λ¦¬νμ§ μμ΅λλ€." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursiveμ λν΄ μ μ μλ μ΅μ
: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "%sμ μΈ μ μμ΅λλ€" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "'%s'μμ μ½μ μ μμ΅λλ€" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "λ³ν©μ 컀λ°νμ§ μμ΅λλ€. λ³ν©μ λ§μΉλ €λ©΄ 'git commit'μ μ¬μ©νμμμ€.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7919,52 +8241,52 @@ msgstr "" "'%c' λ¬Έμλ‘ μμνλ μ€μ 무μλκ³ , λ©μμ§κ° λΉμ΄ μμΌλ©΄ 컀λ°μ\n" "μ€μ§ν©λλ€.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "λΉ μ»€λ° λ©μμ§." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "νλ₯ν©λλ€.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "μλ λ³ν©μ΄ μ€ν¨νμ΅λλ€. μΆ©λμ λ°λ‘μ‘κ³ κ²°κ³Όλ¬Όμ 컀λ°νμμμ€.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s'μ(λ) 컀λ°μ΄ μλλλ€" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "νμ¬ λΈλμΉκ° μμ΅λλ€." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "νμ¬ λΈλμΉμ λν 리λͺ¨νΈκ° μμ΅λλ€." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "νμ¬ λΈλμΉμ λν΄ κΈ°λ³Έ μ
μ€νΈλ¦Όμ μ§μ νμ§ μμμ΅λλ€." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "리λͺ¨νΈ %2$sμμ %1$sμ λν 리λͺ¨νΈ μΆμ λΈλμΉκ° μμ΅λλ€" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "'%s'μ(λ₯Ό) λ«μ μ μμ΅λλ€" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "μ€μ§ν λ³ν© μμ
μ΄ μμ΅λλ€. (MERGE_HEADκ° μμ)" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7972,7 +8294,7 @@ msgstr "" "λ³ν©μ λ§μΉμ§ μμμ΅λλ€. (MERGE_HEAD μμ)\n" "λ³ν©νκΈ° μ μ λ³κ²½ μ¬νμ 컀λ°νμμμ€." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7980,100 +8302,104 @@ msgstr "" "μ»€λ° λΉΌμ€κΈ°λ₯Ό λ§μΉμ§ μμμ΅λλ€. (COMMIT_PICK_HEAD μμ)\n" "λ³ν©νκΈ° μ μ λ³κ²½ μ¬νμ 컀λ°νμμμ€." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "μ»€λ° λΉΌμ€κΈ°λ₯Ό λ§μΉμ§ μμμ΅λλ€. (CHERRY_PICK_HEAD μμ)" -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "--squash μ΅μ
μ --no-ff μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "컀λ°μ μ§μ νμ§ μμκ³ merge.defaultToUpstreamλ₯Ό μ€μ νμ§ μμμ΅λλ€." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "λΉ ν€λλ‘ μ»€λ°μ ν©μΉκΈ°λ μ§μνμ§ μμ΅λλ€" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "μ λ°©ν₯μ΄ μλ 컀λ°μ λΉ ν€λμμλ μλ€κ° λ§μ§ μμ΅λλ€" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - λ³ν©ν μ μλ νλͺ©μ΄ μλλλ€" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "λΉ ν€λμλ μ νν νλμ 컀λ°λ§ λ³ν©ν μ μμ΅λλ€" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "%s 컀λ°μ μ λ’°νμ§ μλ (μλͺ
μκ° %sλΌκ³ νλ) GPG μλͺ
μ΄ μμ΅λλ€." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "%s 컀λ°μ μλͺ»λ (μλͺ
μκ° %sλΌκ³ νλ) GPG μλͺ
μ΄ μμ΅λλ€." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "%s 컀λ°μ GPG μλͺ
μ΄ μμ΅λλ€." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "%s 컀λ°μ %sμ μ¬λ°λ₯Έ GPG μλͺ
μ΄ μμ΅λλ€\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "κ΄κ³ μλ μ»€λ° λ΄μμ λ³ν©μ κ±°λΆν©λλ€" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "μ
λ°μ΄νΈ μ€ %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "μμ£Ό κ°λ¨ν μΈλ±μ€ λ΄λΆ λ³ν©μ μλν©λλ€...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "μλ.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "μ λ°©ν₯μ΄ λΆκ°λ₯νλ―λ‘, μ€μ§ν©λλ€." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "νΈλ¦¬λ₯Ό λ³Έλ μμΉλ‘ λλ립λλ€...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "λ³ν© μ λ΅ %s μλ...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "λ³ν©μ μ²λ¦¬ν μ λ΅μ΄ μμ΅λλ€.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "μ λ΅ %s(μΌ)λ‘ λ³ν©μ΄ μ€ν¨νμ΅λλ€.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "μλ ν΄κ²°μ μ€λΉλ₯Ό μν΄ %s μ λ΅μ μ¬μ©ν©λλ€.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "μλ λ³ν©μ΄ μ μ§νλμμ΅λλ€. μμ²νλλ‘ μ»€λ° μ μ μ€μ§ν©λλ€\n" @@ -8183,9 +8509,9 @@ msgstr "git mv [<μ΅μ
>] <μλ³Έ>... <λμ>" msgid "Directory %s is in index and no submodule?" msgstr "%s λλ ν°λ¦¬κ° μΈλ±μ€μ μκ³ νμ λͺ¨λμ΄ μμ΅λλ€?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "κ³μνλ €λ©΄ .gitmodulesμ λ³κ²½ μ¬νμ μ€ν
μ΄μ§μ λ£κ±°λ stash νμμμ€" +msgstr "κ³μνλ €λ©΄ .gitmodulesμ λ³κ²½ μ¬νμ μ€ν
μ΄μ§μ λ£κ±°λ μ€νμ νμμμ€" #: builtin/mv.c:90 #, c-format @@ -8261,48 +8587,48 @@ msgstr "%s, μλ³Έ=%s, λμ=%s" msgid "Renaming %s to %s\n" msgstr "μ΄λ¦ λ°κΎΈκΈ°, '%s'μμ '%s'(μΌ)λ‘\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "'%s'μ μ΄λ¦ λ°κΎΈκΈ°κ° μ€ν¨νμ΅λλ€" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<μ΅μ
>] <컀λ°>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<μ΅μ
>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<μ΅μ
>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "μ΄λ¦λ§ νμ (SHA-1 μμ΄)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "컀λ°μ μ§μ ν λ νκ·Έλ§ μ¬μ©ν©λλ€" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "<ν¨ν΄>κ³Ό μΌμΉνλ λ νΌλ°μ€λ§ μ¬μ©ν©λλ€" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "λͺ¨λ λ νΌλ°μ€μμ μ κ·Ό κ°λ₯ν λͺ¨λ μ»€λ° λͺ©λ‘μ νμν©λλ€" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "νμ€μ
λ ₯μμ μ½μ΅λλ€" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "`μ μλμ§ μμ' μ΄λ¦ νμλ₯Ό νμ©ν©λλ€ (κΈ°λ³Έκ°)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "μ
λ ₯μ νκ·Έ λ νΌλ°μ€λ₯Ό λ°λΌκ°λλ€ (λ΄λΆ μ¬μ©)" @@ -8449,24 +8775,16 @@ msgstr "λ
ΈνΈ μ€λΈμ νΈλ₯Ό μΈ μ μμ΅λλ€" msgid "The note contents have been left in %s" msgstr "λ
ΈνΈ λ΄μ©μ %sμ λ¨μ΅λλ€" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "'%s'μ(λ₯Ό) μ½μ μ μμ΅λλ€" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "'%s'μ(λ₯Ό) μ΄κ±°λ μ½μ μ μμ΅λλ€" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "'%s'μ(λ₯Ό) μ¬λ°λ₯Έ λ νΌλ°μ€λ‘ μμλ΄λλ° μ€ν¨νμ΅λλ€." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8479,7 +8797,7 @@ msgstr "λΈλ‘μ΄ μλ '%s' μ€λΈμ νΈμ λν΄ λ
ΈνΈ λ°μ΄ν°λ₯Ό μ½μ #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "νλΌλ―Έν°κ° λ무 λ§μ΅λλ€" @@ -8526,7 +8844,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "%s μ€λΈμ νΈμ λν κΈ°μ‘΄ λ
ΈνΈλ₯Ό λμ΄μλλ€\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "%s μ€λΈμ νΈμ λν λ
ΈνΈλ₯Ό μ κ±°ν©λλ€\n" @@ -8566,15 +8884,15 @@ msgstr "" "-m/-F/-c/-C μ΅μ
μ 'edit' νμ λͺ
λ Ήμ λν΄ μ¬μ©μ κΆνμ§ μμ΅λλ€.\n" "λμ μ 'git notes add -f -m/-F/-c/-C' λͺ
λ Ήμ μ¬μ©νμμμ€.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "μΌλ° μ΅μ
" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "λ³ν© μ΅μ
" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8582,49 +8900,49 @@ msgstr "" "μ£Όμ΄μ§ μ λ΅μ μ¬μ©ν΄ λ
ΈνΈ μΆ©λμ ν΄κ²°ν©λλ€ (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "λ³ν©νμ§ μμ λ
ΈνΈ 컀λ°" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "λ³ν©νμ§ μμ λ
ΈνΈλ₯Ό 컀λ°ν΄ λ
ΈνΈ λ³ν©μ λ§μΉ©λλ€" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "λ
ΈνΈ λ³ν© ν΄κ²° μ€μ§" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "λ
ΈνΈ λ³ν©μ μ€μ§ν©λλ€" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "%s μμΉλ‘ λ
ΈνΈ λ³ν©μ΄ μ΄λ―Έ %sμμ μ§νμ€μ
λλ€" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "%s μ€λΈμ νΈμ λ
ΈνΈκ° μμ΅λλ€\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "μλ λ
ΈνΈλ₯Ό μ κ±°νλ €λ μλλ₯Ό μ€λ₯κ° μλ κ²μΌλ‘ μ·¨κΈν©λλ€" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "νμ€ μ
λ ₯μμ μ€λΈμ νΈ μ΄λ¦μ μ½μ΅λλ€" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "λ
ΈνΈ-λ νΌλ°μ€" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "<λ
ΈνΈ-λ νΌλ°μ€>μμ λ
ΈνΈλ₯Ό μ¬μ©ν©λλ€" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "μ μ μλ νμ λͺ
λ Ή: %s" @@ -8647,166 +8965,170 @@ msgstr "" msgid "deflate error (%d)" msgstr "deflate μ€λ₯ (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "λ°°νΈλ§΅ μ°κΈ°λ₯Ό νμ§ μμ΅λλ€. λ¬Άμμ pack.packSizeLimit κ°μ λ°λΌ μͺΌκ°μ§λλ€" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "μ€λΈμ νΈ μ°λ μ€" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "λ¬Άμμ λ€μ΄μμ§ μμ μ€λΈμ νΈκ° μμΌλ―λ‘, λΉνΈλ§΅ μ°κΈ°λ₯Ό νμ§ μμ΅λλ€" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "μ€λΈμ νΈ μμΆνλ μ€" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "μ§μνμ§ μλ μΈλ±μ€ λ²μ %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "μλͺ»λ μΈλ±μ€ λ²μ '%s'" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "μ§νλ₯ μ νμνμ§ μμ΅λλ€" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "μ§νλ₯ μ νμν©λλ€" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "μ€λΈμ νΈ μ°κΈ° λ¨κ³μμ μ§νλ₯ μ νμν©λλ€" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "μ§νλ₯ μ΄ νμλ λ --all-progressμ λΉμ·ν©λλ€" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "λ²μ [,μ€νμ
]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "μ§μ ν λ²μ μ μΈλ±μ€ νμμ λ°λΌ λ¬Άμ μΈλ±μ€ νμΌμ μλλ€" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "μΆλ ₯ λ¬Άμ νμΌμ μ΅λ ν¬κΈ°" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "보쑰 μ€λΈμ νΈ μ μ₯μμμ λΉλ €μ¨ μ€λΈμ νΈλ₯Ό 무μν©λλ€" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "λ¬Άμ μ€λΈμ νΈλ₯Ό 무μν©λλ€" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "λ¬Άμ μλμ°λ₯Ό μ€λΈμ νΈ λ¨μλ‘ μ νν©λλ€" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "λ¬Άμ μλμ°λ₯Ό μ€λΈμ νΈ λ¨μμ μΆκ°λ‘ λ©λͺ¨λ¦¬ λ¨μλ‘ μ νν©λλ€" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "κ²°κ³Όλ¬Ό λ¬Άμμμ νμ©λλ μ΅λ κΈΈμ΄μ λΈν 체μΈ" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "κΈ°μ‘΄ λΈνλ₯Ό μ¬μ¬μ©ν©λλ€" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "κΈ°μ‘΄ μ€λΈμ νΈλ₯Ό μ¬μ¬μ©ν©λλ€" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA μ€λΈμ νΈλ₯Ό μ¬μ©ν©λλ€" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "μ΅μμ λΈν μΌμΉλ₯Ό κ²μνλλ° μ€λ λλ₯Ό μ¬μ©ν©λλ€" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "λΉ λ¬Άμ μΆλ ₯μ λ§λ€μ§ μμ΅λλ€" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "νμ€ μ
λ ₯μμ 리λΉμ μΈμλ₯Ό μ½μ΅λλ€" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "λ¬Άμ§ μλ μ€λΈμ νΈ μλ₯Ό μ νν©λλ€" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "λͺ¨λ λ νΌλ°μ€μμ μ κ·Ό κ°λ₯ν μ€λΈμ νΈλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "reflog νλͺ©μμ λ νΌλ°μ€ν μ μλ μ€λΈμ νΈλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "μΈλ±μ€μμ< λ νΌλ°μ€νλ μ€λΈμ νΈλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "λ¬Άμμ νμ€ μΆλ ₯μΌλ‘ μΆλ ₯ν©λλ€" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "λ¬Άμμ λ€μ΄κ° μ€λΈμ νΈλ₯Ό λ νΌλ°μ€νλ νκ·Έ μ€λΈμ νΈλ₯Ό ν¬ν¨ν©λλ€" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "μ κ·Ό λΆκ°λ₯ μ€λΈμ νΈλ₯Ό 보쑴ν©λλ€" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "μκ°" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "<μκ°>λ³΄λ€ μλ‘μ΄ μ κ·Ό λΆκ°λ₯ μ€λΈμ νΈμ λ¬Άμμ νλλ€" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "μμ λ¬Άμμ λ§λλλ€" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "μμ κ°μ Έμ€κΈ°μ μ ν©ν λ¬Άμμ λ§λλλ€" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ν΄λΉνλ .keep νμΌμ΄ μλ λ¬Άμμ 무μν©λλ€" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "λ¬Άμ μμΆ λ¨κ³" # FIXME: graft? -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "λΆμ΄ μλ 컀λ°μ μ¨κΈ°μ§ μμ΅λλ€" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "κ°λ₯νλ©΄ λΉνΈλ§΅ μΈλ±μ€λ₯Ό μ¬μ©ν΄ μ€λΈμ νΈ μΈκΈ° μλλ₯Ό λμ
λλ€" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "λ¬Άμ μΈλ±μ€μ κ°μ΄ λΉνΈλ§΅ μΈλ±μ€λ₯Ό μλλ€" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "μ€λΈμ νΈ κ°μ μΈλ μ€" @@ -8834,15 +9156,15 @@ msgstr "μ€λ³΅λ μ€λΈμ νΈ μ κ±°" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <μκ°>] [--] [<ν€λ>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "μ κ±°νμ§ μκ³ , 보μ¬μ£ΌκΈ°λ§ ν©λλ€" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "μλΌλΈ μ€λΈμ νΈλ₯Ό μ립λλ€" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "<μκ°>λ³΄λ€ μ€λ λ μ€λΈμ νΈκ° λ§λ£λ©λλ€" @@ -8854,61 +9176,65 @@ msgstr "precious-objects μ μ₯μμμ μλΌλΌ μ μμ΅λλ€" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<μ΅μ
>] [<μ μ₯μ> [<λ νΌλ°μ€λͺ
μΈ>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "λ³ν© κ΄λ ¨ μ΅μ
" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "λ³κ²½ μ¬νμ μ μ©ν λ λ³ν©νλ λμ λ¦¬λ² μ΄μ€ν©λλ€" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "μ λ°©ν₯ μ§νμ νμ©ν©λλ€" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "μ§μ ν 컀λ°μ μ¬λ°λ₯Έ GPG μλͺ
μ΄ μλμ§ κ²μ¦ν©λλ€" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "λ¦¬λ² μ΄μ€ μ κ³Ό νμ stash λ° stash popμ μλμΌλ‘ ν©λλ€" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "κ°μ Έμ€κΈ° κ΄λ ¨ μ΅μ
" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "λ³λ ¬μ μΌλ‘ νμ μ€νν νμλͺ¨λ κ°μ" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ffμ λν΄ μλͺ»λ κ°: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "λ¦¬λ² μ΄μ€λ‘ νμ ν μ μμ΅λλ€: μ€ν
μ΄μ§νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "μΆκ°λ‘, μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "λ¦¬λ² μ΄μ€λ‘ νμ ν μ μμ΅λλ€: μΈλ±μ€μ 컀λ°νμ§ μμ λ³κ²½ μ¬νμ΄ μμ΅λλ€." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "κ°μ Έμ¨ λ νΌλ°μ€ μ€μ λ¦¬λ² μ΄μ€ν λμ νλ³΄κ° μμ΅λλ€." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "κ°μ Έμ¨ λ νΌλ°μ€ μ€μ λ³ν©ν λμ νλ³΄κ° μμ΅λλ€." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -8916,7 +9242,7 @@ msgstr "" "λ³΄ν΅ μ΄λ° κ²½μ°λ 리λͺ¨νΈ μͺ½μλ μλ μμΌλμΉ΄λ λ νΌλ°μ€λͺ
μΈκ°\n" "μ£Όμ΄μ‘μ λ μΌμ΄λ©λλ€." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8927,38 +9253,42 @@ msgstr "" "μ΄ λ¦¬λͺ¨νΈλ νμ¬ λΈλμΉμ λν΄ κΈ°λ³ΈμΌλ‘ μ€μ λ 리λͺ¨νΈκ°\n" "μλκΈ° λλ¬Έμ, λͺ
λ Ήνμμ λΈλμΉλ₯Ό μ§μ ν΄μΌ ν©λλ€." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "νμ¬ μ΄λ€ λΈλμΉ μμλ μμ§ μμ΅λλ€." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "μ΄λ€ λΈλμΉλ₯Ό λμμΌλ‘ λ¦¬λ² μ΄μ€ν μ§ μ§μ νμμμ€." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "μ΄λ€ λΈλμΉλ₯Ό λμμΌλ‘ λ³ν©ν μ§ μ§μ νμμμ€." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "μμΈν μ 보λ git-pull(1) νμ΄μ§λ₯Ό μ°Έκ³ νμμμ€." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<리λͺ¨νΈ>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<λΈλμΉ>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "νμ¬ λΈλμΉμ μΆμ μ λ³΄κ° μμ΅λλ€." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "" -"μ΄ λΈλμΉμ λν μΆμ μ 보λ₯Ό μ€μ νλ €λ©΄ λ€μκ³Ό κ°μ΄ ν μ μμ΅λλ€:\n" -"\n" -" git branch --set-upstream-to=%s/<λΈλμΉ> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "μ΄ λΈλμΉμ λν μΆμ μ 보λ₯Ό μ€μ νλ €λ©΄ λ€μκ³Ό κ°μ΄ ν μ μμ΅λλ€:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -8967,11 +9297,15 @@ msgstr "" "μ€μ μμ 리λͺ¨νΈμ '%s' λ νΌλ°μ€μ λ³ν©νλλ‘ μ§μ νμ§λ§,\n" "κ·Έλ° λ νΌλ°μ€λ₯Ό κ°μ Έμ€μ§ μμμ΅λλ€." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash μ΅μ
μ --rebase μ΅μ
κ³Ό κ°μ΄ μ¨μΌ ν©λλ€." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "λ§λ€μ΄μ§μ§ μμ λΈλμΉλ₯Ό μΈλ±μ€μ μΆκ°λ λ³κ²½ μ¬νμΌλ‘ μ
λ°μ΄νΈν©λλ€." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8982,7 +9316,7 @@ msgstr "" "μμ
ν΄λλ₯Ό %s 컀λ°μμ μ λ°©ν₯\n" "μ§νν©λλ€." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8999,11 +9333,11 @@ msgstr "" "$ git reset --hard\n" "볡ꡬλ©λλ€." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "μ¬λ¬ λΈλμΉλ₯Ό λΉ ν€λλ‘ λ³ν©ν μ μμ΅λλ€." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "μ¬λ¬ λΈλμΉλ‘ λ¦¬λ² μ΄μ€ν μ μμ΅λλ€." @@ -9367,6 +9701,18 @@ msgstr "λλ¬Έ 체ν¬μμ νν° μ μ©μ 건λλλλ€" msgid "debug unpack-trees" msgstr "unpack-trees λλ²κΉ
" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dir>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "μΆλ ₯ μκΈ°" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "λλ ν°λ¦¬λ₯Ό μ§μ ν΄μΌ ν©λλ€." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9688,174 +10034,176 @@ msgstr "* 리λͺ¨νΈ %s" msgid " Fetch URL: %s" msgstr " κ°μ Έμ€κΈ° URL: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(URL μμ)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " νΈμ URL: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " HEAD λΈλμΉ: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD λΈλμΉ (리λͺ¨νΈ HEADλ μ 맀νκ³ , λ€μ μ€ νλμΌ μ μμ΅λλ€):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 리λͺ¨νΈ λΈλμΉ:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (μνλ₯Ό μ§μνμ§ μμ)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 'git pull'μ μ¬μ©ν λ‘컬 λΈλμΉλ₯Ό μ€μ :" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " λ‘컬 λ νΌλ°μ€λ₯Ό 'git push'λ‘ λ―Έλ¬λ§ν μμ " -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " λ‘컬 λ νΌλ°μ€λ₯Ό 'git push'λ‘ λ―Έλ¬λ§%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "λ νΌλ°μ€/리λͺ¨νΈ/<μ΄λ¦>/HEAD κ°μ 리λͺ¨νΈμ λ§κ² μ€μ ν©λλ€" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "λ νΌλ°μ€/리λͺ¨νΈ/<μ΄λ¦>/HEAD κ°μ μμ ν©λλ€" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "리λͺ¨νΈ HEADλ₯Ό κ²°μ ν μ μμ΅λλ€" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "리λͺ¨νΈ HEAD λΈλμΉκ° μ¬λ¬κ°μ
λλ€. λ€μ μ€ νλλ₯Ό λͺ
μμ μΌλ‘ μ§μ νμμμ€:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "%sμ(λ₯Ό) μμ ν μ μμ΅λλ€" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "μ¬λ°λ₯Έ λ νΌλ°μ€κ° μλλλ€: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "%sμ(λ₯Ό) μ€μ ν μ μμ΅λλ€" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %sμ μ°κ²°μ΄ λμ΄μ§λλ€!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %sμ μ°κ²°μ΄ λμ΄μ‘μ΅λλ€!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "μλΌλ: %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [μλΌλΌ μμ ] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [μλΌλ] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "κ°μ Έμ¨ νμ 리λͺ¨νΈλ₯Ό μλΌλ
λλ€" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "κ·Έλ° λ¦¬λͺ¨νΈκ° μμ΅λλ€ ('%s')" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "λΈλμΉλ₯Ό μΆκ°ν©λλ€" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "리λͺ¨νΈλ₯Ό μ§μ νμ§ μμμ΅λλ€" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "κ°μ Έμ€κΈ° URLμ΄ μλλΌ νΈμ URLμ μ§μν©λλ€" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "λͺ¨λ URLμ 리ν΄ν©λλ€" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "'%s' 리λͺ¨νΈμ λν URLμ μ€μ νμ§ μμμ΅λλ€" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "νΈμ URLμ μ§μ ν©λλ€" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "URLμ μΆκ°ν©λλ€" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "URLμ μμ ν©λλ€" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete μ΅μ
μ λλ€ μ°λ©΄ μ λ©λλ€" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "μλͺ»λ μ€λμ URL ν¨ν΄: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "κ·Έλ° URLμ΄ μμ΅λλ€: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "νΈμμ©μ΄ μλ λͺ¨λ URLμ μμ νμ§ μμ΅λλ€" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "μμΈν νμν©λλ€ (νμ λͺ
λ Ή μμ μμΌ ν©λλ€)" @@ -10359,10 +10707,6 @@ msgstr "μ¬κ·μ μ κ±°λ₯Ό νμ©ν©λλ€" msgid "exit with a zero status even if nothing matched" msgstr "μ무 κ²λ μΌμΉνμ§ μμΌλ©΄ μν 0λ²μΌλ‘ λλ©λλ€" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "κ³μνλ €λ©΄ .gitmodulesμ λ³κ²½ μ¬νμ μ€ν
μ΄μ§νκ±°λ stashνμμμ€" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10565,82 +10909,178 @@ msgstr "μ£Όμ λ¬Έμλ‘ μμνλ λͺ¨λ μ€μ 건λλ°κ³ μ κ±°ν©λλ€ msgid "prepend comment character and space to each line" msgstr "κ° μ€μ μμ μ£Όμ λ¬Έμμ 곡백μ λΆμ
λλ€" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "κ·Έλ° λ νΌλ°μ€κ° μμ΅λλ€: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "μ 체 λ νΌλ°μ€ μ΄λ¦μ΄ νμνμ§λ§, μ
λ ₯μ %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "'%s' URL νλμ λ¨κ³λ₯Ό μλΌλΌ μ μμ΅λλ€" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "μλ κ²½λ‘μ μ¬μ©ν λλ€λ₯Έ κΈ°μ€" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<κ²½λ‘>] [<κ²½λ‘>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr ".gitmodulesμμ νμ λͺ¨λ κ²½λ‘ '%s'μ λν URLμ΄ μμ΅λλ€" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "νμ λͺ¨λ κ²½λ‘ '%s'μ λν URLμ λ±λ‘νλλ° μ€ν¨νμ΅λλ€" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "'%3$s' κ²½λ‘μ λν΄ '%1$s' (%2$s) νμ λͺ¨λ λ±λ‘\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "κ²½κ³ : '%s' νμ λͺ¨λμ λν΄ μ»€λ§¨λ μ
λ°μ΄νΈ λͺ¨λκ° μ μλμμ΅λλ€\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "'%s' νμ λͺ¨λμ λν΄ μ
λ°μ΄νΈ λͺ¨λ λ±λ‘μ΄ μ€ν¨νμ΅λλ€" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "νμ λͺ¨λ μ΄κΈ°νμ μΆλ ₯μ νμ§ μμ΅λλ€" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<κ²½λ‘>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <κ²½λ‘>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "κ²½λ‘ '%s'μ λν΄ .gitmodulesμ μλ νμλͺ¨λ 맀νμ΄ μμ΅λλ€" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "μ νμ λͺ¨λμ 볡μ ν λμ μμΉ" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "μ νμ λͺ¨λ μ΄λ¦" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "νμ λͺ¨λμ 볡μ ν΄ μ¬ URL" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "μμ 볡μ μ μ¬μ©ν κΉμ΄" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" -msgstr "" -"git submodule--helper clone [--prefix=<κ²½λ‘>] [--quiet] [--reference <μ μ₯μ" -">] [--name <μ΄λ¦>] [--url <URL>][--depth <κΉμ΄>] [--] [<κ²½λ‘>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<κ²½λ‘>] [--quiet] [--reference <μ μ₯μ>] [--name <μ΄λ¦>] [--depth <κΉμ΄>] --url <url> --path <κ²½λ‘>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "'%s' λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "'%s'μμ νμ λͺ¨λ κ²½λ‘ '%s'μ 볡μ νλλ° μ€ν¨νμ΅λλ€" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "'%s' νμΌμ μ΄ μ μμ΅λλ€" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "%s νμΌμ λ«μ μ μμ΅λλ€" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s'μ λν νμ λͺ¨λ λλ ν°λ¦¬λ₯Ό κ°μ Έμ¬ μ μμ΅λλ€" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "" -"μΉλͺ
μ μ΄μ: submodule--helper νμ λͺ
λ Ήμ νμ λͺ
λ ΉμΌλ‘ νΈμΆν΄μΌ ν©λλ€" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "'%s' νμ λͺ¨λ κ²½λ‘κ° μ΄κΈ°νλμ§ μμμ΅λλ€" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "'update --init'μ νλ €κ³ ν κ² μλμμ΅λκΉ?" + +#: builtin/submodule--helper.c:639 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "μΉλͺ
μ μ΄μ: '%s'μ(λ) μ¬λ°λ₯Έ submodule--helper νμ λͺ
λ Ήμ΄ μλλλ€" +msgid "Skipping unmerged submodule %s" +msgstr "λ³ν©νμ§ νμ λͺ¨λ %s 건λλ" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "νμ λͺ¨λ '%s' 건λλ" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "μμ
ν΄λλ‘ κ°λ κ²½λ‘" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "μμ
ν΄λλ‘ κ°λ κ²½λ‘, λ΄μ₯λ νμ λͺ¨λμ κ²½κ³ ν΅κ³Ό" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout λλ none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "μ§μ ν κ°μμ 리λΉμ μμ μλ¦° μμ 볡μ λ₯Ό λ§λλλ€" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "λ³λ ¬ μμ
κ°μ" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "볡μ κ³Όμ μ νμνμ§ μμ΅λλ€" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<κ²½λ‘>] [<κ²½λ‘>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "νλΌλ―Έν° μ
λ°μ΄νΈμ κ°μ΄ μλͺ»λμμ΅λλ€" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "submodule--helper νμ λͺ
λ Ήμ νμ λͺ
λ ΉμΌλ‘ νΈμΆν΄μΌ ν©λλ€" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s'μ(λ) μ¬λ°λ₯Έ submodule--helper νμ λͺ
λ Ήμ΄ μλλλ€" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10694,27 +11134,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <νκ·Έμ΄λ¦>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "νκ·Έ μ΄λ¦μ΄ λ무 κΉλλ€: %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "'%s' νκ·Έκ° μμ΅λλ€." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "'%s' νκ·Έ μμ ν¨ (κ³Όκ±° %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "'%s' νκ·Έλ₯Ό κ²μ¦ν μ μμ΅λλ€" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10727,7 +11162,7 @@ msgstr "" " %s\n" "'%c' λ¬Έμλ‘ μμνλ μ€μ 무μλ©λλ€.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10858,21 +11293,21 @@ msgstr "--merged λ° --no-merged μ΅μ
μ -l μ΅μ
κ³Ό κ°μ΄ μ¨μΌ ν©λλ€. msgid "only one -F or -m option is allowed." msgstr "νλμ -F λλ -m μ΅μ
λ§ μΈ μ μμ΅λλ€." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "νλΌλ―Έν°κ° λ무 λ§μ΅λλ€" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s'μ9λ) μ¬λ°λ₯Έ νκ·Έ μ΄λ¦μ΄ μλλλ€." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "νκ·Έ '%s'μ΄(κ°) μ΄λ―Έ μμ΅λλ€" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "νκ·Έ '%s' μ
λ°μ΄νΈ (κ³Όκ±° %s)\n" @@ -11121,7 +11556,7 @@ msgstr "git verify-commit [-v | --verbose] <컀λ°>..." msgid "print commit contents" msgstr "μ»€λ° λ΄μ©μ νμν©λλ€" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "μλ³Έ GPG μνλ₯Ό μΆλ ₯ν©λλ€" @@ -11141,7 +11576,7 @@ msgstr "ν΅κ³λ§ νμ" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <νκ·Έ>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "νκ·Έ λ΄μ© νμ" @@ -11157,68 +11592,72 @@ msgstr "git worktree prune [<μ΅μ
>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<μ΅μ
>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "worktrees/%s μ κ±°: μ¬λ°λ₯Έ λλ ν°λ¦¬κ° μλλλ€" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "worktrees/%s μ κ±°: gitdir νμΌμ΄ μμ΅λλ€" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "worktrees/%s μ κ±°: gitdir νμΌμ μ½μ μ μμ΅λλ€ (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "worktrees/%s μ κ±°: gitdir νμΌμ΄ μ¬λ°λ₯΄μ§ μμ΅λλ€" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "worktrees/%s μ κ±°: gitdir νμΌμ΄ μλ μμΉλ₯Ό κ°λ¦¬ν΅λλ€" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "μ κ±°μ μ€ν¨νμ΅λλ€: %s" +msgid "failed to remove '%s'" +msgstr "'%s' μ κ±°μ μ€ν¨νμ΅λλ€" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s'μ΄(κ°) μ΄λ―Έ μμ΅λλ€" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "'%s'μ λλ ν°λ¦¬λ₯Ό λ§λ€ μ μμ΅λλ€" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "%s μ€λΉ μ€ (ID %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "λ€λ₯Έ μμ
ν΄λμμ 체ν¬μμνλλΌλ <λΈλμΉ>λ₯Ό 체ν¬μμν©λλ€" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "μ λΈλμΉλ₯Ό λ§λλλ€" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "λΈλμΉλ₯Ό λ§λ€κ±°λ 리μ
ν©λλ€" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "HEADλ₯Ό ν΄λΉ 컀λ°μμ λΆλ¦¬ν©λλ€" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "μ μμ
ν΄λλ₯Ό λ§λλλ€" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, --detach μ΅μ
μ€ νλλ§ μΈ μ μμ΅λλ€" @@ -11238,7 +11677,7 @@ msgstr "νμ λλ ν°λ¦¬ <μ λμ΄>μ λν΄ νΈλ¦¬ μ€λΈμ νΈλ₯Ό μλλ msgid "only useful for debugging" msgstr "λλ²κΉ
μ©λλ‘λ§ μ¬μ©" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "λλ²κΉ
λ©μμ§λ₯Ό νμ€μ€λ₯λ‘ μΆλ ₯ν©λλ€" @@ -11252,7 +11691,7 @@ msgstr "" "λͺ©λ‘μ λ³Ό μ μμ΅λλ€. νΉμ νμ λͺ
λ Ήμ΄λ κ°λ
μ λν΄ μ½μ΄ λ³΄λ €λ©΄ 'git help\n" "<λͺ
λ Ή>' λλ 'git help <κ°λ
>' λͺ
λ Ήμ μ€ννμμμ€." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "κ³΅κ° ν€ κ³ μ μ cURL 7.44.0 μ λ²μ μμλ μ§μνμ§ μμ΅λλ€" @@ -11298,7 +11737,7 @@ msgstr "μ μ₯μλ₯Ό 볡μ ν΄ μ λλ ν°λ¦¬λ‘ κ°μ Έ μ΅λλ€" #: common-cmds.h:22 msgid "Record changes to the repository" -msgstr "λ°λ μ¬νμ μ μ₯μμ κΈ°λ‘ν©λλ€." +msgstr "λ°λ μ¬νμ μ μ₯μμ κΈ°λ‘ν©λλ€" #: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" @@ -11380,7 +11819,7 @@ msgstr "λ κ°λ΅ν νμν©λλ€" msgid "use <n> digits to display SHA-1s" msgstr "SHA-1 νμμ <n>κ°μ μ«μλ₯Ό μ¬μ©ν©λλ€" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "κ°λ₯νλ©΄ μΈλ±μ€λ₯Ό μ¬μ¬μ©ν μΆ©λ ν΄κ²°λ‘ μ
λ°μ΄νΈν©λλ€" @@ -11592,16 +12031,16 @@ msgstr "" "μλ λΈλμΉλ₯Ό 체ν¬μμνκ³ λ¦¬λ² μ΄μ€λ₯Ό μ€μ§νλ €λ©΄, \"git rebase --abort\"λ₯Ό μ€" "ννμμμ€." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "μλμ€νμ μ μ©." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "\"$stash_sha1\"μ(λ₯Ό) μ μ₯ν μ μμ΅λλ€" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11611,31 +12050,27 @@ msgstr "" "λ³κ²½ μ¬νμ μ€νμ μμ μμ νκ² λ€μ΄ μμ΅λλ€.\n" "μΈμ λ μ§ \"git stash pop\" λλ \"git stash drop\"μ μ€νν μ μμ΅λλ€.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "λ¦¬λ² μ΄μ€ μ νν¬μμ λ¦¬λ² μ΄μ€λ₯Ό κ±°λΆνμ΅λλ€." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "git-amμ΄ μ§ν μ€μΈ κ²μ²λΌ 보μ
λλ€. λ¦¬λ² μ΄μ€ν μ μμ΅λλ€." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "--exec μ΅μ
μ --interactive μ΅μ
κ³Ό κ°μ΄ μ¬μ©ν΄μΌ ν©λλ€" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "λ¦¬λ² μ΄μ€κ° μ§ν μ€μ΄μ§ μμ΅λλ€" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "--edit-todo λμμ λνν λ¦¬λ² μ΄μ€μμλ§ μ¬μ©ν μ μμ΅λλ€." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "HEADλ₯Ό μ½μ μ μμ΅λλ€" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11643,12 +12078,12 @@ msgstr "" "λͺ¨λ λ³ν© μΆ©λμ νΈμ§νκ³ git add\n" "λͺ
λ ΉμΌλ‘ ν΄κ²°λμλ€κ³ νμν΄μΌ ν©λλ€" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "'$head_name' μμΉλ‘ λμκ° μ μμ΅λλ€" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11669,64 +12104,64 @@ msgstr "" "μ΄ λͺ
λ Ήμ λ€μ μ€ννμμμ€. μ€μν μ¬νμ΄ λ¨μ μμ κ²½μ°λ₯Ό\n" "λλΉν΄ μ¬κΈ°μ λ©μΆ₯λλ€." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "μλͺ»λ μ
μ€νΈλ¦Ό $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: μ¬λ¬ κ°μ λ³ν© λ² μ΄μ€κ° μμ΅λλ€" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: λ³ν© λ² μ΄μ€κ° μμ΅λλ€" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "μ¬λ°λ₯Έ 컀λ°μ κ°λ¦¬ν€μ§ μμ΅λλ€: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "μΉλͺ
μ μ΄μ: κ·Έλ° λΈλμΉκ° μμ΅λλ€: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "μλ μ€νμλ₯Ό ν μ μμ΅λλ€" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "μλ μ€νμλ₯Ό λ§λ€μμ΅λλ€: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "컀λ°νκ±°λ μ€νμμ λ£μΌμμμ€." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "νμ¬ λΈλμΉκ° ($branch_name) μ΅μ μνμ
λλ€." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "νμ¬ λΈλμΉκ° ($branch_name) μ΅μ μνμ
λλ€. κ°μ λ¦¬λ² μ΄μ€ν©λλ€." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "λ³κ²½ μ¬ν '$mb'μμ '$onto'(μΌ)λ‘:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "μμ
μ¬νμ λ€μ λ£κΈ° μν΄ λ¨Όμ ν€λλ₯Ό λ€λ‘ λ립λλ€..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name λΈλμΉλ₯Ό $onto_name μμΉλ‘ μ λ°©ν₯ μ§νν©λλ€." @@ -11870,26 +12305,21 @@ msgstr "λΈλμΉ μ΄λ¦μ μ§μ νμ§ μμμ΅λλ€" msgid "(To restore them type \"git stash apply\")" msgstr "(볡ꡬνλ €λ©΄ \"git stash apply\"λ₯Ό μ€ννμμμ€)" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "'$remoteurl' URLμμ νλμ νλͺ©μ μλΌλΌ μ μμ΅λλ€" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "μλ κ²½λ‘λ μμ
ν΄λμ μ΅μμμμλ§ μΈ μ μμ΅λλ€" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "μ μ₯μ URL: '$repo' κ°μ μ λ κ²½λ‘κ±°λ ./ λλ ../λ‘ μμν΄μΌ ν©λλ€." -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path'μ(λ) μ΄λ―Έ μΈλ±μ€μ μμ΅λλ€" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11900,111 +12330,93 @@ msgstr "" "$sm_path\n" "μ λ§λ‘ μΆκ°νλ €λ©΄ -f μ΅μ
μ μ¬μ©νμμμ€." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "'$sm_path'μ κΈ°μ‘΄ μ μ₯μλ₯Ό μΈλ±μ€μ μΆκ°ν©λλ€" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path'μ΄(κ°) μ΄λ―Έ μκ³ μ¬λ°λ₯Έ git μ μ₯μκ° μλλλ€" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "'$sm_name'μ λν κΉ λλ ν°λ¦¬κ° λ‘컬μμ 리λͺ¨νΈκ° μλ μ±λ‘ μμ΅λλ€:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "λ€μ 볡μ νμ§ μκ³ μ΄ λ‘컬 κΉ λλ ν°λ¦¬λ₯Ό μ¬νμ©νλ €λ©΄" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "'--force' μ΅μ
μ μ¬μ©νμμμ€. λ‘컬 κΉ λλ ν°λ¦¬κ° μ¬λ°λ₯Έ μ μ₯μκ° μλκ±°λ" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "λ¬΄μ¨ μλ―ΈμΈμ§ μ λͺ¨λ₯΄κ² λ€λ©΄ '--name' μ΅μ
μΌλ‘ λ€λ₯Έ μ΄λ¦μ μ°μμμ€." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "λ‘컬 κΉ λλ ν°λ¦¬λ₯Ό '$sm_name' νμλͺ¨λλ‘ λ€μ νμ±νν©λλ€." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "'$sm_path' νμ λͺ¨λμ 체ν¬μμν μ μμ΅λλ€" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "'$sm_path' νμ λͺ¨λμ μΆκ°νλλ° μ€ν¨νμ΅λλ€" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "'$sm_path' νμ λͺ¨λμ λ±λ‘νλλ° μ€ν¨νμ΅λλ€" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "'$prefix$displaypath' μ
λ ₯" +msgid "Entering '$displaypath'" +msgstr "'$displaypath' λ€μ΄κ°" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "" -"'$prefix$displaypath' μμΉμμ λ©μΆ€. μ€ν¬λ¦½νΈμμ 0μ΄ μλ μνλ₯Ό 리ν΄νμ΅λ" -"λ€." +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "'$displaypath'μμ λ©μΆ€. μ€ν¬λ¦½νΈκ° 0μ΄ μλ μνλ₯Ό 리ν΄ν¨." -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr ".gitmodulesμμ νμ λͺ¨λ κ²½λ‘ '$displaypath'μ λν URLμ΄ μμ΅λλ€" - -#: git-submodule.sh:492 -#, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μ λν URLμ λ±λ‘νλλ° μ€ν¨νμ΅λλ€" - -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "'$displaypath' κ²½λ‘μ ($url) λν΄ λ±λ‘λ '$name' νμ λͺ¨λ" - -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"νμ λͺ¨λ κ²½λ‘ '$displaypath'μ λν΄ μ
λ°μ΄νΈ λͺ¨λλ₯Ό λ±λ‘νλλ° μ€ν¨νμ΅λλ€" +msgid "pathspec and --all are incompatible" +msgstr "κ²½λ‘λͺ
μΈ λ° --all μ΅μ
μ νΈνλμ§ μμ΅λλ€" -#: git-submodule.sh:549 +#: git-submodule.sh:453 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "μ λ§λ‘ λͺ¨λ νμ λͺ¨λ μ΄κΈ°νλ₯Ό ν΄μ νλ €λ©΄ '.'μ μ¬μ©νμμμ€" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "μ λ§λ‘ λͺ¨λ νμ λͺ¨λ μ΄κΈ°νλ₯Ό ν΄μ νλ €λ©΄ '--all'μ μ¬μ©νμμμ€" -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "νμ λͺ¨λ μμ
ν΄λμ ('$displaypath') .git λλ ν°λ¦¬κ° λ€μ΄ μμ΅λλ€" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "(μ λ§λ‘ κ·Έ μ»€λ° λ΄μκΉμ§ ν¬ν¨ν΄ μ κ±°νλ €λ©΄ 'rm -rf'λ₯Ό μ¬μ©νμμμ€)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12013,133 +12425,127 @@ msgstr "" "νμ λͺ¨λ μμ
ν΄λμ ('$displaypath') λ‘컬 μμ μ¬νμ΄ μμ΅λλ€. λ²λ¦¬λ €λ©΄ '-" "f'λ₯Ό μ¬μ©νμμμ€" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "'$displaypath' λλ ν°λ¦¬λ₯Ό μ§μλλ€" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "νμ λͺ¨λ λλ ν°λ¦¬λ₯Ό ('$displaypath') μ κ±°ν μ μμ΅λλ€" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "λΉ νμ λͺ¨λ λλ ν°λ¦¬λ₯Ό ('$displaypath') λ§λ€ μ μμ΅λλ€" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "'$name' νμ λͺ¨λμ΄ ($url) '$displaypath' κ²½λ‘μ λν΄ λ±λ‘λμ§ μμμ΅λλ€" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"νμ λͺ¨λ κ²½λ‘κ° ('$displaypath') μ΄κΈ°νλμ§ μμμ΅λλ€\n" -"μλ§λ 'update --init'μ΄ νμν©λλ€?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘μμ ('$displaypath') νμ¬ λ¦¬λΉμ μ μ°Ύμ μ μμ΅λλ€" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "νμ λͺ¨λ κ²½λ‘ '$sm_path'μμ κ°μ Έμ¬ μ μμ΅λλ€" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ κ°μ Έμ¬ μ μμ΅λλ€" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ '$sha1'μ(λ₯Ό) 체ν¬μμν μ μμ΅λλ€" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath': '$sha1' 체ν¬μμ" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ '$sha1'μ(λ₯Ό) λ¦¬λ² μ΄μ€ν μ μμ΅λλ€" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath': '$sha1'(μΌ)λ‘ λ¦¬λ² μ΄μ€" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ '$sha1' λ³ν©ν μ μμ΅λλ€" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath': '$sha1'μμ λ³ν©" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "" -"νμ λͺ¨λ κ²½λ‘ '$prefix$sm_path'μμ '$command $sha1' μ€νμ΄ μ€ν¨νμ΅λλ€" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "'$command $sha1' μ€νμ΄ νμ λͺ¨λ κ²½λ‘ '$displaypath'μμ μ€ν¨νμ΅λλ€" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "νμ λͺ¨λ κ²½λ‘ '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "νμ λͺ¨λ κ²½λ‘ '$displaypath': '$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "μ¬κ·μ μΌλ‘ νμ λͺ¨λ κ²½λ‘ '$displaypath'μ λ€μ΄κ°λλ° μ€ν¨νμ΅λλ€" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "--cached μ΅μ
μ --files μ΅μ
κ³Ό κ°μ΄ μΈ μ μμ΅λλ€" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "μμμΉ λͺ»ν λͺ¨λ $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " κ²½κ³ : '$display_name'μ '$sha1_src' 컀λ°μ΄ λ€μ΄μμ§ μμ΅λλ€" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " κ²½κ³ : '$display_name'μ '$sha1_dst' 컀λ°μ΄ λ€μ΄μμ§ μμ΅λλ€" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "λΈλ‘" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "μ¬κ·μ μΌλ‘ νμ λͺ¨λ κ²½λ‘ '$sm_path'μ λ€μ΄κ°λλ° μ€ν¨νμ΅λλ€" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "νμ λͺ¨λ URLμ '$displaypath'μ λν΄ λκΈ°ν" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "μμΈν μ 보λ git-${cmd}(1) νμ΄μ§λ₯Ό μ°Έκ³ νμμμ€." diff --git a/po/pt_PT.po b/po/pt_PT.po index 321b553..f2cc93f 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1,16 +1,17 @@ # Portuguese translations for Git package. # Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com> +# Copyright (C) 2016 Vasco Almeida <vascomalmeida@sapo.pt> # This file is distributed under the same license as the Git package. -# Contributers: +# Contributors: # - Marco Sousa <marcomsousa AT gmail.com> -# Vasco Almeida <vasco13almeida@gmail.com>, 2016. +# Vasco Almeida <vascomalmeida@sapo.pt>, 2016. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-22 16:00+0000\n" -"Last-Translator: Vasco Almeida <vasco13almeida@gmail.com>\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-31 18:17+0000\n" +"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -30,23 +31,23 @@ msgid "" "as appropriate to mark resolution and make a commit." msgstr "" "Corrija-os na Γ‘rvore de trabalho e use 'git add/rm <ficheiro>'\n" -"conforme apropriado para marcΓ‘-los como resolvidos e faΓ§a commit." +"conforme apropriado para marcΓ‘-los como resolvidos e submeta." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Merge nΓ£o concluΓdo (MERGE_HEAD presente)." +msgstr "NΓ£o concluΓdo a integração (MERGE_HEAD presente)." #: advice.c:103 msgid "Please, commit your changes before merging." -msgstr "FaΓ§a commit das suas alteraçáes antes de efetuar merge." +msgstr "Submeta as suas alteraçáes antes de integrar." #: advice.c:104 msgid "Exiting because of unfinished merge." -msgstr "A terminar por causa de merge incompleto." +msgstr "A terminar devido a integração incompleta." #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<opçáes>] <Γ‘rvore> [<caminho>...]" +msgstr "git archive [<opçáes>] <Γ‘rvore-etc> [<caminho>...]" #: archive.c:13 msgid "git archive --list" @@ -56,7 +57,7 @@ msgstr "git archive --list" msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <repo> [--exec <cmd>] [<opçáes>] <tree-ish> " +"git archive --remote <repo> [--exec <cmd>] [<opçáes>] <Γ‘rvore-etc> " "[<caminho>...]" #: archive.c:15 @@ -76,7 +77,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato do arquivo" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "prefixo" @@ -84,9 +85,9 @@ msgstr "prefixo" msgid "prepend prefix to each pathname in the archive" msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -120,7 +121,8 @@ msgstr "compressΓ£o Γ³tima" msgid "list supported archive formats" msgstr "listar formatos de arquivo suportados" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "repo" @@ -153,8 +155,8 @@ msgid "" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" "\n" -"ApΓ³s resolver a causa do problema, pode tentar corrigir\n" -"o ramo remoto que deve ser seguido invocando\n" +"ApΓ³s resolver a causa do erro, pode tentar corrigir\n" +"o ramo remoto que deve ser seguido, invocando\n" "\"git branch --set-upstream-to=%s%s%s\"." #: branch.c:67 @@ -271,10 +273,15 @@ msgstr "Nome de objeto ambΓguo: '%s'." msgid "Not a valid branch point: '%s'." msgstr "Ponto no ramo invΓ‘lido: '%s'." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" -msgstr "'%s' jΓ‘ extraΓdo em '%s'" +msgstr "'%s' foi jΓ‘ extraΓdo em '%s'" + +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD da Γ‘rvore de trabalho %s nΓ£o estΓ‘ atualizada" #: bundle.c:34 #, c-format @@ -286,19 +293,19 @@ msgstr "'%s' nΓ£o parece ser um ficheiro bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "cabeΓ§alho nΓ£o reconhecido: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" -msgstr "nΓ£o Γ© possΓvel abrir '%s'" +msgstr "nΓ£o foi possΓvel abrir '%s'" #: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "O repositΓ³rio nΓ£o possuΓ estes commits prΓ©-requisitados:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "falha ao configurar percurso de revisΓ΅es" @@ -337,21 +344,21 @@ msgstr "rev-list terminou inesperadamente" msgid "ref '%s' is excluded by the rev-list options" msgstr "a referΓͺncia '%s' Γ© excluΓda pelas opçáes de rev-list" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "argumento nΓ£o reconhecido: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Criação de bundle vazio recusada." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "nΓ£o Γ© possΓvel criar '%s'" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack terminou inesperadamente" @@ -360,8 +367,8 @@ msgstr "index-pack terminou inesperadamente" msgid "invalid color value: %.*s" msgstr "valor de cor invΓ‘lido: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "nΓ£o foi possΓvel analisar %s" @@ -381,7 +388,7 @@ msgid "bad config line %d in %s %s" msgstr "linha %d de configuração incorreta em %s %s" #: config.c:593 -#, c-format +#, c-format, fuzzy msgid "bad numeric config value '%s' for '%s' in %s %s: %s" msgstr "valor numΓ©rico '%s' da configuração '%s' em %s %s incorreto: %s" @@ -395,21 +402,21 @@ msgstr "valor numΓ©rico '%s' da configuração '%s' incorreto: %s" msgid "failed to expand user dir in: '%s'" msgstr "falha ao expandir diretΓ³rio de utilizador em: '%s'" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "nΓvel de compressΓ£o zlib %d incorreto" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo invΓ‘lido para criação de objeto: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "nΓ£o Γ© possΓvel analisar configuração de linha de comandos" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "" "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração" @@ -429,24 +436,27 @@ msgstr "variΓ‘vel de configuração '%s' incorreta no ficheiro '%s' na linha %d" msgid "%s has multiple values" msgstr "%s tem mΓΊltiplos valores" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "nΓ£o foi possΓvel definir '%s' como '%s'" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "NΓ£o foi possΓvel definir '%s' como '%s'" +msgid "could not unset '%s'" +msgstr "nΓ£o foi possΓvel reiniciar '%s'" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "NΓ£o foi possΓvel executar 'git rev-list'" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "falha ao escrever para rev-list: %s" +msgid "failed write to rev-list" +msgstr "falha ao escrever para rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "falha ao fechar stdin de rev-list: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "falha ao fechar entrada padrΓ£o de rev-list" #: date.c:95 msgid "in the future" @@ -521,26 +531,26 @@ msgstr[1] "hΓ‘ %lu anos atrΓ‘s" msgid "failed to read orderfile '%s'" msgstr "falha ao ler o ficheiro de comando '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Deteção de mudanΓ§a de nome inexata em curso" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " ParΓ’metro de dirstat desconhecido '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Valor desconhecido na variΓ‘vel de configuração 'diff.submodule': '%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -549,16 +559,16 @@ msgstr "" "Erros encontrados na variΓ‘vel de configuração 'diff.dirstat':\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "o diff externo terminou inesperadamente, interrompido em %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow requer exatamente um ΓΊnico especificador de caminho" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -567,20 +577,20 @@ msgstr "" "Falha ao analisar parΓ’metro da opção --dirstat/-X:\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Falha ao analisar parΓ’metro da opção --submodule: '%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "falha ao obter nome e informação do kernel" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "A cache nΓ£o controlada estΓ‘ desativada neste sistema ou localização." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "nΓ£o foi possΓvel executar gpg." @@ -594,28 +604,28 @@ msgstr "gpg nΓ£o assinou os dados" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "nΓ£o foi possΓvel criar ficheiro temporΓ‘rio '%s': %s" +msgid "could not create temporary file '%s'" +msgstr "nΓ£o foi possΓvel criar ficheiro temporΓ‘rio '%s'" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "falha ao escrever assinatura destacada em '%s': %s" +msgid "failed writing detached signature to '%s'" +msgstr "falha ao escrever assinatura destacada em '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': nΓ£o foi possΓvel ler %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s': %s" +msgid "failed to stat '%s'" +msgstr "falha ao invocar stat de '%s'" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s': leitura truncada %s" +msgid "'%s': short read" +msgstr "'%s': leitura truncada" #: help.c:205 #, c-format @@ -641,7 +651,7 @@ msgstr "" #: help.c:366 msgid "Uh oh. Your system reports no Git commands at all." -msgstr "Ai ai. NΓ£o hΓ‘ nenhum comando do Git disponΓvel no sistema." +msgstr "Oh nΓ£o. NΓ£o hΓ‘ nenhum comando do Git disponΓvel no sistema." #: help.c:388 #, c-format @@ -681,12 +691,36 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"NΓ£o Γ© possΓvel criar '%s.lock': %s.\n" +"\n" +"Outro processo git parece estar a executar neste repositΓ³rio, e.g.\n" +"um editor aberto por 'git commit'. Certifique-se que todos os processos\n" +"terminaram e tente de novo. Se ainda assim falhar, um processo git\n" +"pode ter falhado anteriormente no repositΓ³rio:\n" +"remova o ficheiro manualmente para continuar." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "NΓ£o Γ© foi possΓvel criar '%s.lock': %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "falha ao ler a cache" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "nΓ£o foi possΓvel escrever novo ficheiro de Γndice" @@ -721,7 +755,7 @@ msgstr ": talvez um conflito D/F?" #: merge-recursive.c:725 #, c-format msgid "refusing to lose untracked file at '%s'" -msgstr "recusando-se a perder ficheiro nΓ£o controlado em '%s'" +msgstr "perda de ficheiro nΓ£o controlado em '%s' recusada" #: merge-recursive.c:765 #, c-format @@ -733,7 +767,7 @@ msgstr "nΓ£o Γ© possΓvel ler o objeto %s: '%s'" msgid "blob expected for %s '%s'" msgstr "blob para %s '%s' esperado" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "falha ao abrir '%s'" @@ -750,7 +784,7 @@ msgstr "nΓ£o sei o que fazer com %06o %s '%s'" #: merge-recursive.c:939 msgid "Failed to execute internal merge" -msgstr "Falha ao executar merge interno" +msgstr "Falha ao executar integração interna" #: merge-recursive.c:943 #, c-format @@ -868,16 +902,16 @@ msgstr "%s ignorado (integrado Γ© igual ao existente)" #: merge-recursive.c:1646 #, c-format msgid "Auto-merging %s" -msgstr "Merge automΓ‘tico de %s" +msgstr "A integrar automaticamente %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "submΓ³dulo" #: merge-recursive.c:1651 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "CONFLITO (%s): conflito de merge em %s" +msgstr "CONFLITO (%s): conflito de integração em %s" #: merge-recursive.c:1737 #, c-format @@ -898,58 +932,57 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITO (%s): HΓ‘ um diretΓ³rio designado %s em %s. A adicionar %s como %s" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "A adicionar %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." -msgstr "Falha de merge fatal, nΓ£o devia acontecer." +msgstr "Falha de integração fatal, nΓ£o devia acontecer." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "JΓ‘ estΓ‘ atualizado!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" -msgstr "falha ao realizar merge das Γ‘rvores %s e %s" +msgstr "falha ao integrar as Γ‘rvores %s e %s" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Caminho nΓ£o processado??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" -msgstr "A realizar merge:" +msgstr "A integrar:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u antecessor comum encontrado:" msgstr[1] "%u antecessores comuns encontrados:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" -msgstr "merge nΓ£o retornou nenhum commit" +msgstr "a integração nΓ£o retornou nenhum commit" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "NΓ£o foi possΓvel analisar o objeto '%s'" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "NΓ£o Γ© possΓvel escrever no Γndice." #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -"NΓ£o Γ© possΓvel fazer commit de Γ‘rvore de notas nΓ£o inicializada ou nΓ£o " -"referenciada" +"NΓ£o Γ© possΓvel submeter Γ‘rvore de notas nΓ£o inicializada ou nΓ£o referenciada" #: notes-utils.c:100 #, c-format @@ -959,7 +992,7 @@ msgstr "Valor de notes.rewriteMode incorreto: '%s'" #: notes-utils.c:110 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "Recusando-se a reescrever notas em %s (fora de refs/notes/)" +msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value @@ -973,28 +1006,28 @@ msgstr "Valor incorreto de %s: '%s'" msgid "unable to parse object: %s" msgstr "nΓ£o foi possΓvel analisar o objeto: %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "utilização: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " ou: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" @@ -1003,7 +1036,7 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nome do objeto malformado '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "NΓ£o foi possΓvel dar permissΓ£o de escrita ao grupo a %s" @@ -1075,7 +1108,7 @@ msgstr "" "NΓ£o hΓ‘ nada para excluir de acordo com o padrΓ£o :(excluir).\n" "Talvez se tenha esquecido de acrescentar ':/' ou '.' ?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "nΓ£o foi possΓvel analisar o formato de --pretty" @@ -1101,23 +1134,23 @@ msgstr "" "GIT_INDEX_VERSION definido, mas com valor invΓ‘lido.\n" "A usar a versΓ£o %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "NΓ£o foi possΓvel abrir '%s' para escrita" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "nΓ£o foi possΓvel eliminar a referΓͺncia %s: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "nΓ£o foi possΓvel eliminar as referΓͺncias: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "nΓ£o foi possΓvel eliminar a referΓͺncia %s" @@ -1256,97 +1289,98 @@ msgstr "formato: falta Γ‘tomo %%(end)" msgid "malformed object name %s" msgstr "nome de objeto malformado %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "NΓ£o Γ© possΓvel obter %s e %s ao mesmo tempo para %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s geralmente segue %s, nΓ£o %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segue %s e %s em simultΓ’neo" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Erro interno" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD nΓ£o aponta para um ramo" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "ramo inexistente: '%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "nenhum ramo a montante configurado para o ramo '%s'" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" -msgstr "o ramo a montante '%s' nΓ£o estΓ‘ guardado como um ramo remoto seguido" +msgstr "" +"o ramo a montante '%s' nΓ£o estΓ‘ guardado como um ramo de monitorização remoto" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "o destino de publicação '%s' no remoto '%s' nΓ£o Γ© seguido por nenhum ramo " "local" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "o ramo '%s' nΓ£o tem nenhum remoto para publicar" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" "'%2$s' nΓ£o faz parte dos especificadores de referΓͺncia de '%1$s' para " "publicação" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "publicação sem destino (push.default Γ© 'nothing')" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "nΓ£o Γ© possΓvel resolver a publicação 'simple' num ΓΊnico destino" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "A base do seu ramo Γ© '%s', mas o ramo a montante desapareceu.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (use \"git branch --unset-upstream\" para corrigir)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "O seu ramo estΓ‘ atualizado com '%s'.\n" -#: remote.c:2084 +#: remote.c:2085 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "O seu ramo estΓ‘ Γ frente de '%s' por %d commit.\n" msgstr[1] "O seu ramo estΓ‘ Γ frente de '%s' por %d commits.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (use \"git push\" para publicar os commits locais)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1358,11 +1392,11 @@ msgstr[1] "" "O seu ramo estΓ‘ atrΓ‘s de '%s' por %d commits, podendo ser atualizado com " "avanΓ§o rΓ‘pido.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (use \"git pull\" para atualizar o seu ramo local)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1377,20 +1411,20 @@ msgstr[1] "" "O seu ramo e '%s' divergiram,\n" "tendo cada um %d e %d commits diferentes, respetivamente.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (use \"git pull\" para incorporar o ramo remoto no seu)\n" +msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "o ramo atual parece estar danificado" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "o ramo atual '%s' ainda nΓ£o contΓ©m nenhum commit" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent Γ© incompatΓvel com --bisect" @@ -1439,17 +1473,17 @@ msgid "" msgstr "" "depois de resolver os conflitos, marque os caminhos corrigidos\n" "com 'git add <caminhos>' ou 'git rm <caminhos>'\n" -"e faΓ§a commit do resultado com 'git commit'" +"e submeta o resultado com 'git commit'" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "NΓ£o foi possΓvel escrever em %s" #: sequencer.c:193 -#, fuzzy, c-format +#, c-format msgid "Error wrapping up %s" -msgstr "Erro ao isolar %s" +msgstr "Erro ao rematar %s." #: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." @@ -1461,7 +1495,7 @@ msgstr "As suas alteraçáes locais serΓ£o substituΓdas por revert." #: sequencer.c:213 msgid "Commit your changes or stash them to proceed." -msgstr "FaΓ§a commit ou stash das suas alteraçáes para continuar." +msgstr "Submeta ou empilhe (stash) as suas alteraçáes para continuar." #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:300 @@ -1494,7 +1528,7 @@ msgstr "Ficheiro de Γndice nΓ£o integrado." #: sequencer.c:479 #, c-format msgid "Commit %s is a merge but no -m option was given." -msgstr "O commit %s Γ© um merge mas nenhuma opção -m fornecida." +msgstr "O commit %s Γ© uma integração mas nΓ£o foi fornecida nenhuma opção -m." #: sequencer.c:487 #, c-format @@ -1504,7 +1538,8 @@ msgstr "O commit %s nΓ£o tem o pai %d" #: sequencer.c:491 #, c-format msgid "Mainline was specified but commit %s is not a merge." -msgstr "Linha principal especificada mas o commit %s nΓ£o Γ© um merge." +msgstr "" +"A linha principal foi especificada mas o commit %s nΓ£o Γ© uma integração." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 @@ -1599,12 +1634,12 @@ msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" msgid "Could not create sequencer directory %s" msgstr "NΓ£o foi possΓvel criar o diretΓ³rio do sequenciador %s" -#: sequencer.c:835 sequencer.c:917 -#, fuzzy, c-format +#: sequencer.c:835 sequencer.c:916 +#, c-format msgid "Error wrapping up %s." -msgstr "Erro ao isolar %s." +msgstr "Erro ao rematar %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "nenhum cherry-pick ou revert em curso" @@ -1616,63 +1651,72 @@ msgstr "nΓ£o Γ© possΓvel resolver HEAD" msgid "cannot abort from a branch yet to be born" msgstr "nΓ£o Γ© possΓvel abortar um ramo ainda nΓ£o criado" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "nΓ£o Γ© possΓvel abrir %s: %s" +msgid "cannot open %s" +msgstr "nΓ£o Γ© possΓvel abrir %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "nΓ£o Γ© possΓvel ler %s: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "fim de ficheiro inesperado" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "o ficheiro HEAD de pre-cherry-pick '%s' estΓ‘ corrompido" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "NΓ£o foi possΓvel formatar %s." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: nΓ£o Γ© possΓvel efetuar cherry-pick de %s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: revisΓ£o incorreta" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "NΓ£o Γ© possΓvel reverter como commit inicial" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "NΓ£o Γ© possΓvel efetuar cherry-pick numa cabeΓ§a vazia" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "falha ao ler %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Esperava-se versΓ£o do repositΓ³rio git <= %d, obteve-se %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "extensΓ΅es de repositΓ³rio desconhecidas encontradas:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset antes do inΓcio do Γndice do pacote %s (Γndice corrompido?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset depois do fim do Γndice do pacote %s (Γndice truncado?)" @@ -1702,31 +1746,40 @@ msgstr "" "Analise estas referΓͺncias e elimine-as se desejar. Desative esta\n" "mensagem executando \"git config advice.objectNameWarning false\"" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -"NΓ£o Γ© possΓvel alterar .gitmodules nΓ£o integrado, resolva os conflitos do " -"merge primeiro" +"NΓ£o Γ© possΓvel alterar .gitmodules nΓ£o integrado, resolva primeiro os " +"conflitos de integração" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Secção de .gitmodules cujo path=%s nΓ£o encontrada" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "NΓ£o foi possΓvel atualizar o elemento %s de .gitmodules" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "NΓ£o foi possΓvel remover o elemento %s de .gitmodules" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "falha ao preparar .gitmodules atualizado" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "nΓ£o Γ© permitido valores negativos em submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "Valor invΓ‘lido de %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1746,7 +1799,7 @@ msgstr "mais do que um %s" #: trailer.c:582 #, c-format msgid "empty trailer token in trailer '%.*s'" -msgstr "" +msgstr "token terminador vazio no terminador '%.*s'" #: trailer.c:702 #, c-format @@ -1786,7 +1839,241 @@ msgstr "nΓ£o foi possΓvel mudar o nome do ficheiro temporΓ‘rio para %s" msgid "Could not read ref %s" msgstr "NΓ£o foi possΓvel ler a referΓͺncia %s" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"As suas alteraçáes locais nos seguintes ficheiros seriam substituΓdas ao " +"extrair:\n" +"%%sSubmeta as suas alteraçáes ou empilhe-as (stash) antes de trocar de ramo." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"As suas alteraçáes locais nos seguintes ficheiros seriam substituΓdas ao " +"extrair:\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"As suas alteraçáes locais nos seguintes ficheiros seriam substituΓdas ao " +"integrar:\n" +"%%sSubmeta as suas alteraçáes ou empilhe-as (stash) antes de integrar." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"As suas alteraçáes locais nos seguintes ficheiros seriam substituΓdas ao " +"integrar:\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"As suas alteraçáes locais nos seguintes ficheiros seriam substituΓdas por %s:" +"\n" +"%%sSubmeta as suas alteraçáes ou empilhe-as (stash) antes de efetuar %s." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"As suas alteraçáes locais nos seguintes ficheiros seriam substituΓdas por %s:" +"\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"Perder-se-iam ficheiros nΓ£o controlados ao atualizar os seguintes diretΓ³rios:" +"\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Os seguintes ficheiros nΓ£o controlados na Γ‘rvore de trabalho seriam " +"removidos ao extrair:\n" +"%%sMova ou remova-os antes de trocar de ramos." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros nΓ£o controlados na Γ‘rvore de trabalho seriam " +"removidos ao extrair:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Os seguintes ficheiros nΓ£o controlados na Γ‘rvore de trabalho seriam " +"removidos ao integrar:\n" +"%%sMova ou remova-os antes de integrar." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros nΓ£o controlados na Γ‘rvore de trabalho seriam " +"removidos ao integrar:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Os seguintes ficheiros nΓ£o controlados na Γ‘rvore de trabalho seriam " +"removidos por %s:\n" +"%%sMova ou remova-os antes de efetuar %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros nΓ£o controlados na Γ‘rvore de trabalho seriam " +"removidos por %s:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Os seguintes ficheiros nΓ£o controlados da Γ‘rvore de trabalho seriam " +"substituΓdos ao extrair:\n" +"%%sMova ou remova-os antes de trocar de ramos." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros nΓ£o controlados da Γ‘rvore de trabalho seriam " +"substituΓdos ao extrair:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Os seguintes ficheiros nΓ£o controlados da Γ‘rvore de trabalho seriam " +"substituΓdos ao integrar:\n" +"%%sMova ou remova-os antes de integrar." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros nΓ£o controlados da Γ‘rvore de trabalho seriam " +"substituΓdos ao integrar:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Os seguintes ficheiros nΓ£o controlados da Γ‘rvore de trabalho seriam " +"substituΓdos por %s:\n" +"%%sMova ou remova-os antes de efetuar %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Os seguintes ficheiros nΓ£o controlados da Γ‘rvore de trabalho seriam " +"substituΓdos por %s:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "A entrada '%s' sobrepΓ΅e-se com '%s'. NΓ£o Γ© possΓvel vincular." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"NΓ£o Γ© possΓvel extrair esparsamente: as seguintes entradas nΓ£o estΓ£o " +"atualizadas:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Os seguintes ficheiros na Γ‘rvore de trabalho seriam substituΓdos ao " +"atualizar a extração esparsa:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Os seguintes ficheiros na Γ‘rvore de trabalho seriam removidos ao atualizar a " +"extração esparsa:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "A abortar\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "A extrair ficheiros" @@ -1824,202 +2111,195 @@ msgstr "segmento de caminho '..' invΓ‘lido" msgid "could not open '%s' for reading and writing" msgstr "nΓ£o foi possΓvel abrir '%s' para leitura e escrita" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "nΓ£o foi possΓvel abrir '%s' para escrita" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "nΓ£o foi possΓvel abrir '%s' para leitura" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "nΓ£o Γ© possΓvel aceder a '%s': %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "nΓ£o Γ© possΓvel aceder a '%s'" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "nΓ£o Γ© possΓvel de obter o diretΓ³rio de trabalho atual" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "nΓ£o foi possΓvel abrir %s para escrita" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "nΓ£o foi possΓvel escrever para %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "nΓ£o foi possΓvel fechar %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Caminhos nΓ£o integrados:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (use \"git reset %s <ficheiro>...\" para retirar do Γndice)" +msgstr " (use \"git reset %s <ficheiro>...\" para despreparar)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (use \"git rm --cached <ficheiro>...\" para retirar do Γndice)" +msgstr " (use \"git rm --cached <ficheiro>...\" para despreparar)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (use \"git add <ficheiro>...\" para marcar como resolvido)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como " "resolvido)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" -msgstr "Alteraçáes incluΓdas no prΓ³ximo commit:" +msgstr "Alteraçáes para serem submetidas:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" -msgstr "Alteraçáes nΓ£o preparadas para commit:" +msgstr "Alteraçáes nΓ£o preparadas para submeter:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr "" -" (use \"git add <ficheiro>...\" para atualizar o que serΓ‘ incluΓdo no " -"commit)" +msgstr " (use \"git add <ficheiro>...\" para atualizar o que serΓ‘ submetido)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -" (use \"git add/rm <ficheiro>...\" para atualizar o que serΓ‘ incluΓdo no " -"commit)" +" (use \"git add/rm <ficheiro>...\" para atualizar o que serΓ‘ submetido)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (use \"git checkout -- <ficheiro>...\" para descartar alteraçáes no " "diretΓ³rio de trabalho)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -" (faΓ§a commit ou descarte o conteΓΊdo modificado ou nΓ£o controlado nos " +" (submeta ou descarte o conteΓΊdo modificado ou nΓ£o controlado nos " "submΓ³dulos)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (use \"git %s <ficheiro>...\" para incluir no prΓ³ximo commit)" +msgstr " (use \"git %s <ficheiro>...\" para incluir no que serΓ‘ submetido)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "eliminado por ambos:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "adicionado por nΓ³s:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "eliminado por eles:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "adicionado por eles:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "eliminado por nΓ³s:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "adicionado por ambos:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "modificado por ambos:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "novo ficheiro:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "copiado:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "eliminado:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "modificado:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "nome mudado:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "tipo alterado:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "desconhecido:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "nΓ£o integrado:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "novos commits, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "conteΓΊdo modificado, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "conteΓΊdo nΓ£o controlado, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "SubmΓ³dulos alterados mas nΓ£o atualizados:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" -msgstr "Alteraçáes em submΓ³dulos incluΓdas no prΓ³ximo commit:" +msgstr "Alteraçáes em submΓ³dulos para serem submetidas:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2027,39 +2307,39 @@ msgstr "" "NΓ£o altere a linha acima.\n" "Tudo o que estiver abaixo serΓ‘ removido." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "HΓ‘ caminhos nΓ£o integrados." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (corrija os conflitos e execute \"git commit\")" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." -msgstr "Todos os conflitos foram corrigidos mas o merge continua em curso." +msgstr "Todos os conflitos foram corrigidos mas ainda estΓ‘ a integrar." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" -msgstr " (use \"git commit\" para concluir o merge)" +msgstr " (use \"git commit\" para concluir a integração)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "SessΓ£o am em curso." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "O patch atual estΓ‘ vazio." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (corrija os conflitos e execute \"git am --continue\")" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (use \"git am --skip\" para ignorar este patch)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (use \"git am --abort\" para restaurar o ramo original)" @@ -2097,11 +2377,11 @@ msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)" #: wt-status.c:1148 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "A realizar rebase do ramo '%s' sobre '%s'." +msgstr "EstΓ‘ a realizar rebase do ramo '%s' sobre '%s'." #: wt-status.c:1153 msgid "You are currently rebasing." -msgstr "Rebase em curso." +msgstr "EstΓ‘ a rebasear neste momento." #: wt-status.c:1167 msgid " (fix conflicts and then run \"git rebase --continue\")" @@ -2125,11 +2405,12 @@ msgstr "" msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -"A dividir um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre '%s'." +"EstΓ‘ a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' " +"sobre '%s'." #: wt-status.c:1186 msgid "You are currently splitting a commit during a rebase." -msgstr "A dividir um commit durante um rebase." +msgstr "EstΓ‘ a dividir um commit durante um rebase." #: wt-status.c:1189 msgid " (Once your working directory is clean, run \"git rebase --continue\")" @@ -2141,11 +2422,12 @@ msgstr "" #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -"A editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre '%s'." +"EstΓ‘ a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre " +"'%s'." #: wt-status.c:1198 msgid "You are currently editing a commit during a rebase." -msgstr "A editar um commit durante um rebase." +msgstr "EstΓ‘ a editar um commit durante um rebase." #: wt-status.c:1201 msgid " (use \"git commit --amend\" to amend the current commit)" @@ -2161,7 +2443,7 @@ msgstr "" #: wt-status.c:1213 #, c-format msgid "You are currently cherry-picking commit %s." -msgstr "A realizar cherry-pick do commit %s." +msgstr "EstΓ‘ a realizar cherry-pick do commit %s." #: wt-status.c:1218 msgid " (fix conflicts and run \"git cherry-pick --continue\")" @@ -2181,7 +2463,7 @@ msgstr "" #: wt-status.c:1232 #, c-format msgid "You are currently reverting commit %s." -msgstr "A reverter o commit %s." +msgstr "EstΓ‘ a reverter o commit %s neste comento." #: wt-status.c:1237 msgid " (fix conflicts and run \"git revert --continue\")" @@ -2199,53 +2481,53 @@ msgstr " (use \"git rever --abort\" para cancelar a operação de reversΓ£o)" #: wt-status.c:1253 #, c-format msgid "You are currently bisecting, started from branch '%s'." -msgstr "Bissecção em curso, iniciada a partir do ramo '%s'." +msgstr "EstΓ‘ a bissetar, iniciado a partir do ramo '%s'." #: wt-status.c:1257 msgid "You are currently bisecting." -msgstr "Bissecção em curso." +msgstr "EstΓ‘ a bissetar neste momento." #: wt-status.c:1260 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (use \"git bisect reset\" para voltar ao ramo original)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "No ramo " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "rebase interativo em curso; sobre " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "rebase em curso; sobre " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD destacada em " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD destacada de " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "NΓ£o se encontra em nenhum ramo neste momento." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Commit inicial" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Ficheiros nΓ£o controlados" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Ficheiros ignorados" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2257,91 +2539,92 @@ msgstr "" "cuidado de nΓ£o se esquecer de adicionar novos ficheiros\n" "(consulte 'git help status')." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Ficheiros nΓ£o controlados nΓ£o listados%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (use a opção -u para mostrar os ficheiros nΓ£o controlados)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Sem alteraçáes" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"nenhuma alteração adicionada para commit (use \"git add\" e/ou \"git commit -" -"a\")\n" +"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git " +"commit -a\")\n" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" -msgstr "nenhuma alteração adicionada para commit\n" +msgstr "nenhuma alteração adicionada para submeter\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"nΓ£o foi adicionado nada para commit, mas existem ficheiros nΓ£o controlados " +"nΓ£o foi adicionado nada para submeter, mas existem ficheiros nΓ£o controlados " "(use \"git add\" para controlΓ‘-los)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -"nΓ£o foi adicionado nada para commit, mas existem ficheiros nΓ£o controlados\n" +"nΓ£o foi adicionado nada para submeter, mas existem ficheiros nΓ£o " +"controlados\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -"nΓ£o hΓ‘ nada para fazer commit (crie/copie ficheiros e use \"git add\" para " +"nΓ£o hΓ‘ nada para submeter (crie/copie ficheiros e use \"git add\" para " "controlΓ‘-los)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" -msgstr "nΓ£o hΓ‘ nada para fazer commit\n" +msgstr "nΓ£o hΓ‘ nada para submeter\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -"nΓ£o hΓ‘ nada para fazer commit (use -u para mostrar os ficheiros nΓ£o " -"controlados)\n" +"nΓ£o hΓ‘ nada para submeter (use -u para mostrar os ficheiros nΓ£o controlados)" +"\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" -msgstr "nΓ£o hΓ‘ nada para fazer commit, diretΓ³rio de trabalho limpo\n" +msgstr "nΓ£o hΓ‘ nada para submeter, diretΓ³rio de trabalho limpo\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Commit inicial em " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (nenhum ramo)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "desaparecido" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "atrΓ‘s " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "Γ frente " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "falha ao invocar unlink de '%s'" @@ -2355,7 +2638,7 @@ msgstr "git add [<opçáes>] [--] <caminho>..." msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "falha ao atualizar os ficheiros" @@ -2368,7 +2651,7 @@ msgstr "remover '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Alteraçáes nΓ£o preparadas depois de atualizar o Γndice:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "NΓ£o foi possΓvel ler o Γndice" @@ -2404,14 +2687,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Os seguintes caminhos estΓ£o ignorados por algum ficheiro .gitignore:\n" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "simular ação" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "ser verboso" @@ -2419,7 +2702,7 @@ msgstr "ser verboso" msgid "interactive picking" msgstr "seleção interativa" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "selecionar blocos interativamente" @@ -2489,16 +2772,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Queria dizer 'git add .'?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "ficheiro de Γndice corrompido" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "NΓ£o foi possΓvel escrever novo ficheiro de Γndice" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "nΓ£o foi possΓvel ler '%s'" @@ -2526,16 +2809,6 @@ msgstr "Falha ao copiar notas de '%s' para '%s'" msgid "fseek failed" msgstr "falha ao invocar fseek" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "nΓ£o foi possΓvel abrir '%s' para leitura: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "nΓ£o foi possΓvel abrir '%s' para escrita: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2545,77 +2818,77 @@ msgstr "nΓ£o foi possΓvel analisar o patch '%s'" msgid "Only one StGIT patch series can be applied at once" msgstr "SΓ³ pode ser aplicada uma sΓ©rie de patches StGIT duma sΓ³ vez" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "carimbo de data/hora invΓ‘lido" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "linha de Data invΓ‘lida" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "mudanΓ§a de fuso horΓ‘rio invΓ‘lida" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Falha ao detetar o formato do patch." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "falha ao criar o diretΓ³rio '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Falha ao dividir patches." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "nΓ£o Γ© possΓvel escrever o ficheiro de Γndice" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "ApΓ³s resolver este problema, execute \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferir ignorar este patch, execute \"%s --skip\"." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar o ramo original e interromper a aplicação dos patches, " "execute \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "O patch estΓ‘ vazio. Foi dividido incorretamente?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "linha de identidade invΓ‘lida: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "nΓ£o foi possΓvel analisar o commit %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -"O repositΓ³rio nΓ£o tem os blobs necessΓ‘rios para recorrer a merge com 3 " +"O repositΓ³rio nΓ£o tem os blobs necessΓ‘rios para recorrer a integração com 3 " "pontos." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "A usar informação do Γndice para reconstruir uma Γ‘rvore de base..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2623,40 +2896,41 @@ msgstr "" "Editou o patch manualmente?\n" "NΓ£o Γ© possΓvel aplicΓ‘-lo aos blobs registados no Γndice." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "" -"A recorrer a uma de base para aplicação de patches e merge com 3 pontos..." +"A recorrer a uma de base para aplicação de patches e integração com 3 " +"pontos..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." -msgstr "Falha ao efetuar merge das alteraçáes." +msgstr "Falha ao integrar as alteraçáes." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree falhou ao escrever uma Γ‘rvore" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "a aplicar a um histΓ³rico vazio" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "falha ao escrever objeto de commit" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "nΓ£o Γ© possΓvel continuar: %s nΓ£o existe." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "nΓ£o Γ© possΓvel entrar em modo interativo sem um entrada padrΓ£o conectada a " "um terminal." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Corpo do commit:" @@ -2664,35 +2938,35 @@ msgstr "Corpo do commit:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Aplicar? [y]sim/[n]Γ£o/[e]ditar/[v]er patch/[a]ceitar todos: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Γndice modificado: nΓ£o Γ© possΓvel aplicar patches (modificado: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "A aplicar: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Nenhuma alteração -- JΓ‘ foi aplicado o patch." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Falha ao aplicar o patch em %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "A cΓ³pia do patch que falhou encontra-se em: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2702,7 +2976,7 @@ msgstr "" "Se nΓ£o hΓ‘ nada por preparar, provavelmente essas mesmas alteraçáes\n" "jΓ‘ foram introduzidas; pode querer ignorar este patch." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2710,17 +2984,17 @@ msgstr "" "Ainda hΓ‘ caminhos nΓ£o integrados no Γndice.\n" "Esqueceu-se de usar 'git add'?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "NΓ£o foi possΓvel analisar o objeto '%s'." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "falha ao limpar o Γndice" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2728,153 +3002,155 @@ msgstr "" "Parece que a HEAD foi movida desde a ΓΊltima vez que o 'am' falhou.\n" "NΓ£o recuando a ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor invΓ‘lido de --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<opçáes>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opçáes>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "executar interativamente" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "opção histΓ³rica -- sem-ação" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" -msgstr "permitir recorrer a merge com 3 pontos se necessΓ‘rio" +msgstr "permitir recorrer a integração com 3 pontos se necessΓ‘rio" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "silencioso" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "recodificar em utf8 (predefinição)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "passar a opção -k ao git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "passar a opção -b ao git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "passar a opção -m ao git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "nΓ£o passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "retirar todo o conteΓΊdo antes da linha de tesoura" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "ação" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "transmitir ao git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "raiz" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "caminho" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "num" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "formato" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "formato de apresentação de patches" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "substituir a mensagem de erro quando a aplicação do patch falha" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "continuar a aplicar os patches depois de resolver os conflitos" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "sinΓ³nimo de --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "ignorar o patch atual" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." -msgstr "restaurar o ramo original e abortar a operação de patch" +msgstr "restaurar o ramo original e abortar a operação de patch." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "mentir sobre a data de commit" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "usar a data e hora atual como data de autor" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "id-chave" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "assinar os commits com GPG" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(uso interno de git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2882,17 +3158,17 @@ msgstr "" "A opção -b/--binary hΓ‘ muito que Γ© ignorada e serΓ‘\n" "futuramente removida. Por favor nΓ£o a use." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "falha ao ler o Γndice" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "o diretΓ³rio de rebesa anterior %s ainda existe, mas foi fornecida uma mbox." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2901,7 +3177,7 @@ msgstr "" "DiretΓ³rio abandonado %s encontrado.\n" "Use \"git am --abort\" para o remover." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "A operação de resolução nΓ£o estΓ‘ em curso, nΓ£o retomando." @@ -2934,43 +3210,43 @@ msgstr "regexec retornou %d para a entra: %s" msgid "unable to find filename in patch at line %d" msgstr "nΓ£o foi possΓvel encontrar o nome do ficheiro no patch na linha %d" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha " "%d" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff incorreto - o nome do novo ficheiro na linha %d Γ© " "inconsistente" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d Γ© " "inconsistente" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recontagem: linha inesperada: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragmento de patch sem cabeΓ§alho na linha %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2985,77 +3261,77 @@ msgstr[1] "" "o cabeΓ§alho do git diff nΓ£o revelou o nome do ficheiro depois de se remover " "%d componentes de caminho (linha %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "o novo ficheiro depende de conteΓΊdos antigos" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "o ficheiro eliminado ainda tem conteΓΊdos" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompido na linha %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "o novo ficheiro %s depende de conteΓΊdos antigos" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "o ficheiro eliminado %s ainda tem conteΓΊdos" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** aviso: o ficheiro %s ficarΓ‘ vazio, mas nΓ£o serΓ‘ eliminado" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binΓ‘rio corrompido na linha %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binΓ‘rio nΓ£o reconhecido na linha %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "patch incompreensΓvel na linha %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "nΓ£o Γ© possΓvel ler a ligação simbΓ³lica %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "nΓ£o Γ© possΓvel abrir ou ler %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "inΓcio de linha invΓ‘lido: '%c'" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "Excerto nΒΊ%d bem sucedido na linha %d (%d linha deslocada)" -msgstr[1] "Excerto nΒΊ%d bem sucedido na linha %d (%d linhas deslocadas)" +msgstr[0] "Excerto nΒΊ%d bem sucedido na linha %d (%d linha deslocada)." +msgstr[1] "Excerto nΒΊ%d bem sucedido na linha %d (%d linhas deslocadas)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3064,324 +3340,335 @@ msgstr "" "ao procura por:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "falta de dados do patch binΓ‘rio '%s'" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "o patch binΓ‘rio nΓ£o foi aplicado corretamente a '%s'" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "o patch binΓ‘rio aplicado a '%s' gera resultados incorretos (esperava-se %s, " "obteve-se %s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "falha ao aplicar o patch: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "nΓ£o Γ© possΓvel extrair %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "falha ao ler %s" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "a ler '%s' indicado por uma ligação simbΓ³lica" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "o caminho %s foi eliminado ou mudou de nome" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: nΓ£o existe no Γndice" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: nΓ£o tem correspondΓͺncia no Γndice" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "patch de remoção deixa conteΓΊdos no ficheiro" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errado" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s Γ© do tipo %o, esperado %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "caminho invΓ‘lido '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: jΓ‘ existe no Γndice" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: jΓ‘ existe no diretΓ³rio de trabalho" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "o novo modo (%o) de %s nΓ£o corresponde ao modo antigo (%o)" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "o novo modo (%o) de %s nΓ£o corresponde ao modo antigo (%o) de %s" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "o ficheiro afetado '%s' Γ© indicado por uma ligação simbΓ³lica" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: patch nΓ£o se aplica com sucesso" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "A verificar o patch %s..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "falha ao invocar make_cache_entry em '%s'" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "nΓ£o Γ© possΓvel remover %s do Γndice" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompido no submΓ³dulo %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "nΓ£o Γ© possΓvel obter estado do novo ficheiro criado '%s'" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "nΓ£o Γ© possΓvel criar armazenamento de seguranΓ§a do ficheiro recΓ©m-criado %s" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "nΓ£o Γ© possΓvel adicionar %s Γ cache" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "a fechar o ficheiro '%s'" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "nΓ£o Γ© possΓvel escrever o ficheiro '%s' com o modo %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s aplicado com sucesso." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "erro interno" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "A aplicar patch %%s com %d rejeição..." msgstr[1] "A aplicar patch %%s com %d rejeiçáes..." -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" -msgstr "a truncar o nome do ficheiro .rej em %.*s.rej " +msgstr "a truncar o nome do ficheiro .rej em %.*s.rej" + +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "nΓ£o Γ© possΓvel abrir %s: %s" -#: builtin/apply.c:4300 +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Excerto nΒΊ%d aplicado com sucesso." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Excerto nΒΊ%d rejeitado." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Patch '%s' ignorado." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "entrada nΓ£o reconhecida" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "nΓ£o foi possΓvel ler o ficheiro de Γndice" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "nΓ£o aplicar alteraçáes que correspondam ao caminho fornecido" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "aplicar alteraçáes que correspondam ao caminho fornecido" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "remover <num> barras Γ esquerda dos caminhos de diff tradicional" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ignorar adiçáes feitas pelo patch" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar nΓΊmero de linhas adicionadas e removidas em notação decimal" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "em vez de aplicar o patch, mostrar um resumo da entrada" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "garantir que o patch pode ser aplicado ao Γndice atual" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "aplicar um patch sem tocar na Γ‘rvore de trabalho" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "aceitar patches que alteram ficheiros fora da Γ‘rea de trabalho" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplicar o patch tambΓ©m (use com --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" -msgstr "tentar merge com trΓͺs pontos se um patch nΓ£o for aplicado corretamente" +msgstr "" +"tentar integração com trΓͺs pontos se um patch nΓ£o se se aplica com Γͺxito" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "construir um Γndice temporΓ‘rio baseado na informação incorporada do Γndice" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "os caminhos estΓ£o separados por caracteres NUL" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "detetar linhas novas ou modificadas que tenham espaΓ§os em branco" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ignorar alteraçáes de espaΓ§o em branco ao procurar contexto" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "aplicar o patch em reverso" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "nΓ£o esperar nenhuma linha de contexto" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "permitir a sobreposição de excertos" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar deteçáes incorretas de falta de nova linha no final do ficheiro" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "nΓ£o confiar na contagem de linhas no cabeΓ§alho dos excertos" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "preceder <root> a todos os nomes de ficheiro" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way fora de um repositΓ³rio" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index fora de um repositΓ³rio" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached fora de um repositΓ³rio" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "nΓ£o Γ© possΓvel abrir o patch '%s'" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erro de espaΓ§o em branco reprimido" -msgstr[1] "%d erros de espaΓ§o em branco repimidos" +msgstr[1] "%d erros de espaΓ§o em branco reprimidos" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3447,102 +3734,101 @@ msgstr "<rev-opçáes> estΓ£o documentadas em git-rev-list(1)" msgid "Blaming lines" msgstr "Linhas de culpa" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "" "Mostrar entradas de culpa Γ medida que forem encontradas, incrementalmente" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "" -"Mostar SHA-1 dos commits de limite em branco (Predefinição: desativado)" +msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "NΓ£o tratar os commits raiz como limites (Predefinição: desativado)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Mostrar estatΓsticas de custo de atividade" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "ForΓ§ar informação de progresso" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Mostrar a pontuação das entradas de culpa" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Mostrar nΓΊmeros de linha originais (Predefinição: desativado)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Mostrar em formato prΓ³prio para ser consumo por uma mΓ‘quina" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar em formato de porcelana com informaçáes de commit por linha" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar o mesmo modo de saΓda que git-annotate (Predefinição: desativado)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Ignorar as diferenΓ§as de espaΓ§o em branco" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "Despender ciclos extra para encontrar uma melhor correspondΓͺncia" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usar revisΓ΅es do <ficheiro> em vez de invocar git-rev-list" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Usar o conteΓΊdo do <ficheiro> como imagem final" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "pontuação" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "Localizar linhas copiadas dentro e entre ficheiros" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "Localizar linhas movidas dentro e entre ficheiros" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1" @@ -3552,356 +3838,377 @@ msgstr "Processar apenas o intervalo de linhas n,m, a cantar 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "hΓ‘ 4 anos e 11 meses atrΓ‘s" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<opçáes>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<opçáes>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<opçáes>] [-r] (-d | -D) <nome-do-ramo>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<opçáes>] (-m | -M) [<ramo-antigo>] <novo-ramo>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<opçáes>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -"a eliminar o ramo '%s' incorporado em\n" -" '%s', mas ainda nΓ£o incorporado em HEAD." +"a eliminar o ramo '%s' integrado em\n" +" '%s', mas ainda nΓ£o integrado em HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"ramo '%s' nΓ£o eliminado, visto que ainda nΓ£o foi incorporado em\n" -" '%s', apesar de jΓ‘ ter sido incorporado em HEAD." +"ramo '%s' nΓ£o eliminado, visto que ainda nΓ£o foi integrado em\n" +" '%s', apesar de jΓ‘ ter sido integrado em HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "NΓ£o foi possΓvel pesquisar pelo objeto commit de '%s'" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, 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 "" -"O ramo '%s' nΓ£o foi totalmente incorporado.\n" +"O ramo '%s' nΓ£o foi totalmente integrado.\n" "Se tem a certeza que o quer eliminar, execute 'git branch -D %s'." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Falha ao atualizar o ficheiro de configuração" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "nΓ£o Γ© possΓvel usar -a com -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "NΓ£o foi possΓvel pesquisar pelo objeto commit de HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "NΓ£o Γ© possΓvel eliminar o ramo '%s' no qual se encontra neste momento." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "NΓ£o Γ© possΓvel eliminar o ramo '%s' extraΓdo em '%s'" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." -msgstr "ramo remoto seguido '%s' nΓ£o encontrado." +msgstr "ramo de monitorização remoto '%s' nΓ£o encontrado." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "ramo '%s' nΓ£o encontrado." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" -msgstr "Erro a eliminar o ramo remoto seguido '%s'" +msgstr "Erro a eliminar o ramo de monitorização remoto '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Erro a eliminar ramo '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" -msgstr "Ramo remoto seguido %s eliminado (era %s).\n" +msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ramo %s eliminado (era %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: desaparecido]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: atrΓ‘s %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[atrΓ‘s %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: Γ frente %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[Γ frente %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: Γ frente %d, atrΓ‘s %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[Γ frente %d, atrΓ‘s %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** referΓͺncias invΓ‘lida ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(nenhum ramo, a efetuar rebase de %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(nenhum ramo, bissecção iniciada em %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD destacada em %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD destacada de %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(nenhum ramo)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "O ramo %s estΓ‘ a ser rebaseado em %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "O ramo %s estΓ‘ a ser bissetado em %s" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "" "nΓ£o Γ© possΓvel mudar o nome do ramo atual vista que nΓ£o se encontra num ramo." -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nome de ramo invΓ‘lido: '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Falha ao mudar o nome do ramo" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "O ramo incorretamente denominado '%s' mudou de nome" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "O nome do ramo mudou para %s, mas a HEAD nΓ£o estΓ‘ atualizada!" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "" "O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "nΓ£o foi possΓvel escrever o modelo da descrição de ramo: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "nΓ£o foi possΓvel escrever o modelo da descrição do ramo" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Opçáes genΓ©ricas" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "apresentar hash e assunto, duplique para ramos a montante" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "suprimir mensagens informativas" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "configurar modo de seguimento (consulte git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "alterar a informação do ramo a montante" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "a montante" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "alterar a informação do ramo a montante" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "usar saΓda colorida" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" -msgstr "atuar sobre ramos remotos seguidos" +msgstr "atuar sobre ramos de monitorização remotos" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "imprimir apenas ramos que contenham o commit" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Açáes especΓficas do git-branch:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" -msgstr "listar ramos remotos seguidos e ramos locais" +msgstr "listar ramos de monitorização remotos e ramos locais" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" -msgstr "eliminar um ramo totalmente incorporado" +msgstr "eliminar um ramo totalmente integrado" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" -msgstr "eliminar um ramo (mesmo que nΓ£o tenha sido incorporado)" +msgstr "eliminar um ramo (mesmo que nΓ£o tenha sido integrado)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "mover ou mudar o nome de um ramo e o seu reflog" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "mover ou mudar o nome de um ramo, mesmo que o destino jΓ‘ exista" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "listar os nomes dos ramos" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "criar reflog do ramo" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "editar a descrição do ramo" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "forΓ§ar criação, mover/mudar o nome ou exclusΓ£o" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" -msgstr "imprimir apenas os ramos que foram incorporados" +msgstr "imprimir apenas os ramos que foram integrados" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" -msgstr "imprimir apenas os ramos que nΓ£o foram incorporados" +msgstr "imprimir apenas os ramos que nΓ£o foram integrados" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "listar os ramos em colunas" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "chave" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "nome do campo pelo qual ordernar" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "objeto" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "imprimir apenas os ramos do objeto" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falha ao resolver HEAD numa referΓͺncia vΓ‘lida." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD nΓ£o encontrada em refs/heads!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column e --verbose sΓ£o incompatΓveis" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "nome do ramo Γ© obrigatΓ³rio" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "NΓ£o Γ© possΓvel atribuir descrição a HEAD destacada" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "nΓ£o Γ© possΓvel editar a descrição de mais do que um ramo" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Ainda nΓ£o hΓ‘ commits no ramo '%s'." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "NΓ£o hΓ‘ nenhum ramo denominado '%s'." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "demasiados ramos para uma operação de mudanΓ§a de nome" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "demasiados ramos para definir novo ramo a montante" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3909,41 +4216,40 @@ msgstr "" "nΓ£o foi possΓvel definir %s como ramo a montante de HEAD visto que esta nΓ£o " "aponta para um ramo." -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "o ramo '%s' nΓ£o existe" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "o ramo '%s' nΓ£o existe" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "demasiados ramos para remover a definição de ramo a montante" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "nΓ£o foi possΓvel remover a definição de ramo a montante de HEAD visto que " "esta nΓ£o aponta para um ramo." -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "O ramo '%s' nΓ£o tem informação sobre o ramo a montante" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "nΓ£o faz sentido criar 'HEAD' manualmente" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "" -"as opçáes -a e -r de 'git branch' nΓ£o fazem sentido com um nome de ramo" +msgstr "as opçáes -a e -r de 'git branch' nΓ£o fazem sentido com um nome de ramo" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3952,7 +4258,7 @@ msgstr "" "A opção --set-upstream Γ© obsoleta e serΓ‘ removida. Considere o uso de --" "track ou --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3963,16 +4269,6 @@ msgstr "" "Se quer que '%s' siga '%s', faΓ§a:\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -3991,8 +4287,8 @@ msgid "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" "<type>|--textconv) <object>" msgstr "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<tipo>|--textconv) <objeto>" +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-" +"type]|-e|-p|<tipo>|--textconv) <objeto>" #: builtin/cat-file.c:429 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" @@ -4072,7 +4368,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrΓ£o" msgid "terminate input and output records by a NUL character" msgstr "terminar registos da entrada e da saΓda com um carΓ‘cter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "suprimir informação de progresso" @@ -4164,8 +4460,9 @@ msgid "write the content to temporary files" msgstr "escrever o conteΓΊdo em ficheiros temporΓ‘rios" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "cadeia" @@ -4213,82 +4510,82 @@ msgstr "caminho '%s': nΓ£o Γ© possΓvel integrar" #: builtin/checkout.c:230 #, c-format msgid "Unable to add merge result for '%s'" -msgstr "NΓ£o Γ© possΓvel integrar os resultados do merge de '%s'" +msgstr "NΓ£o Γ© possΓvel adicionar os resultados da integração de '%s'" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' nΓ£o pode ser usado com caminhos em atualização" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' nΓ£o pode ser usado com %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "NΓ£o Γ© possΓvel atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "ficheiro de Γndice corrompido" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "o caminho '%s' nΓ£o foi integrado" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "primeiro deve resolver o Γndice atual" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "NΓ£o Γ© possΓvel efetuar reflog de '%s': %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD estΓ‘ agora em" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "nΓ£o foi possΓvel atualizar HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Repor ramo '%s'\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "JΓ‘ em '%s'\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Mudou para e repΓ΄s o ramo '%s'\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Mudou para o novo ramo '%s'\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Mudou para o ramo '%s'\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... e mais %d.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4309,7 +4606,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4336,166 +4633,166 @@ msgstr[1] "" " git branch <nome-do-novo-ramo> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "erro interno durante o curso de revisΓ΅es" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "A posição anterior de HEAD era" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "EstΓ‘ num ramo ainda nΓ£o criado" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "esperava-se apenas uma referΓͺncia, %d fornecidas." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "referΓͺncia invΓ‘lida: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "a referΓͺncia nΓ£o Γ© uma Γ‘rvore: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "nΓ£o podem ser usados caminhos ao mudar de ramo" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' nΓ£o pode ser usado ao mudar de ramo" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' nΓ£o pode ser usado com '%s'" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "NΓ£o Γ© possΓvel mudar de ramo para '%s', visto que nΓ£o Γ© um commit" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "ramo" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "criar e extrair um novo ramo" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "criar/repor e extrair um ramo" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "criar reflog do novo ramo" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "destacar HEAD no commit indicado" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "definir a informação do ramo a montante do novo ramo" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "novo-ramo" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "novo ramo sem pai" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "extrair a nossa versΓ£o dos ficheiros nΓ£o integrados" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "extrair a versΓ£o deles dos ficheiros nΓ£o integrados" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "forΓ§ar extração (descartar modificaçáes locais)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" -msgstr "realizar um merge com 3 pontos com o novo ramo" +msgstr "realizar uma integração com 3 pontos com o novo ramo" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "atualizar ficheiros ignorados (predefinição)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "estilo de conflito (merge ou diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "nΓ£o restringir especificadores de caminho a entradas esparsas" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" "nΓ£o verificar se outra Γ‘rvore de trabalho contΓ©m a referΓͺncia fornecida" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "forΓ§ar informação de progresso" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B e --orphan sΓ£o mutuamente exclusivos" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track requer um nome dum ramo" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "especificação de caminho invΓ‘lida" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, 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 "" -"NΓ£o Γ© possΓvel atualizar os caminho e mudar para o ramo '%s' ao mesmo " -"tempo.\n" -"Pretendia extrair '%s' podendo ser resolvido num commit?" +"NΓ£o Γ© possΓvel atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo." +"\n" +"Pretendia extrair '%s' o qual nΓ£o pode ser resolvido como commit?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nΓ£o aceita um caminho como argumento '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4579,7 +4876,7 @@ msgstr "Introduza padrΓ΅es a ignorar>> " #: builtin/clean.c:690 #, c-format msgid "WARNING: Cannot find items matched by: %s" -msgstr "AVISO: nΓ£o foram encontrados itens correspondentes a %s" +msgstr "AVISO: nΓ£o foram encontrados itens correspondentes a: %s" #: builtin/clean.c:711 msgid "Select items to delete" @@ -4647,8 +4944,8 @@ msgstr "limpeza interativa" msgid "remove whole directories" msgstr "remover diretΓ³rios inteiros" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "padrΓ£o" @@ -4674,7 +4971,7 @@ msgid "" "clean" msgstr "" "clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; " -"recusando-se a limpar" +"limpeza recusada" #: builtin/clean.c:904 msgid "" @@ -4682,110 +4979,119 @@ msgid "" "refusing to clean" msgstr "" "clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; " -"recusando-se a limpar" +"limpeza recusada" #: builtin/clone.c:37 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opçáes>] [--] <repo> [<dir>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" -msgstr "nΓ£o realizar extração" +msgstr "nΓ£o criar uma extração" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "criar um repositΓ³rio nu" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "criar um repositΓ³rio espelhado (implica repositΓ³rio nu)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "para clonar de um repositΓ³rio local" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "nΓ£o usar ligaçáes fixas, copiar sempre" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "configurar como repositΓ³rio partilhado" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "inicializar submΓ³dulos no clone" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "nΓΊmero de submΓ³dulos clonados em paralelo" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "diretΓ³rio-modelo" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "diretΓ³rio que contΓ©m os modelos usados" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "repositΓ³rio de referΓͺncia" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "usar --reference apenas para clonar" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nome" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extrair <ramo> em vez da HEAD do remoto" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "caminho para git-upload-pack no remoto" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "profundidade" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "criar um clone raso com essa profundidade" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "clonar apenas um ramo, HEAD ou --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "qualquer submΓ³dulo clonado serΓ‘ raso" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "separar o repositΓ³rio git da Γ‘rvore de trabalho" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "chave=valor" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "definir configuração dentro do novo repositΓ³rio" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "usar apenas endereΓ§os IPv4" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "usar apenas endereΓ§os IPv6" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4793,59 +5099,54 @@ msgstr "" "NΓ£o foi possΓvel adivinhar o nome do diretΓ³rio.\n" "Especifique um diretΓ³rio na linha de comandos" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "ainda nΓ£o Γ© suportada a funcionalidade que permite ter o repositΓ³rio de " -"referΓͺncia '%s' como uma extração ligada" +"referΓͺncia '%s' como uma extração ligada." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "o repositΓ³rio de referΓͺncia '%s' nΓ£o Γ© um repositΓ³rio local." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "o repositΓ³rio de referΓͺncia '%s' Γ© raso" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "o repositΓ³rio de referΓͺncia '%s' estΓ‘ enxertado" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "falha ao invocar stat de '%s'" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe e nΓ£o Γ© um diretΓ³rio" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "falha ao invocar stat de %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "falha ao criar a ligação '%s'" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "falha ao copiar o ficheiro para '%s'" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "concluΓdo.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4855,128 +5156,128 @@ msgstr "" "Pode inspecionar o que foi extraΓdo com 'git status'\n" "e repetir a extração com 'git checkout -f HEAD'\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Ramo remoto %s nΓ£o encontrado para clonar." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "A verificar a conectividade... " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "o remoto nΓ£o enviou todos os objetos necessΓ‘rios" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "nΓ£o foi possΓvel atualizar %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -"a HEAD remota referencia uma referΓͺncia inexistente, nΓ£o Γ© possΓvel " -"extrair.\n" +"a HEAD remota referencia uma referΓͺncia inexistente, nΓ£o Γ© possΓvel extrair." +"\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "nΓ£o foi possΓvel extrair a Γ‘rvore de trabalho" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "nΓ£o foi possΓvel escrever os parΓ’metros no ficheiro de configuração" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "nΓ£o Γ© possΓvel reempacotar para limpar" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" -msgstr "nΓ£o Γ© possΓvel invocar unlink sobre o ficheiro alternates temporΓ‘rio" +msgstr "nΓ£o Γ© possΓvel invocar unlink sobre o ficheiro sobressalente temporΓ‘rio" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Demasiados argumentos." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Deve especificar um repositΓ³rio para clonar." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "as opçáes --bare e --origin %s sΓ£o incompatΓveis." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare e --separate-git-dir sΓ£o incompatΓveis." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "o repositΓ³rio '%s' nΓ£o existe" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "profundidade %s nΓ£o Γ© um nΓΊmero positivo" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "o caminho de destino '%s' jΓ‘ existe e nΓ£o Γ© um diretΓ³rio vazio." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "a Γ‘rvore de trabalho '%s' jΓ‘ existe." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "nΓ£o foi possΓvel criar os diretΓ³rios superiores de '%s'" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "nΓ£o foi possΓvel criar o diretΓ³rio de Γ‘rvore de trabalho '%s'" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "A clonar no repositΓ³rio nu '%s'...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "A clonar em '%s'...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth Γ© ignorado em clones locais; use file:// ." -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "o repositΓ³rio de origem Γ© raso, --local ignorado" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local ignorado" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "NΓ£o sei como clonar %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "O ramo remoto %s nΓ£o foi encontrado no repositΓ³rio a montante %s" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Parece foi clonado um repositΓ³rio vazio." @@ -5076,7 +5377,7 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"Pediu para emendar o commit mais recente, mas fazΓͺ-lo tornΓ‘-lo-ia\n" +"Pediu para emendar o commit mais recente, mas ao fazΓͺ-lo tornΓ‘-lo-ia\n" "vazio. Pode repetir o comando com --allow-empty, ou pode remover o\n" "commit completamente com \"git reset HEAD^\".\n" @@ -5090,7 +5391,7 @@ msgid "" msgstr "" "O cherry-pick anterior estΓ‘ vazio, possivelmente devido a resolução de " "conflitos.\n" -"Se deseja fazer commit de qualquer forma, use:\n" +"Se deseja submeter de qualquer forma, use:\n" "\n" " git commit --allow-empty\n" "\n" @@ -5115,66 +5416,66 @@ msgstr "" "Depois \"git cherry-pick --continue\" irΓ‘ retomar o cherry-pick\n" "dos restantes commits.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "falha ao descompactar o objeto Γ‘rvore HEAD" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "nΓ£o foi possΓvel criar Γndice temporΓ‘rio" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "falha ao adicionar interativamente" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "nΓ£o Γ© possΓvel atualizar o Γndice temporΓ‘rio" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Falha ao atualizar a Γ‘rvore de cache principal" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "nΓ£o Γ© possΓvel escrever o ficheiro new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." -msgstr "nΓ£o Γ© possΓvel fazer um commit parcial durante um merge." +msgstr "nΓ£o Γ© possΓvel fazer um commit parcial durante uma integração." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "nΓ£o Γ© possΓvel fazer um commit parcial durante um cherry-pick." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "nΓ£o Γ© possΓvel ler o Γndice" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "nΓ£o Γ© possΓvel escrever ficheiro de Γndice temporΓ‘rio" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "o commit '%s' nΓ£o tem cabeΓ§alho de autor" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "o commit '%s' tem a linha de autor malformada" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "parΓ’metro --author malformado" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "formato de data invΓ‘lido: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5182,38 +5483,38 @@ msgstr "" "nΓ£o foi possΓvel selecionar um carΓ‘cter de comentΓ‘rio que\n" "nΓ£o estivesse jΓ‘ a ser usado na mensagem de commit atual" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "nΓ£o foi possΓvel consultar o commit %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(a ler mensagem de log da entrada padrΓ£o)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "nΓ£o foi possΓvel ler o log da entrada padrΓ£o" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "nΓ£o Γ© possΓvel ler o ficheiro de log '%s'" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "nΓ£o foi possΓvel ler MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "nΓ£o foi possΓvel ler SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "nΓ£o foi possΓvel ler MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "nΓ£o foi possΓvel escrever o modelo de commit" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5223,12 +5524,12 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que estΓ‘ a fazer commit de um merge.\n" +"Parece que estΓ‘ a submeter uma integração.\n" "Se nΓ£o for o caso, remova o ficheiro\n" "\t%s\n" "e tente de novo.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5238,12 +5539,12 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que estΓ‘ a fazer commit de um cherry-pick.\n" +"Parece que estΓ‘ a submeter um cherry-pick.\n" "Se nΓ£o Γ© o caso, remova o ficheiro\n" -" %s\n" +"\t%s\n" "e tente outra vez.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5253,7 +5554,7 @@ msgstr "" "Linhas comeΓ§adas com '%c' serΓ£o ignoradas, e uma mensagem vazia\n" "aborta o commit.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5264,149 +5565,149 @@ msgstr "" "Linhas comeΓ§adas com '%c' serΓ£o mantidas; pode removΓͺ-las se o desejar.\n" "Uma mensagem vazia aborta o commit.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "NΓ£o Γ© possΓvel ler o Γndice" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Erro ao construir Γ‘rvores" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Indique a mensagem usando as opçáes -m ou -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' nΓ£o Γ© do tipo 'Nome <email>' e nΓ£o corresponde a um autor " "existente" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo invΓ‘lido de ficheiros nΓ£o controlados '%s'" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long e -z sΓ£o incompatΓveis" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "NΓ£o faz sentido usar --reset-author e --author ao mesmo tempo" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "NΓ£o hΓ‘ nada para emendar." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." -msgstr "Merge em curso -- nΓ£o Γ© possΓvel emendar." +msgstr "Integração em curso -- nΓ£o Γ© possΓvel emendar." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Cherry-pick em curso -- nΓ£o Γ© possΓvel emendar." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "As opçáes --squash e --fixup nΓ£o podem ser usadas juntas" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "A opção -m nΓ£o pode ser combinada com -c/C/-F/--fixup." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sΓ³ pode ser usado com -C, -c ou --amend." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "As opçáes --include/--only nΓ£o fazem sentido sem indicar caminhos." -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Inteligente... a emendar o ΓΊltimo commit com o Γndice sujo." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Caminhos explΓcitos especificados sem -i ou -o; assumindo --only..." -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo de limpeza invΓ‘lido %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." -msgstr "A especificação de caminhos com -a nΓ£o faz sentido." +msgstr "Indicar caminhos com -a nΓ£o faz sentido." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "mostrar status de forma concisa" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "mostrar informação do ramo" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "saΓda inteligΓvel por mΓ‘quina" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "apresentar status em formato longo (predefinição)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "terminar entradas com NUL" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "modo" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar ficheiros nΓ£o controlados, modo Γ© opcional: all, normal, no. " "(Predefinição: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "mostrar ficheiros ignorados" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "quando" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5414,200 +5715,199 @@ msgstr "" "ignorar alteraçáes em submΓ³dulos, quando Γ© opcional: all, dirty, untracked. " "(Predefinição: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "listar ficheiros nΓ£o controlados em colunas" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "nΓ£o foi possΓvel consultar o commit recΓ©m-criado" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "nΓ£o foi possΓvel analisar o commit recΓ©m-criado" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "HEAD destacada" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (commit-raiz)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" -msgstr "suprimir o resumo depois de fazer commit com sucesso" +msgstr "suprimir o resumo depois de submeter com sucesso" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "mostrar diff no modelo da mensagem de commit" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Opçáes de mensagem de commit" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "ler mensagem de um ficheiro" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "autor" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "substituir autor do commit" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "data" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "substituir data do commit" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "mensagem" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "mensagem de commit" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "commit" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "reutilizar e editar a mensagem de um commit especificado" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "reutilizar a mensagem de um commit especificado" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensagem com formato autosquash para corrigir o commit especificado" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" -msgstr "" -"usar mensagem com formato autosquash para esmagar o commit especificado" +msgstr "usar mensagem com formato autosquash para esmagar o commit especificado" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "adicionar Signed-off-by:" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "usar ficheiro de modelo especificado" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "forΓ§ar edição do commit" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "predefinição" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "como retirar espaΓ§os e #comentΓ‘rios da mensagem" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "incluir status no modelo da mensagem de commit" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "assinar o commit com GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Opçáes de conteΓΊdo do commit" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" -msgstr "fazer commit de todos os ficheiros alterados" +msgstr "submeter todos os ficheiros alterados" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" -msgstr "adicionar ficheiros especificados ao Γndice para incluir no commit" +msgstr "adicionar ficheiros especificados ao Γndice para submeter" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "adicionar ficheiros interativamente" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "adicionar alteraçáes interativamente" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" -msgstr "fazer commit somente dos ficheiros especificados" +msgstr "submeter somente os ficheiros especificados" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "ignorar pre-commit hook" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" -msgstr "mostrar o que serΓ‘ incluΓdo no commit" +msgstr "mostrar o que seria submetido" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "emendar o commit anterior" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "ignorar post-rewrite hook" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "aceitar o registo duma alteração vazia" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "aceitar o registo duma alteração com uma mensagem vazia" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "nΓ£o foi possΓvel analisar o commit HEAD" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Ficheiro MERGE_HEAD corrompido (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "nΓ£o foi possΓvel ler MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "nΓ£o foi possΓvel ler a mensagem de commit: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "A abortar o commit; nΓ£o editou a mensagem.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "A abortar o commit uma vez que a mensagem de commit estΓ‘ vazia.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5716,7 +6016,7 @@ msgstr "Tipo" #: builtin/config.c:78 msgid "value is \"true\" or \"false\"" -msgstr "o valor Γ© \"true\" (verdadeiro) ou \"falso\" (falso)" +msgstr "o valor Γ© \"true\" (verdadeiro) ou \"false\" (falso)" #: builtin/config.c:79 msgid "value is decimal number" @@ -5756,7 +6056,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "nΓ£o Γ© possΓvel analisar o valor de cor por omissΓ£o" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5771,7 +6071,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "nΓ£o Γ© possΓvel criar o ficheiro de configuração %s" @@ -5786,7 +6086,7 @@ msgstr "imprimir dimensΓ΅es em formato inteligΓvel por humanos" #: builtin/describe.c:17 msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<opçáes>] [<commit-ish>...]" +msgstr "git describe [<opçáes>] [<commit-etc>...]" #: builtin/describe.c:18 msgid "git describe [<options>] --dirty" @@ -5807,7 +6107,7 @@ msgstr "a tag anotada %s nΓ£o tem nenhum nome incorporado" msgid "tag '%s' is really '%s' here" msgstr "a tag '%s' estΓ‘ de facto em '%s'" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "%s nΓ£o Γ© um nome de objeto vΓ‘lido" @@ -5900,7 +6200,7 @@ msgstr "considerar as <n> tags mais recentes (predefinição: 10)" msgid "only consider tags matching <pattern>" msgstr "apenas considerar tags que correspondam ao <padrΓ£o>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "mostrar objetos de commit abreviados em recurso" @@ -5936,21 +6236,21 @@ msgstr "'%s': nΓ£o Γ© um ficheiro regular nem uma ligação simbΓ³lica" msgid "invalid option: %s" msgstr "opção invΓ‘lida: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "NΓ£o Γ© um repositΓ³rio git" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "objeto invΓ‘lido '%s' fornecido." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "mais do que dois blobs fornecidos: '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "objeto sem tratamento '%s' fornecido." @@ -6009,8 +6309,7 @@ msgstr "anonimizar saΓda" #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "" -"git fetch [<opçáes>] [<repositΓ³rio> [<especificador-de-referΓͺncia>...]]" +msgstr "git fetch [<opçáes>] [<repositΓ³rio> [<especificador-de-referΓͺncia>...]]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" @@ -6024,19 +6323,19 @@ msgstr "git fetch --multiple [<opçáes>] [(<repositΓ³rio> | <grupo>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opçáes>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "obter de todos os remotos" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "caminho para o comando upload pack no remoto" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "forΓ§ar a substituição do ramo local" @@ -6044,7 +6343,7 @@ msgstr "forΓ§ar a substituição do ramo local" msgid "fetch from multiple remotes" msgstr "obter de mΓΊltiplos remotos" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "obter todas as tags e objetos associados" @@ -6056,19 +6355,19 @@ msgstr "nΓ£o obter todas as tags (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "nΓΊmero de submΓ³dulos obtidos em paralelo" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" -msgstr "eliminar os ramos cujo respetivo ramo remoto jΓ‘ nΓ£o existe" +msgstr "eliminar os ramos de monitorização remotos que jΓ‘ nΓ£o existem no remoto" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "controlar a obtenção recursiva de submΓ³dulos" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "manter o pacote transferido" @@ -6076,15 +6375,15 @@ msgstr "manter o pacote transferido" msgid "allow updating of HEAD ref" msgstr "permitir a atualização da referΓͺncia HEAD" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "aprofundar o histΓ³rico de um clone raso" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "converter num repositΓ³rio completo" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "dir" @@ -6096,15 +6395,15 @@ msgstr "preceder isto ao caminho do submΓ³dulo" msgid "default mode for recursion" msgstr "modo recursivo por omissΓ£o" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "aceitar referΓͺncia que atualizem .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "mapa de referΓͺncias" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "especificar mapa de referΓͺncias" @@ -6162,11 +6461,6 @@ msgstr "atualização forΓ§ada" msgid "(non-fast-forward)" msgstr "(sem avanΓ§o rΓ‘pido)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "nΓ£o Γ© possΓvel abrir %s: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6212,7 +6506,7 @@ msgstr "(nenhum)" #: builtin/fetch.c:841 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "NΓ£o Γ© possΓvel obter objetos no ramo atual %s de um repositΓ³rio nΓ£o nu" +msgstr "Obtenção de objetos no ramo atual %s de um repositΓ³rio nΓ£o nu recusada" #: builtin/fetch.c:860 #, c-format @@ -6352,11 +6646,11 @@ msgstr "imprimir apenas referΓͺncias que apontem para o objeto fornecido" #: builtin/for-each-ref.c:43 msgid "print only refs that are merged" -msgstr "imprimir apenas referenciadas incorporadas" +msgstr "imprimir apenas referenciadas integradas" #: builtin/for-each-ref.c:44 msgid "print only refs that are not merged" -msgstr "imprimir apenas referΓͺncias nΓ£o incorporadas" +msgstr "imprimir apenas referΓͺncias nΓ£o integrada" #: builtin/for-each-ref.c:45 msgid "print only refs which contain the commit" @@ -6370,55 +6664,55 @@ msgstr "A verificar conectividade" msgid "Checking object directories" msgstr "A verificar diretΓ³rios de objetos" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opçáes>] [<objeto>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "mostrar objetos inalcançÑveis" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "mostrar objetos suspensos" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "mostrar tags" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "mostrar nΓ³s raiz" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "considerar objetos do Γndice como nΓ³s cabeΓ§a" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "considerar os reflogs como nΓ³s cabeΓ§a (predefinição)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" -msgstr "considerar tambΓ©m pacotes e objetos alternate" +msgstr "considerar tambΓ©m pacotes e objetos sobressalente" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "verificar sΓ³ a conetividade" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "ativar verificação mais rigorosa" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "escrever objetos suspensos em .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "mostrar progresso" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "A verificar objetos" @@ -6446,7 +6740,7 @@ msgid "" "%s" msgstr "" "A ΓΊltima execução do gc reportou o seguinte.\n" -"Corrija a raiz do problema e remova %s.\n" +"Corrija a origem do problema e remova %s.\n" "A limpeza automΓ‘tica nΓ£o serΓ‘ realizada enquanto o ficheiro existir.\n" "\n" "%s" @@ -6523,229 +6817,229 @@ msgstr "nΓ£o foi possΓvel ler a Γ‘rvore (%s)" msgid "unable to grep from object of type %s" msgstr "nΓ£o foi possΓvel efetuar grep de objetos do tipo %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "a opção '%c' espera um valor numΓ©rico" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "nΓ£o Γ© possΓvel abrir '%s'" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "procurar no Γndice em vez de procurar na Γ‘rvore de trabalho" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "procurar em conteΓΊdos nΓ£o geridos pelo git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "procurar em ficheiros controlados e nΓ£o controlados" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ignorar ficheiros especificados via '.gitignore'" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "mostrar linhas nΓ£o correspondidas" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "nΓ£o diferenciar maiΓΊsculas de minΓΊsculas" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "corresponder padrΓ΅es apenas a palavras" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "processar ficheiros binΓ‘rios como texto" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "ignorar ficheiros binΓ‘rios" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "processar ficheiros binΓ‘rios com filtros textconv" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "descer no mΓ‘ximo atΓ© <profundidade>" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "usar expressΓ΅es regulares estendidas do POSIX" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "usar expressΓ΅es regulares bΓ‘sicas do POSIX (predefinição)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "interpretar padrΓ΅es como cadeias de caracteres fixas" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "usar expressΓ΅es regulares compatΓveis com Perl" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "mostrar nΓΊmeros de linha" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "nΓ£o mostrar nomes de ficheiro" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "mostrar nomes de ficheiro" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "mostrar nomes de ficheiro relativamente ao diretΓ³rio superior" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "sinΓ³nimo de --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "mostrar apenas nomes de ficheiro sem correspondΓͺncia" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "imprimir NUL depois dos nomes de ficheiro" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "mostrar o nΓΊmero de correspondΓͺncias em vez das linha correspondidas" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "realΓ§ar correspondΓͺncias" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" "imprimir uma linha em branco entre correspondΓͺncias de diferentes ficheiros" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "mostrar sΓ³ uma vez o nome do ficheiro acima das correspondΓͺncias dentro do " "mesmo ficheiro" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> linhas de contexto antes e depois das correspondΓͺncias" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "mostrar <n> linhas de contexto antes das correspondΓͺncias" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "mostrar <n> linhas de contexto depois das correspondΓͺncias" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "usar <n> threads de trabalho" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "atalho para -C NUM" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "mostrar uma linha com o nome da função antes das correspondΓͺncias" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "mostrar a função circundante" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "ler padrΓ΅es do ficheiro" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "procurar <padrΓ£o>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "combinar padrΓ΅es especificados com -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "indicar padrΓ£o encontrado no valor de saΓda, mas nΓ£o imprimir" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" "mostrar apenas correspondΓͺncias de ficheiro que tenham todos os padrΓ΅es" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "mostrar Γ‘rvore de analise da expressΓ΅es grep" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "paginador" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "mostrar ficheiros com correspondΓͺncias no paginador" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir invocar grep(1) (ignorado nesta compilação)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "nenhum padrΓ£o fornecido." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nΓΊmero de threads especificado invΓ‘lido (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager sΓ³ funciona na Γ‘rvore de trabalho" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ou --untracked nΓ£o podem ser usados com --no-index." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index ou --untracked nΓ£o podem ser usados em revisΓ΅es." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard nΓ£o podem ser usados em conteΓΊdos nΓ£o controlados." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." -msgstr "--cached e Γ‘rvores fornecidos simultaneamente." +msgstr "--cached e Γ‘rvores foram fornecidos simultaneamente." #: builtin/hash-object.c:81 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "" -"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--" -"stdin] [--] <ficheiro>..." +"git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--stdin]" +" [--] <ficheiro>..." #: builtin/hash-object.c:82 msgid "git hash-object --stdin-paths" @@ -6826,8 +7120,8 @@ msgstr "a versΓ£o do emacsclient '%d' Γ© demasiado antiga (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "falha ao executar '%s': %s" +msgid "failed to exec '%s'" +msgstr "falha ao executar '%s'" #: builtin/help.c:205 #, c-format @@ -6836,7 +7130,7 @@ msgid "" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s': caminho para visualizador de manual nΓ£o suportado.\n" -"Considere usar 'man.<tool>.cmd'." +"Considere usar 'man.<ferramenta>.cmd'." #: builtin/help.c:217 #, c-format @@ -6845,12 +7139,12 @@ msgid "" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': comando de visualizador de manual suportado.\n" -"Considere usar 'man.<tool>.path'." +"Considere usar 'man.<ferramenta>.path'." #: builtin/help.c:334 #, c-format msgid "'%s': unknown man viewer." -msgstr "'%s' visualizador de manual desconhecido." +msgstr "'%s': visualizador de manual desconhecido." #: builtin/help.c:351 msgid "no man viewer handled the request" @@ -6910,7 +7204,7 @@ msgstr "'git %s' Γ© um alias de '%s'" #: builtin/index-pack.c:152 #, c-format msgid "unable to open %s" -msgstr "nΓ£o foi possΓvel ler %s" +msgstr "nΓ£o foi possΓvel abrir %s" #: builtin/index-pack.c:202 #, c-format @@ -6984,9 +7278,8 @@ msgid "offset value overflow for delta base object" msgstr "delta de objeto base com capacidade excedida no valor de offset" #: builtin/index-pack.c:530 -#, fuzzy msgid "delta base offset is out of bound" -msgstr "um offset de base delta ultrapassou o limite" +msgstr "offset da base delta estΓ‘ fora do limite" #: builtin/index-pack.c:538 #, c-format @@ -7087,107 +7380,109 @@ msgstr "extrema confusΓ£o" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "concluΓdo com %d objetos locais" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "concluΓdo com %d objeto local" +msgstr[1] "concluΓdo com %d objetos locais" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "pacote com %d delta nΓ£o resolvido" msgstr[1] "pacote com %d deltas nΓ£o resolvidos" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "nΓ£o Γ© possΓvel compactar objeto acrescentado (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s corrompido" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "erro ao fechar ficheiro de pacote" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "nΓ£o Γ© possΓvel escrever o ficheiro de conservação '%s'" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "nΓ£o Γ© possΓvel fechar o ficheiro de conservação '%s' escrito" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "nΓ£o Γ© possΓvel guardar ficheiro de pacote" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "nΓ£o Γ© possΓvel guardar o ficheiro Γndice" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorreto" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "sem suporte de threads, %s ignorado" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "NΓ£o Γ© possΓvel abrir o ficheiro de pacote '%s' existente" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "NΓ£o Γ© possΓvel abrir o ficheiro de Γndice do pacote existente de '%s'" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d objeto nΓ£o delta" msgstr[1] "%d objetos nΓ£o delta" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "comprimento de cadeia = %d: %lu objeto" msgstr[1] "comprimento de cadeia = %d: %lu objetos" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "o nome do ficheiro de pacote '%s' nΓ£o termina em '.pack'" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "NΓ£o Γ© possΓvel voltar ao diretΓ³rio de trabalho atual" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "%s incorreto" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin nΓ£o pode ser usado sem --stdin" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "o nome do ficheiro de pacote '%s' nΓ£o termina em '.pack'" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify sem nome do ficheiro de pacote indicado" @@ -7226,28 +7521,27 @@ msgstr "nΓ£o Γ© possΓvel copiar '%s' para '%s'" msgid "ignoring template %s" msgstr "modelo %s ignorado" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "modelos nΓ£o encontrados em %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "" -"os modelos com versΓ£o de formato %d incorreta nΓ£o foram copiados de '%s'" +msgid "not copying templates from '%s': %s" +msgstr "modelos nΓ£o copiados de '%s': %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s jΓ‘ existe" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "nΓ£o foi possΓvel processar o tipo de ficheiro %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "nΓ£o foi possΓvel mover %s para %s" @@ -7255,51 +7549,51 @@ msgstr "nΓ£o foi possΓvel mover %s para %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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "RepositΓ³rio Git %s%s em %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "existente reinicializado" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "vazio inicializado" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " partilhado" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<diretΓ³rio-modelo>] [--" -"shared[=<permissΓ΅es>]] [<diretΓ³rio>]" +"git init [-q | --quiet] [--bare] [--template=<diretΓ³rio-modelo>] " +"[--shared[=<permissΓ΅es>]] [<diretΓ³rio>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "permissΓ΅es" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especificar que o repositΓ³rio git serΓ‘ partilhado por vΓ‘rios utilizadores" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "nΓ£o Γ© possΓvel criar o diretΓ³rio %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "nΓ£o Γ© possΓvel mudar para o diretΓ³rio %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7308,7 +7602,7 @@ msgstr "" "%s (ou --work-tree=<diretΓ³rio>) nΓ£o Γ© permitido sem especificar %s (ou --git-" "dir=<diretΓ³rio>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "NΓ£o Γ© possΓvel aceder Γ Γ‘rvore de trabalho '%s'" @@ -7354,267 +7648,319 @@ msgstr "git show [<opçáes>] <objeto>..." msgid "invalid --decorate option: %s" msgstr "opção --decorate invΓ‘lida: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "suprimir saΓda do diff" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "mostrar origem" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "usar ficheiro de mapeamento de correio" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "opçáes de decoração" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "processar intervalo de linhas n,m, a cantar a partir de 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Resultado final: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ficheiro incorreto" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "NΓ£o foi possΓvel ler o objeto %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Tipo desconhecido: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers sem valor" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "o nome do diretΓ³rio de saΓda Γ© demasiado longo" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "NΓ£o Γ© possΓvel abrir o ficheiro de patch %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Γ necessΓ‘rio exatamente um intervalo." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "NΓ£o Γ© um intervalo." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "A carta de apresentação precisa de um formato de e-mail" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to incorreto: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opçáes>] [<desde> | <intervalo-de-revisΓ΅es>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Dois diretΓ³rios de saΓda?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit desconhecido %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Falha ao resolver '%s' numa referΓͺncia vΓ‘lida." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "NΓ£o foi possΓvel encontrar a base exata de integração." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"Falha ao obter ramo a montante, se quer gravar o commit base automaticamente," +"\n" +"use branch --set-upstream-to para seguir um ramo remoto.\n" +"Ou pode especificar o commit base com --base=<base-commit-id> manualmente." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Falha ao procurar base exata de integração" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "o commit base deve ser o antecessor da lista de revisΓ΅es" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "o commit base nΓ£o deve fazer parte da lista de revisΓ΅es" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "nΓ£o Γ© possΓvel obter o id do patch" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "usar [PATCH n/m] mesmo com um ΓΊnico patch" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "usar [PATCH] mesmo com mΓΊltiplos patches" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "imprimir patches para a saΓda padrΓ£o" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "gerar uma carta de apresentação" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "" "usar uma sequΓͺncia de nΓΊmeros simples para denominar os ficheiros gerados" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "usar <sfx> em vez de '.patch'" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "comeΓ§ar a numerar os patches em <n> em vez de 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "marcar a sΓ©rie como a n-Γ©sima reiteração" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "usar [<prefixo>] em vez de [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "guardar os ficheiros resultantes em <dir>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "nΓ£o tirar/inserir [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "nΓ£o gerar diffs binΓ‘rios" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "preencher o cabeΓ§alho From com hash de zeros" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "nΓ£o incluir um patch que coincida com um commit a montante" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostrar no formato de patch em vez de no formato por omissΓ£o (patch + stat)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Mensagem" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "cabeΓ§alho" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "adicionar cabeΓ§alho de e-mail" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "e-mail" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "adicionar cabeΓ§alho To:" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "adicionar cabeΓ§alho Cc:" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "identidade" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "definir o endereΓ§o From como <identidade> (ou como identidade do committer " "se nΓ£o indicado)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "id-mensagem" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "usar o primeiro email para responder a <id-mensagem>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "limite" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "anexar o patch" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "incorporar o patch" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "ativar mensagens por tΓ³picos, estilos: shallow (raso), deep (profundo)" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "assinatura" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "adicionar uma assinatura" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "commit-base" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "adicionar informação prΓ©-requisito da Γ‘rvore Γ sΓ©rie de patches" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "adicionar uma assinatura de um ficheiro" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "nΓ£o imprimir os nomes dos ficheiros de patch" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n e -k sΓ£o mutuamente exclusivos." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix e -k sΓ£o mutuamente exclusivos." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only nΓ£o faz sentido" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status nΓ£o faz sentido" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check nΓ£o faz sentido" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "saΓda padrΓ£o, ou diretΓ³rio, qual deles?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "NΓ£o foi possΓvel criar o diretΓ³rio '%s'" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "nΓ£o Γ© possΓvel ler o ficheiro de assinatura '%s'" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Falha ao criar os ficheiros de saΓda" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7622,11 +7968,6 @@ msgstr "" "O ramo remoto seguido nΓ£o foi encontrado, especifique <ramo-a-montante> " "manualmente.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "Commit desconhecido %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opçáes>] [<ficheiro>...]" @@ -7643,7 +7984,7 @@ msgstr "" #: builtin/ls-files.c:431 msgid "show cached files in the output (default)" -msgstr "mostrar ficheiros em cache na saΓda" +msgstr "mostrar ficheiros em cache na saΓda (predefinição)" #: builtin/ls-files.c:433 msgid "show deleted files in the output" @@ -7684,11 +8025,11 @@ msgstr "nΓ£o mostrar diretΓ³rios vazios" #: builtin/ls-files.c:453 msgid "show unmerged files in the output" -msgstr "mostrar ficheiros com versΓ΅es nΓ£o conciliadas, na saΓda" +msgstr "mostrar ficheiros nΓ£o integrados na saΓda" #: builtin/ls-files.c:455 msgid "show resolve-undo information" -msgstr "mostrar informação de resolver-anular" +msgstr "mostrar informação de resolver-desfazer" #: builtin/ls-files.c:457 msgid "skip files matching pattern" @@ -7716,11 +8057,12 @@ msgstr "se um <ficheiro> nΓ£o estiver no Γndice, tratar como erro" #: builtin/ls-files.c:472 msgid "tree-ish" -msgstr "Γ‘rvore" +msgstr "Γ‘rvore-etc" #: builtin/ls-files.c:473 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "fingir que os caminhos removidos desde <Γ‘rvore> ainda estΓ£o presentes" +msgstr "" +"fingir que os caminhos removidos desde <Γ‘rvore-etc> ainda estΓ£o presentes" #: builtin/ls-files.c:475 msgid "show debugging data" @@ -7774,7 +8116,7 @@ msgstr "mostrar a referΓͺncia subjacente em adição ao objeto por ela apontado" #: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git ls-tree [<opçáes>] <Γ‘rvore> [<caminho>...]" +msgstr "git ls-tree [<opçáes>] <Γ‘rvore-etc> [<caminho>...]" #: builtin/ls-tree.c:128 msgid "only show trees" @@ -7821,172 +8163,178 @@ msgstr "git merge [<opçáes>] <msg> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "a opção 'm' requer um valor" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" -msgstr "EstratΓ©gia de merge '%s' nΓ£o encontrada.\n" +msgstr "EstratΓ©gia de integração '%s' nΓ£o encontrada.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "EstratΓ©gias disponΓveis:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "EstratΓ©gias personalizadas disponΓveis:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" -msgstr "nΓ£o apresentar um diffstat no final do merge" +msgstr "nΓ£o apresentar um diffstat ao fim da integração" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" -msgstr "mostrar um diffstat no final do merge" +msgstr "mostrar um diffstat ao fim da integração" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(sinΓ³nimo de --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -"adicionar (no mΓ‘ximo <n>) entradas do shortlog Γ mensagem de commit do merge" +"adicionar (no mΓ‘ximo <n>) entradas do shortlog Γ mensagem de commit da " +"integração" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" -msgstr "criar um ΓΊnico commit em vez de realizar um merge" +msgstr "criar um ΓΊnico commit em vez de realizar uma integração" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" -msgstr "realizar um commit se o merge for bem sucedido (predefinição)" +msgstr "realizar um commit se a integração for bem sucedida (predefinição)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" -msgstr "editar a mensagem antes de realizar commit" +msgstr "editar a mensagem antes de submeter" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "permitir avanΓ§o rΓ‘pido (predefinição)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "abortar se nΓ£o Γ© possΓvel efetuar avanΓ§o rΓ‘pido" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "verificar se o commit tem uma assinatura GPG vΓ‘lida" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "estratΓ©gia" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" -msgstr "estratΓ©gia de merge a usar" +msgstr "estratΓ©gia de integração a usar" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "opção=valor" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" -msgstr "opçáes para a estratΓ©gia de merge selecionada" +msgstr "opçáes da estratΓ©gia de integração selecionada" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "mensagem de commit (de merge nΓ£o suscetΓvel a avanΓ§o rΓ‘pido)" +msgstr "mensagem de commit (de integração nΓ£o suscetΓvel a avanΓ§o rΓ‘pido)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" -msgstr "abortar merge em curso" +msgstr "abortar integração em curso" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "permitir integração de histΓ³ricos nΓ£o relacionados" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "nΓ£o foi possΓvel executar o comando stash." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "falha ao executar o comando stash" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "nome de objeto invΓ‘lido: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "falha ao executar o comando read-tree" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (nΓ£o hΓ‘ nada para esmagar)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit esmagado -- HEAD nΓ£o atualizada\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "NΓ£o foi possΓvel escrever em '%s'" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "A escrever SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "A concluir SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" -msgstr "Sem mensagem de merge -- HEAD nΓ£o atualizada\n" +msgstr "Nenhuma mensagem de integração -- HEAD nΓ£o atualizada\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' nΓ£o aponta para um commit" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Valor de branch.%s.mergeoptions incorreto: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." -msgstr "A processar exclusivamente merge de duas cabeΓ§as." +msgstr "NΓ£o se processa outra coisa senΓ£o incorporação de duas cabeΓ§as." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opção desconhecida de merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "nΓ£o foi possΓvel escrever %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "NΓ£o foi possΓvel ler '%s'" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"Commit do merge nΓ£o realizado; use 'git commit' para concluir o merge.\n" +"Commit de integração nΓ£o realizado; use 'git commit' para concluir a " +"integração.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7995,180 +8343,184 @@ msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Introduza uma mensagem de commit, explicando por que este merge Γ© " +"Introduza uma mensagem de commit, explicando por que esta integração Γ© " "necessΓ‘rio,\n" -"sobretudo se incorpora um ramo a montante atualizado, com um ramo tΓ³pico.\n" +"sobretudo se incorpora um ramo a montante atualizado, num ramo tΓ³pico.\n" "\n" -"Linhas comeΓ§adas com '%c' sΓ£o ignoradas, e uma mensagem vazia\n" +"Linhas comeΓ§adas com '%c' sΓ£o ignoradas e uma mensagem vazia\n" "aborta o commit.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Mensagem de commit vazia." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Maravilhoso.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"Falha ao realizar merge automΓ‘tico; corrija os conflitos e faΓ§a commit do " +"Falha ao realizar integração automΓ‘tica; corrija os conflitos e submeta o " "resultado.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' nΓ£o Γ© um commit" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Nenhum ramo atual." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "NΓ£o hΓ‘ um remoto para o ramo atual." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "NΓ£o estΓ‘ definido nenhum ramo a montante para o ramo atual." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" -msgstr "Nenhum ramo remoto seguido por %s de %s" +msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "nΓ£o foi possΓvel fechar '%s'" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "NΓ£o hΓ‘ nenhum merge para abortar (MERGE_HEAD nΓ£o presente)." +msgstr "NΓ£o hΓ‘ nenhuma integração para se abortar (MERGE_HEAD nΓ£o presente)." -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"Merge nΓ£o concluΓdo (MERGE_HEAD presente).\n" -"FaΓ§a commit das suas alteraçáes antes de realizar merge." +"NΓ£o concluiu a integração (MERGE_HEAD presente).\n" +"Submeta as suas alteraçáes antes de integrar." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" "Cherry-pick nΓ£o concluΓdo (CHERRY_PICK_HEAD presente).\n" -"FaΓ§a commit das suas alteraçáes antes de realizar merge." +"Submeta as suas alteraçáes antes de integrar." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Cherry-pick nΓ£o concluΓdo (CHERRY_PICK_HEAD presente)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "NΓ£o Γ© possΓvel combinar --squash e --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Nenhum commit especificado e merge.defaultToUpstream nΓ£o definido." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "Esmagar um commit numa cabeΓ§a vazia ainda nΓ£o Γ© suportado" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -"NΓ£o faz sentido efetuar commit nΓ£o suscetΓvel a avanΓ§o rΓ‘pido, numa cabeΓ§a " +"NΓ£o faz sentido submeter de modo nΓ£o suscetΓvel a avanΓ§o rΓ‘pido, numa cabeΓ§a " "vazia" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" -msgstr "%s - nΓ£o Γ© algo suscetΓvel a merge" +msgstr "%s - nΓ£o Γ© algo se possa integrar" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" -msgstr "SΓ³ Γ© possΓvel realizar merge de exatamente um commit numa cabeΓ§a vazia" +msgstr "SΓ³ se pode integrar exatamente um commit numa cabeΓ§a vazia" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "A assinatura GPG do commit %s, alegadamente assinada por %s, nΓ£o Γ© de " "confianΓ§a." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "A assinatura GPG do commit %s, alegadamente assinada por %s, estΓ‘ incorreta." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "O commit %s nΓ£o tem uma assinatura GPG." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "A assinatura GPG do commit %s por %s estΓ‘ correta\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "integração de histΓ³ricos nΓ£o relacionados recusada" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "A atualizar %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "A tentar merge mesmo trivial no interior do Γndice...\n" +msgstr "A tentar integração mesmo trivial no interior do Γndice...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "NΓ£o.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "NΓ£o Γ© possΓvel avanΓ§ar rapidamente, a abortar." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "A recuar a Γ‘rvore ao seu estado original...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" -msgstr "A tentar a estratΓ©gia de merge %s...\n" +msgstr "A tentar a estratΓ©gia de integração %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" -msgstr "Nenhuma estratΓ©gia de merge conseguiu processar o merge.\n" +msgstr "Nenhuma estratΓ©gia de integração conseguiu processar a integração.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" -msgstr "Falha ao realizar merge com a estratΓ©gia %s.\n" +msgstr "Falha ao integrar com a estratΓ©gia %s.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "A usar %s para preparar resolução manual.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -"O merge automΓ‘tico foi bem sucedido; interrompido antes de realizar commit " -"como pretendido\n" +"A integração automΓ‘tica foi bem sucedida; interrompida antes de submeter " +"como solicitado\n" #: builtin/merge-base.c:29 msgid "git merge-base [-a | --all] <commit> <commit>..." @@ -8196,7 +8548,7 @@ msgstr "mostrar todos os antecessores" #: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" -msgstr "encontrar antecessores de um ΓΊnico merge com n pontos" +msgstr "encontrar antecessores de uma ΓΊnica integração com n pontos" #: builtin/merge-base.c:218 msgid "list revs not reachable from others" @@ -8209,7 +8561,7 @@ msgstr "o primeiro Γ© antecessor do segundo?" #: builtin/merge-base.c:222 msgid "find where <commit> forked from reflog of <ref>" msgstr "" -"descobrir aonde foi que o <commit> divergiu usando o reflog da <referΓͺncia>" +"descobrir onde foi que o <commit> divergiu usando o reflog da <referΓͺncia>" #: builtin/merge-file.c:8 msgid "" @@ -8225,7 +8577,7 @@ msgstr "enviar resultados para a saΓda padrΓ£o" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "usar merge baseado em diff3" +msgstr "usar integração baseada em diff3" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" @@ -8274,12 +8626,12 @@ msgstr "git mv [<opçáes>] <origem>... <destino>" #: builtin/mv.c:70 #, fuzzy, c-format msgid "Directory %s is in index and no submodule?" -msgstr "O diretΓ³rio %s estΓ‘ no Γndice mas nΓ£o no submΓ³dulo?" +msgstr "O diretΓ³rio %s estΓ‘ no Γndice mas nΓ£o em nenhum submΓ³dulo?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Prepare as suas alteraçáes em .gitmodules ou esconda-as (stash) para " +"Prepare as suas alteraçáes em .gitmodules ou empilhe-as (stash) para " "prosseguir" #: builtin/mv.c:90 @@ -8356,48 +8708,48 @@ msgstr "%s, origem=%s, destino=%s" msgid "Renaming %s to %s\n" msgstr "A mudar de nome de %s para %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "falha ao mudar o nome de '%s'" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opçáes>] <commit>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opçáes>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opçáes>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "imprimir apenas nomes (sem SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "usar apenas tags para designar commits" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "usar apenas referΓͺncia que correspondam ao <padrΓ£o>" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "listar todos os commits alcançÑveis a partir de todas as referΓͺncias" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "ler da entrada padrΓ£o" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nomes 'indefinidos' (predefinição)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags na entrada (uso interno)" @@ -8505,7 +8857,7 @@ msgstr "git notes remove [<objeto>]" #: builtin/notes.c:84 msgid "git notes prune [<options>]" -msgstr "git notes prune [<optçáes>]" +msgstr "git notes prune [<opçáes>]" #: builtin/notes.c:89 msgid "git notes get-ref" @@ -8543,24 +8895,16 @@ msgstr "nΓ£o Γ© possΓvel escrever o objeto de nota" msgid "The note contents have been left in %s" msgstr "O conteΓΊdo da nota foi guardado em %s" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "nΓ£o Γ© possΓvel ler '%s'" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "nΓ£o foi possΓvel abrir ou ler '%s'" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Falha ao resolver '%s' numa referΓͺncia vΓ‘lida." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8573,7 +8917,7 @@ msgstr "NΓ£o Γ© possΓvel ler os dados da nota de um objeto nΓ£o-blob '%s'." #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "demasiados parΓ’metros" @@ -8620,7 +8964,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "A substituir as notas existentes do objeto %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "A remover a nota do objeto %s\n" @@ -8660,65 +9004,65 @@ msgstr "" "As opçáes -m/-F/-c/-C sΓ£o obsoletas no subcomando 'edit'.\n" "Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "Opçáes gerais" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" -msgstr "Opçáes de merge" +msgstr "Opçáes de integração" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -"resolver conflitos nas notas usando a estratΓ©gia indicada (manual/ours/" -"theirs/union/cat_sort_uniq)" +"resolver conflitos nas notas usando a estratΓ©gia indicada " +"(manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" -msgstr "Efetuar commit de notas nΓ£o integradas" +msgstr "A submeter notas nΓ£o integradas" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" -msgstr "concluir merge de notas, fazendo commit de notas nΓ£o integradas" +msgstr "concluir integração de notas, submetendo notas nΓ£o integradas" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" -msgstr "Abortar resoluçáes de merge das notas" +msgstr "A abortar resolução de integração das notas" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" -msgstr "abortar merge das notas" +msgstr "abortar integração das notas" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" -msgstr "Merge das notas em %s jΓ‘ estΓ‘ em curso em %s" +msgstr "Uma integração das notas em %s jΓ‘ estΓ‘ em curso em %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "O objeto %s nΓ£o tem nenhuma nota\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "nΓ£o considerar como erro a remoção de uma nota nΓ£o existente" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "ler nome dos objetos da entrada padrΓ£o" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "usar notas de <notes-ref>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Subcomando desconhecido: %s" @@ -8742,171 +9086,177 @@ msgstr "" msgid "deflate error (%d)" msgstr "erro ao compactar (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" +"a desativar escrita de mapa de bits, os pacotes sΓ£o divididos devido a " +"pack.packSizeLimit" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "A escrever objetos" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "a desativar escrita de mapa de bits, visto que alguns objetos nΓ£o estΓ£o a " "ser compactados" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "A comprimir objetos" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "versΓ£o de Γndice %s nΓ£o suportada" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "versΓ£o de Γndice '%s' incorreta" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "nΓ£o mostrar medidor de progresso" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "mostrar medidor de progresso" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "semelhante a --all-progress quando o medidor de progresso Γ© mostrado" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "versΓ£o[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "" "escrever o ficheiro de Γndice do pacote na versΓ£o de formato especificada" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "tamanho mΓ‘ximo de cada ficheiro de pacote gerado" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" -msgstr "ignorar objetos emprestados do arquivo de objetos alternate" +msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ignorar objetos compactados" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "limitar a janela de compactação por objetos" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" "limitar a janela de compactação por memΓ³ria em adição ao limite por objetos" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "tamanho mΓ‘ximo de cadeias delta permitidas no pacote resultante" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "reutilizar deltas existentes" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "usar threads ao procurar pela melhor correspondΓͺncia delta" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "nΓ£o criar um pacote vazio" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "ler argumentos de revisΓ£o da entrada padrΓ£o" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "restringir-se aos objetos que ainda nΓ£o foram compactados" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "incluir objetos alcançÑveis a partir de qualquer referΓͺncia" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "incluir objetos referenciados por entradas do reflog" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "incluir objetos referenciados pelo Γndice" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "gerar pacote para a saΓda padrΓ£o" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refiram objetos a compactar" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "manter objetos inalcançÑveis" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "hora" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "descompactar objetos inalcançÑveis mais recentes que <hora>" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "criar pacotes finos" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "criar pacotes adequados para obter em repositΓ³rios pouco profundos" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ignorar pacotes que tenham um ficheiro .keep" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "nΓvel de compactação do pacote" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "nΓ£o esconder commits introduzidos por enxertos" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar um Γndice de mapa de bits se disponΓvel, para acelerar a contagem de " "objetos" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "escrever um Γndice de mapa de bits juntamente com o Γndice do pacote" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "A contar objetos" @@ -8934,15 +9284,15 @@ msgstr "A remover objetos duplicados" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <hora>] [--] [<head>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "nΓ£o remover, mostrar apenas" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "apresentar objetos eliminados" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "expirar objetos mais antigos que <hora>" @@ -8954,50 +9304,53 @@ msgstr "nΓ£o Γ© possΓvel limpar num repositΓ³rio de objetos-preciosos" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opçáes>] [<repositΓ³rio> [<especificador-de-referΓͺncia>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" -msgstr "Opçáes relacionadas com merge" +msgstr "Opçáes relativas a integração" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" -msgstr "incorporar alteraçáes por rebase em vez de merge" +msgstr "incorporar alteraçáes por rebase em vez de integrar" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "permitir avanΓ§o rΓ‘pido" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar se o commit tem uma assinatura GPG vΓ‘lida" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "empilhar/desempilhar automaticamente antes de depois de rebase" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Opçáes relacionadas com obtenção de objetos" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" -msgstr "nΓΊmero de submΓ³dulos obtidos em paralelo" +msgstr "nΓΊmero de submΓ³dulos puxados em paralelo" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor invΓ‘lido de pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "NΓ£o Γ© possΓvel efetuar pull com rebase: tem alteraçáes nΓ£o preparadas." +msgstr "NΓ£o Γ© possΓvel puxar com rebase: tem alteraçáes nΓ£o preparadas." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." -msgstr "AlΓ©m disso, o Γndice contΓ©m alteraçáes pendentes para commit." +msgstr "AlΓ©m disso, o Γndice contΓ©m alteraçáes nΓ£o submetidas." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -"NΓ£o Γ© possΓvel efetuar pull com rebase: o Γndice contΓ©m alteraçáes pendentes " -"para commit." +"NΓ£o Γ© possΓvel puxar com rebase: o Γndice contΓ©m alteraçáes nΓ£o submetidas." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9005,14 +9358,14 @@ msgstr "" "NΓ£o hΓ‘ nenhum candidato com o qual realizar rebase de entre as referΓͺncias " "que se acabaram de obter." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -"NΓ£o hΓ‘ nenhum candidato com o qual realizar merge de entre as referΓͺncias " -"que se acabaram obter." +"NΓ£o hΓ‘ nenhum candidato com o qual integrar de entre as referΓͺncias que se " +"acabaram obter." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9020,64 +9373,74 @@ msgstr "" "Geralmente, significa que forneceu um especificador de referΓͺncia\n" "com um carΓ‘cter universal (wildcard) que nΓ£o corresponde a nenhum remoto." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" "a branch. Because this is not the default configured remote\n" "for your current branch, you must specify a branch on the command line." msgstr "" -"Solicitou pull do remoto '%s', mas nΓ£o especificou um ramo.\n" -"Uma vez que este nΓ£o Γ© o remoto configurado por omissΓ£o,\n" -"deve especificar um ramo na linha de comandos." +"Solicitou puxar o remoto '%s', mas nΓ£o especificou um ramo.\n" +"Uma vez que este nΓ£o Γ© o remoto configurado por predefinição\n" +"do ramo atual, deve especificar um ramo na linha de comandos." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "NΓ£o se encontra em nenhum ramo de momento." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Especifique o ramo sobre o qual pretende realizar rebase." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." -msgstr "Especifique o ramo com o qual pretende realizar merge." +msgstr "Especifique o ramo com o qual pretende integrar." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Consulte git-pull(1) para obter mais detalhes." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<remoto>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<ramo>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "O ramo atual nΓ£o segue nenhum ramo." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -"Se deseja definir um ramo para este ramo seguir, pode fazΓͺ-lo com:\n" -"\n" -" git branch --set-upstream-to=%s/<ramo> %s\n" +"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazΓͺ-lo " +"com:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -"A configuração indica para efetuar merge com a referΓͺncia '%s'\n" -"do remoto, mas esta ainda nΓ£o foi obtida." +"A configuração indica para integrar com a referΓͺncia '%s'\n" +"do remoto, mas aquela referΓͺncia nΓ£o foi obtida." + +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "a opção --[no-]autostash sΓ³ Γ© vΓ‘lida com --rebase." -#: builtin/pull.c:841 +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" "A atualizar um ramo que ainda nΓ£o foi criado e com alteraçáes adicionadas ao " "Γndice." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9088,7 +9451,7 @@ msgstr "" "a avanΓ§ar a Γ‘rvore de trabalho a partir do\n" "commit %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9105,11 +9468,11 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." -msgstr "NΓ£o Γ© possΓvel efetuar merge de mΓΊltiplos ramos numa cabeΓ§a vazia." +msgstr "NΓ£o Γ© possΓvel integrar mΓΊltiplos ramos numa cabeΓ§a vazia." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "NΓ£o Γ© possΓvel efetuar rebase sobre mΓΊltiplos ramos." @@ -9189,8 +9552,7 @@ msgstr "" #: builtin/push.c:183 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "" -"O ramo atual %s tem mΓΊltiplos ramos a montante, recusando-se a publicar." +msgstr "O ramo atual %s tem mΓΊltiplos ramos a montante, publicação recusada." #: builtin/push.c:186 #, c-format @@ -9403,10 +9765,10 @@ msgid "" "[-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=<prefixo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" -"sparse-checkout] [--index-output=<ficheiro>] (--empty | <Γ‘rvore1> [<Γ‘rvore2> " -"[<Γ‘rvore3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefixo>)" +" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] " +"[--index-output=<ficheiro>] (--empty | <Γ‘rvore-etc1> [<Γ‘rvore-etc2> [<Γ‘rvore-" +"etc3>]])" #: builtin/read-tree.c:110 msgid "write resulting index to <file>" @@ -9418,21 +9780,21 @@ msgstr "apenas esvaziar o Γndice" #: builtin/read-tree.c:115 msgid "Merging" -msgstr "A realizar merge" +msgstr "A integrar" #: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" -msgstr "realizar um merge em adição a uma leitura" +msgstr "realizar uma integração em adição a uma leitura" #: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "" -"realizar merge com 3 pontos se o merge ao nΓvel dos ficheiros nΓ£o for " -"necessΓ‘rio" +"integrar com 3 pontos se a integração ao nΓvel de ficheiros nΓ£o for " +"necessΓ‘ria" #: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" -msgstr "realizar merge com 3 ponto na presenΓ§a de adiçáes e remoçáes" +msgstr "integrar com 3 ponto na presenΓ§a de adiçáes e remoçáes" #: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" @@ -9448,7 +9810,7 @@ msgstr "ler a Γ‘rvore em <subdiretΓ³rio>/ para o Γndice" #: builtin/read-tree.c:128 msgid "update working tree with merge result" -msgstr "atualizar a Γ‘rvore de trabalho com os resultados do merge" +msgstr "atualizar a Γ‘rvore de trabalho com os resultados da integração" #: builtin/read-tree.c:130 msgid "gitignore" @@ -9460,7 +9822,7 @@ msgstr "permitir que os ficheiros explicitamente ignorados sejam substituΓdos" #: builtin/read-tree.c:134 msgid "don't check the working tree after merging" -msgstr "nΓ£o verificar a Γ‘rvore de trabalho depois de efetuar merge" +msgstr "nΓ£o verificar a Γ‘rvore de trabalho depois de integrar" #: builtin/read-tree.c:135 msgid "don't update the index or the work tree" @@ -9474,6 +9836,18 @@ msgstr "ignorar a aplicação do filtro de extração esparsa" msgid "debug unpack-trees" msgstr "depurar unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dir>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "silencioso" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Deve especificar um diretΓ³rio." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9493,8 +9867,8 @@ msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <ramo>] [-m <master>] [-f] [--tags | --no-tags] [--" -"mirror=<fetch|push>] <nome> <url>" +"git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] " +"[--mirror=<fetch|push>] <nome> <url>" #: builtin/remote.c:14 builtin/remote.c:34 msgid "git remote rename <old> <new>" @@ -9733,7 +10107,7 @@ msgstr "realiza rebase interativo sobre %s do remoto" #: builtin/remote.c:971 #, c-format msgid " merges with remote %s" -msgstr " realiza merge com %s do remoto" +msgstr " integra com %s do remoto" #: builtin/remote.c:972 msgid " and with remote" @@ -9742,7 +10116,7 @@ msgstr " e com o remoto" #: builtin/remote.c:974 #, c-format msgid "merges with remote %s" -msgstr "realiza merge com %s do remoto" +msgstr "integra com %s do remoto" #: builtin/remote.c:975 msgid " and with remote" @@ -9802,176 +10176,178 @@ msgstr "* remoto %s" msgid " Fetch URL: %s" msgstr " Obter do URL: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(nenhum URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " Publicar no URL: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " Ramo HEAD: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " Ramo HEAD (o remoto HEAD Γ© ambΓguo, pode ser um dos seguintes):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Ramo remoto:%s" msgstr[1] " Ramos remotos:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (estado nΓ£o consultado)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Ramo local configurado para 'git pull':" msgstr[1] " Ramos locais configurados para 'git pull':" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " ReferΓͺncias locais serΓ£o refletidas (mirror) por 'git push'" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " ReferΓͺncia local configurada para 'git push'%s:" msgstr[1] " ReferΓͺncias locais configuradas para 'git push'%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "eliminar refs/remotes/<nome>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "NΓ£o Γ© possΓvel determinar o remoto HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "MΓΊltiplos ramos HEAD remotos. Escolha um explicitamente com:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "NΓ£o foi possΓvel eliminar %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "ReferΓͺncia invΓ‘lida: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "NΓ£o foi possΓvel configurar %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s ficarΓ‘ suspenso!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s ficou suspenso!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "A eliminar %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [eliminaria] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [eliminado] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "eliminar remotos depois de obter" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Remoto inexistente '%s'" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "adicionar ramo" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "nenhum remoto especificado" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de publicação em vez de URLs utilizados para obter" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "retornar todos os URLs" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "o remoto '%s' nΓ£o tem nenhum URL configurado" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipular URLs de publicação" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "adicionar URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "eliminar URLs" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete nΓ£o faz sentido" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "PadrΓ£o de URL antigo invΓ‘lido: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "URL nΓ£o encontrado: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "NΓ£o Γ© possΓvel remover todos os URLs de nΓ£o publicação" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "ser verboso; deve ser colocado antes de um subcomando" @@ -10087,7 +10463,7 @@ msgstr "mergetag incorreta no commit '%s'" #: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" -msgstr "mergetag malformada no commit '%s' " +msgstr "mergetag malformada no commit '%s'" #: builtin/replace.c:368 #, c-format @@ -10105,12 +10481,12 @@ msgstr "o commit original '%s' tem uma assinatura gpg." #: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" -msgstr "a assinatura serΓ‘ removida do commit substituto!" +msgstr "a assinatura serΓ‘ removida do commit suplente!" #: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" -msgstr "nΓ£o foi possΓvel escrever o commit substituto de: '%s'" +msgstr "nΓ£o foi possΓvel escrever o commit suplente de: '%s'" #: builtin/replace.c:432 msgid "list replace refs" @@ -10157,11 +10533,11 @@ msgstr "" #: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <Γ‘rvore> [--] <caminhos>..." +msgstr "git reset [-q] <Γ‘rvore-etc> [--] <caminhos>..." #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<Γ‘rvore>] [--] [<caminhos>...]" +msgstr "git reset --patch [<Γ‘rvore-etc>] [--] [<caminhos>...]" #: builtin/reset.c:34 msgid "mixed" @@ -10204,7 +10580,7 @@ msgstr "HEAD estΓ‘ agora em %s" #: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." -msgstr "NΓ£o Γ© possΓvel repor de modo %s durante um merge." +msgstr "NΓ£o Γ© possΓvel repor de modo %s durante uma integração." #: builtin/reset.c:276 msgid "be quiet, only report errors" @@ -10286,7 +10662,7 @@ msgstr "git rev-parse --parseopt [<opçáes>] -- [<argumentos>...]" #: builtin/rev-parse.c:363 msgid "keep the `--` passed as an arg" -msgstr "Conservar '--' passado como argumento" +msgstr "conservar '--' passado como argumento" #: builtin/rev-parse.c:365 msgid "stop parsing after the first non-option argument" @@ -10313,7 +10689,7 @@ msgstr "" #: builtin/revert.c:22 msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<opçáes>] <commit-ish>..." +msgstr "git revert [<opçáes>] <commit-etc>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" @@ -10321,7 +10697,7 @@ msgstr "git revert <subcommando>" #: builtin/revert.c:28 msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<opçáes>] <commit-ish>..." +msgstr "git cherry-pick [<opçáes>] <commit-etc>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -10346,7 +10722,7 @@ msgstr "cancelar reversΓ£o ou cherry-pick" #: builtin/revert.c:83 msgid "don't automatically commit" -msgstr "nΓ£o efetuar commit automaticamente" +msgstr "nΓ£o submeter automaticamente" #: builtin/revert.c:84 msgid "edit the commit message" @@ -10358,7 +10734,7 @@ msgstr "nΓΊmero de pai" #: builtin/revert.c:89 msgid "merge strategy" -msgstr "estratΓ©gia de merge" +msgstr "estratΓ©gia de integração" #: builtin/revert.c:90 msgid "option" @@ -10366,7 +10742,7 @@ msgstr "opção" #: builtin/revert.c:91 msgid "option for merge strategy" -msgstr "opção de estratΓ©gia de merge" +msgstr "opção de estratΓ©gia de integração" #: builtin/revert.c:104 msgid "append commit name" @@ -10420,7 +10796,7 @@ msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "\n" -"(use 'rm -rf' se quer mesmo removΓͺ-lo, incluindo todo o seu histΓ³rico)" +"(use 'rm -rf' se pretende mesmo removΓͺ-lo, incluindo todo o seu histΓ³rico)" #: builtin/rm.c:230 msgid "" @@ -10484,12 +10860,6 @@ msgstr "permitir remoção recursiva" msgid "exit with a zero status even if nothing matched" msgstr "sair com valor zero mesmo quando nΓ£o hΓ‘ correspondΓͺncia" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Prepare as suas alteraçáes em .gitmodules ou esconda-as (stash) para " -"prosseguir" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10531,8 +10901,7 @@ msgstr "imprimir estado do programa auxiliar remoto" #: builtin/shortlog.c:13 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" -msgstr "" -"git shortlog [<opçáes>] [<intervalo-de-revisΓ΅es>] [[--] [<caminho>...]]" +msgstr "git shortlog [<opçáes>] [<intervalo-de-revisΓ΅es>] [[--] [<caminho>...]]" #: builtin/shortlog.c:242 msgid "sort output according to the number of commits per author" @@ -10572,11 +10941,11 @@ msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referΓͺncia>]" #: builtin/show-branch.c:640 msgid "show remote-tracking and local branches" -msgstr "mostrar os ramos remotos seguidos e os ramos locais" +msgstr "mostrar os ramos de monitorização remotos e os ramos locais" #: builtin/show-branch.c:642 msgid "show remote-tracking branches" -msgstr "mostrar os ramos remotos seguidos" +msgstr "mostrar os ramos de monitorização remotos" #: builtin/show-branch.c:644 msgid "color '*!+-' corresponding to the branch" @@ -10604,7 +10973,7 @@ msgstr "designar commits pelos seus nomes de objeto" #: builtin/show-branch.c:655 msgid "show possible merge bases" -msgstr "mostrar possΓveis bases de merge" +msgstr "mostrar possΓveis bases de integração" #: builtin/show-branch.c:657 msgid "show refs unreachable from any other ref" @@ -10620,7 +10989,7 @@ msgstr "mostrar apenas commits nΓ£o presentes no primeiro ramo" #: builtin/show-branch.c:664 msgid "show merges reachable from only one tip" -msgstr "mostrar merges alcançÑveis a partir duma ΓΊnica ponta" +msgstr "mostrar integraçáes alcançÑveis a partir duma ΓΊnica ponta" #: builtin/show-branch.c:666 msgid "topologically sort, maintaining date order where possible" @@ -10640,8 +11009,8 @@ 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] [--] [<padrΓ£o>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | " +"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrΓ£o>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=<pattern>]" @@ -10698,84 +11067,183 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "preceder cada linha com um carΓ‘cter de comentΓ‘rio e um espaΓ§o" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "ReferΓͺncia inexistente: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Esperava-se um nome completo de uma referΓͺncia, obteve-se %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "nΓ£o Γ© possΓvel tirar um componente do URL '%s'" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "Γ’ncora alternativa para caminhos relativos" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "Nenhum URL encontrado para o caminho de submΓ³dulo '%s' em .gitmodules" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Falha ao registar o URL do caminho de submΓ³dulo '%s'" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "SubmΓ³dulo '%s' (%s) registado com caminho '%s'\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "aviso: modo de atualização do comando sugerido para o submΓ³dulo '%s'\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "Falha ao registar o modo de atualização do caminho de submΓ³dulo '%s'" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "Suprimir a saΓda ao inicializar um submΓ³dulo" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<caminho>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <caminho>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "nenhum mapeamento de submΓ³dulo do caminho '%s' encontrado em .gitmodules" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "sΓtio para aonde o novo submΓ³dulo serΓ‘ clonado" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "nome do novo submΓ³dulo" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "url donde clonar o submΓ³dulos" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "profundidade de clones rasos" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference " -"<repositΓ³rio>] [--name <nome>] [--url <url>][--depth <profundidade>] [--] " -"[<caminho>...]" +"<repositΓ³rio>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "nΓ£o foi possΓvel criar o diretΓ³rio '%s'" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" -msgstr "falha ao clonar '%s' no caminho do submΓ³dulo '%s'" +msgstr "falha ao clonar '%s' no caminho de submΓ³dulo '%s'" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "nΓ£o Γ© possΓvel abrir o ficheiro '%s'" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "nΓ£o Γ© possΓvel fechar o ficheiro %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" -msgstr "nΓ£o foi possΓvel obter o o diretΓ³rio do submΓ³dulo de '%s'" +msgstr "nΓ£o foi possΓvel obter o diretΓ³rio do submΓ³dulo de '%s'" + +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Caminho de submΓ³dulo '%s' nΓ£o inicializado" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Pretendia usar 'update --init'?" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "A ignorar submΓ³dulo %s nΓ£o integrado" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "A ignorar submΓ³dulo '%s'" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "caminho para a Γ‘rvore de trabalho" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" msgstr "" -"fatal: o subcomando submodule--helper deve ser invocado com um subcomando" +"caminho para a Γ‘rvore de trabalho, atravessando limites de submΓ³dulos " +"aninhados" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout ou none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "criar um clone raso, truncado ao nΓΊmero especificado de revisΓ΅es" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "trabalhos em paralelo" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "nΓ£o imprimir progresso da clonagem" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "valor incorreto no parΓ’metro update" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "o subcomando submodule--helper deve ser invocado com um subcomando" + +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "fatal: '%s' nΓ£o Γ© um subcomando de submodule--helper vΓ‘lido" +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' nΓ£o Γ© um subcomando vΓ‘lido de submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10830,27 +11298,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <nome-da-tag>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "o nome da tag Γ© demasiado longo: %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' nΓ£o encontrada." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' eliminada (era %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "nΓ£o foi possΓvel validar a tag '%s'" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10863,7 +11326,7 @@ msgstr "" " %s\n" "Linha comeΓ§adas com '%c' serΓ£o ignoradas.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10960,11 +11423,11 @@ msgstr "imprimir apenas tags que contenham o commit" #: builtin/tag.c:364 msgid "print only tags that are merged" -msgstr "imprimir apenas as tags que foram incorporadas" +msgstr "imprimir apenas as tags que foram integradas" #: builtin/tag.c:365 msgid "print only tags that are not merged" -msgstr "imprimir apenas as tags que nΓ£o foram incorporadas" +msgstr "imprimir apenas as tags que nΓ£o foram integradas" #: builtin/tag.c:370 msgid "print only tags of the object" @@ -10994,21 +11457,21 @@ msgstr "as opçáes --merged e --no-merged sΓ³ sΓ£o permitidas com -l" msgid "only one -F or -m option is allowed." msgstr "sΓ³ Γ© permitido um opção -F ou -m." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "demasiado parΓ’metros" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' nΓ£o Γ© um nome de tag vΓ‘lido." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "a tag '%s' jΓ‘ existe" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' atualizada (era %s)\n" @@ -11025,7 +11488,7 @@ msgstr "falha ao criar o diretΓ³rio %s" #: builtin/update-index.c:85 #, c-format msgid "failed to stat %s" -msgstr "falha ao efetuar stat de %s" +msgstr "falha ao invocar stat de %s" #: builtin/update-index.c:95 #, c-format @@ -11040,7 +11503,7 @@ msgstr "falha ao eliminar o ficheiro %s" #: builtin/update-index.c:110 builtin/update-index.c:212 #, c-format msgid "failed to delete directory %s" -msgstr "falha ao criar o diretΓ³rio %s" +msgstr "falha ao eliminar o diretΓ³rio %s" #: builtin/update-index.c:133 #, c-format @@ -11109,7 +11572,7 @@ msgstr "avisar sobre ficheiros que faltem na Γ‘rvore de trabalho" #: builtin/update-index.c:942 msgid "refresh even if index contains unmerged entries" -msgstr "refrescar mesmo que o Γndice contenha entradas nΓ£o incorporadas" +msgstr "refrescar mesmo que o Γndice contenha entradas nΓ£o integradas" #: builtin/update-index.c:945 msgid "refresh stat information" @@ -11272,7 +11735,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..." msgid "print commit contents" msgstr "imprimir conteΓΊdo do commit" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "imprimir informação do gpg em bruto" @@ -11292,7 +11755,7 @@ msgstr "mostrar apenas estatΓsticas" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <tag>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "imprimir conteΓΊdo da tag" @@ -11308,71 +11771,75 @@ msgstr "git worktree prune [<opçáes>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<opçáes>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "A remover worktrees/%s: diretΓ³rio invΓ‘lido" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "A remover worktrees/%s: o ficheiro gitdir nΓ£o existe" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "A remover worktrees/%s: nΓ£o Γ© possΓvel ler o ficheiro gitdir (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "A remover worktrees/%s: ficheiro gitdir invΓ‘lido" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "A remover worktrees/%s: o ficheiro gitdir aponta para uma localização " "inexistente" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "falha ao remover: %s" +msgid "failed to remove '%s'" +msgstr "falha ao remover '%s'" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' jΓ‘ existe" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "nΓ£o foi possΓvel criar o diretΓ³rio de '%s'" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "A preparar %s (identificador %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extrair o <ramo> mesmo se jΓ‘ tenha sido extraΓdo noutra Γ‘rvore de trabalho" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "criar um novo ramo" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "criar ou repor um ramo" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "destacar HEAD no commit indicado" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "povoar a nova Γ‘rvore de trabalho" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B e --detach sΓ£o mutuamente exclusivos" @@ -11392,7 +11859,7 @@ msgstr "escrever objeto Γ‘rvore do subdiretΓ³rio <prefixo>" msgid "only useful for debugging" msgstr "apenas ΓΊtil para depuração" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "imprimir mensagens de depuração no stderr" @@ -11406,9 +11873,9 @@ msgstr "" "guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n" "para ler sobre um subcomando ou conceito especΓfico." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" -msgstr "" +msgstr "NΓ£o Γ© suportado afixar chaves pΓΊblicas com cURL < 7.44.0" #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" @@ -11473,7 +11940,7 @@ msgstr "Criar um repositΓ³rio Git vazio ou reinicializar um jΓ‘ existente" #: common-cmds.h:27 msgid "Show commit logs" -msgstr "Mostrado logs de commits" +msgstr "Mostrar histΓ³rico de commits" #: common-cmds.h:28 msgid "Join two or more development histories together" @@ -11535,7 +12002,7 @@ msgstr "ser mais silencioso" msgid "use <n> digits to display SHA-1s" msgstr "usar <n> dΓgitos para mostrar SHA-1s" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "atualizar o Γndice com resoluçáes de conflitos reutilizadas se possΓvel" @@ -11569,12 +12036,11 @@ msgstr "HEAD incorreta - Γ© necessΓ‘rio uma HEAD" #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." -msgstr "" -"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-vΓ‘lido>'." +msgstr "Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-vΓ‘lido>'." #: git-bisect.sh:178 msgid "won't bisect on cg-seek'ed tree" -msgstr "nΓ£o Γ© possΓvel bisseccionar numa Γ‘rvore \"cg-seek'ed\"" +msgstr "nΓ£o Γ© possΓvel bissetar numa Γ‘rvore \"cg-seek'ed\"" #: git-bisect.sh:182 msgid "Bad HEAD - strange symbolic ref" @@ -11607,7 +12073,7 @@ msgstr "'git bisect $TERM_BAD' sΓ³ leva um argumento." #: git-bisect.sh:322 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." -msgstr "Aviso: a bisseccionar sΓ³ com um commit $TERM_BAD." +msgstr "Aviso: a bissetar sΓ³ com um commit $TERM_BAD." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input @@ -11638,7 +12104,7 @@ msgstr "" #: git-bisect.sh:414 git-bisect.sh:546 msgid "We are not bisecting." -msgstr "NΓ£o estamos a bisseccionar." +msgstr "NΓ£o se estΓ‘ a bissetar." #: git-bisect.sh:421 #, sh-format @@ -11678,12 +12144,12 @@ msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -"falha bisseccionar:\n" +"falha ao bissetar:\n" "cΓ³digo de saΓda $res de '$command' Γ© < 0 ou >= 128" #: git-bisect.sh:525 msgid "bisect run cannot continue any more" -msgstr "nΓ£o Γ© possΓvel continuar a bisseccionar" +msgstr "nΓ£o Γ© possΓvel continuar a bissetar" #: git-bisect.sh:531 #, sh-format @@ -11691,7 +12157,7 @@ msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -"falha ao bisseccionar:\n" +"falha ao bissetar:\n" "'bisect_state $state' retornou com o cΓ³digo de erro $res" #: git-bisect.sh:538 @@ -11721,7 +12187,7 @@ msgstr "nΓ£o Γ© possΓvel alterar o significado do termo '$term'" #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" -"Comando invΓ‘lido: bissecção em curso usando os termo $TERM_BAD/$TERM_GOOD." +"Comando invΓ‘lido: estΓ‘-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD." #: git-bisect.sh:636 msgid "no terms defined" @@ -11748,63 +12214,59 @@ msgstr "" "Para extrair o ramo original e interromper o rebase, execute \"git rebase --" "abort\"." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." -msgstr "Autostash aplicado." +msgstr "Pilha automΓ‘tica (autostash) aplicada." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "NΓ£o Γ© possΓvel guardar $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 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 "" -"Surgiram conflitos ao aplicar autostash.\n" -"As suas alteraçáes estΓ£o guardadas no stash.\n" +"Surgiram conflitos ao aplicar a pilha automΓ‘tica (autostash).\n" +"As suas alteraçáes estΓ£o guardadas na pilha.\n" "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Rebase recusado pelo hook pre-rebase." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Parece que o git-am estΓ‘ em curso. NΓ£o Γ© possΓvel efetuar rebase." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "A opção --exec deve ser usada com a opção --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Rebase nΓ£o estΓ‘ em curso?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "A ação --edit-todo sΓ³ pode ser usada durante um rebase interativo." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "NΓ£o Γ© possΓvel ler HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -"Deve editar todos os conflitos do merge e\n" -"marcΓ‘-los como resolvidos usando git add" +"Deve editar todos os conflitos da integração\n" +"e marcΓ‘-los como resolvidos usando git add" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "NΓ£o foi possΓvel voltar para $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11825,65 +12287,65 @@ msgstr "" "e execute o comando de novo. A execução foi interrompida no caso de\n" "ainda ter algo importante nesse sΓtio." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "$upstream_name a montante invΓ‘lido" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: hΓ‘ mais do que uma base de merge" +msgstr "$onto_name: hΓ‘ mais do que uma base de integração" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" -msgstr "$onto_name: nΓ£o hΓ‘ nenhuma base de merge" +msgstr "$onto_name: nΓ£o hΓ‘ nenhuma base de integração" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "NΓ£o aponta para um commit vΓ‘lido: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal: ramo inexistente: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" -msgstr "NΓ£o Γ© possΓvel efetuar autostash" +msgstr "NΓ£o Γ© possΓvel empilhar automaticamente (autostash)" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" -msgstr "Autostash criado: $stash_abbrev" +msgstr "Pilha automΓ‘tica (autostash) criada: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." -msgstr "FaΓ§a commit ou stash delas." +msgstr "Submeta ou empilhe-as (stash)." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "O ramo atual $branch_name estΓ‘ atualizado." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "O ramo atual $branch_name estΓ‘ atualizado, rebase forΓ§ado." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Alteraçáes de $mb para $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Primeiro, a recuar a cabeΓ§a para replicar as suas alteraçáes no topo desta..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name avanΓ§ado rapidamente para $onto_name." @@ -11946,7 +12408,7 @@ msgstr "NΓ£o hΓ‘ alteraçáes locais para guardar" #: git-stash.sh:264 msgid "Cannot initialize stash" -msgstr "NΓ£o Γ© possΓvel inicializar o stash" +msgstr "NΓ£o Γ© possΓvel inicializar a pilha" #: git-stash.sh:268 msgid "Cannot save the current status" @@ -11963,7 +12425,7 @@ msgstr "opção desconhecido: $opt" #: git-stash.sh:415 msgid "No stash found." -msgstr "Nenhum stash encontrado." +msgstr "Nenhuma pilha encontrada." #: git-stash.sh:422 #, sh-format @@ -11978,12 +12440,12 @@ msgstr "$reference nΓ£o Γ© uma referΓͺncia vΓ‘lida" #: git-stash.sh:456 #, sh-format msgid "'$args' is not a stash-like commit" -msgstr "'$args' nΓ£o Γ© um commit do tipo stash" +msgstr "'$args' nΓ£o Γ© um commit semelhante a pilha" #: git-stash.sh:467 #, sh-format msgid "'$args' is not a stash reference" -msgstr "'$args' nΓ£o Γ© uma referΓͺncia de stash" +msgstr "'$args' nΓ£o Γ© uma referΓͺncia de pilha" #: git-stash.sh:475 msgid "unable to refresh index" @@ -11991,7 +12453,7 @@ msgstr "nΓ£o foi possΓvel refrescar o Γndice" #: git-stash.sh:479 msgid "Cannot apply a stash in the middle of a merge" -msgstr "NΓ£o Γ© possΓvel aplicar um stash durante um merge" +msgstr "NΓ£o Γ© possΓvel aplicar uma pilha durante uma integração" #: git-stash.sh:487 msgid "Conflicts in index. Try without --index." @@ -12003,7 +12465,7 @@ msgstr "NΓ£o foi possΓvel guardar Γ‘rvore do Γndice" #: git-stash.sh:523 msgid "Cannot unstage modified files" -msgstr "NΓ£o Γ© possΓvel retirar os ficheiros modificado do Γndice" +msgstr "NΓ£o Γ© possΓvel despreparar os ficheiros modificado" #: git-stash.sh:538 msgid "Index was not unstashed." @@ -12017,7 +12479,7 @@ msgstr "A descartar ${REV} ($s)" #: git-stash.sh:562 #, sh-format msgid "${REV}: Could not drop stash entry" -msgstr "${REV}: NΓ£o foi possΓvel descartar elemento do stash" +msgstr "${REV}: NΓ£o foi possΓvel descartar elemento da pilha" #: git-stash.sh:570 msgid "No branch name specified" @@ -12027,28 +12489,23 @@ msgstr "Nenhum nome de ramo especificado" msgid "(To restore them type \"git stash apply\")" msgstr "(Para os restaurar execute \"git stash apply\")" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "nΓ£o Γ© possΓvel tirar um componente do URL '$remoteurl'" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Os caminhos relativos sΓ³ podem ser usados a partir do topo da Γ‘rvore de " "trabalho" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL do repositΓ³rio: '$repo' deve ser absoluto ou comeΓ§ar com ./|../" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' jΓ‘ existe no Γndice" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12059,255 +12516,280 @@ msgstr "" "$sm_path\n" "Use -f se pretende mesmo adicionΓ‘-lo." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "A adicionar repositΓ³rio existente em '$sm_path' ao Γndice" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' jΓ‘ existe e nΓ£o Γ© uma repositΓ³rio git vΓ‘lido" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Um diretΓ³rio git de '$sm_name' foi encontrado localmente com os remotos:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" "Se deseja reutilizar este diretΓ³rio git local em vez de clonar de novo de" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "use a opção '--force'. Se o diretΓ³rio git local nΓ£o Γ© o repositΓ³rio correto" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"ou nΓ£o tem a certeza do que isto significa, escolha outro nome com a opção " -"'--name'." +"ou se nΓ£o tem a certeza do que isto significa, escolha outro nome com a " +"opção '--name'." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "A reativar o diretΓ³rio git local do submΓ³dulo '$sm_name'." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "NΓ£o foi possΓvel extrair o submΓ³dulo '$sm_path'" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falha ao adicionar o submΓ³dulo '$sm_path'" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falha ao registar o submΓ³dulo '$sm_path'" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "A entrar em '$prefix$displaypath'" +msgid "Entering '$displaypath'" +msgstr "A entrar em '$displaypath'" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -"Interrompido em '$prefix$displaypath'; o script retornou um valor diferente " -"de zero." - -#: git-submodule.sh:483 -#, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "Nenhum URL encontrado no submΓ³dulo '$displaypath' em .gitmodules" - -#: git-submodule.sh:492 -#, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "Falha ao registar o URL do submΓ³dulo '$displaypath'" - -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "SubmΓ³dulo '$name' ($url) registado em '$displaypath'" +"Interrompido em '$displaypath'; o script retornou um valor diferente de zero." -#: git-submodule.sh:511 +#: git-submodule.sh:448 #, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "Falha ao registar o modo de atualização do submΓ³dulo em '$displaypath'" +msgid "pathspec and --all are incompatible" +msgstr "especificador de caminho e --all sΓ£o incompatΓveis" -#: git-submodule.sh:549 +#: git-submodule.sh:453 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "Use '.' se pretende mesmo anular a inicialização todos os submΓ³dulos" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "" +"Use '--all' se pretende mesmo anular a inicialização todos os submΓ³dulos" -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -"A Γ‘rvore de trabalho do submΓ³dulo em '$displaypath' contΓ©m um diretΓ³rio .git" +"A Γ‘rvore de trabalho do submΓ³dulo '$displaypath' contΓ©m um diretΓ³rio .git" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "(use 'rm -rf' se pretende mesmo removΓͺ-lo, incluindo todo o seu histΓ³rico)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -"A Γ‘rvore de trabalho do submΓ³dulo em '$displaypath' contΓ©m alteraçáes " -"locais; use '-f' para as descartar" +"A Γ‘rvore de trabalho do submΓ³dulo '$displaypath' contΓ©m alteraçáes locais; " +"use '-f' para as descartar" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "DiretΓ³rio '$displaypath' limpo" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -"NΓ£o foi possΓvel remover a Γ‘rvore de trabalho do submΓ³dulo em '$displaypath'" +"NΓ£o foi possΓvel remover a Γ‘rvore de trabalho do submΓ³dulo '$displaypath'" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "NΓ£o foi possΓvel criar o diretΓ³rio vazio do submΓ³dulo '$displaypath'" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "O registo do submΓ³dulo '$name' ($url) foi removido do caminho '$displaypath'" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"SubmΓ³dulo em '$displaypath' nΓ£o inicializado\n" -"Talvez queira usar 'update --init'?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -"NΓ£o foi possΓvel encontrar a revisΓ£o atual no submΓ³dulo em '$displaypath'" +"NΓ£o foi possΓvel encontrar a revisΓ£o atual no caminho de submΓ³dulo " +"'$displaypath'" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" -msgstr "NΓ£o foi possΓvel obter no submΓ³dulo '$sm_path'" +msgstr "NΓ£o foi possΓvel obter no caminho de submΓ³dulo '$sm_path'" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "NΓ£o Γ© possΓvel obter no submΓ³dulo '$displaypath'" +msgstr "NΓ£o Γ© possΓvel obter no caminho de submΓ³dulo '$displaypath'" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "NΓ£o foi possΓvel extrair '$sha1' no submΓ³dulo em '$displaypath'" +msgstr "NΓ£o Γ© possΓvel extrair '$sha1' no caminho de submΓ³dulo '$displaypath'" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "SubmΓ³dulo em '$displaypath': '$sha1' extraΓdo" +msgstr "Caminho de submΓ³dulo '$displaypath': '$sha1' extraΓdo" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -"NΓ£o foi possΓvel efetuar rebase de '$sha1' no submΓ³dulo em '$displaypath'" +"NΓ£o foi possΓvel efetuar rebase de '$sha1' no caminho de submΓ³dulo " +"'$displaypath'" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "SubmΓ³dulo em '$displaypath': rebase concluΓdo em '$sha1'" +msgstr "Caminho de submΓ³dulo '$displaypath': rebase concluΓdo em '$sha1'" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "NΓ£o Γ© possΓvel efetuar merge de '$sha1' no submΓ³dulo em '$displaypath'" +msgstr "NΓ£o Γ© possΓvel integrar '$sha1' no caminho de submΓ³dulo '$displaypath'" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "SubmΓ³dulo em '$displaypath': merge em '$sha1' concluΓdo" +msgstr "Caminho de submΓ³dulo '$displaypath': integrado em '$sha1'" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "Falha ao executar '$command $sha1' no submΓ³dulo em '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "" +"Falha ao executar '$command $sha1' no caminho de submΓ³dulo '$displaypath'" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "SubmΓ³dulo em '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Caminho de submΓ³dulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" -msgstr "Falha ao percorrer o submΓ³dulo em '$displaypath'" +msgstr "Falha ao percorrer o caminho de submΓ³dulo '$displaypath'" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "A opção --cached nΓ£o pode ser usada com a opção --files" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo inesperado $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Aviso: $display_name nΓ£o contΓ©m o commit $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warn: $display_name nΓ£o contΓ©m o commit $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Warn: $display_name contΓ©m os commits $sha1_src e $sha1_dst" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Falha ao percorrer recursivamente o submΓ³dulo em '$sm_path'" +msgstr "Falha ao percorrer recursivamente o caminho de submΓ³dulo '$sm_path'" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" -msgstr "A sincronizar o URL do submΓ³dulo em '$displaypath'" +msgstr "A sincronizar o URL do submΓ³dulo '$displaypath'" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Consulte git-${cmd}(1) para obter mais detalhes." + +#~ msgid "'%s': %s" +#~ msgstr "'%s': %s" + +#~ msgid "unable to access '%s': %s" +#~ msgstr "nΓ£o Γ© possΓvel aceder a '%s': %s" + +#~ msgid "could not open '%s' for reading: %s" +#~ msgstr "nΓ£o foi possΓvel abrir '%s' para leitura: %s" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "nΓ£o foi possΓvel abrir '%s' para escrita: %s" + +#~ msgid " git branch -d %s\n" +#~ msgstr " git branch -d %s\n" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "nΓ£o Γ© possΓvel abrir %s: %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "Prepare as suas alteraçáes em .gitmodules ou esconda-as (stash) para " +#~ "prosseguir" + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "nΓ£o foi possΓvel validar a tag '%s'" + +#~ msgid "failed to remove: %s" +#~ msgstr "falha ao remover: %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "A opção --exec deve ser usada com a opção --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "SubmΓ³dulo em '$displaypath' nΓ£o inicializado\n" +#~ "Talvez queira usar 'update --init'?" #~ msgid "unable to parse format" #~ msgstr "nΓ£o foi possΓvel analisar o formato" @@ -12354,8 +12836,8 @@ msgstr "A sincronizar o URL do submΓ³dulo em '$displaypath'" #~ "Quando push.default estΓ‘ definido como 'matching', o Git publica\n" #~ "os ramos locais nos ramos remotos que jΓ‘ existam com o mesmo nome.\n" #~ "\n" -#~ "Desde a versΓ£o 2.0, o Git assume o comportamento mais conservativo " -#~ "'simple',\n" +#~ "Desde a versΓ£o 2.0, o Git assume o comportamento mais conservativo 'simple'," +#~ "\n" #~ "publicando sΓ³ o ramo atual no ramo remoto correspondente, que Γ© usado\n" #~ "para atualizar o ramo atual com 'git pull'.\n" #~ "Consulte 'git help config' e procure por 'push.default' para mais " @@ -12369,9 +12851,6 @@ msgstr "A sincronizar o URL do submΓ³dulo em '$displaypath'" #~ msgid "Could not append '%s'" #~ msgstr "NΓ£o foi possΓvel acrescentar '%s'" -#~ msgid "Could not set '%s'" -#~ msgstr "NΓ£o foi possΓvel definir '%s'" - #~ msgid "Missing author: %s" #~ msgstr "Autor em falta: %s" @@ -4,14 +4,14 @@ # # Translators: # Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2016 -# insolor <insolor@gmail.com>, 2014 -# insolor <insolor@gmail.com>, 2014 +# insolor, 2014 +# insolor, 2014 msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-15 18:54+0000\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-06-11 09:37+0000\n" "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgid "" "as appropriate to mark resolution and make a commit." msgstr "ΠΡΠΏΡΠ°Π²ΡΡΠ΅ ΠΈΡ
Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git add/rm <ΡΠ°ΠΉΠ»>Β»,\nΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΠΈ ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "ΠΡ Π½Π΅ Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ (ΠΏΡΠΈΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» MERGE_HEAD)." @@ -74,7 +74,7 @@ msgstr "ΡΠΎΡΠΌΠ°Ρ" msgid "archive format" msgstr "ΡΠΎΡΠΌΠ°Ρ Π°ΡΡ
ΠΈΠ²Π°" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "ΠΏΡΠ΅ΡΠΈΠΊΡ" @@ -82,9 +82,9 @@ msgstr "ΠΏΡΠ΅ΡΠΈΠΊΡ" msgid "prepend prefix to each pathname in the archive" msgstr "Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ ΠΏΡΠ΅ΡΠΈΠΊΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠ°ΠΆΠ΄ΡΠΌ ΠΏΡΡΠ΅ΠΌ ΡΠ°ΠΉΠ»Π° Π² Π°ΡΡ
ΠΈΠ²Π΅" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -118,7 +118,8 @@ msgstr "ΡΠΆΠΈΠΌΠ°ΡΡ Π»ΡΡΡΠ΅" msgid "list supported archive formats" msgstr "ΠΏΠ΅ΡΠ΅ΡΠΈΡΠ»ΠΈΡΡ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠΎΡΠΌΠ°ΡΡ Π°ΡΡ
ΠΈΠ²ΠΎΠ²" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" @@ -255,11 +256,16 @@ msgstr "ΠΠ΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: Β«%sΒ»." msgid "Not a valid branch point: '%s'." msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΡΠΎΡΠΊΠ° Π²Π΅ΡΠΊΠΈ: Β«%sΒ»." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "Β«%sΒ» ΡΠΆΠ΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π½Π° Β«%sΒ»" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° %s Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ½" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -270,7 +276,7 @@ msgstr "Β«%sΒ» Π½Π΅ ΠΏΠΎΡ
ΠΎΠΆ Π½Π° ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ° Π²Π΅ΡΡΠΈΠΈ 2" msgid "unrecognized header: %s%s (%d)" msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" @@ -279,10 +285,10 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" msgid "Repository lacks these prerequisite commits:" msgstr "Π ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΠΈ ΠΏΡΠΎΡ
ΠΎΠ΄Π° ΠΏΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΌ" @@ -325,21 +331,21 @@ msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° rev-list" msgid "ref '%s' is excluded by the rev-list options" msgstr "ΡΡΡΠ»ΠΊΠ° Β«%sΒ» ΠΈΡΠΊΠ»ΡΡΠ΅Π½Π° Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΈ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ rev-list" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "ΠΡΠΊΠ»ΠΎΠ½Π΅Π½ΠΈΠ΅ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΠΏΡΡΡΠΎΠ³ΠΎ ΠΏΠ°ΠΊΠ΅ΡΠ°." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Β«%sΒ»" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° index-pack" @@ -348,8 +354,8 @@ msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° index-pack" msgid "invalid color value: %.*s" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΠ²Π΅ΡΠ°: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ %s" @@ -383,21 +389,21 @@ msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Β«%sΒ» Π΄Π»Ρ msgid "failed to expand user dir in: '%s'" msgstr "ΡΠ±ΠΎΠΉ ΡΠ°Π·Π²ΠΎΡΠ°ΡΠΈΠ²Π°Π½ΠΈΡ ΠΏΡΡΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ: Β«%sΒ»" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΡΠΎΠ²Π΅Π½Ρ ΡΠΆΠ°ΡΠΈΡ zlib %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΉ ΡΠ΅ΠΆΠΈΠΌ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ ΠΈΠ· ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»Π° Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΡΡΠ΅Π½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ² ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" @@ -416,24 +422,27 @@ msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½Π°Ρ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ Β msgid "%s has multiple values" msgstr "%s ΠΈΠΌΠ΅Π΅Ρ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠΉ" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Β«%sΒ» Π² Β«%sΒ»" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Β«%sΒ» Π² Β«%sΒ»" +msgid "could not unset '%s'" +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" +msgid "failed write to rev-list" +msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ Π² rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΊΡΡΡΠΈΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π° Ρ rev-list: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΊΡΡΡΠΈΡ ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π° Ρ rev-list" #: date.c:95 msgid "in the future" @@ -526,62 +535,62 @@ msgstr[3] "%lu Π»Π΅Ρ Π½Π°Π·Π°Π΄" msgid "failed to read orderfile '%s'" msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ orderfile Β«%sΒ»" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "ΠΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ Π½Π΅ΡΠΎΡΠ½ΠΎΠ΅ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° Π²Π΅Π»ΠΈΡΠΈΠ½Ρ ΡΡΠ΅Π·Π° (cut-off) Ρ dirstat Β«%sΒ»\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ dirstat: Β«%sΒ»\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠΉ Β«diff.submoduleΒ»: Β«%sΒ»" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "ΠΠ°ΠΉΠ΄Π΅Π½Ρ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠΉ Β«diff.dirstatΒ»:\n%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΡΠ°Π²Π½Π΅Π½ΠΈΠΈ, ΠΎΡΡΠ°Π½ΠΎΠ² Π½Π° %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow ΡΡΠ΅Π±ΡΠ΅Ρ ΡΠΎΠ²Π½ΠΎ ΠΎΠ΄Π½ΠΎΠΉ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΠΏΡΡΠΈ" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΎΠΏΡΠΈΠΈ --dirstat/-X :\n%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Π‘Π±ΠΎΠΉ ΡΠ°Π·Π±ΠΎΡΠ° ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΎΠΏΡΠΈΠΈ --submodule: Β«%sΒ»" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠΌΡ ΡΠ΄ΡΠ° ΠΈ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "ΠΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΎΡΠΊΠ»ΡΡΠ΅Π½ Π½Π° ΡΡΠΎΠΉ ΡΠΈΡΡΠ΅ΠΌΠ΅ ΠΈΠ»ΠΈ Π² ΡΡΠΎΠΌ ΠΌΠ΅ΡΡΠ΅." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΡΡΠΈΡΡ gpg." @@ -595,28 +604,28 @@ msgstr "gpg Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ Π΄Π°Π½Π½ΡΠ΅" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Β«%sΒ»: %s" +msgid "could not create temporary file '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Β«%sΒ»" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΠΎΠΉ ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ Π² Β«%sΒ»: %s" +msgid "failed writing detached signature to '%s'" +msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΠΎΠΉ ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ Π² Β«%sΒ»" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "Β«%sΒ»: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠ΅ΡΡΡ %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "Β«%sΒ»: %s" +msgid "failed to stat '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Β«%sΒ»" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "Β«%sΒ»: ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ°Π»ΠΎ Π΄Π°Π½Π½ΡΡ
ΠΏΡΠΎΡΠΈΡΠ°Π½ΠΎ %s" +msgid "'%s': short read" +msgstr "Β«%sΒ»: ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ°Π»ΠΎ Π΄Π°Π½Π½ΡΡ
ΠΏΡΠΎΡΠΈΡΠ°Π½ΠΎ" #: help.c:205 #, c-format @@ -676,12 +685,29 @@ msgstr[3] "\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ ΡΡΠΎ-ΡΠΎ ΠΈΠ· ΡΡ msgid "%s: %s - %s" msgstr "%s: %s β %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Β«%s.lockΒ»: %s.\n\nΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π΄ΡΡΠ³ΠΎΠΉ ΠΏΡΠΎΡΠ΅ΡΡ git Π·Π°ΠΏΡΡΠ΅Π½ Π² ΡΡΠΎΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ,\nΠ½Π°ΠΏΡΠΈΠΌΠ΅Ρ ΡΠ΅Π΄Π°ΠΊΡΠΎΡ ΠΎΡΠΊΡΡΡ ΠΈΠ· Β«git commitΒ». ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠ±Π΅Π΄ΠΈΡΠ΅ΡΡ,\nΡΡΠΎ Π²ΡΠ΅ ΠΏΡΠΎΡΠ΅ΡΡΡ Π±ΡΠ»ΠΈ Π·Π°Π²Π΅ΡΡΠ΅Π½Ρ ΠΈ ΠΏΠΎΡΠΎΠΌ ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ ΡΠ½ΠΎΠ²Π°.\nΠΡΠ»ΠΈ ΡΡΠΎ Π½Π΅ ΠΏΠΎΠΌΠΎΠΆΠ΅Ρ, ΡΠΎ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΎΡΠ΅ΡΡ git Π±ΡΠ» ΡΠ°Π½Π΅Π΅ Π·Π°Π²Π΅ΡΡΠ΅Π½\nΡ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ Π² ΡΡΠΎΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ: \nΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΠ°ΠΉΠ» Π²ΡΡΡΠ½ΡΡ Π΄Π»Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ΅Π½ΠΈΡ." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Β«%s.lockΒ»: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ ΠΊΡΡΠ°" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" @@ -728,7 +754,7 @@ msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ %s Β«%sΒ»" msgid "blob expected for %s '%s'" msgstr "ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Π΄Π»Ρ %s Β«%sΒ»" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" @@ -855,7 +881,7 @@ msgstr "ΠΡΠΎΠΏΡΡΠΊ %s (ΡΠ»ΠΈΡΡ ΠΎΠ΄ΠΈΠ½Π°ΠΊΠΎΠ²ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΊ msgid "Auto-merging %s" msgstr "ΠΠ²ΡΠΎΡΠ»ΠΈΡΠ½ΠΈΠ΅ %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" @@ -883,34 +909,34 @@ 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:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "ΠΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ, ΡΠ°ΠΊΠΎΠ³ΠΎ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ½ΠΎ ΡΠ»ΡΡΠ°ΡΡΡΡ." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Π£ΠΆΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΎ!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "ΡΠ±ΠΎΠΉ ΡΠ»ΠΈΡΠ½ΠΈΡ Π΄Π΅ΡΠ΅Π²ΡΠ΅Π² Β«%sΒ» ΠΈ Β«%sΒ»" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "ΠΠ΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΠΏΡΡΡ??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -919,16 +945,16 @@ msgstr[1] "Π½Π°ΠΉΠ΄Π΅Π½ΠΎ %u ΠΎΠ±ΡΠΈΡ
ΠΏΡΠ΅Π΄ΠΊΠ°:" msgstr[2] "Π½Π°ΠΉΠ΄Π΅Π½ΠΎ %u ΠΎΠ±ΡΠΈΡ
ΠΏΡΠ΅Π΄ΠΊΠΎΠ²:" msgstr[3] "Π½Π°ΠΉΠ΄Π΅Π½ΠΎ %u ΠΎΠ±ΡΠΈΡ
ΠΏΡΠ΅Π΄ΠΊΠΎΠ²:" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ Π²Π΅ΡΠ½ΡΠ»ΠΎ ΠΊΠΎΠΌΠΌΠΈΡ" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "ΠΠ΅ ΡΠ΄Π°Π΅ΡΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ." @@ -958,28 +984,28 @@ msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΠΎΠΉ %s: Β«%sΒ msgid "unable to parse object: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ: %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "β¦" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " ΠΈΠ»ΠΈ: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-ΠΠΠΠΠ§ΠΠ‘Π’ΠΠ" @@ -988,7 +1014,7 @@ msgstr "-ΠΠΠΠΠ§ΠΠ‘Π’ΠΠ" msgid "malformed object name '%s'" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Β«%sΒ»" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠ΅Π΄ΠΎΡΡΠ°Π²ΠΈΡΡ Π΄ΠΎΡΡΡΠΏ ΠΊ %s Π½Π° Π·Π°ΠΏΠΈΡΡ" @@ -1053,7 +1079,7 @@ msgid "" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ ΡΠ°Π±Π»ΠΎΠ½ Π΄Π»Ρ ΠΈΡΠΊΠ»ΡΡΠ΅Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ :(exclude).\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Π±ΡΠ»ΠΈ Β«:/Β» ΠΈΠ»ΠΈ Β«.Β» ?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΡΠΎΡΠΌΠ°Ρ Π΄Π»Ρ --pretty" @@ -1075,23 +1101,23 @@ msgid "" "Using version %i" msgstr "GIT_INDEX_VERSION ΡΠΊΠ°Π·Π°Π½, Π½ΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΡ Π²Π΅ΡΡΠΈΡ %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ %s: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΠΈ: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΠΈ %s" @@ -1230,82 +1256,82 @@ msgstr "format: ΠΏΡΠΎΠΏΡΡΠ΅Π½Π° ΡΠ°ΡΡΠΈΡΠ° %%(end)" msgid "malformed object name %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΈΠ·Π²Π»Π΅ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ %s ΠΈ %s Π² %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s ΠΎΠ±ΡΡΠ½ΠΎ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅Ρ %s, Π° Π½Π΅ %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅Ρ ΠΈ %s ΠΈ %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "ΠΠ½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ°" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD Π½Π΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° Π²Π΅ΡΠΊΡ" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ Π²Π΅ΡΠΊΠΈ: Β«%sΒ»" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° Π½Π΅ Π½Π°ΡΡΡΠΎΠ΅Π½Π° Π΄Π»Ρ Π²Π΅ΡΠΊΠΈ Β«%sΒ»" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π° ΠΊΠ°ΠΊ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ°" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ Β«%sΒ» Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΡΠ²Π΅ΡΠ΅ Β«%sΒ» Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠΈ" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Π²Π΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΡΠ²Π΅ΡΠ° Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΠΏΡΡΠΈ Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ Β«%sΒ» Π½Π΅ Π²ΠΊΠ»ΡΡΠ°ΡΡ Π² ΡΠ΅Π±Ρ Β«%sΒ»" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "ΠΎΡΠΏΡΠ°Π²ΠΊΠ° Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΡΠΊΠΈ Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΡ (push.default Π²ΡΡΡΠ°Π²Π»Π΅Π½ Π² Β«nothingΒ»)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ Β«simpleΒ» ΠΎΡΠΏΡΠ°Π²ΠΊΡ Π² Π΅Π΄ΠΈΠ½ΡΡΠ²Π΅Π½Π½ΡΡ ΡΠΎΡΠΊΡ Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΡ" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° Π±Π°Π·ΠΈΡΡΠ΅ΡΡΡ Π½Π° Β«%sΒ», Π½ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΈΡΡΠ΅Π·.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "(Π΄Π»Ρ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git branch --unset-upstreamΒ»)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π° Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΈ Ρ Β«%sΒ».\n" -#: remote.c:2084 +#: remote.c:2085 #, 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" @@ -1314,11 +1340,11 @@ msgstr[1] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΠΏΠ΅ΡΠ΅ΠΆΠ°Π΅Ρ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠ°. msgstr[2] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΠΏΠ΅ΡΠ΅ΠΆΠ°Π΅Ρ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ².\n" msgstr[3] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΠΏΠ΅ΡΠ΅ΠΆΠ°Π΅Ρ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ².\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git pushΒ», ΡΡΠΎΠ±Ρ ΠΎΠΏΡΠ±Π»ΠΈΠΊΠΎΠ²Π°ΡΡ Π²Π°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1328,11 +1354,11 @@ msgstr[1] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΡΡΡΠ°Π΅Ρ ΠΎΡ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠ° msgstr[2] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΡΡΡΠ°Π΅Ρ ΠΎΡ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² ΠΈ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°Π½Π° Π²ΠΏΠ΅ΡΠ΅Π΄.\n" msgstr[3] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΎΡΡΡΠ°Π΅Ρ ΠΎΡ Β«%sΒ» Π½Π° %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² ΠΈ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°Π½Π° Π²ΠΏΠ΅ΡΠ΅Π΄.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git pullΒ», ΡΡΠΎΠ±Ρ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π²Π°ΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1345,20 +1371,20 @@ msgstr[1] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΈ Β«%sΒ» ΡΠ°Π·Π΄Π΅Π»ΠΈΠ»ΠΈΡΡ\nΠΈ ΡΠ΅ΠΏΠ΅ΡΡ msgstr[2] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΈ Β«%sΒ» ΡΠ°Π·Π΄Π΅Π»ΠΈΠ»ΠΈΡΡ\nΠΈ ΡΠ΅ΠΏΠ΅ΡΡ ΠΈΠΌΠ΅ΡΡ %d ΠΈ %d ΡΠ°Π·Π½ΡΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π² ΠΊΠ°ΠΆΠ΄ΠΎΠΉ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²Π΅Π½Π½ΠΎ.\n" msgstr[3] "ΠΠ°ΡΠ° Π²Π΅ΡΠΊΠ° ΠΈ Β«%sΒ» ΡΠ°Π·Π΄Π΅Π»ΠΈΠ»ΠΈΡΡ\nΠΈ ΡΠ΅ΠΏΠ΅ΡΡ ΠΈΠΌΠ΅ΡΡ %d ΠΈ %d ΡΠ°Π·Π½ΡΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π² ΠΊΠ°ΠΆΠ΄ΠΎΠΉ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²Π΅Π½Π½ΠΎ.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git pullΒ», ΡΡΠΎΠ±Ρ ΡΠ»ΠΈΡΡ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ Π² Π²Π°ΡΡ)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "ΠΏΠΎΡ
ΠΎΠΆΠ΅, Π²Π°ΡΠ° ΡΠ΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π°" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Π²Π°ΡΠ° ΡΠ΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° Β«%sΒ» Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½ΠΈ ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "ΠΎΠΏΡΠΈΡ --first-parent Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --bisect" @@ -1402,7 +1428,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ², ΠΏΠΎΠΌΠ΅ΡΡΡΠ΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΡΠΈ\nΡ ΠΏΠΎΠΌΠΎΡΡΡ Β«git add <ΠΏΡΡΠΈ>Β» ΠΈΠ»ΠΈ Β«git rm <ΠΏΡΡΠΈ>Β»\nΠΈ ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git commitΒ»" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² %s" @@ -1560,12 +1586,12 @@ msgstr "ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ Β«git cherry-pick (--continue | --quit | --abort)Β» msgid "Could not create sequencer directory %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π΄Π»Ρ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ ΡΠ»Π΅Π΄ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² %s" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΎΠ±ΠΎΡΠ°ΡΠΈΠ²Π°Π½ΠΈΡ %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ ΠΈΠ»ΠΈ Π²ΠΎΠ·Π²ΡΠ°Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½Π΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ" @@ -1577,63 +1603,72 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD" msgid "cannot abort from a branch yet to be born" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Ρ Π²Π΅ΡΠΊΠΈ, ΠΊΠΎΡΠΎΡΠ°Ρ Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ·Π΄Π°Π½Π°" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s: %s" +msgid "cannot open %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "Π½Π΅ΠΎΠΆΠΈΠ΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠ½Π΅Ρ ΡΠ°ΠΉΠ»Π°" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Ρ HEAD ΠΏΠ΅ΡΠ΅Π΄ ΠΎΡΠ±ΠΎΡΠΎΠΌ Π»ΡΡΡΠ΅Π³ΠΎ Β«%sΒ» ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°ΡΡ %s." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΎΠ±ΡΠ°ΡΡ %s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: ΠΏΠ»ΠΎΡ
Π°Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "ΠΠ΅Π»ΡΠ·Ρ Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΡΡ ΠΈΠ·Π½Π°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΡΠΎΠ±ΡΠ°ΡΡ Π»ΡΡΡΠ΅Π΅ Π² ΠΏΡΡΡΡΡ Π²Π΅ΡΠΊΡ" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "ΠΠΆΠΈΠ΄Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΡΠΈΡ git ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ <= %d, Π° ΠΎΠ±Π½Π°ΡΡΠΆΠ΅Π½Π° %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "ΠΎΠ±Π½Π°ΡΡΠΆΠ΅Π½Ρ Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠ΅ ΡΠ°ΡΡΠΈΡΠ΅Π½ΠΈΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "ΡΠ΄Π²ΠΈΠ³ Π΄ΠΎ ΠΊΠΎΠ½ΡΠ° ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ° (Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½ ΡΠ°ΠΉΠ» .idx?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "ΡΠ΄Π²ΠΈΠ³ Π΄ΠΎ Π½Π°ΡΠ°Π»Π° ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π΄Π»Ρ %s (ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄ΡΠ½ ΠΈΠ½Π΄Π΅ΠΊΡ?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "ΡΠ΄Π²ΠΈΠ³ Π·Π° ΠΏΡΠ΅Π΄Π΅Π»Π°ΠΌΠΈ ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π΄Π»Ρ %s (ΠΎΠ±ΡΠ΅Π·Π°Π½ ΠΈΠ½Π΄Π΅ΠΊΡ?)" @@ -1651,29 +1686,38 @@ msgid "" "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Β»" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠΉ .gitmodules, ΡΠ½Π°ΡΠ°Π»Π° ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠ°Π·Π΄Π΅Π» Π² .gitmodules, Π³Π΄Π΅ ΠΏΡΡΡ ΡΠ°Π²Π΅Π½ %s" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr " ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ .gitmodules Π·Π°ΠΏΠΈΡΡ %s" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ Π·Π°ΠΏΠΈΡΡ Π² .gitmodules Π΄Π»Ρ %s" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π½ΠΎΠ³ΠΎ .gitmodules" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΡΠΏΡΠΈΡΠ°ΡΠ΅Π»ΡΠ½ΡΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1733,7 +1777,171 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉ msgid "Could not read ref %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΡΡΠ»ΠΊΡ %s" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%sΠ‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%sΠ‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ΅ΡΠ΅Π΄ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ %s:\n%%sΠ‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ΅ΡΠ΅Π΄ %s." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "ΠΠ°ΡΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ %s:\n%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ² ΠΏΡΠΈΠ²Π΅Π΄Π΅Ρ ΠΊ ΠΏΠΎΡΠ΅ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Π² Π½ΠΈΡ
:\n%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ %s:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ %s:\n%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by checkout:\n" +"%%s" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:\n%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ΠΌ Π²Π΅ΡΠΎΠΊ." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ:\n%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ %s:\n%%sΠΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΠ΅ ΡΡΠΈ ΡΠ°ΠΉΠ»Ρ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΠ΅ ΠΈΡ
ΠΏΠ΅ΡΠ΅Π΄ %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅ Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ %s:\n%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "ΠΠ°ΠΏΠΈΡΡ Β«%sΒ» ΡΠ°ΡΡΠΈΡΠ½ΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π°Π΅Ρ Ρ Β«%sΒ». ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°Π·Π½Π°ΡΠΈΡΡ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅: ΡΠ»Π΅Π΄ΡΡΡΠΈΠ΅ ΡΠ»Π΅ΠΌΠ΅Π½ΡΡ Π½Π΅ ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅ΠΉ Π²Π΅ΡΡΠΈΠΈ:\n%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout update:\n" +"%s" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΈΠ· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π±ΡΠ΄ΡΡ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°Π½Ρ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ:\n%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout update:\n" +"%s" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΈΠ· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ:\n%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "ΠΡΠ΅ΡΡΠ²Π°Ρ\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Π Π°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠ° ΡΠ°ΠΉΠ»ΠΎΠ²" @@ -1771,231 +1979,227 @@ msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΠ°ΡΡΡ ΠΏΡΡΠΈ Β«..Β»" msgid "could not open '%s' for reading and writing" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ ΠΈ Π·Π°ΠΏΠΈΡΠΈ" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "Β«%sΒ» Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΠΎ: %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "Β«%sΒ» Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΠΎ" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "ΠΠ΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ:" -#: wt-status.c:176 wt-status.c:203 +#: 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:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git rm --cached <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΡΠ±ΡΠ°ΡΡ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git add <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)" -#: wt-status.c:184 wt-status.c:188 +#: 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:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git rm <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ Π²ΠΊΠ»ΡΡΠ΅Π½Ρ Π² ΠΊΠΎΠΌΠΌΠΈΡ:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git add <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠ°ΠΉΠ» Π² ΠΈΠ½Π΄Π΅ΠΊΡ)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git add/rm <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working " "directory)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git checkout -- <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ\n Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΠΎΡΠΌΠ΅Π½ΠΈΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΌ ΠΈΠ»ΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΠΎΠΌ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git %s <ΡΠ°ΠΉΠ»>β¦Β», ΡΡΠΎΠ±Ρ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π² ΡΠΎ, ΡΡΠΎ Π±ΡΠ΄Π΅Ρ Π²ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "ΠΎΠ±Π° ΡΠ΄Π°Π»Π΅Π½Ρ:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π½Π°ΠΌΠΈ:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ ΠΈΠΌΠΈ:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ ΠΈΠΌΠΈ:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ Π½Π°ΠΌΠΈ:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "ΠΎΠ±Π° Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Ρ:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "ΠΎΠ±Π° ΠΈΠ·ΠΌΠ΅Π½Ρ:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΡΡΠ°ΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ»:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΎ:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "ΡΠ΄Π°Π»Π΅Π½ΠΎ:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΎ:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ ΡΠΈΠΏ:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎ:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "Π½Π΅ ΡΠ»ΠΈΡΡΠ΅:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "Π½ΠΎΠ²ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΡΡΠ°ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅, Π½ΠΎ Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π½ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Ρ:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "ΠΠ΅ ΡΡΠΎΠ³Π°ΠΉΡΠ΅ ΡΡΡΠΎΠΊΡ Π²ΡΡΠ΅ ΡΡΠΎΠΉ.\nΠΡΡ, ΡΡΠΎ Π½ΠΈΠΆΠ΅ β Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½ΠΎ." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git commitΒ»)" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "ΠΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Ρ, Π½ΠΎ Π²Ρ Π²ΡΠ΅ Π΅ΡΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ." -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git commitΒ», ΡΡΠΎΠ±Ρ Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅)" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ΅ΡΡΠΈΠΈ am." -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Π’Π΅ΠΊΡΡΠΈΠΉ ΠΏΠ°ΡΡ ΠΏΡΡΡΠΎΠΉ." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (ΡΠ°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git am --continueΒ»)" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git am --skipΒ», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git am --abortΒ», ΡΡΠΎΠ±Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ)" @@ -2137,43 +2341,43 @@ msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠΈΡΠΊΠ°." msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git bisect resetΒ», ΡΡΠΎΠ±Ρ Π²Π΅ΡΠ½ΡΡΡΡΡ Π½Π° ΠΈΡΡ
ΠΎΠ΄Π½ΡΡ Π²Π΅ΡΠΊΡ)" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "ΠΠ° Π²Π΅ΡΠΊΠ΅ " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅; Π½Π°Π΄ " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅; Π½Π°Π΄ " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π° " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π°ΡΠΈΠ½Π°Ρ Ρ " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Π‘Π΅ΠΉΡΠ°Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π΅ΡΠΎΠΊ" -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "ΠΠ°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "ΠΠ΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "ΠΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2181,82 +2385,82 @@ msgid "" "new files yourself (see 'git help status')." msgstr "%.2f ΡΠ΅ΠΊΡΠ½Π΄Ρ Π·Π°Π½ΡΠ» Π²ΡΠ²ΠΎΠ΄ ΡΠΏΠΈΡΠΊΠ° Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ². Β«status -unoΒ» Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΌΠΎΠΆΠ΅Ρ ΡΡΠΊΠΎΡΠΈΡΡ ΡΡΠΎ, Π½ΠΎ Π±ΡΠ΄ΡΡΠ΅ Π²Π½ΠΈΠΌΠ°ΡΠ΅Π»ΡΠ½Ρ, ΠΈ Π½Π΅ Π·Π°Π±ΡΠ΄ΡΡΠ΅ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π½ΠΎΠ²ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π²ΡΡΡΠ½ΡΡ (ΡΠΌΠΎΡΡΠΈΡΠ΅ Β«git help statusΒ» Π΄Π»Ρ ΠΏΠΎΠ΄ΡΠΎΠ±Π½ΠΎΡΡΠ΅ΠΉ)." -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "ΠΠ΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π½Π΅ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr "(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ Β«-uΒ», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "Π½Π΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ Π΅ΡΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git addΒ», ΡΡΠΎΠ±Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°ΡΡ ΠΈΡ
)\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ, Π½ΠΎ Π΅ΡΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ\n" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ (ΡΠΎΠ·Π΄Π°ΠΉΡΠ΅/ΡΠΊΠΎΠΏΠΈΡΡΠΉΡΠ΅ ΡΠ°ΠΉΠ»Ρ, Π·Π°ΡΠ΅ΠΌ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«git addΒ», ΡΡΠΎΠ±Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°ΡΡ ΠΈΡ
)\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ Β«-uΒ», ΡΡΠΎΠ±Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ)\n" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "Π½Π΅ΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ, Π½Π΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "ΠΠ°ΡΠ°Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π½Π° " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "ΠΈΡΡΠ΅Π·" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "ΠΏΠΎΠ·Π°Π΄ΠΈ" -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "ΡΠ±ΠΎΠΉ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡ Β«%sΒ»" @@ -2270,7 +2474,7 @@ msgstr "git add [<ΠΎΠΏΡΠΈΠΈ>] [--] <ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ-ΠΏΡΡΠΈ>β¦" msgid "unexpected diff status %c" msgstr "Π½Π΅ΠΎΠΆΠΈΠ΄Π°Π½Π½ΡΠΉ ΡΡΠ°ΡΡΡ ΡΠ°Π·Π»ΠΈΡΠΈΠΉ %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²" @@ -2283,7 +2487,7 @@ msgstr "ΡΠ΄Π°Π»ΠΈΡΡ Β«%sΒ»\n" msgid "Unstaged changes after refreshing the index:" msgstr "ΠΠ΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎΡΠ»Π΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" @@ -2319,14 +2523,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Π‘Π»Π΅Π΄ΡΡΡΠΈΠ΅ ΠΏΡΡΠΈ ΠΈΠ³Π½ΠΎΡΠΈΡΡΡΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ· Π²Π°ΡΠΈΡ
ΡΠ°ΠΉΠ»ΠΎΠ² .gitignore:\n" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "ΠΏΡΠΎΠ±Π½ΡΠΉ Π·Π°ΠΏΡΡΠΊ" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅" @@ -2334,7 +2538,7 @@ msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅" msgid "interactive picking" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΡΠΉ Π²ΡΠ±ΠΎΡ" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΡΠΉ Π²ΡΠ±ΠΎΡ Π±Π»ΠΎΠΊΠΎΠ²" @@ -2402,16 +2606,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ ΠΈΠΌΠ΅Π»ΠΈ Π² Π²ΠΈΠ΄Ρ Β«git add .Β»?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»" @@ -2439,16 +2643,6 @@ msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ ΠΈΠ· Β«%sΒ» Π² msgid "fseek failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ fseek" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ ΡΡΠ΅Π½ΠΈΡ: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ» Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠΈ: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2458,340 +2652,342 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΏΠ°ΡΡ Β«%sΒ»" msgid "Only one StGIT patch series can be applied at once" msgstr "Π’ΠΎΠ»ΡΠΊΠΎ ΡΠ΅ΡΠΈΡ ΠΏΠ°ΡΡΠ΅ΠΉ StGIT ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π·Π° ΡΠ°Π·" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΠΌΠ΅ΡΠΊΠ° Π΄Π°ΡΡ/Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠ°Ρ ΡΡΡΠΎΠΊΠ° Π΄Π°ΡΡ" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "Π½Π΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΡΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΡΠΎΠ²ΠΎΠ³ΠΎ ΠΏΠΎΡΡΠ°" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Π‘Π±ΠΎΠΉ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΡ ΡΠΎΡΠΌΠ°ΡΠ° ΠΏΠ°ΡΡΠ°." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·Π΄Π΅Π»ΠΈΡΡ ΠΏΠ°ΡΡΠΈ Π½Π° ΡΠ°ΡΡΠΈ." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "ΠΠΎΠ³Π΄Π° Π²Ρ ΡΡΡΡΠ°Π½ΠΈΡΠ΅ ΡΡΡ ΠΏΡΠΎΠ±Π»Π΅ΠΌΡ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«%s --continueΒ»." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ, ΡΠΎ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«%s --skipΒ»." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Π§ΡΠΎΠ±Ρ Π²Π΅ΡΠ½ΡΡΡΡΡ Π½Π° ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΠΎΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, Π·Π°ΠΏΡΡΡΠΈΡΠ΅ Β«%s --abortΒ»." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "ΠΠ°ΡΡ ΠΏΡΡΡ. ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, ΠΎΠ½ Π±ΡΠ» Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎ ΡΠ°Π·Π΄Π΅Π»ΡΠ½?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Π ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ Π΄Π»Ρ ΠΎΡΠΊΠ°ΡΠ° ΠΊ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π΄Π»Ρ ΡΠ΅ΠΊΠΎΠ½ΡΡΡΡΠΊΡΠΈΠΈ Π±Π°Π·ΠΎΠ²ΠΎΠ³ΠΎ Π΄Π΅ΡΠ΅Π²Π°β¦" -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "ΠΡ Π²ΡΡΡΠ½ΡΡ ΠΈΠ·ΠΌΠ΅Π½ΡΠ»ΠΈ ΠΏΠ°ΡΡ?\nΠΠ½ Π½Π΅ Π½Π°ΠΊΠ»Π°Π΄ΡΠ²Π°Π΅ΡΡΡ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ Π½Π° Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π·Π°ΠΏΠΈΡΠ°Π½Π½ΡΠ΅ Π² Π΅Π³ΠΎ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ΅." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "ΠΡΠΊΠ°Ρ ΠΊ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΊ Π±Π°Π·ΠΎΠ²ΠΎΠΌΡ ΠΊΠΎΠΌΠΌΠΈΡΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡβ¦" -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΊ ΠΏΡΡΡΠΎΠΉ ΠΈΡΡΠΎΡΠΈΠΈ" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "ΡΠ±ΠΎΠΉ Π·Π°ΠΏΠΈΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ½ΠΈΡΡ: %s Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ " -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ ΠΏΠΎΠ²Π΅Π΄Π΅Π½ΠΈΠ΅, Π±Π΅Π· stdin ΠΏΠΎΠ΄ΠΊΠ»ΡΡΠ΅Π½Π½ΠΎΠ³ΠΎ ΠΊ ΡΠ΅ΡΠΌΠΈΠ½Π°Π»Ρ." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Π’Π΅Π»ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "ΠΡΠΈΠΌΠ΅Π½ΠΈΡΡ? [y] - Π΄Π°/[n] - Π½Π΅Ρ/[e] - ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ/[v] - ΠΏΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ ΠΏΠ°ΡΡ/[a] - ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π²ΡΡ: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "ΠΠ½Π΄Π΅ΠΊΡ Π½Π΅ ΠΏΡΡΡΠΎΠΉ: Π½Π΅Π»ΡΠ·Ρ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΏΠ°ΡΡΠΈ (Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ β ΠΠ°ΡΡ ΡΠΆΠ΅ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π½Π° %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "ΠΠΎΠΏΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ, Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ Π½Π°ΠΉΡΠΈ Π²: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ β Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Π±ΡΠ»ΠΈ Π²ΡΠ·Π²Π°ΡΡ Β«git addΒ»?\nΠΡΠ»ΠΈ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ ΠΎΡΡΠ°Π»ΠΎΡΡ Π΄Π»Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠ°ΡΠΈΠΈ, ΡΠΎ, ΡΠΊΠΎΡΠ΅Π΅ Π²ΡΠ΅Π³ΠΎ, ΡΡΠΎ-ΡΠΎ Π΄ΡΡΠ³ΠΎΠ΅ ΡΠΆΠ΅ ΡΠ΄Π΅Π»Π°Π»ΠΎ ΡΠ΅ ΠΆΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ; Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Π°ΠΌ ΡΠ»Π΅Π΄ΡΠ΅Ρ ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΡΠΎΡ ΠΏΠ°ΡΡ." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "Π£ Π²Π°Ρ Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅ΡΡΡΡ Π½Π΅ ΡΠ»ΠΈΡΡΠ΅ ΠΏΡΡΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅.\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Π·Π°Π±ΡΠ»ΠΈ Π²ΡΠ·Π²Π°ΡΡ Β«git addΒ»?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΈΡΡΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΠ»ΠΈ HEAD Ρ ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅ΠΉ ΠΎΡΠΈΠ±ΠΊΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Β«amΒ».\nΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π½Π° ORIG_HEAD Π½Π΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<ΠΎΠΏΡΠΈΠΈ>] [(<mbox>|<Maildir>)β¦]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<ΠΎΠΏΡΠΈΠΈ>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "Π·Π°ΠΏΡΡΡΠΈΡΡ Π² ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠΌ ΡΠ΅ΠΆΠΈΠΌΠ΅" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "ΠΈΡΡΠΎΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΠΏΡΠΈΡ β Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°Π΅Ρ" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΎΡΠΊΠ°ΡΠΈΡΡΡΡ ΠΊ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π΅ΡΠ»ΠΈ Π½ΡΠΆΠ½ΠΎ" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΡΡΠΎΠΊΡ Signed-off-by ΠΊ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠΎΠ΄ΠΈΡΠΎΠ²Π°ΡΡ Π² utf8 (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -k Π² git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -b Π² git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ -m Π² git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ ΡΠ»Π°Π³ --keep-cr Π² git-mailsplit Π΄Π»Ρ ΡΠΎΡΠΌΠ°ΡΠ° mbox" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "Π½Π΅ ΠΏΠ΅ΡΠ΅Π΄Π°Π²Π°ΡΡ --keep-cr ΡΠ»Π°Π³ Π² git-mailsplit Π²Π½Π΅ Π·Π°Π²ΠΈΡΠΈΠΌΠΎΡΡΠΈ ΠΎΡ am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "ΠΎΠ±ΡΠ΅Π·Π°ΡΡ Π²ΡΠ΅ Π΄ΠΎ ΡΡΡΠΎΠΊΠΈ ΠΎΠ±ΡΠ΅Π·ΠΊΠΈ" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ Π΅Π³ΠΎ Π² git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "ΠΊΠΎΡΠ΅Π½Ρ" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "ΠΏΡΡΡ" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "ΡΠΎΡΠΌΠ°Ρ" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "ΡΠΎΡΠΌΠ°Ρ, Π² ΠΊΠΎΡΠΎΡΠΎΠΌ Π½Π°Ρ
ΠΎΠ΄ΡΡΡΡ ΠΏΠ°ΡΡΠΈ" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "ΠΏΠ΅ΡΠ΅ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΠ± ΠΎΡΠΈΠ±ΠΊΠ΅, Π΅ΡΠ»ΠΈ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°Π»ΠΎΠΆΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠΈΠ»ΠΈΠΊΡΠ°" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΠΏΠ°ΡΡ" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ ΠΈ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "ΡΠΎΠ²ΡΠ°ΡΡ ΠΎ Π΄Π°ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ΅ΡΠ°" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΡΡΠ΅Π΅ Π²ΡΠ΅ΠΌΡ ΠΊΠ°ΠΊ Π²ΡΠ΅ΠΌΡ Π°Π²ΡΠΎΡΡΡΠ²Π°" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ GPG" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(Π²Π½ΡΡΡΠ΅Π½Π½Π΅Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅ Π΄Π»Ρ git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "ΠΠΏΡΠΈΡ -b/--binary ΡΠΆΠ΅ Π΄ΠΎΠ»Π³ΠΎΠ΅ Π²ΡΠ΅ΠΌΡ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°Π΅Ρ ΠΈ Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½Π° Ρ ΡΠ»Π΅Π΄ΡΡΡΠΈΡ
Π²Π΅ΡΡΠΈΡΡ
Git. ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π½Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π΅Π΅." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "ΡΠ±ΠΎΠΉ ΡΡΠ΅Π½ΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ %s Π΅ΡΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ, Π½ΠΎ ΠΏΠ΅ΡΠ΅Π΄Π°Π½ mbox." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "ΠΠ°ΠΉΠ΄Π΅Π½ Π·Π°Π±ΡΡΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ %s.\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git am --abortΒ», ΡΡΠΎΠ±Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π΅Π³ΠΎ." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "ΠΠΏΠ΅ΡΠ°ΡΠΈΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ² Π½Π΅ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ, Π½Π΅ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ°Π΅ΠΌ." @@ -2824,37 +3020,37 @@ msgstr "regexec Π²ΠΎΠ·Π²ΡΠ°ΡΠΈΠ» %d Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°: %s" msgid "unable to find filename in patch at line %d" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π² ΡΡΡΠΎΠΊΠ΅ ΠΏΠ°ΡΡΠ° %d" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ Π½ΠΎΠ²ΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β Π½Π΅ ΡΠΎΠ³Π»Π°ΡΡΡΡΠ΅Π΅ΡΡ ΡΡΠ°ΡΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ΠΏΠ»ΠΎΡ
ΠΎΠΉ git-diff β ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ /dev/null Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: Π½Π΅ ΠΎΠΆΠΈΠ΄Π°Π΅ΠΌΠ°Ρ ΡΡΡΠΎΠΊΠ°: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "ΡΡΠ°Π³ΠΌΠ΅Π½Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π±Π΅Π· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname" @@ -2867,65 +3063,65 @@ msgstr[1] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± msgstr[2] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" msgstr[3] "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ git diff Π½Π΅ Π½Π°ΡΠ΅Π» ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ %d Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ ΠΏΡΡΠΈ ΠΊ ΡΠ°ΠΉΠ»Ρ (ΡΡΡΠΎΠΊΠ° %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "ΠΏΠ°ΡΡ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ°ΠΉΠ» %s Π·Π°Π²ΠΈΡΠΈΡ ΠΎΡ ΡΡΠ°ΡΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "ΡΠ΄Π°Π»Π΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» %s Π²ΡΠ΅ Π΅ΡΠ΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: ΡΠ°ΠΉΠ» %s ΡΡΠ°Π½ΠΎΠ²ΠΈΡΡΡ ΠΏΡΡΡΡΠΌ, Π½ΠΎ Π½Π΅ ΡΠ΄Π°Π»ΡΠ΅ΡΡΡ" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "Π½Π΅ΠΎΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "ΠΏΠ°ΡΡ Ρ ΠΌΡΡΠΎΡΠΎΠΌ Π½Π° ΡΡΡΠΎΠΊΠ΅ %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΈΠΌΠ²ΠΎΠ»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠ΅ΡΡΡ %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π½Π°ΡΠ°Π»ΠΎ ΡΡΡΠΎΠΊΠΈ: Β«%cΒ»" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -2934,177 +3130,177 @@ msgstr[1] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π² msgstr[2] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)." msgstr[3] "Π§Π°ΡΡΡ #%d ΡΡΠΏΠ΅ΡΠ½ΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½Π° Π½Π° %d (ΡΠΎ ΡΠ΄Π²ΠΈΠ³ΠΎΠΌ Π² %d ΡΡΡΠΎΠΊ)." -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "ΠΠΎΠ½ΡΠ΅ΠΊΡΡ ΡΡΠΆΠ΅Π½ Π΄ΠΎ (%ld/%ld), ΡΡΠΎΠ±Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΡΡΠ°Π³ΠΌΠ΅Π½Ρ Π½Π° %d ΡΡΡΠΎΠΊΠ΅" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅:\n%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "ΠΏΡΠΎΠΏΡΡΠ΅Π½Ρ Π΄Π°Π½Π½ΡΠ΅ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ Β«%sΒ»" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠ°ΡΡ ΠΊ Β«%sΒ»" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "ΠΏΠΎΡΠ»Π΅ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π²ΠΎΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΡΠ° Π΄Π»Ρ Β«%sΒ» Π±ΡΠ» ΠΏΠΎΠ»ΡΡΠ΅Π½ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ (ΠΎΠΆΠΈΠ΄Π°Π»ΠΎΡΡ %s, ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s)" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Π½Π° %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΡΡΠ΅Π½ΠΈΡ %s" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "ΡΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· Β«%sΒ» Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "ΠΏΡΡΡ %s Π±ΡΠ» ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½/ΡΠ΄Π°Π»Π΅Π½" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: Π½Π΅Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°Π΅Ρ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "ΠΏΠ°ΡΡ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π½Π΅ ΡΠ΄Π°Π»ΠΈΠ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΡΠ°ΠΉΠ»Π°" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠΈΠΏ" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ΠΈΠΌΠ΅Π΅Ρ ΡΠΈΠΏ %o, Π° ΠΎΠΆΠΈΠ΄Π°Π»ΡΡ %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΡΡΡ Β«%sΒ»" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o)" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΡΠ°ΡΠΎΠΌΡ ΡΠ΅ΠΆΠΈΠΌΡ Π΄ΠΎΡΡΡΠΏΠ° (%o) Π΄Π»Ρ %s" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "Π·Π°ΡΡΠΎΠ½ΡΡΡΠΉ ΡΠ°ΠΉΠ» Β«%sΒ» Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π·Π° ΡΠΈΠΌΠ²ΠΎΠ»ΠΈΡΠ΅ΡΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΎΠΉ" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΏΠ°ΡΡΠ° %sβ¦" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "ΡΠ±ΠΎΠΉ make_cache_entry Π΄Π»Ρ ΠΏΡΡΠΈ Β«%sΒ»" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %s ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½Π½ΡΠΉ ΠΏΠ°ΡΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° Β«%sΒ»" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° %s" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π·Π°ΠΏΠΈΡΡ Π² ΠΊΡΡΠ΅ Π΄Π»Ρ %s" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "Π·Π°ΠΊΡΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Π° Β«%sΒ»" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» Β«%sΒ» Ρ ΡΠ΅ΠΆΠΈΠΌΠΎΠΌ Π΄ΠΎΡΡΡΠΏΠ° %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "ΠΠ°ΡΡ %s ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "Π²Π½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ°" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -3113,147 +3309,157 @@ msgstr[1] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" msgstr[2] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" msgstr[3] "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΠΏΠ°ΡΡΠ° %%s Ρ %d ΠΎΡΠΊΠ°Π·Π°ΠΌΠΈβ¦" -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "ΡΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠΌΠ΅Π½ΠΈ .rej ΡΠ°ΠΉΠ»Π° Π΄ΠΎ %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "ΠΠ»ΠΎΠΊ β%d ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ Π±Π΅Π· ΠΎΡΠΈΠ±ΠΎΠΊ." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "ΠΠ»ΠΎΠΊ β%d ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "ΠΠ°ΡΡ Β«%sΒ» ΠΏΡΠΎΠΏΡΡΠ΅Π½." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "Π½Π΅ ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½ΡΠΉ Π²Π²ΠΎΠ΄" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌΡ ΠΏΡΡΠΈ" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ <ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ> Π²Π΅Π΄ΡΡΠΈΡ
ΠΊΠΎΡΡΡ
ΡΠ΅ΡΡ ΠΈΠ· ΡΡΠ°Π΄ΠΈΡΠΈΠΎΠ½Π½ΡΡ
ΠΏΡΡΠ΅ΠΉ ΡΠΏΠΈΡΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ, ΡΠ΄Π΅Π»Π°Π½Π½ΡΠ΅ ΡΡΠΈΠΌ ΠΏΠ°ΡΡΠ΅ΠΌ" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠΉ ΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΡ
ΠΈ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
ΡΡΡΠΎΠΊ Π² Π΄Π΅ΡΡΡΠΈΡΠ½ΠΎΠΌ ΠΏΡΠ΅Π΄ΡΡΠ°Π²Π»Π΅Π½ΠΈΠΈ" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄Π»Ρ Π²Π²ΠΎΠ΄Π°" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "Π²ΠΌΠ΅ΡΡΠΎ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠ°ΡΡΠ° ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΠΈΡ Π»ΠΈ ΠΎΠ½" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΠΏΠ°ΡΡ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ ΠΊ ΡΠ΅ΠΊΡΡΠ΅ΠΌΡ ΠΈΠ½Π΄Π΅ΠΊΡΡ" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ, Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½ΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "ΠΏΡΠΈΠ½ΡΡΡ ΠΏΠ°ΡΡ, ΠΊΠΎΡΠΎΡΡΠΉ Π·Π°ΡΡΠ°Π³ΠΈΠ²Π°Π΅Ρ ΡΠ°ΠΉΠ»Ρ Π·Π° ΡΠ°Π±ΠΎΡΠΈΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Π° ΡΠ°ΠΊΠΆΠ΅ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ (ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Ρ --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "ΠΏΠΎΠΏΡΡΠ°ΡΡΡΡ ΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅, Π΅ΡΠ»ΠΈ ΠΏΠ°ΡΡ Π½Π΅ ΠΏΡΠΈΠΌΠ΅Π½ΡΠ΅ΡΡΡ" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "ΠΏΠΎΡΡΡΠΎΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡΠΉ Π½Π° Π²ΡΡΡΠΎΠ΅Π½Π½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "ΠΏΡΡΠΈ, ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠ΅ ΠΠ£ΠΠΠΠ«Π ΡΠΈΠΌΠ²ΠΎΠ»ΠΎΠΌ" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "ΡΠ΄ΠΎΡΡΠΎΠ²Π΅ΡΠΈΡΡΡΡ, ΡΡΠΎ ΠΏΠΎ ΠΊΡΠ°ΠΉΠ½Π΅ΠΉ ΠΌΠ΅ΡΠ΅ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡ" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "ΠΎΠΏΡΠ΅Π΄Π΅Π»ΡΡΡ Π½ΠΎΠ²ΡΠ΅ ΠΈΠ»ΠΈ ΠΌΠΎΠ΄ΠΈΡΠΈΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ, Ρ ΠΊΠΎΡΠΎΡΡΡ
Π΅ΡΡΡ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ ΠΏΠ°ΡΡ Ρ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "Π½Π΅ ΠΎΠΆΠΈΠ΄Π°ΡΡ ΠΊΠ°ΠΊ ΠΌΠΈΠ½ΠΈΠΌΡΠΌ ΠΎΠ΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ ΠΎΡΠΊΠ»ΠΎΠ½Π΅Π½Π½ΡΠ΅ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΡ
*.rej ΡΠ°ΠΉΠ»Π°Ρ
" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΊΡΡΠ²Π°ΡΡΠΈΠ΅ΡΡ Π±Π»ΠΎΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π½Π΅ΠΊΠΎΡΡΠ΅ΠΊΡΠ½ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΡΠ΅ ΠΏΡΠΎΠΏΡΡΠ΅Π½Π½ΡΠ΅ ΠΏΡΡΡΡΠ΅ ΡΡΡΠΎΠΊΠΈ Π² ΠΊΠΎΠ½ΡΠ΅ ΡΠ°ΠΉΠ»Π°" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "Π½Π΅ Π΄ΠΎΠ²Π΅ΡΡΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΡΡΡΠΎΠΊ ΠΈΠ· Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ° Π±Π»ΠΎΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ <ΠΊΠΎΡΠ΅Π½Ρ> ΡΠΏΠ΅ΡΠ΅Π΄ΠΈ ΠΊΠΎ Π²ΡΠ΅ΠΌ ΠΈΠΌΠ΅Π½Π°ΠΌ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached Π²Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΏΠ°ΡΡ Β«%sΒ»" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" @@ -3262,7 +3468,7 @@ msgstr[1] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎ msgstr[2] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" msgstr[3] "ΠΏΡΠΎΠΏΡΡΠ΅Π½ΠΎ %d ΠΎΡΠΈΠ±ΠΎΠΊ Π² ΠΏΡΠΎΠ±Π΅Π»ΡΠ½ΡΡ
ΡΠΈΠΌΠ²ΠΎΠ»Π°Ρ
" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3330,99 +3536,99 @@ msgstr "<ΠΎΠΏΡΠΈΠΈ-rev-list> Π΄ΠΎΠΊΡΠΌΠ΅Π½ΡΠΈΡΠΎΠ²Π°Π½Ρ Π² git-rev-list(1)" msgid "Blaming lines" msgstr "ΠΡΠΎΡΠΌΠΎΡΡ Π°Π²ΡΠΎΡΠΎΠ² ΡΡΡΠΎΠΊ" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π·Π°ΠΏΠΈΡΠΈ Π°Π²ΡΠΎΡΡΡΠ²Π° ΠΏΠΎΡΡΠ΅ΠΏΠ΅Π½Π½ΠΎ, Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π½Π°Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΡ" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "ΠΠ΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ SHA-1 Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ², Π½Π΅ Π²Ρ
ΠΎΠ΄ΡΡΠΈΡ
Π² Π³ΡΠ°Π½ΠΈΡΡ Π·Π°ΠΏΡΠΎΡΠ° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "ΠΠ΅ Π²ΠΎΡΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡ ΠΊΠΎΡΠ½Π΅Π²ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ ΠΊΠ°ΠΊ Π³ΡΠ°Π½ΠΈΡΠ½ΡΠ΅ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΡΠ°ΡΡ
ΠΎΠ΄ΠΎΠ² Π½Π° Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ Π·Π°ΠΏΡΠΎΡΠ°" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "ΠΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠ΅Π½ΠΊΡ Π΄Π»Ρ Π·Π°ΠΏΠΈΡΠ΅ΠΉ Π°Π²ΡΠΎΡΡΡΠ²Π°" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΠΈΠ³ΠΈΠ½Π°Π»ΡΠ½ΡΠ΅ Π½ΠΎΠΌΠ΅ΡΠ° ΡΡΡΠΎΠΊ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ Π΄Π»Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ½ΠΎΠ³ΠΎ ΡΠ°Π·Π±ΠΎΡΠ°" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π² ΠΌΠ°ΡΠΈΠ½ΠΎΡΠΈΡΠ°Π΅ΠΌΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅, Ρ ΠΏΠΎΡΡΡΠΎΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠ΅ΠΉ ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ΅" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΠΊΠΎΠΉ ΠΆΠ΅ ΡΠΎΡΠΌΠ°Ρ Π²ΡΠ²ΠΎΠ΄Π°, ΠΊΠ°ΠΊ ΠΈ git-annotate (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠ΅ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π΄Π»ΠΈΠ½Π½ΡΠΉ SHA1 ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "ΠΠ΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΈΠΌΡ Π°Π²ΡΠΎΡΠ° ΠΈ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΠΎΡΡΡ Π°Π²ΡΠΎΡΠ° Π²ΠΌΠ΅ΡΡΠΎ ΠΈΠΌΠ΅Π½ΠΈ (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΎ)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "ΠΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°Π·Π»ΠΈΡΠΈΡ Π² ΠΏΡΠΎΠ±Π΅Π»Π°Ρ
" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "ΠΠΎΡΡΠ°ΡΠΈΡΡ Π±ΠΎΠ»ΡΡΠ΅ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ, Π΄Π»Ρ Π½Π°Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΡ Π»ΡΡΡΠΈΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ ΠΈΠ· <ΡΠ°ΠΉΠ»Π°> Π²ΠΌΠ΅ΡΡΠΎ Π²ΡΠ·ΠΎΠ²Π° git-rev-list" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ <ΡΠ°ΠΉΠ»Π°> ΠΊΠ°ΠΊ ΡΠΈΠ½Π°Π»ΡΠ½ΡΠΉ ΡΠ½ΠΈΠΌΠΎΠΊ" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "ΠΌΠΈΠ½-Π΄Π»ΠΈΠ½Π°" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "ΠΠ°ΠΉΡΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΡΡΡΠΎΠΊ Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
ΠΈ ΠΌΠ΅ΠΆΠ΄Ρ ΡΠ°ΠΉΠ»Π°ΠΌΠΈ" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "ΠΠ°ΠΉΡΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ ΡΡΡΠΎΠΊ Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
ΠΈ ΠΌΠ΅ΠΆΠ΄Ρ ΡΠ°ΠΉΠ»Π°ΠΌΠΈ" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "Π½Π°ΡΠ°Π»ΠΎ,ΠΊΠΎΠ½Π΅Ρ" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "ΠΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΡΠΎΠΊΠΈ Π² Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½Π΅ Π½Π°ΡΠ°Π»ΠΎ,ΠΊΠΎΠ½Π΅Ρ, Π½Π°ΡΠΈΠ½Π°Ρ Ρ 1" @@ -3432,392 +3638,413 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4 Π³ΠΎΠ΄Π° ΠΈ 11 ΠΌΠ΅ΡΡΡΠ΅Π² Π½Π°Π·Π°Π΄" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<ΠΎΠΏΡΠΈΠΈ>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<ΠΎΠΏΡΠΈΠΈ>] [-l] [-f] <ΠΈΠΌΡ-Π²Π΅ΡΠΊΠΈ> [<ΡΠΎΡΠΊΠ°-Π½Π°ΡΠ°Π»Π°>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<ΠΎΠΏΡΠΈΠΈ>] [-r] (-d | -D) <ΠΈΠΌΡ-Π²Π΅ΡΠΊΠΈ>β¦" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<ΠΎΠΏΡΠΈΠΈ>] (-m | -M) [<ΡΡΠ°ΡΠ°Ρ-Π²Π΅ΡΠΊΠ°>] <Π½ΠΎΠ²Π°Ρ-Π²Π΅ΡΠΊΠ°>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<ΠΎΠΏΡΠΈΠΈ>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, 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:146 +#: builtin/branch.c:147 #, 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:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ Β«%sΒ»" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, 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:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΊΠ»ΡΡΠΈ -a ΠΈ -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π²Π΅ΡΠΊΡ Β«%sΒ», ΡΠ°ΠΊ ΠΊΠ°ΠΊ Π²Ρ ΡΠ΅ΠΉΡΠ°Ρ Π½Π° Π½Π΅ΠΉ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΠ΅ΡΡ." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π²Π΅ΡΠΊΡ Β«%sΒ» Ρ.ΠΊ. ΠΎΠ½Π° Π°ΠΊΡΠΈΠ²Π½Π° Π½Π° Β«%sΒ»" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "Π²Π½Π΅ΡΠ½ΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Π°." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "Π²Π΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Π°." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "ΠΡΠΈΠ±ΠΊΠ° ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π²Π½Π΅ΡΠ½Π΅ΠΉ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠΈ Β«%sΒ»" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "ΠΡΠΈΠ±ΠΊΠ° ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π²Π΅ΡΠΊΠΈ Β«%sΒ»" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "ΠΠ½Π΅ΡΠ½ΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ° %s ΡΠ΄Π°Π»Π΅Π½Π° (Π±ΡΠ»Π° %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "ΠΠ΅ΡΠΊΠ° %s ΡΠ΄Π°Π»Π΅Π½Π° (Π±ΡΠ»Π° %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: ΠΏΡΠΎΠΏΠ°Π»]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: ΠΏΠΎΠ·Π°Π΄ΠΈ %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[ΠΏΠΎΠ·Π°Π΄ΠΈ %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ %d, ΠΏΠΎΠ·Π°Π΄ΠΈ %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[Π²ΠΏΠ΅ΡΠ΅Π΄ΠΈ %d, ΠΏΠΎΠ·Π°Π΄ΠΈ %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΡΡΡΠ»ΠΊΠ° ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ, ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ, Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ Π½Π°ΡΠ°Ρ Π½Π° %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π° %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD ΠΎΡΠ΄Π΅Π»ΡΠ½ Π½Π°ΡΠΈΠ½Π°Ρ Ρ %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(Π½Π΅Ρ Π²Π΅ΡΠΊΠΈ)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "ΠΡΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ %s Π½Π° %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "ΠΡΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΏΠΎΠΈΡΠΊ Π² Π²Π΅ΡΠΊΠ΅ %s Π½Π° %s" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ, Π΅ΡΠ»ΠΈ Π²Ρ Π½Π΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΠ΅ΡΡ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π½ΠΈΡ
." -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "ΠΠ΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ: Β«%sΒ»" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Π‘Π±ΠΎΠΉ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½Π° Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎ Π½Π°Π·Π²Π°Π½Π½Π°Ρ Π²Π΅ΡΠΊΠ° Β«%sΒ»" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "ΠΠ΅ΡΠΊΠ° ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½Π° Π² %s, Π½ΠΎ HEAD Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½!" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "ΠΠ΅ΡΠΊΠ° ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½Π°, Π½ΠΎ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ΅Π» ΡΠ±ΠΎΠΉ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΡΠ°ΠΉΠ»Π° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½ ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ Π²Π΅ΡΠΊΠΈ: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½ ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "ΠΠ±ΡΠΈΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ Ρ
ΡΡ-ΡΡΠΌΠΌΡ ΠΈ ΡΠ΅ΠΌΡ, ΡΠΊΠ°ΠΆΠΈΡΠ΅ Π΄Π²Π°ΠΆΠ΄Ρ Π΄Π»Ρ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΎΠ½Π½ΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΡΠ΅ΠΆΠΈΠΌ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ (ΡΠΌ. git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ²Π΅ΡΠ½ΠΎΠΉ Π²ΡΠ²ΠΎΠ΄" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡ Π½Π° ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π½Π΅ΡΠ½ΠΈΡ
Π²Π΅ΡΠΊΠ°Ρ
" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ»ΡΠΊΠΎ Π²Π΅ΡΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠ°Ρ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Π‘ΠΏΠ΅ΡΠΈΡΠΈΡΠ½ΡΠ΅ Π΄Π»Ρ git-branch Π΄Π΅ΠΉΡΡΠ²ΠΈΡ:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΈ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
Π²Π΅ΡΠΎΠΊ" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΠΏΠΎΠ»Π½ΠΎΡΡΡΡ ΡΠ»ΠΈΡΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ Π²Π΅ΡΠΊΡ (Π΄Π°ΠΆΠ΅ Π½ΠΈΠΊΡΠ΄Π° Π½Π΅ ΡΠ»ΠΈΡΡΡ)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ/ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ Π²Π΅ΡΠΊΠΈ ΠΈ Π΅Π΅ ΠΆΡΡΠ½Π°Π» ΡΡΡΠ»ΠΎΠΊ" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ/ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ Π²Π΅ΡΠΊΡ, Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ ΡΠ΅Π»Π΅Π²ΠΎΠ΅ ΠΈΠΌΡ ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΈΠΌΠ΅Π½ Π²Π΅ΡΠΎΠΊ" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΆΡΡΠ½Π°Π» ΡΡΡΠ»ΠΎΠΊ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΡΠΎΠ·Π΄Π°Π½ΠΈΠ΅, ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ»ΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ»ΡΠΊΠΎ ΡΠ»ΠΈΡΡΡ
Π²Π΅ΡΠΎΠΊ" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ»ΡΠΊΠΎ Π½Π΅ ΡΠ»ΠΈΡΡΡ
Π²Π΅ΡΠΎΠΊ" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ Π²Π΅ΡΠΎΠΊ ΠΏΠΎ ΡΡΠΎΠ»Π±ΡΠ°ΠΌ" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "ΠΊΠ»ΡΡ" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "ΠΈΠΌΡ ΠΏΠΎΠ»Ρ, ΠΏΠΎ ΠΊΠΎΡΠΎΡΠΎΠΌΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠΎΡΡΠΈΡΠΎΠ²ΠΊΡ" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "ΠΎΠ±ΡΠ΅ΠΊΡ" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "Π²ΡΠ²ΠΎΠ΄ ΡΠΎΠ»ΡΠΊΠΎ Π²Π΅ΡΠΎΠΊ, ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠ³ΠΎ ΠΎΠ±ΡΠ΅ΠΊΡΠ°" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD ΠΊΠ°ΠΊ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΡ ΡΡΡΠ»ΠΊΡ." -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² refs/heads!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column ΠΈ --verbose Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "ΡΡΠ΅Π±ΡΠ΅ΡΡΡ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "ΠΠ΅Π»ΡΠ·Ρ Π΄Π°ΡΡ ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΠΎΠΌΡ HEAD" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡΡ ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π±ΠΎΠ»Π΅Π΅ ΠΎΠ΄Π½ΠΎΠΉ Π²Π΅ΡΠΊΠΈ Π·Π° ΡΠ°Π·" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "ΠΡΠ΅ Π½Π΅Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π½Π° Π²Π΅ΡΠΊΠ΅ Β«%sΒ»." -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "ΠΠ΅Ρ Π²Π΅ΡΠΊΠΈ Ρ ΠΈΠΌΠ΅Π½Π΅ΠΌ Β«%sΒ»." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ Π²Π΅ΡΠΎΠΊ Π΄Π»Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ Π²Π΅ΡΠΎΠΊ Π΄Π»Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΡ Π½ΠΎΠ²ΡΡ
Π²ΡΡΠ΅ΡΡΠΎΡΡΠΈΡ
" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, 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:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ Π²Π΅ΡΠΊΠΈ Β«%sΒ»" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "Π²Π΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ Π²Π΅ΡΠΎΠΊ Π΄Π»Ρ ΡΠ±ΠΈΡΠ°Π½ΠΈΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΠΈΡ
" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΡΠ±ΡΠ°ΡΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π΄Π»Ρ HEAD, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΠΎΠ½ Π½Π΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½Ρ Π²Π΅ΡΠΊΡ." -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "ΠΠ΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π° ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ Β«HEADΒ» Π²ΡΡΡΠ½ΡΡ" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ -a ΠΈ -r Π΄Π»Ρ Β«git branchΒ» Π½Π΅ ΠΈΠΌΠ΅ΡΡ ΡΠΌΡΡΠ»Π° Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΠΈΠΌΠ΅Π½ΠΈ Π²Π΅ΡΠΊΠΈ" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, 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:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3825,16 +4052,6 @@ msgid "" "\n" msgstr "\nΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅, ΡΡΠΎΠ±Ρ Β«%sΒ» ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π»Π° Β«%sΒ», ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΡΠ»Π΅Π΄ΡΡΡΠ΅Π΅:\n\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr "git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -3930,7 +4147,7 @@ msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ msgid "terminate input and output records by a NUL character" msgstr "ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΠ΅ Π²Π²ΠΎΠ΄Π° ΠΈ Π²ΡΠ²ΠΎΠ΄Π° Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΏΠΎ ΠΠ£ΠΠΠΠΠΠ£ ΡΠΈΠΌΠ²ΠΎΠ»Ρ" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" @@ -3993,7 +4210,7 @@ msgstr "ΠΈΠ½Π΄Π΅ΠΊΡ Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ ΠΌΠ΅ΠΆΠ΄Ρ 1 ΠΈ 3 ΠΈΠ»ΠΈ all" #: builtin/checkout-index.c:160 msgid "check out all files in the index" -msgstr "ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Π²ΡΠ΅Ρ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" +msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Π²ΡΠ΅Ρ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" #: builtin/checkout-index.c:161 msgid "force overwrite of existing files" @@ -4020,8 +4237,9 @@ msgid "write the content to temporary files" msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π²ΠΎ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "ΡΡΡΠΎΠΊΠ°" @@ -4071,79 +4289,79 @@ msgstr "ΠΏΡΡΡ Β«%sΒ»: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ»ΠΈΡΡ" msgid "Unable to add merge result for '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ Β«%sΒ»" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "Β«%sΒ» Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΠΏΡΡΠ΅ΠΉ" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "Β«%sΒ» Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ ΠΏΡΡΠΈ ΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ°ΡΡΡΡ Π½Π° Π²Π΅ΡΠΊΡ Β«%sΒ» ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "ΠΏΡΡΡ Β«%sΒ» Π½Π΅ ΡΠ»ΠΈΡ" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "ΡΠ½Π°ΡΠ°Π»Π° Π½ΡΠΆΠ½ΠΎ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Π² Π²Π°ΡΠ΅ΠΌ ΡΠ΅ΠΊΡΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΆΡΡΠ½Π°Π» ΡΡΡΠ»ΠΎΠΊ Π΄Π»Ρ Β«%sΒ»: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD ΡΠ΅ΠΉΡΠ°Ρ Π½Π°" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Π‘Π±ΡΠΎΡ Π²Π΅ΡΠΊΠΈ Β«%sΒ»\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Π£ΠΆΠ΅ Π½Π° Β«%sΒ»\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ ΠΈ ΡΠ±ΡΠΎΡ Π²Π΅ΡΠΊΠΈ Β«%sΒ»\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ Β«%sΒ»\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "ΠΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΎ Π½Π° Π²Π΅ΡΠΊΡ Β«%sΒ»\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " β¦ ΠΈ Π΅ΡΠ΅ %d.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4160,7 +4378,7 @@ msgstr[1] "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Π²Ρ ΠΎΡΡΠ°Π²Π»ΡΠ΅ΡΠ΅ ΠΏΠΎΠ·Π°Π΄ΠΈ msgstr[2] "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Π²Ρ ΠΎΡΡΠ°Π²Π»ΡΠ΅ΡΠ΅ ΠΏΠΎΠ·Π°Π΄ΠΈ %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π½Π΅ ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠ΅ Π½ΠΈ Ρ ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π°ΡΠΈΡ
Π²Π΅ΡΠΎΠΊ:\n\n%s\n" msgstr[3] "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Π²Ρ ΠΎΡΡΠ°Π²Π»ΡΠ΅ΡΠ΅ ΠΏΠΎΠ·Π°Π΄ΠΈ %d ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ² Π½Π΅ ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠ΅ Π½ΠΈ Ρ ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π°ΡΠΈΡ
Π²Π΅ΡΠΎΠΊ:\n\n%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4179,162 +4397,162 @@ msgstr[1] "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΡ
Ρ ΠΏΠΎΠΌΠΎΡΡΡ msgstr[2] "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΡ
Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ, ΡΠΎ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°ΠΌΠΎΠ΅ Π²ΡΠ΅ΠΌΡ\nΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ:\n\n git branch <ΠΈΠΌΡ-Π½ΠΎΠ²ΠΎΠΉ-Π²Π΅ΡΠΊΠΈ> %s\n" msgstr[3] "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΠΈΡ
Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ, ΡΠΎ ΡΠ΅ΠΉΡΠ°Ρ ΡΠ°ΠΌΠΎΠ΅ Π²ΡΠ΅ΠΌΡ\nΡΠ΄Π΅Π»Π°ΡΡ ΡΡΠΎ Ρ ΠΏΠΎΠΌΠΎΡΡΡ:\n\n git branch <ΠΈΠΌΡ-Π½ΠΎΠ²ΠΎΠΉ-Π²Π΅ΡΠΊΠΈ> %s\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "Π²Π½ΡΡΡΠ΅Π½Π½ΡΡ ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Ρ
ΠΎΠΆΠ΄Π΅Π½ΠΈΠΈ ΠΏΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΌ" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "ΠΡΠ΅Π΄ΡΠ΄ΡΡΠ°Ρ ΠΏΠΎΠ·ΠΈΡΠΈΡ HEAD Π±ΡΠ»Π°" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "ΠΡ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΠ΅ΡΡ Π½Π° Π΅ΡΠ΅ Π½Π΅ ΡΠΎΠ·Π΄Π°Π½Π½ΠΎΠΉ Π²Π΅ΡΠΊΠ΅" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "ΠΎΠΆΠΈΠ΄Π°Π΅ΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΡΡΡΠ»ΠΊΠ°, Π° ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ %d." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠ»ΠΊΠ°: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "Π² Π΄Π΅ΡΠ΅Π²Π΅ Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΈ: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΡΡΠΈ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΎΠΊ" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Β«%sΒ» ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΈ Π²Π΅ΡΠΎΠΊ" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "Β«%sΒ» Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ Β«%sΒ»" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡ Π²Π΅ΡΠΊΡ Π½Π° Π½Π΅ ΠΊΠΎΠΌΠΌΠΈΡ Β«%sΒ»" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "Π²Π΅ΡΠΊΠ°" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" -msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΈ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" +msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" -msgstr "ΡΠΎΠ·Π΄Π°ΡΡ/ΡΠ±ΡΠΎΡΠΈΡΡ ΠΈ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" +msgstr "ΡΠΎΠ·Π΄Π°ΡΡ/ΡΠ±ΡΠΎΡΠΈΡΡ ΠΈ ΠΏΠ΅ΡΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΆΡΡΠ½Π°Π» ΡΡΡΠ»ΠΎΠΊ Π΄Π»Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ HEAD Π½Π° ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ΅" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅ Π΄Π»Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "Π½ΠΎΠ²Π°Ρ-Π²Π΅ΡΠΊΠ°" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "Π½ΠΎΠ²Π°Ρ Π²Π΅ΡΠΊΠ° Π±Π΅Π· ΡΠΎΠ΄ΠΈΡΠ΅Π»Π΅ΠΉ" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" -msgstr "ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π½Π°ΡΡ Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" +msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π½Π°ΡΡ Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" -msgstr "ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΠΈΡ
Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" +msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΠΈΡ
Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ Π½Π΅ ΡΠ»ΠΈΡΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" -msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄ (ΠΎΡΠ±ΡΠ°ΡΡΠ²Π°Π΅Ρ Π²ΡΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ)" +msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ (ΠΎΡΠ±ΡΠ°ΡΡΠ²Π°Π΅Ρ Π²ΡΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΡΠ΅Ρ
Ρ
ΠΎΠ΄ΠΎΠ²ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Ρ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΎΠΉ" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "ΡΡΠΈΠ»Ρ" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "ΡΡΠΈΠ»Ρ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ² ΡΠ»ΠΈΡΠ½ΠΈΡ (merge ΠΈΠ»ΠΈ diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "Π½Π΅ ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΠ²Π°ΡΡ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡΡ ΠΏΡΡΠΈ ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌΠΈ Π·Π°ΠΏΠΈΡΡΠΌΠΈ" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" -msgstr "ΠΏΠ΅ΡΠ΅ΡΠΌΠΎΡΡ Β«git checkout <no-such-branch>Β»" +msgstr "ΠΏΠ΅ΡΠ΅ΡΠΌΠΎΡΡ Β«git checkout <Π½Π΅Ρ-ΡΠ°ΠΊΠΎΠΉ-Π²Π΅ΡΠΊΠΈ>Β»" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "Π½Π΅ ΠΏΡΠΎΠ²Π΅ΡΡΡΡ, ΡΡΠΎ Π΄ΡΡΠ³ΠΎΠ΅ Π΄Π΅ΡΠ΅Π²ΠΎ ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΡ ΡΡΡΠ»ΠΊΡ" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B ΠΈ --orphan Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track ΡΡΠ΅Π±ΡΠ΅Ρ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "ΠΡΠΎΠΏΡΡΠ΅Π½ΠΎ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ; ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, 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Β», ΡΡΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΎ ΠΊΠ°ΠΊ ΠΊΠΎΠΌΠΌΠΈΡ?" +msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΏΡΡΠΈ ΠΈ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π²Π΅ΡΠΊΡ Β«%sΒ».\nΠΡ Ρ
ΠΎΡΠ΅Π»ΠΈ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Β«%sΒ», ΡΡΠΎ Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΎ ΠΊΠ°ΠΊ ΠΊΠΎΠΌΠΌΠΈΡ?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach Π½Π΅ ΠΏΡΠΈΠ½ΠΈΠΌΠ°Π΅Ρ ΠΏΡΡΡ Β«%sΒ» ΠΊΠ°ΠΊ Π°ΡΠ³ΡΠΌΠ΅Π½Ρ" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4466,8 +4684,8 @@ msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½Π°Ρ ΠΎΡΠΈΡΡΠΊΠ°" msgid "remove whole directories" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ ΠΏΠΎΠ»Π½ΠΎΡΡΡΡ" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "ΡΠ°Π±Π»ΠΎΠ½" @@ -4503,286 +4721,290 @@ msgstr "clean.requireForce ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ ΠΊΠ°ΠΊ t msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<ΠΎΠΏΡΠΈΠΈ>] [--] <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "Π½Π΅ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ°ΡΡ ΡΠ°Π±ΠΎΡΡΡ ΠΊΠΎΠΏΠΈΡ Π½Π° HEAD" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ Π³ΠΎΠ»ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ Π·Π΅ΡΠΊΠ°Π»ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ (Π²ΠΊΠ»ΡΡΠ°Π΅Ρ Π² ΡΠ΅Π±Ρ ΠΈ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ bare)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ· Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "Π½Π΅ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΆΠ΅ΡΡΠΊΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π²ΡΠ΅Π³Π΄Π° ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "Π½Π°ΡΡΡΠΎΠΈΡΡ ΠΊΠ°ΠΊ ΠΎΠ±ΡΠ΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ Π² ΠΊΠ»ΠΎΠ½Π΅" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³-ΡΠ°Π±Π»ΠΎΠ½ΠΎΠ²" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³, ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΎΠ³ΠΎ Π±ΡΠ΄ΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½Ρ" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ --reference ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠΈ" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "ΠΈΠΌΡ" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <ΠΈΠΌΡ> Π²ΠΌΠ΅ΡΡΠΎ Β«originΒ» Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° <Π²Π΅ΡΠΊΡ>, Π²ΠΌΠ΅ΡΡΠΎ HEAD Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" +msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° <Π²Π΅ΡΠΊΡ>, Π²ΠΌΠ΅ΡΡΠΎ HEAD Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "ΠΏΡΡΡ ΠΊ git-upload-pack Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "Π³Π»ΡΠ±ΠΈΠ½Π°" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ Π³Π»ΡΠ±ΠΈΠ½Ρ" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Ρ Π²Π΅ΡΠΊΡ, HEAD ΠΈΠ»ΠΈ --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "Π²ΡΠ΅ ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ Π±ΡΠ΄ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌΠΈ ΠΊΠ»ΠΎΠ½Π°ΠΌΠΈ" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³-git" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "ΡΠ°Π·ΠΌΠ΅ΡΡΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git ΠΎΡΠ΄Π΅Π»ΡΠ½ΠΎ ΠΎΡ ΡΠ°Π±ΠΎΡΠ΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "ΠΊΠ»ΡΡ=Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ Π²Π½ΡΡΡΠΈ Π½ΠΎΠ²ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ IPv4 Π°Π΄ΡΠ΅ΡΠ°" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ IPv6 Π°Π΄ΡΠ΅ΡΠ°" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "ΠΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΡΠ³Π°Π΄Π°Π½ΠΎ.\nΠ£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΈΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΠΊΠ°ΠΊ ΡΠ²ΡΠ·Π°Π½Π½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅, ΠΏΠΎΠΊΠ° Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌ." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "ΡΡΡΠ»Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΡΠ°ΡΠ΅Π½Π½ΡΠΌ" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat Β«%sΒ»" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stat %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΡΡΠ»ΠΊΡ Β«%sΒ»" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» Π² Β«%sΒ»" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "Π³ΠΎΡΠΎΠ²ΠΎ.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 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" +msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ, Π½ΠΎ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ ΠΏΡΠΎΠΈΠ·ΠΎΡΠ»Π° ΠΎΡΠΈΠ±ΠΊΠ°.\nΠ‘ ΠΏΠΎΠΌΠΎΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ Β«git statusΒ» Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΠΏΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ, ΠΊΠ°ΠΊΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Π±ΡΠ»ΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Ρ, Π° ΠΏΠΎΠ²ΡΠΎΡΠΈΡΡ ΠΏΠΎΠΏΡΡΠΊΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ Π½Π° Π²Π΅ΡΠΊΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git checkout -f HEADΒ»\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ %s Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡβ¦ " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΏΡΠΈΡΠ»Π°Π» Π½Π΅ Π²ΡΠ΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ HEAD ΡΡΡΠ»Π°Π΅ΡΡΡ Π½Π° Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΡΡ ΡΡΡΠ»ΠΊΡ, Π½Π΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΡΠ°ΠΊΡΡ Π²Π΅ΡΡΠΈΡ.\n" +msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ HEAD ΡΡΡΠ»Π°Π΅ΡΡΡ Π½Π° Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΡΡ ΡΡΡΠ»ΠΊΡ, Π½Π΅Π»ΡΠ·Ρ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠ°ΠΊΡΡ Π²Π΅ΡΡΠΈΡ.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π²Π΅ΡΡΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° Π²Π΅ΡΡΠΈΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ Π² ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΏΠ°ΠΊΠΎΠ²ΠΊΡ Π΄Π»Ρ ΠΎΡΠΈΡΡΠΊΠΈ" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Π‘Π»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΎΠ²." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "ΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π΄Π»Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare ΠΈ --origin %s Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare ΠΈ --separate-git-dir Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "Π³Π»ΡΠ±ΠΈΠ½Π° %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΡΠΌ ΡΠΈΡΠ»ΠΎΠΌ" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ΡΠ΅Π»Π΅Π²ΠΎΠΉ ΠΏΡΡΡ Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΡΡΡΡΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΈΠ΅ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΈ Π΄Π»Ρ Β«%sΒ»" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π² Π³ΠΎΠ»ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Β«%sΒ»β¦\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π² Β«%sΒ»β¦\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π½Π° Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ
ΠΊΠ»ΠΎΠ½Π°Ρ
; Π²ΠΌΠ΅ΡΡΠΎ ΡΡΠΎΠ³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ file://." -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "ΠΈΡΡ
ΠΎΠ΄Π½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΌ, --local ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "ΠΠ΅ Π·Π½Π°Ρ ΠΊΠ°ΠΊ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "ΠΠ½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΠ° %s Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Π° Π² Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ %s" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π»ΠΈ ΠΏΡΡΡΠΎΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ." @@ -4885,103 +5107,103 @@ msgid "" "the remaining commits.\n" msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠΏΡΡΡΠΈΡ ΡΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡ, ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ:\n\n git reset\n\nΠΠΎΡΠ»Π΅ ΡΡΠΎΠ³ΠΎ Β«git cherry-pick --continueΒ» ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡ ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ\nΠ² ΠΎΡΡΠ°Π²ΡΠΈΡ
ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°Ρ
.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "ΡΠ±ΠΎΠΉ ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ° Π΄Π΅ΡΠ΅Π²Π° HEAD" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "ΡΠ±ΠΎΠΉ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ³ΠΎ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠΈ ΠΎΡΠ½ΠΎΠ²Π½ΠΎΠ³ΠΎ ΠΊΡΡΠ° Π΄Π΅ΡΠ΅Π²Π°" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΠΎΡΠ±ΠΎΡΠ° Π»ΡΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π²ΡΠ΅ΠΌΠ΅Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° Β«%sΒ» ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ Π°Π²ΡΠΎΡ Π² Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ΅" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ° Β«%sΒ» ΡΡΡΠΎΠΊΠ° Π°Π²ΡΠΎΡΠ° Π² Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ --author Π² Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠΎΡΠΌΠ°Ρ Π΄Π°ΡΡ: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 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 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΡΠΎΡΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(ΡΡΠ΅Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° ΠΆΡΡΠ½Π°Π»Π° ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΆΡΡΠ½Π°Π»Π° ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, 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 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½ ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -4991,7 +5213,7 @@ msgid "" "and try again.\n" msgstr "\nΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΡΡΠ°Π΅ΡΠ΅ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅.\nΠΡΠ»ΠΈ ΡΡΠΎ ΠΎΡΠΈΠ±ΠΊΠ°, ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ° ΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΠ°ΠΉΠ»\n\t%s\nΠΈ ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ ΡΠ½ΠΎΠ²Π°.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5001,14 +5223,14 @@ msgid "" "and try again.\n" msgstr "\nΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ Π²Ρ ΠΏΡΡΠ°Π΅ΡΠ΅ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ.\nΠΡΠ»ΠΈ ΡΡΠΎ ΠΎΡΠΈΠ±ΠΊΠ°, ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ° ΡΠ΄Π°Π»ΠΈΡΠ΅ ΡΠ°ΠΉΠ»\n\t%s\nΠΈ ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅ ΡΠ½ΠΎΠ²Π°.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π²Π²Π΅Π΄ΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ Π²Π°ΡΠΈΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ. Π‘ΡΡΠΎΠΊΠΈ,\nΠ½Π°ΡΠΈΠ½Π°ΡΡΠΈΠ΅ΡΡ Ρ Β«%cΒ» Π±ΡΠ΄ΡΡ ΠΏΡΠΎΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Ρ, Π° ΠΏΡΡΡΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅\nΠΎΡΠΌΠ΅Π½ΡΠ΅Ρ ΠΏΡΠΎΡΠ΅ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5016,341 +5238,341 @@ msgid "" "An empty message aborts the commit.\n" msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π²Π²Π΅Π΄ΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ Π²Π°ΡΠΈΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ. Π‘ΡΡΠΎΠΊΠΈ,\nΠ½Π°ΡΠΈΠ½Π°ΡΡΠΈΠ΅ΡΡ Ρ Β«%cΒ» Π±ΡΠ΄ΡΡ ΠΎΡΡΠ°Π²Π»Π΅Π½Ρ; Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΠ΄Π°Π»ΠΈΡΡ ΠΈΡ
Π²ΡΡΡΠ½ΡΡ,\nΠ΅ΡΠ»ΠΈ Ρ
ΠΎΡΠΈΡΠ΅. ΠΡΡΡΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΡΠΌΠ΅Π½ΡΠ΅Ρ ΠΏΡΠΎΡΠ΅ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sΠΠ²ΡΠΎΡ: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sΠΠ°ΡΠ°: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sΠΠΎΠΌΠΌΠΈΡΠ΅Ρ: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ ΠΏΠΎΡΡΡΠΎΠ΅Π½ΠΈΠΈ Π΄Π΅ΡΠ΅Π²ΡΠ΅Π²" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅, ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ ΠΎΠΏΡΠΈΠΉ -m ΠΈΠ»ΠΈ -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, 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 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Β«%sΒ»" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long ΠΈ -z Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ ΠΎΠΏΡΠΈΠΉ --reset-author ΠΈ --author Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "ΠΠ΅ΡΠ΅Π³ΠΎ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ β ΡΠ΅ΠΉΡΠ°Ρ Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "ΠΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΠΎΡΠ±ΠΎΡΠ° Π»ΡΡΡΠ΅Π³ΠΎ β ΡΠ΅ΠΉΡΠ°Ρ Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΡΠ°Π²Π»ΡΡΡ." -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "ΠΠΏΡΠΈΠΈ --squash ΠΈ --fixup Π½Π΅ ΠΌΠΎΠ³ΡΡ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "ΠΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΠΈΠ· ΠΎΠΏΡΠΈΠΉ -c/-C/-F/--fixup." -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "ΠΠΏΡΠΈΡ -m Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Ρ -c/-C/-F/--fixup." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ -C, -c ΠΈΠ»ΠΈ --amend." -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "ΠΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄Π½Π° ΠΈΠ· ΠΎΠΏΡΠΈΠΉ --include/--only/--all/--interactive/--patch." -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "Π£ΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΏΡΡΠ΅ΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ² Ρ ΠΎΠΏΡΠΈΡΠΌΠΈ --include/--only Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°." -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Π£ΠΌΠ½ΠΎβ¦ ΠΎΡΠΌΠ΅Π½Π° ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅Π³ΠΎ Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "ΠΡΡΠΈ ΡΠ²Π½ΠΎ ΡΠΊΠ°Π·Π°Π½Ρ ΠΏΡΡΠΈ Π±Π΅Π· ΠΎΠΏΡΠΈΠΉ -i ΠΈΠ»ΠΈ -o; ΠΏΡΠ΅Π΄ΠΏΠΎΠ»Π°Π³Π°Ρ ΠΎΠΏΡΠΈΡ --onlyβ¦" -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΠ΅ΠΆΠΈΠΌΠ° ΠΎΡΠΈΡΡΠΊΠΈ %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "Π‘ ΠΎΠΏΡΠΈΠ΅ΠΉ -a ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ ΠΏΡΡΠΈ Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "ΠΊΡΠ°ΡΠΊΠΎ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΡΡ" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²Π΅ΡΡΠΈΠΈ" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "ΠΌΠ°ΡΠΈΠ½ΠΎΡΠΈΡΠ°Π΅ΠΌΡΠΉ Π²ΡΠ²ΠΎΠ΄" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠ°ΡΡΡ Π² Π΄Π»ΠΈΠ½Π½ΠΎΠΌ ΡΠΎΡΠΌΠ°ΡΠ΅ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "Π·Π°Π²Π΅ΡΡΠ°ΡΡ Π·Π°ΠΏΠΈΡΠΈ ΠΠ£ΠΠΠΠ«Π Π±Π°ΠΉΡΠΎΠΌ" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "ΡΠ΅ΠΆΠΈΠΌ" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ, ΠΎΠΏΡΠΈΠΎΠ½Π°Π»ΡΠ½ΡΠ΅ ΡΠ΅ΠΆΠΈΠΌΡ: all (Π²ΡΠ΅), normal (ΠΊΠ°ΠΊ ΠΎΠ±ΡΡΠ½ΠΎ), no (Π½Π΅Ρ). (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "ΠΊΠΎΠ³Π΄Π°" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΡΡ
, ΠΎΠΏΡΠΈΠΎΠ½Π°Π»ΡΠ½ΠΎ ΠΊΠΎΠ³Π΄Π°: all (Π²ΡΠ΅Π³Π΄Π°), dirty (ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅), untracked (Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅). (ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΏΠΎ ΡΡΠΎΠ»Π±ΡΠ°ΠΌ" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "Π½Π΅Π»ΡΠ·Ρ Π·Π°ΠΏΡΠΎΡΠΈΡΡ Π½ΠΎΠ²ΠΎΡΠΎΠ·Π΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ Π½ΠΎΠ²ΠΎΡΠΎΠ·Π΄Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠΉ HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (ΠΊΠΎΡΠ½Π΅Π²ΠΎΠΉ ΠΊΠΎΠΌΠΌΠΈΡ)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠ²ΠΎΠ΄ΠΊΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΏΠ΅ΡΠ½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠΏΠΈΡΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² ΡΠ°Π±Π»ΠΎΠ½ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "ΠΠΏΡΠΈΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ· ΡΠ°ΠΉΠ»Π°" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "Π°Π²ΡΠΎΡ" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "ΠΏΠΎΠ΄ΠΌΠ΅Π½ΠΈΡΡ Π°Π²ΡΠΎΡΠ° ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "Π΄Π°ΡΠ°" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "ΠΏΠΎΠ΄ΠΌΠ΅Π½ΠΈΡΡ Π΄Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈ ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π°Π²ΡΠΎΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΡΠΌΠ°ΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π°Π²ΡΠΎΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ Π΄Π»Ρ ΡΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΡ ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "ΠΊΠΎΠΌΠΌΠΈΡ ΡΠ΅ΠΏΠ΅ΡΡ Π·Π° ΠΌΠΎΠΈΠΌ Π°Π²ΡΠΎΡΡΡΠ²ΠΎΠΌ (Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅ΠΌ -C/-c/--amend)" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Signed-off-by:" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΡΠ°Π±Π»ΠΎΠ½Π°" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "ΠΏΠΎ-ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "ΠΊΠ°ΠΊ ΡΠ΄Π°Π»ΡΡΡ ΠΏΡΠΎΠ±Π΅Π»Ρ ΠΈ #ΠΊΠΎΠΌΠΌΠ΅Π½ΡΠ°ΡΠΈΠΈ ΠΈΠ· ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΡΡΠ°ΡΡΡ ΡΠ°ΠΉΠ»ΠΎΠ² Π² ΡΠ°Π±Π»ΠΎΠ½ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΠ°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "ΠΠΏΡΠΈΠΈ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ Π²ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠ΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ ΠΏΠ΅ΡΠ΅Π΄-ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ, ΡΡΠΎ Π±ΡΠ΄Π΅Ρ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½ΠΎ" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΏΡΠ΅Π΄ΡΠ΄ΡΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ ΠΏΠΎΡΠ»Π΅-ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π·Π°ΠΏΠΈΡΡ ΠΏΡΡΡΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π·Π°ΠΏΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Ρ ΠΏΡΡΡΡΠΌ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ΠΌ" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ HEAD ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Π€Π°ΠΉΠ» MERGE_HEAD ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½ (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "ΠΡΠΌΠ΅Π½Π° ΠΊΠΎΠΌΠΌΠΈΡΠ°; Π²Ρ Π½Π΅ ΠΈΠ·ΠΌΠ΅Π½ΠΈΠ»ΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "ΠΡΠΌΠ΅Π½Π° ΠΊΠΎΠΌΠΌΠΈΡΠ° ΠΈΠ·-Π·Π° ΠΏΡΡΡΠΎΠ³ΠΎ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5493,7 +5715,7 @@ msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠ½ΠΈΠΊ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ (ΡΠ°ΠΉΠ», ΡΡΠ°Π½ msgid "unable to parse default color value" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΠΎΠ±ΡΠ°ΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ ΡΠ²Π΅ΡΠ° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5503,7 +5725,7 @@ msgid "" "#\temail = %s\n" msgstr "# ΠΡΠΎ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ Git.\n[user]\n# ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π°Π΄Π°ΠΏΡΠΈΡΡΠΉΡΠ΅ ΠΈ ΡΠ°ΡΠΊΠΎΠΌΠΌΠ΅Π½ΡΠΈΡΡΠΉΡΠ΅ ΡΠ»Π΅Π΄ΡΡΡΠΈΠ΅ ΡΡΡΠΎΠΊΠΈ:\n#\tuser = %s\n#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΠΉΠ» ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ %s" @@ -5539,7 +5761,7 @@ msgstr "Π°Π½Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Π½Π°Ρ ΠΌΠ΅ΡΠΊΠ° %s Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π²ΡΡΡ msgid "tag '%s' is really '%s' here" msgstr "ΠΌΠ΅ΡΠΊΠ° Β«%sΒ» ΡΠΆΠ΅ Π·Π΄Π΅ΡΡ Β«%sΒ»" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "ΠΠ΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΈΠΌΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s" @@ -5626,9 +5848,9 @@ msgstr "ΡΠ°ΡΡΠΌΠ°ΡΡΠΈΠ²Π°ΡΡ ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈΠ΅ <n> ΠΌΠ΅ΡΠΎΠΊ (ΠΏΠΎ ΡΠΌΠ msgid "only consider tags matching <pattern>" msgstr "ΡΠ°ΡΡΠΌΠ°ΡΡΠΈΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΌΠ΅ΡΠΊΠΈ ΠΏΠΎ <ΡΠ°Π±Π»ΠΎΠ½Ρ>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" -msgstr "Π΅ΡΠ»ΠΈ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ, ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠΊΡΠ°ΡΠ΅Π½Π½ΡΠΉ Π½ΠΎΠΌΠ΅Ρ ΡΠ΅Π²ΠΈΠ·ΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°" +msgstr "Π΅ΡΠ»ΠΈ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ, ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠΊΡΠ°ΡΠ΅Π½Π½ΡΠΉ Π½ΠΎΠΌΠ΅Ρ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ ΠΊΠΎΠΌΠΌΠΈΡΠ°" #: builtin/describe.c:411 msgid "mark" @@ -5660,21 +5882,21 @@ msgstr "Β«%sΒ»: Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΠ±ΡΡΠ½ΡΠΌ ΡΠ°ΠΉΠ»ΠΎΠΌ ΠΈΠ»ΠΈ ΡΠΈΠΌΠ msgid "invalid option: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "ΠΠ΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ git" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ Π±ΠΎΠ»ΡΡΠ΅ Π΄Π²ΡΡ
Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²: Β«%sΒ»" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ Π½Π΅ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ Β«%sΒ»." @@ -5747,19 +5969,19 @@ msgstr "git fetch --multiple [<ΠΎΠΏΡΠΈΠΈ>] [(<ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> | <Π³ΡΡ msgid "git fetch --all [<options>]" msgstr "git fetch --all [<ΠΎΠΏΡΠΈΠΈ>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ ΡΠΎ Π²ΡΠ΅Ρ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "Π΄ΠΎΠΏΠΈΡΠ°ΡΡ ΠΊ .git/FETCH_HEAD Π²ΠΌΠ΅ΡΡΠΎ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠΈ" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "ΠΏΡΡΡ ΠΊ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ΅ ΡΠΏΠ°ΠΊΠΎΠ²ΠΊΠΈ ΠΏΠ°ΠΊΠ΅ΡΠ° Π½Π° ΠΌΠ°ΡΠΈΠ½Π΅ Ρ Π²Π½Π΅ΡΠ½ΠΈΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" @@ -5767,7 +5989,7 @@ msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ Π²Π msgid "fetch from multiple remotes" msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ Ρ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΡ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ Π²ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ ΠΈ ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" @@ -5779,19 +6001,19 @@ msgstr "Π½Π΅ ΠΈΠ·Π²Π»Π΅ΠΊΠ°ΡΡ Π²ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΡΠΊΠ°ΡΠ°Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "ΠΏΠΎΡΠΈΡΡΠΈΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ Π²Π½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ, ΠΊΠΎΡΠΎΡΡΡ
ΡΠΆΠ΅ Π½Π΅Ρ Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "ΠΏΠΎ ΡΡΠ΅Π±ΠΎΠ²Π°Π½ΠΈΡ" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΡΠΌ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ Π·Π°Π³ΡΡΠΆΠ΅Π½Π½ΡΠΉ ΠΏΠ°ΠΊΠ΅Ρ Π΄Π°Π½Π½ΡΡ
" @@ -5799,15 +6021,15 @@ msgstr "ΠΎΡΡΠ°Π²ΠΈΡΡ Π·Π°Π³ΡΡΠΆΠ΅Π½Π½ΡΠΉ ΠΏΠ°ΠΊΠ΅Ρ Π΄Π°Π½Π½ΡΡ
" msgid "allow updating of HEAD ref" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ HEAD" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "Π³Π»ΡΠ±ΠΎΠΊΠ°Ρ ΠΈΡΡΠΎΡΠΈΡ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π°" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "ΠΏΡΠ΅ΠΎΠ±ΡΠ°Π·ΠΎΠ²Π°ΡΡ Π² ΠΏΠΎΠ»Π½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "ΠΊΠ°ΡΠ°Π»ΠΎΠ³" @@ -5819,15 +6041,15 @@ msgstr "ΠΏΡΠΈΡΠΎΠ΅Π΄ΠΈΠ½ΡΡΡ ΡΡΠΎ ΡΠΏΠ΅ΡΠ΅Π΄ΠΈ ΠΊ Π²ΡΠ²ΠΎΠ΄Ρ ΠΏΡΡΠ΅Π msgid "default mode for recursion" msgstr "ΡΠ΅ΠΆΠΈΠΌ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ Π΄Π»Ρ ΡΠ΅ΠΊΡΡΡΠΈΠΈ" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "ΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡ ΡΡΡΠ»ΠΊΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅-ΡΡΡΠ»ΠΎΠΊ" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "ΡΠΊΠ°Π·Π°ΡΡ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΡΡΡΠ»ΠΎΠΊ ΠΏΡΠΈ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΈ" @@ -5885,11 +6107,6 @@ msgstr "ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅" msgid "(non-fast-forward)" msgstr "(Π±Π΅Π· ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠΈ Π²ΠΏΠ΅ΡΠ΅Π΄)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ %s: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6084,55 +6301,55 @@ msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΡ" msgid "Checking object directories" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ² ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<ΠΎΠΏΡΠΈΠΈ>] [<ΠΎΠ±ΡΠ΅ΠΊΡ>β¦]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅Ρ ΡΡΡΠ»ΠΎΠΊ" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΎΡΡΠ΅Ρ ΠΏΠΎ ΠΌΠ΅ΡΠΊΠ°ΠΌ" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΎΡΡΠ΅Ρ ΠΏΠΎ ΠΊΠΎΡΠ½Π΅Π²ΡΠΌ ΡΠ·Π»Π°ΠΌ" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "Π²ΠΎΡΠΏΡΠΈΠ½ΠΈΠΌΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΊΠ°ΠΊ ΠΊΠΎΡΠ½Π΅Π²ΡΠ΅ ΡΠ·Π»Ρ" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠΎΡΠ½Π΅Π²ΡΠ΅ ΡΠ·Π»Ρ ΠΆΡΡΠ½Π°Π»ΠΎΠ² ΡΡΡΠ»ΠΎΠΊ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "ΡΠ°ΠΊΠΆΠ΅ ΠΏΡΠΎΠ²Π΅ΡΡΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ ΠΈ Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½ΠΈΠ΅" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±ΠΎΠ»Π΅Π΅ ΡΡΡΠΎΠ³ΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΊΡ" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅Ρ ΡΡΡΠ»ΠΎΠΊ Π² .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" @@ -6227,214 +6444,214 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ (%s)" msgid "unable to grep from object of type %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ grep ΠΈΠ· ΠΎΠ±ΡΠ΅ΠΊΡΠ° ΡΠΈΠΏΠ° %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Β«%cΒ» ΠΎΠΆΠΈΠ΄Π°Π΅Ρ ΡΠΈΡΠ»ΠΎΠ²ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ Β«%sΒ»" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "ΠΈΡΠΊΠ°ΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅, Π° Π½Π΅ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "ΠΈΡΠΊΠ°ΡΡ Π² ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠΌ Π½Π΅ ΡΠΏΡΠ°Π²Π»ΡΠ΅ΠΌΡΠΌ git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "ΠΈΡΠΊΠ°ΡΡ ΠΈ Π² ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
, ΠΈ Π² Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ»Ρ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Π² Β«.gitignoreΒ»" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "ΠΈΡΠΊΠ°ΡΡ Π² Π½Π΅ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΡ
ΡΡΡΠΎΠΊΠ°Ρ
" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "Π±Π΅Π· ΡΡΠ΅ΡΠ° ΡΠ΅Π³ΠΈΡΡΡΠ°" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "ΠΈΡΠΊΠ°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΡΠ°Π±Π»ΠΎΠ½Π° ΡΠΎΠ»ΡΠΊΠΎ Π½Π° Π³ΡΠ°Π½ΠΈΡΠ°Ρ
ΡΠ»ΠΎΠ²" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "ΠΎΠ±ΡΠ°Π±ΠΎΡΠΊΠ° Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΊΠ°ΠΊ ΡΠ΅ΠΊΡΡΠ°" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "Π½Π΅ ΠΈΡΠΊΠ°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΡΠ°Π±Π»ΠΎΠ½Π° Π² Π΄Π²ΠΎΠΈΡΠ½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°ΡΡΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠΈΠ»ΡΡΡΠΎΠ² textconv" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "Π½Π° Π³Π»ΡΠ±ΠΈΠ½Π΅ ΠΌΠ°ΠΊΡΠΈΠΌΡ <Π³Π»ΡΠ±ΠΈΠ½Π°> ΡΡΠΎΠ²Π½Π΅ΠΉ" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ΅Π½Π½ΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ POSIX" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ POSIX (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "ΠΈΠ½ΡΠ΅ΡΠΏΡΠ΅ΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΊΠ°ΠΊ ΡΠΈΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΡΡΡΠΎΠΊΠΈ" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Perl-ΡΠΎΠ²ΠΌΠ΅ΡΡΠΈΠΌΡΠ΅ ΡΠ΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ Π½ΠΎΠΌΠ΅ΡΠ° ΡΡΡΠΎΠΊ" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ², Π° Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΡΡΠΎΠΊΠΈ" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π½Π΅ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΠΠΠ¬ ΠΏΠΎΡΠ»Π΅ ΡΠΏΠΈΡΠΊΠ° ΠΈΠΌΠ΅Π½ ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ, Π° Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΡΡΠΎΠΊΠΈ" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "ΠΏΠΎΠ΄ΡΠ²Π΅ΡΠΈΠ²Π°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΡΡΡΡ ΡΡΡΠΎΠΊΡ ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ ΠΈΠ· ΡΠ°Π·Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΡ ΡΠ°ΠΉΠ»Π° ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°Π· Π½Π° Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ Π² ΠΎΠ΄Π½ΠΎΠΌ ΡΠ°ΠΉΠ»Π΅" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠ΅ΡΠ΅Π΄ ΠΈ ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠ΅ΡΠ΅Π΄ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ΠΌ" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ <n> ΡΡΡΠΎΠΊ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° ΠΏΠΎΡΠ»Π΅ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <ΠΊΠΎΠ»> ΡΠ°Π±ΠΎΡΠΈΡ
ΠΏΠΎΡΠΎΠΊΠΎΠ²" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "ΡΠΎΠΆΠ΅, ΡΡΠΎ ΠΈ -C ΠΠΠΠΠ§ΠΠ‘Π’ΠΠ" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΡΠΎΠΊΡ Ρ ΠΈΠΌΠ΅Π½Π΅ΠΌ ΡΡΠ½ΠΊΡΠΈΠΈ ΠΏΠ΅ΡΠ΅Π΄ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ΠΌ" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΠΊΡΡΠΆΠ°ΡΡΡΡ ΡΡΠ½ΠΊΡΠΈΡ" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· ΡΠ°ΠΉΠ»Π°" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "ΠΏΠΎΠΈΡΠΊ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠΉ Ρ <ΡΠ°Π±Π»ΠΎΠ½ΠΎΠΌ>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½ΠΈΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ, ΡΠΊΠ°Π·Π°ΡΡ Π½Π° ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΊΠΎΠ΄Π° Π²ΡΡ
ΠΎΠ΄Π°" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ ΠΈΠ· ΡΠ°ΠΉΠ»ΠΎΠ² Π² ΠΊΠΎΡΠΎΡΡΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡ Π²ΡΠ΅ ΡΠ°Π±Π»ΠΎΠ½Ρ" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ Π΄Π΅ΡΠ΅Π²ΠΎ ΡΠ°Π·Π±ΠΎΡΠ° Π΄Π»Ρ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ ΠΏΠΎΠΈΡΠΊΠ°" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "ΠΏΠ΅ΠΉΠ΄ΠΆΠ΅Ρ" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΎΠ²ΠΏΠ°Π΄Π°ΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ-ΠΏΠ΅ΠΉΠ΄ΠΆΠ΅ΡΠ°" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π²ΡΠ·ΠΎΠ² grep(1) (ΠΈΠ³Π½ΠΎΡΠΈΡΡΠ΅ΡΡΡ Π² ΡΡΠΎΠΉ ΡΠ±ΠΎΡΠΊΠ΅)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "Π½Π΅ Π·Π°Π΄Π°Π½ ΡΠ°Π±Π»ΠΎΠ½." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ΡΠΊΠ°Π·Π°Π½ΠΎ Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΡΠΎΠΊΠΎΠ² (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ΡΠ°Π±ΠΎΡΠ°Π΅Ρ ΡΠΎΠ»ΡΠΊΠΎ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ΠΈΠ»ΠΈ --untracked Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --no-index." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index ΠΈΠ»ΠΈ --untracked Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΡΠ΅Π²ΠΈΠ·ΠΈΠΈ." +msgstr "--no-index ΠΈΠ»ΠΈ --untracked Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΈ." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ³ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --cached ΠΈ Π΄Π΅ΡΠ΅Π²ΠΎ." @@ -6521,8 +6738,8 @@ msgstr "Π²Π΅ΡΡΠΈΡ emacsclient Β«%dΒ» ΡΠ»ΠΈΡΠΊΠΎΠΌ ΡΡΠ°ΡΠ°Ρ (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π·Π°ΠΏΡΡΠΊΠ΅ Β«%sΒ»: %s" +msgid "failed to exec '%s'" +msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π·Π°ΠΏΡΡΠΊΠ΅ Β«%sΒ»" #: builtin/help.c:205 #, c-format @@ -6780,15 +6997,19 @@ msgstr "Π±Π΅Π·ΡΠΌΠ½Π°Ρ ΠΏΡΡΠ°Π½ΠΈΡΠ°" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠΌ" +msgstr[1] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" +msgstr[2] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" +msgstr[3] "Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ Ρ %d Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "ΠΠ΅ΠΎΠΆΠΈΠ΄Π°Π½Π½Π°Ρ ΠΊΠΎΠ½ΡΡΠΎΠ»ΡΠ½Π°Ρ ΡΡΠΌΠΌΠ° Π² ΠΊΠΎΠ½ΡΠ΅ %s (Π΄ΠΈΡΠΊ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -6797,59 +7018,59 @@ msgstr[1] "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ %d Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΠ΅ Π΄Π΅Π»ΡΡΡ msgstr[2] "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ %d Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΡ
Π΄Π΅Π»ΡΡ" msgstr[3] "ΠΏΠ°ΠΊΠ΅Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ %d Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΡ
Π΄Π΅Π»ΡΡ" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Π½Π΅Π»ΡΠ·Ρ ΡΠΆΠ°ΡΡ ΠΏΡΠΈΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ %s ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π·Π°ΠΊΡΡΡΠΈΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΡΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ Β«%sΒ»" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ Π·Π°ΠΏΠΈΡΠ°Π½Π½ΡΠΉ ΡΠ°ΠΉΠ» ΡΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ Β«%sΒ»" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠΉ pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "Π½Π΅Ρ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΊΠΈ ΠΏΠΎΡΠΎΠΊΠΎΠ², ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ°ΠΉΠ» ΠΏΠ°ΠΊΠ΅ΡΠ° Β«%sΒ»" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π΄Π»Ρ Β«%sΒ»" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -6858,7 +7079,7 @@ msgstr[1] "Π½Π΅ Π΄Π΅Π»ΡΡΡ: %d ΠΎΠ±ΡΠ΅ΠΊΡΠ°" msgstr[2] "Π½Π΅ Π΄Π΅Π»ΡΡΡ: %d ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" msgstr[3] "Π½Π΅ Π΄Π΅Π»ΡΡΡ: %d ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -6867,26 +7088,26 @@ msgstr[1] "Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ = %d: %lu ΠΎΠ±ΡΠ΅ΠΊΡΠ°" msgstr[2] "Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ = %d: %lu ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" msgstr[3] "Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ = %d: %lu ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "ΠΈΠΌΡ ΠΏΠ°ΠΊΠ΅ΡΠ° Β«%sΒ» Π½Π΅ ΠΎΠΊΠ°Π½ΡΠΈΠ²Π°Π΅ΡΡΡ Π½Π° Β«.packΒ»" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²Π΅ΡΠ½ΡΡΡΡΡ Π² ΡΠ΅ΠΊΡΡΠΈΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠΉ %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π΅Π· --stdin" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "ΠΈΠΌΡ ΠΏΠ°ΠΊΠ΅ΡΠ° Β«%sΒ» Π½Π΅ ΠΎΠΊΠ°Π½ΡΠΈΠ²Π°Π΅ΡΡΡ Π½Π° Β«.packΒ»" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify Π±Π΅Π· ΡΠΊΠ°Π·Π°Π½ΠΈΡ ΠΈΠΌΠ΅Π½ΠΈ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" @@ -6925,27 +7146,27 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» Β«%sΒ» Π² Β«%sΒ»" msgid "ignoring template %s" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΡΠ°Π±Π»ΠΎΠ½Π° %s" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "ΡΠ°Π±Π»ΠΎΠ½Ρ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "Π½Π΅ ΠΊΠΎΠΏΠΈΡΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ Π² Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠΉ Π²Π΅ΡΡΠΈΠΈ ΡΠΎΡΠΌΠ°ΡΠ° %d ΠΈΠ· Β«%sΒ»" +msgid "not copying templates from '%s': %s" +msgstr "Π½Π΅ ΠΊΠΎΠΏΠΈΡΡΡ ΡΠ°Π±Π»ΠΎΠ½Ρ ΠΈΠ· Β«%sΒ»: %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "Π½Π΅ ΡΠ΄Π°Π΅ΡΡΡ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΡΠΈΠΏΠ° %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "Π½Π΅ ΡΠ΄Π°Π΅ΡΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ ΡΠ°ΠΉΠ» %s Π² %s" @@ -6953,55 +7174,55 @@ 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git Π² %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "ΠΠ΅ΡΠ΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ΅Π³ΠΎ" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½ ΠΏΡΡΡΠΎΠΉ" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " ΠΎΠ±ΡΠΈΠΉ" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] " "[--shared[=<permissions>]] [<directory>]" msgstr "git init [-q | --quiet] [--bare] [--template=<ΠΊΠ°ΡΠ°Π»ΠΎΠ³-ΡΠ°Π±Π»ΠΎΠ½ΠΎΠ²>] [--shared[=<ΠΏΡΠ°Π²Π°-Π΄ΠΎΡΡΡΠΏΠ°>]] [<ΠΊΠ°ΡΠ°Π»ΠΎΠ³>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "ΠΏΡΠ°Π²Π°-Π΄ΠΎΡΡΡΠΏΠ°" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "ΡΠΊΠ°ΠΆΠΈΡΠ΅, Π΅ΡΠ»ΠΈ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ git Π±ΡΠ΄Π΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΠΌΠΈ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΡΠΌΠΈ" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ mkdir %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ chdir Π² %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, 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:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π΄ΠΎΡΡΡΠΏ ΠΊ ΡΠ°Π±ΠΎΡΠ΅ΠΌΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Ρ Β«%sΒ»" @@ -7045,274 +7266,317 @@ msgstr "git show [<ΠΎΠΏΡΠΈΠΈ>] <ΠΎΠ±ΡΠ΅ΠΊΡ>β¦" msgid "invalid --decorate option: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ Π΄Π»Ρ --decorate: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠ°Π·Π»ΠΈΡΠΈΡ" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠ½ΠΈΠΊ" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠ°ΠΉΠ» ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΡ ΠΏΠΎΡΡΠΎΠ²ΡΡ
Π°Π΄ΡΠ΅ΡΠΎΠ²" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "ΠΎΠΏΡΠΈΠΈ ΡΠΎΡΠΌΠ°ΡΠ° Π²ΡΠ²ΠΎΠ΄Π° ΡΡΡΠ»ΠΎΠΊ" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "ΠΠ±ΡΠ°Π±ΠΎΡΠ°ΡΡ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½ ΡΡΡΠΎΠΊ n,m ΠΈΠ· ΡΠ°ΠΉΠ»Π°, Π½Π°ΡΠΈΠ½Π°Ρ Ρ 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Π€ΠΈΠ½Π°Π»ΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ΠΏΠ»ΠΎΡ
ΠΎΠΉ ΡΠ°ΠΉΠ»" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΡΠΈΠΏ ΠΎΠ±ΡΠ΅ΠΊΡΠ°: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "Π² format.headers Π½Π΅ ΡΠΊΠ°Π·Π°Π½ΠΎ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ Π΄Π»ΠΈΠ½Π½ΠΎΠ΅ ΠΈΠΌΡ Π²ΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "ΠΡ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ°ΠΉΠ» ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "ΠΡΠΆΠ΅Π½ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄ΠΈΠ½ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "ΠΠ΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½ΠΎΠΌ." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "Π‘ΠΎΠΏΡΠΎΠ²ΠΎΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ Π΄ΠΎΠ»ΠΆΠ½ΠΎ Π±ΡΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΠΎΠΉ ΠΏΠΎΡΡΡ" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° Π² ΠΏΠΎΠ»Π΅ in-reply-to: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<ΠΎΠΏΡΠΈΠΈ>] [<Π½Π°ΡΠΈΠ½Π°Ρ-Ρ> | <Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½-ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "ΠΠ²Π° Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Β«%sΒ» ΠΊΠ°ΠΊ ΡΡΡΠ»ΠΊΡ." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠΎΡΠ½ΡΡ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π²ΡΡΠ΅ΡΡΠΎΡΡΡΡ Π²Π΅ΡΠΊΡ. ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π°Π²ΡΠΎΠΌΠΈΡΠΈΡΠ΅ΡΠΊΠΈ, ΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ git branch --set-upstream-to Π΄Π»Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΡ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΈ.\nΠΠ»ΠΈ ΠΆΠ΅ Π²Ρ ΠΌΠΎΠΆΠ΅ΡΠ΅ ΡΠΊΠ°Π·Π°ΡΡ Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ --base=<ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-Π±Π°Π·ΠΎΠ²ΠΎΠ³ΠΎ-ΠΊΠΎΠΌΠΌΠΈΡΠ°> Π²ΡΡΡΠ½ΡΡ." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠΎΡΠ½ΡΡ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ ΠΏΡΠ΅Π΄ΠΊΠΎΠΌ ΡΠΏΠΈΡΠΊΠ° ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ Π² ΡΠΏΠΈΡΠΊΠ΅ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΏΠ°ΡΡΠ°" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ [PATCH n/m] Π΄Π°ΠΆΠ΅ ΠΊΠΎΠ³Π΄Π° ΠΎΠ΄ΠΈΠ½ ΠΏΠ°ΡΡ" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ [PATCH] Π΄Π°ΠΆΠ΅ ΠΊΠΎΠ³Π΄Π° Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ ΠΏΠ°ΡΡΠ΅ΠΉ" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΠ°ΡΡΠΈ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "Π³Π΅Π½Π΅ΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΏΡΠΎΠ²ΠΎΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΡΠΎΡΡΡΡ ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°ΡΠ΅Π»ΡΠ½ΠΎΡΡΡ ΡΠΈΡΠ΅Π» Π΄Π»Ρ ΠΈΠΌΠ΅Π½ Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "ΡΡΡΡΠΈΠΊΡ" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΡΡΡΠΈΠΊΡ <ΡΡΡΡΠΈΠΊΡ> Π²ΠΌΠ΅ΡΡΠΎ Β«.patchΒ»" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "Π½Π°ΡΠ°ΡΡ Π½ΡΠΌΠ΅ΡΠ°ΡΠΈΡ ΠΏΠ°ΡΡΠ΅ΠΉ Ρ <n>, Π° Π½Π΅ Ρ 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "ΠΏΠΎΠΌΠ΅ΡΠΈΡΡ ΡΠ΅ΡΠΈΡ ΠΊΠ°ΠΊ ΡΠ½Π½ΡΡ ΠΏΠΎΠΏΡΡΠΊΡ" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ [<ΠΏΡΠ΅ΡΠΈΠΊΡ>] Π²ΠΌΠ΅ΡΡΠΎ [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ ΡΠ΅Π·ΡΠ»ΡΡΠΈΡΡΡΡΠΈΠ΅ ΡΠ°ΠΉΠ»Ρ Π² <ΠΊΠ°ΡΠ°Π»ΠΎΠ³>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "Π½Π΅ ΠΎΠ±ΡΠ΅Π·Π°ΡΡ/Π΄ΠΎΠ±Π°Π²Π»ΡΡΡ [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π΄Π²ΠΎΠΈΡΠ½ΡΠ΅ ΡΠ°Π·Π»ΠΈΡΠΈΡ" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π½ΡΠ»Π΅Π²ΡΡ Ρ
ΡΡ-ΡΡΠΌΠΌΡ Π² Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠ΅ From" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "Π½Π΅ Π²ΠΊΠ»ΡΡΠ°ΡΡ ΠΏΠ°ΡΡ, Π΅ΡΠ»ΠΈ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠΆΠ΅ Π΅ΡΡΡ Π² Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠ΅" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ Π² ΡΠΎΡΠΌΠ°ΡΠ΅ ΠΏΠ°ΡΡΠ°, Π° Π½Π΅ Π² ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠΌ (ΠΏΠ°ΡΡ + ΡΡΠ°ΡΠΈΡΡΠΈΠΊΠ°)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "ΠΠ΅ΡΠ΅Π΄Π°ΡΠ° ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "ΠΏΠΎΡΡΠ°" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ To:" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ Cc:" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π°Π΄ΡΠ΅Ρ ΠΎΡΠΏΡΠ°Π²ΠΈΡΠ΅Π»Ρ Π½Π° <ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ> (ΠΈΠ»ΠΈ Π½Π° ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡΠ΅ΡΠ°, Π΅ΡΠ»ΠΈ ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΠΏΠ΅ΡΠ²ΠΎΠ΅ ΠΏΠΈΡΡΠΌΠΎ ΠΎΡΠ²Π΅ΡΠΎΠΌ Π½Π° <ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ-ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "Π²Π»ΠΎΠΆΠ΅Π½ΠΈΠ΅" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "ΠΏΡΠΈΠ»ΠΎΠΆΠΈΡΡ ΠΏΠ°ΡΡ" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΏΠ°ΡΡ Π² ΡΠ΅ΠΊΡΡ ΠΏΠΈΡΡΠΌΠ°" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ Π² ΠΏΠΈΡΡΠΌΠ°Ρ
ΠΈΠ΅ΡΠ°ΡΡ
ΠΈΡΠ½ΠΎΡΡΡ, ΡΡΠΈΠ»ΠΈ: shallow (ΡΠ°ΡΡΠΈΡΠ½ΡΡ), deep (Π³Π»ΡΠ±ΠΎΠΊΡΡ)" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "ΠΏΠΎΠ΄ΠΏΠΈΡΡ" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "Π±Π°Π·ΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΡΡΠ΅Π±ΠΎΠ²Π°Π½ΠΈΠΈ Π΄Π΅ΡΠ΅Π²Π° ΠΊ ΡΠ΅ΡΠΈΠΈ ΠΏΠ°ΡΡΠ΅ΠΉ" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ ΠΈΠ· ΡΠ°ΠΉΠ»Π°" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠΌΠ΅Π½Π° ΡΠ°ΠΉΠ»ΠΎΠ² ΠΏΠ°ΡΡΠ΅ΠΉ" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n ΠΈ -k Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix ΠΈ -k Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ ΡΠΌΡΡΠ»Π°" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄ ΠΈΠ»ΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΏΠΎΠ΄ΠΏΠΈΡΠΈ Β«%sΒ»" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΡΠΎΠ·Π΄Π°Π½ΠΈΠΈ Π²ΡΡ
ΠΎΠ΄Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ-Π²Π΅ΡΠΊΠ°> [<Π³ΠΎΠ»ΠΎΠ²Π°> [<ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½ΠΈΠ΅>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> " "manually.\n" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ, ΡΠΊΠ°ΠΆΠΈΡΠ΅ <Π²ΡΡΠ΅ΡΡΠΎΡΡΡΡ-Π²Π΅ΡΠΊΡ> Π²ΡΡΡΠ½ΡΡ.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<ΠΎΠΏΡΠΈΠΈ>] [<ΡΠ°ΠΉΠ»>β¦]" @@ -7500,170 +7764,174 @@ msgstr "git merge [<ΠΎΠΏΡΠΈΠΈ>] <ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅> HEAD <ΠΊΠΎΠΌΠΌΠΈΡ>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "ΠΏΡΠΈ ΡΠΊΠ°Π·Π°Π½ΠΈΠΈ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° Β«mΒ» ΡΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠΊΠ°Π·Π°ΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Β«%sΒ».\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "ΠΠΎΡΡΡΠΏΠ½ΡΠ΅ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "ΠΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΡΡΠΊΠΈΠ΅ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΡΠ»Π΅ ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(ΡΠΈΠ½ΠΎΠ½ΠΈΠΌ Π΄Π»Ρ --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ (ΠΌΠ°ΠΊΡΠΈΠΌΡΠΌ <n>) Π·Π°ΠΏΠΈΡΠ΅ΠΉ ΠΈΠ· ΠΊΠΎΡΠΎΡΠΊΠΎΠ³ΠΎ ΠΆΡΡΠ½Π°Π»Π° Π² ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΌΠΈΡ, Π²ΠΌΠ΅ΡΡΠΎ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "ΡΠ΄Π΅Π»Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ, Π΅ΡΠ»ΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "ΠΎΡΡΠ΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ΅Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΡ Π²ΠΏΠ΅ΡΠ΅Π΄ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ, Π΅ΡΠ»ΠΈ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π°" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "ΠΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠΌΠ΅Π΅Ρ Π²Π΅ΡΠ½ΡΡ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ GPG" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΠ°Ρ ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "ΠΎΠΏΡΠΈΡ=Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "ΠΎΠΏΡΠΈΠΈ Π΄Π»Ρ Π²ΡΠ±ΡΠ°Π½Π½ΠΎΠΉ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ (Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ Π±Π΅Π· ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠΈ Π²ΠΏΠ΅ΡΠ΅Π΄)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ ΠΏΡΠΎΠΈΡΡ
ΠΎΠ΄ΡΡΠ΅Π³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ΡΠ²ΡΠ·Π°Π½Π½ΡΡ
ΠΈΡΡΠΎΡΠΈΠΉ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ stash." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ stash" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "Π½Π΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠΈ read-tree" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (Π½Π΅ΡΠ΅Π³ΠΎ ΡΠΏΠ»ΠΎΡΠ½ΡΡΡ)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Π£ΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° β Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡ HEAD\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π² Β«%sΒ»" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "ΠΠ°ΠΏΠΈΡΡ SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "ΠΠ°Π²Π΅ΡΡΠ΅Π½ΠΈΠ΅ SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "ΠΠ΅Ρ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ β Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ΅ΠΌ HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "Β«%sΒ» Π½Π΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° ΠΊΠΎΠΌΠΌΠΈΡ" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠΎΠΊΠ° branch.%s.mergeoptions: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "ΠΠ΅ ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°Ρ Π½ΠΈΡΠ΅Π³ΠΎ, ΠΊΡΠΎΠΌΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ Π΄Π²ΡΡ
ΡΠΊΠ°Π·Π°ΡΠ΅Π»Π΅ΠΉ Π½Π° Π²Π΅ΡΠΊΠΈ." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠ΅ΡΡΡ ΠΈΠ· Β«%sΒ»" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "ΠΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«git commitΒ» Π΄Π»Ρ Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7673,157 +7941,161 @@ msgid "" "the commit.\n" msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, Π²Π²Π΅Π΄ΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°, Π΄Π»Ρ ΠΎΠ±ΡΡΡΠ½Π΅Π½ΠΈΡ, Π·Π°ΡΠ΅ΠΌ Π½ΡΠΆΠ½ΠΎ\nΡΡΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅, ΠΎΡΠΎΠ±Π΅Π½Π½ΠΎ, Π΅ΡΠ»ΠΈ ΡΡΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π½ΠΎΠΉ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ΅ΠΉ\nΠ²Π΅ΡΠΊΠΈ Π² ΡΠ΅ΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΡΡ Π²Π΅ΡΠΊΡ.\n\nΠ‘ΡΡΠΎΠΊΠΈ, Π½Π°ΡΠΈΠ½Π°ΡΡΠΈΠ΅ΡΡ Ρ Β«%cΒ» Π±ΡΠ΄ΡΡ ΠΏΡΠΎΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Ρ, Π° ΠΏΡΡΡΠΎΠ΅\nΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΎΡΠΌΠ΅Π½ΡΠ΅Ρ ΠΏΡΠΎΡΠ΅ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "ΠΡΡΡΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "ΠΡΠ΅ΠΊΡΠ°ΡΠ½ΠΎ.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠ²Π΅ΡΡΠΈ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅; ΠΈΡΠΏΡΠ°Π²ΡΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ ΠΈ ΡΠ΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΡΠ΅Π·ΡΠ»ΡΡΠ°ΡΠ°.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "ΠΠ΅Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Π£ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π½Π΅Ρ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "ΠΠ»Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π½Π΅ ΡΠΊΠ°Π·Π°Π½Π° Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½Π° Π²Π½Π΅ΡΠ½ΡΡ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ° Π΄Π»Ρ %s Π½Π° %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ Β«%sΒ»" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "ΠΠ΅Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ, ΠΊΠΎΡΠΎΡΠΎΠ΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ (ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» MERGE_HEAD)." -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 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:1230 +#: builtin/merge.c:1242 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:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "ΠΡ Π½Π΅ Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΈ ΠΎΡΠ±ΠΎΡ Π»ΡΡΡΠ΅Π³ΠΎ (ΠΏΡΠΈΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°ΠΉΠ» CHERRY_PICK_HEAD)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "ΠΠ΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ --squash ΠΈ --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "ΠΠΎΠΌΠΌΠΈΡ Π½Π΅ ΡΠΊΠ°Π·Π°Π½ ΠΈ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡ merge.defaultToUpstream Π½Π΅ ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "Π£ΠΏΠ»ΠΎΡΠ½Π΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ° Π² ΠΏΡΡΡΡΡ Π²Π΅ΡΠΊΡ Π΅ΡΠ΅ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "ΠΠΎΠΌΠΌΠΈΡ, Π½Π΅ ΡΠ²Π»ΡΡΡΠΈΠΉΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠΎΠΉ Π²ΠΏΠ΅ΡΠ΅Π΄, Π½Π΅Ρ ΡΠΌΡΡΠ»Π° Π΄Π΅Π»Π°ΡΡ Π² ΠΏΡΡΡΡΡ Π²Π΅ΡΠΊΡ." -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ΅ΠΌ, ΡΡΠΎ ΠΌΠΎΠΆΠ½ΠΎ ΡΠ»ΠΈΡΡ" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "ΠΠΎΠΆΠ½ΠΎ ΡΠΎΠ»ΡΠΊΠΎ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΌΠΈΡ Π² ΠΏΡΡΡΡΡ Π²Π΅ΡΠΊΡ." -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "ΠΠΎΠΌΠΌΠΈΡ %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½Π΅ Π΄ΠΎΠ²Π΅ΡΠ΅Π½Π½ΡΡ GPG ΠΏΠΎΠ΄ΠΏΠΈΡΡ, ΠΏΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΎΡ %s." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "ΠΠΎΠΌΠΌΠΈΡ %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΏΠ»ΠΎΡ
ΡΡ GPG ΠΏΠΎΠ΄ΠΏΠΈΡΡ, ΠΏΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΎΡ %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "ΠΠΎΠΌΠΌΠΈΡ %s Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ GPG ΠΏΠΎΠ΄ΠΏΠΈΡΡ." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "ΠΠΎΠΌΠΌΠΈΡ %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΡ GPG ΠΏΠΎΠ΄ΠΏΠΈΡΡ, ΠΎΡ %s.\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "ΠΎΡΠΊΠ°Π· ΡΠ»ΠΈΡΠ½ΠΈΡ Π½Π΅ΡΠ²ΡΠ·Π°Π½Π½ΡΡ
ΠΈΡΡΠΎΡΠΈΠΉ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "ΠΠΎΠΏΡΡΠΊΠ° ΡΡΠΈΠ²ΠΈΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅β¦\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "ΠΠ΅ Π²ΡΡΠ»ΠΎ.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²ΠΏΠ΅ΡΠ΅Π΄ Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π°, ΠΎΡΠΌΠ΅Π½Π°." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π΄Π΅ΡΠ΅Π²Π° ΠΊ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠΌΡ ΡΠΎΡΡΠΎΡΠ½ΠΈΡβ¦\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "ΠΠΎΠΏΡΡΠΊΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ %sβ¦\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "ΠΠΈ ΠΎΠ΄Π½Π° ΡΡΡΠ°ΡΠ΅Π³ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π½Π΅ ΠΎΠ±ΡΠ°Π±ΠΎΡΠ°Π»Π° ΡΠ»ΠΈΡΠ½ΠΈΠ΅.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Π‘Π±ΠΎΠΉ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΡΡΠ°ΡΠ΅Π³ΠΈΠΈ %s.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΡ %s Π΄Π»Ρ ΠΏΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΊΠΈ ΡΡΡΠ½ΠΎΠ³ΠΎ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠΎΠ².\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "ΠΠ²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΠΏΡΠΎΡΠ»ΠΎ ΡΡΠΏΠ΅ΡΠ½ΠΎ; ΠΊΠ°ΠΊ ΠΈ Π·Π°ΠΏΡΠ°ΡΠΈΠ²Π°Π»ΠΈ, ΠΎΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΎ ΠΏΠ΅ΡΠ΅Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°\n" @@ -7858,7 +8130,7 @@ msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΏΡΠ΅Π΄ΠΊΠΎΠ² Π΄Π»Ρ ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΌΠ½ΠΎΠ³ΠΎΡ
ΠΎΠ΄ΠΎΠ²ΠΎ #: builtin/merge-base.c:218 msgid "list revs not reachable from others" -msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΡΠ΅Π²ΠΈΠ·ΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ ΠΈΠ· Π΄ΡΡΠ³ Π΄ΡΡΠ³Π°" +msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΡΠ΅Π΄Π°ΡΠΈΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ ΠΈΠ· Π΄ΡΡΠ³ Π΄ΡΡΠ³Π°" #: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" @@ -7931,7 +8203,7 @@ msgstr "git mv [<ΠΎΠΏΡΠΈΠΈ>] <ΠΈΡΡΠΎΡΠ½ΠΈΠΊ>β¦ <Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅>" msgid "Directory %s is in index and no submodule?" msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ %s Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΌ?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "Π§ΡΠΎΠ±Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ, ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΡΠΉΡΠ΅ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°ΠΉΠ»Π΅ .gitmodules" @@ -8009,48 +8281,48 @@ msgstr "%s, ΠΎΡΠΊΡΠ΄Π°=%s, ΠΊΡΠ΄Π°=%s" msgid "Renaming %s to %s\n" msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ %s Π² %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "ΡΠ±ΠΎΠΉ ΠΏΡΠΈ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠΈ Β«%sΒ»" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] <ΠΊΠΎΠΌΠΌΠΈΡ>β¦" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<ΠΎΠΏΡΠΈΠΈ>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΈΠΌΠ΅Π½Π° (Π±Π΅Π· SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΌΠ΅ΡΠΊΠΈ Π΄Π»Ρ ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΡΠ»ΠΊΠΈ, ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΡΡΠΈΠ΅ <ΡΠ°Π±Π»ΠΎΠ½Ρ> " -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ Π²ΡΠ΅Ρ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ², Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡΡ
ΡΠΎ Π²ΡΠ΅Ρ
ΡΡΡΠ»ΠΎΠΊ" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Π²ΡΠ²ΠΎΠ΄ Β«undefinedΒ», Π΅ΡΠ»ΠΈ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ (ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "ΡΠ°Π·ΡΠΌΠ΅Π½ΠΎΠ²ΡΠ²Π°ΡΡ Π²Π²Π΅Π΄Π΅Π½Π½ΡΠ΅ ΠΌΠ΅ΡΠΊΠΈ (Π΄Π»Ρ Π²Π½ΡΡΡΠ΅Π½Π½Π΅Π³ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ)" @@ -8191,24 +8463,16 @@ msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ Π·Π°ΠΌΠ΅ΡΠΊΠΈ" msgid "The note contents have been left in %s" msgstr "Π‘ΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΎΡΡΠ°Π»ΠΎΡΡ Π² %s" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΠΈΠ»ΠΈ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Β«%sΒ»" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ Β«%sΒ» ΠΊΠ°ΠΊ ΡΡΡΠ»ΠΊΡ." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8221,7 +8485,7 @@ msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π΄Π°Π½Π½ΡΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ ΠΈΠ· #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠ²" @@ -8266,7 +8530,7 @@ msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ. ΠΠ°ΠΉΠ΄Π΅Π½Π° ΡΡ msgid "Overwriting existing notes for object %s\n" msgstr "ΠΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s\n" @@ -8302,63 +8566,63 @@ msgid "" "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:767 +#: builtin/notes.c:768 msgid "General options" msgstr "ΠΠ±ΡΠΈΠ΅ ΠΎΠΏΡΠΈΠΈ" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "ΠΠΏΡΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/notes.c:771 +#: builtin/notes.c:772 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:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "ΠΠΎΠΌΠΌΠΈΡ Π½Π΅ ΡΠ»ΠΈΡΡΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ Π½Π΅ ΡΠ»ΠΈΡΡΡ
Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "ΠΡΠΌΠ΅Π½Π° ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ Π·Π°ΠΌΠ΅ΡΠΎΠΊ Π² %s ΡΠΆΠ΅ Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ Π½Π° %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "Π£ ΠΎΠ±ΡΠ΅ΠΊΡΠ° %s Π½Π΅Ρ Π·Π°ΠΌΠ΅ΡΠΊΠΈ\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "ΠΏΠΎΠΏΡΡΠΊΠ° ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ΅ΠΉ Π·Π°ΠΌΠ΅ΡΠΊΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΠΈΠΌΠ΅Π½Π° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "ΡΡΡΠ»ΠΊΠ°-Π½Π°-Π·Π°ΠΌΠ΅ΡΠΊΡ" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π·Π°ΠΌΠ΅ΡΠΊΡ ΠΈΠ· <ΡΡΡΠ»ΠΊΠ°-Π½Π°-Π·Π°ΠΌΠ΅ΡΠΊΡ>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "ΠΠ΅ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π°: %s" @@ -8378,165 +8642,169 @@ msgstr "git pack-objects [<ΠΎΠΏΡΠΈΠΈ>β¦] <ΠΈΠΌΡ-Π±Π°Π·Ρ> [< <ΡΠΏΠΈΡΠΎΠΊ-Ρ msgid "deflate error (%d)" msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΡΠΆΠ°ΡΠΈΡ (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π·Π°ΠΏΠΈΡΠΈ Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ ΠΊΠ°ΡΡΡ Π±ΡΠ»ΠΈ ΡΠ°Π·Π±ΠΈΡΡ Π½Π° ΡΠ°ΡΡΠΈ ΠΈΠ·-Π·Π° pack.packSizeLimit" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "ΠΠ°ΠΏΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "ΠΎΡΠΊΠ»ΡΡΠ΅Π½ΠΈΠ΅ Π·Π°ΠΏΠΈΡΠΈ Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Π½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ Π½Π΅ Π±ΡΠ»ΠΈ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Ρ" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Π‘ΠΆΠ°ΡΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "Π½Π΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΡΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "ΠΏΠ»ΠΎΡ
Π°Ρ Π²Π΅ΡΡΠΈΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Β«%sΒ»" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "Π½Π΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ Π·Π°ΠΏΠΈΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "ΠΏΠΎΡ
ΠΎΠΆΠ΅ Π½Π° --all-progress ΠΏΡΠΈ Π²ΠΊΠ»ΡΡΠ΅Π½Π½ΠΎΠΌ ΠΏΡΠΎΠ³ΡΠ΅ΡΡΠ΅ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "Π²Π΅ΡΡΠΈΡ[,ΡΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» ΠΈΠ½Π΄Π΅ΠΊΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° Π² ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΉ Π²Π΅ΡΡΠΈΠΈ ΡΠΎΡΠΌΠ°ΡΠ°" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½ΡΠΉ ΡΠ°Π·ΠΌΠ΅Ρ ΠΊΠ°ΠΆΠ΄ΠΎΠ³ΠΎ Π²ΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΡΠΆΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π²Π·ΡΡΡΠ΅ ΠΈΠ· Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΠΎΠ³ΠΎ Ρ
ΡΠ°Π½ΠΈΠ»ΠΈΡΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡ ΠΎΠΊΠ½ΠΎ ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΏΠΎ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΊ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ² ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡ ΠΎΠΊΠ½ΠΎ ΠΏΠ°ΠΊΠ΅ΡΠ° ΠΏΠΎ ΠΏΠ°ΠΌΡΡΠΈ" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "ΠΌΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½Π°Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½Π°Ρ Π΄Π»ΠΈΠ½Π° ΡΠ΅ΠΏΠΎΡΠΊΠΈ Π΄Π΅Π»ΡΡ Π² ΡΠ΅Π·ΡΠ»ΡΡΠΈΡΡΡΡΠ΅ΠΌ ΠΏΠ°ΠΊΠ΅ΡΠ΅" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅ Π΄Π΅Π»ΡΡΡ" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ OFS_DELTA" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΌΠ½ΠΎΠ³ΠΎΠΏΠΎΡΠΎΡΠ½ΠΎΡΡΡ ΠΏΡΠΈ ΠΏΠΎΠΈΡΠΊΠ΅ Π»ΡΡΡΠΈΡ
ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΠΉ Π΄Π΅Π»ΡΡ" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "Π½Π΅ ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΠΏΡΡΡΡΠ΅ Π²ΡΡ
ΠΎΠ΄Π½ΡΠ΅ ΠΏΠ°ΠΊΠ΅ΡΡ" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "ΠΏΡΠΎΡΠΈΡΠ°ΡΡ Π°ΡΠ³ΡΠΌΠ΅Π½ΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ ΠΈΠ· ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΠΎΠ³ΠΎ Π²Π²ΠΎΠ΄Π°" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "ΠΎΠ³ΡΠ°Π½ΠΈΡΠΈΡΡΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ Π΅ΡΠ΅ Π½Π΅ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Ρ" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π΄ΠΎΡΡΠΈΠΆΠΈΠΌΡ ΠΏΠΎ Π»ΡΠ±ΠΎΠΉ ΠΈΠ· ΡΡΡΠ»ΠΎΠΊ" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°ΡΡΡΡ Π·Π°ΠΏΠΈΡΠΈ ΠΆΡΡΠ½Π°Π»Π° ΡΡΡΠ»ΠΎΠΊ" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ, Π½Π° ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°Π΅ΡΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΏΠ°ΠΊΠ΅Ρ Π½Π° ΡΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ Π²ΡΠ²ΠΎΠ΄" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "Π²ΠΊΠ»ΡΡΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΠΌΠ΅ΡΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΡΠ»Π°ΡΡΡΡ Π½Π° ΡΠΏΠ°ΠΊΠΎΠ²ΡΠ²Π°Π΅ΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "ΡΠΎΡ
ΡΠ°Π½ΡΡΡ ΡΡΡΠ»ΠΊΠΈ Π½Π° Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "Π²ΡΠ΅ΠΌΡ" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "ΡΠ°ΡΠΏΠ°ΠΊΠΎΠ²Π°ΡΡ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½ΠΎΠ²Π΅Π΅, ΡΠ΅ΠΌ <Π²ΡΠ΅ΠΌΡ>" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΡΠΎΠ½ΠΊΠΈΠ΅ ΠΏΠ°ΠΊΠ΅ΡΡ" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "ΡΠΎΠ·Π΄Π°Π²Π°ΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ, ΠΏΠΎΠ΄Ρ
ΠΎΠ΄ΡΡΠΈΠ΅ Π΄Π»Ρ ΡΠ°ΡΡΠΈΡΠ½ΡΡ
ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΉ" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠ°ΠΊΠ΅ΡΡ, ΡΡΠ΄ΠΎΠΌ Ρ ΠΊΠΎΡΠΎΡΡΠΌΠΈ Π»Π΅ΠΆΠΈΡ .keep ΡΠ°ΠΉΠ»" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "ΡΡΠΎΠ²Π΅Π½Ρ ΡΠΆΠ°ΡΠΈΡ ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "Π½Π΅ ΡΠΊΡΡΠ²Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡΡ ΡΡΠ°ΡΠ΅Π½ΠΈΡΠΌΠΈ" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "ΠΏΠΎ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡΠΈ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Π² Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡΠ°Ρ
, Π΄Π»Ρ ΡΡΠΊΠΎΡΠ΅Π½ΠΈΡ ΠΏΠΎΠ΄ΡΡΠ΅ΡΠ° ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "Π·Π°ΠΏΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ° Π² Π±ΠΈΡΠΎΠ²ΡΡ
ΠΊΠ°ΡΡΠ°Ρ
Π²ΠΌΠ΅ΡΡΠ΅ Ρ ΠΈΠ½Π΄Π΅ΠΊΡΠΎΠΌ ΠΏΠ°ΠΊΠ΅ΡΠ°" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "ΠΠΎΠ΄ΡΡΠ΅Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" @@ -8564,15 +8832,15 @@ msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π΄ΡΠ±Π»ΠΈΡΡΡΡΠΈΡ
ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <Π²ΡΠ΅ΠΌΡ>] [--] [<ΠΈΠΌΡ-Π²Π΅ΡΠΊΠΈ>β¦]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΡΡΡ, ΡΠΎΠ»ΡΠΊΠΎ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΡΠΏΠΈΡΠΎΠΊ" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΏΠΈΡΠΎΠΊ ΡΠ΄Π°Π»Π΅Π½Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΡ ΡΡΠ°ΡΠ΅Π΅ ΡΠ΅ΠΌ <Π΄Π°ΡΠ°-ΠΎΠΊΠΎΠ½ΡΠ°Π½ΠΈΡ>" @@ -8584,65 +8852,69 @@ msgstr "Π½Π΅Π»ΡΠ·Ρ ΠΏΠΎΡΠΈΡΡΠΈΡΡ Π½Π΅ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΠΌΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡ msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<ΠΎΠΏΡΠΈΠΈ>] [<ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ> [<ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ-ΡΡΡΠ»ΠΊΠΈ>β¦]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "ΠΠΏΡΠΈΠΈ, ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ ΡΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ΠΌ" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "Π·Π°Π±ΡΠ°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ΅ΡΠ΅Π±Π°Π·ΠΈΡΠΎΠ²Π°Π½ΠΈΡ, Π° Π½Π΅ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΡ Π²ΠΏΠ΅ΡΠ΅Π΄" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ, ΡΡΠΎ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠΌΠ΅Π΅Ρ Π²Π΅ΡΠ½ΡΡ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΡΡ ΠΏΠΎΠ΄ΠΏΠΈΡΡ GPG" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ Π²ΡΠΏΠΎΠ»Π½ΡΡΡ stash/stash pop Π΄ΠΎ ΠΈ ΠΏΠΎΡΠ»Π΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "ΠΠΏΡΠΈΠΈ, ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ Ρ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ, ΠΊΠΎΡΠΎΡΡΠ΅ Π±ΡΠ΄ΡΡ ΠΏΠΎΠ»ΡΡΠ΅Π½Ρ ΠΏΠ°ΡΡΠ°Π»Π΅Π»ΡΠ½ΠΎ" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π£ Π²Π°Ρ Π΅ΡΡΡ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "Π ΡΠΎΠΌΡ ΠΆΠ΅, Π² Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ΠΌ: Π Π²Π°ΡΠ΅ΠΌ ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΅ΡΡΡ Π½Π΅Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "ΠΠ΅Ρ ΠΏΡΠ΅ΡΠ΅Π½Π΄Π΅Π½ΡΠΎΠ² Π΄Π»Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ ΡΡΠ΅Π΄ΠΈ ΡΡΡΠ»ΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ Π²Ρ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΠΎ ΠΏΠΎΠ»ΡΡΠΈΠ»ΠΈ." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "ΠΠ΅Ρ ΠΏΡΠ΅ΡΠ΅Π½Π΄Π΅Π½ΡΠΎΠ² Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ ΡΡΠ΅Π΄ΠΈ ΡΡΡΠ»ΠΎΠΊ, ΠΊΠΎΡΠΎΡΡΠ΅ Π²Ρ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΠΎ ΠΏΠΎΠ»ΡΡΠΈΠ»ΠΈ." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "ΠΠ±ΡΡΠ½ΠΎ ΡΡΠΎ ΠΎΠ·Π½Π°ΡΠ°Π΅Ρ, ΡΡΠΎ Π²Ρ ΠΏΠ΅ΡΠ΅Π΄Π°Π»ΠΈ ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΡΡΡΠ»ΠΊΠΈ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΡΠ°Π±Π»ΠΎΠ½Π° ΠΈ ΡΡΠΎΡ ΡΠ°Π±Π»ΠΎΠ½ Π½ΠΈ Ρ ΡΠ΅ΠΌ Π½Π΅ ΡΠΎΠ²ΠΏΠ°Π» Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8650,46 +8922,57 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "ΠΡ ΠΏΠΎΠΏΡΠΎΡΠΈΠ»ΠΈ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ», Π½ΠΎ Π½Π΅ ΡΠΊΠ°Π·Π°Π»ΠΈ Π²Π΅ΡΠΊΡ. Π’Π°ΠΊ ΠΊΠ°ΠΊ ΡΡΠΎ Π½Π΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ Π΄Π»Ρ Π²Π°ΡΠ΅ΠΉ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ, Π²Ρ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ Π²Π΅ΡΠΊΡ Π² ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠ΅." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "ΠΡ ΡΠ΅ΠΉΡΠ°Ρ Π½ΠΈ Π½Π° ΠΎΠ΄Π½ΠΎΠΉ ΠΈΠ· Π²Π΅ΡΠΎΠΊ." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ Π½Π° ΠΊΠ°ΠΊΡΡ Π²Π΅ΡΠΊΡ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΡΠΊΠ°ΠΆΠΈΡΠ΅ Ρ ΠΊΠ°ΠΊΠΎΠΉ Π²Π΅ΡΠΊΠΎΠΉ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "ΠΠ»Ρ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ, ΡΠΌΠΎΡΡΠΈΡΠ΅ git-pull(1)." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<Π²Π½Π΅ΡΠ½ΠΈΠΉ-ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<Π²Π΅ΡΠΊΠ°>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Π£ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ Π½Π΅Ρ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎΠ± ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π½ΠΈΠΈ." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠ΅, Π²ΡΠΏΠΎΠ»Π½ΠΈΡΠ΅:\n\n git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠΊΠ°Π·Π°ΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠ΅, Π²ΡΠΏΠΎΠ»Π½ΠΈΡΠ΅:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "ΠΠ°ΡΠ° ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ, ΡΡΠΎ Π½ΡΠΆΠ½ΠΎ ΡΠ»ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠΎ ΡΡΡΠ»ΠΊΠΎΠΉ\nΒ«%sΒ» ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ, Π½ΠΎ ΡΠ°ΠΊΠ°Ρ ΡΡΡΠ»ΠΊΠ° Π½Π΅ Π±ΡΠ»Π° ΠΏΠΎΠ»ΡΡΠ΅Π½Π°." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π²ΠΌΠ΅ΡΡΠ΅ Ρ --rebase." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ Π΅ΡΠ΅ Π½Π΅ Π½Π°ΡΠ°Π²ΡΠ΅ΠΉΡΡ Π²Π΅ΡΠΊΠΈ Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΠΌΠΈ, Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΡΠΌΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡ." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8697,7 +8980,7 @@ msgid "" "commit %s." msgstr "ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΎΠ±Π½ΠΎΠ²ΠΈΠ»ΠΎ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π°ΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ.\nΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠΊΠ° Π²Π°ΡΠ΅Π³ΠΎ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°\nΡ ΠΊΠΎΠΌΠΌΠΈΡΠ° %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8708,11 +8991,11 @@ msgid "" "to recover." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠΎΡΠ°ΡΡ Π²ΠΏΠ΅ΡΡΠ΄ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² Π²Π°ΡΠ΅ΠΌ ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅.\nΠΠΎΡΠ»Π΅ ΡΠΎΠ³ΠΎ, ΠΊΠ°ΠΊ Π²Ρ ΡΠ±Π΅Π΄ΠΈΡΠ΅ΡΡ, ΡΡΠΎ Π²Ρ ΡΠΎΡ
ΡΠ°Π½ΠΈΠ»ΠΈ Π²ΡΡ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎΠ΅ ΠΈΠ· Π²ΡΠ²ΠΎΠ΄Π°\n$ git diff %s\n, Π·Π°ΠΏΡΡΡΠΈΡΠ΅\n$ git reset --hard\nΠ΄Π»Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ ΠΈΡΡ
ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡ." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ»ΠΈΡΡ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π²Π΅ΡΠΎΠΊ Π² ΠΏΡΡΡΠΎΠΉ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ Π½Π° Π²Π΅ΡΠΊΡ." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ Π½Π°Π΄ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΈΠΌΠΈ Π²Π΅ΡΠΊΠ°ΠΌΠΈ." @@ -9011,12 +9294,24 @@ msgstr "Π½Π΅ ΠΎΠ±Π½ΠΎΠ²Π»ΡΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ ΠΈΠ»ΠΈ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ #: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" -msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΡΠΈΠ»ΡΡΡΠ° ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄Π°" +msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΏΡΠΈΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΡΠΈΠ»ΡΡΡΠ° ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅" #: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "ΠΎΡΠ»Π°Π΄ΠΊΠ° unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <ΠΊΠ°ΡΠ°Π»ΠΎΠ³-git>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "ΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ ΡΠΊΠ°Π·Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9330,26 +9625,28 @@ msgstr "* Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ %s" msgid " Fetch URL: %s" msgstr " URL Π΄Π»Ρ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(Π½Π΅Ρ URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL Π΄Π»Ρ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " HEAD Π²Π΅ΡΠΊΠ°: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD Π²Π΅ΡΠΊΠ° (HEAD Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Π½Π΅ΠΎΠ΄Π½ΠΎΠ·Π½Π°ΡΠ½ΡΠΉ, ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ·):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -9358,11 +9655,11 @@ msgstr[1] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" msgstr[2] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" msgstr[3] " ΠΠ½Π΅ΡΠ½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (ΡΡΠ°ΡΡΡ Π½Π΅ Π·Π°ΠΏΡΠΎΡΠ΅Π½)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " ΠΠΎΠΊΠ°Π»ΡΠ½Π°Ρ Π²Π΅ΡΠΊΠ°, Π½Π°ΡΡΡΠΎΠ΅Π½Π½Π°Ρ Π΄Π»Ρ Β«git pullΒ»:" @@ -9370,11 +9667,11 @@ msgstr[1] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git msgstr[2] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git pullΒ»:" msgstr[3] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git pullΒ»:" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π·Π΅ΡΠΊΠ°Π»ΠΈΡΡΠ΅ΠΌΡΠ΅ Ρ ΠΏΠΎΠΌΠΎΡΡΡ Β«git pushΒ»" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -9383,128 +9680,128 @@ msgstr[1] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«gi msgstr[2] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git pushΒ»%s:" msgstr[3] " ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΡΡΠ»ΠΊΠΈ, Π½Π°ΡΡΡΠΎΠ΅Π½Π½ΡΠ΅ Π΄Π»Ρ Β«git pushΒ»%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ refs/remotes/<ΠΈΠΌΡ>/HEAD Π² Π·Π°Π²ΠΈΡΠΈΠΌΠΎΡΡΠΈ ΠΎΡ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ refs/remotes/<ΠΈΠΌΡ>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ Π²Π½Π΅ΡΠ½ΠΈΠΉ HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "ΠΠ΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π²Π½Π΅ΡΠ½ΠΈΡ
HEAD Π²Π΅ΡΠΎΠΊ. Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠ²Π½ΠΎ ΠΎΠ΄Π½Ρ ΠΈΠ· Π½ΠΈΡ
:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΡΡΡΠ»ΠΊΠ°: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΡΡΡΠΎΠΈΡΡ %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s Π±ΡΠ΄Π΅Ρ Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s ΡΡΠ°Π»Π° Π²ΠΈΡΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΎΠΉ!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [Π±ΡΠ΄Π΅Ρ ΡΠ΄Π°Π»Π΅Π½Π°] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [ΡΠ΄Π°Π»Π΅Π½Π°] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "ΠΏΠΎΡΠΈΡΡΠΈΡΡ Π²Π½Π΅ΡΠ½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ ΠΏΠΎΡΠ»Π΅ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ»" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "Π½Π΅ ΡΠΊΠ°Π·Π°Π½ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "Π·Π°ΠΏΡΠΎΡΠΈΡΡ URL ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ, Π²ΠΌΠ΅ΡΡΠΎ URL ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΡ" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "Π²Π΅ΡΠ½ΡΡΡ Π²ΡΠ΅ URL" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "URL Π½Π΅ Π½Π°ΡΡΡΠΎΠ΅Π½Ρ Π΄Π»Ρ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ»" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "ΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ URL ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "ΡΠ΄Π°Π»ΠΈΡΡ URL" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ --delete" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½ΡΠΉ ΡΠ°Π±Π»ΠΎΠ½ ΡΡΠ°ΡΠΎΠ³ΠΎ URL: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "ΠΠ΅ Π½Π°ΠΉΠ΄Π΅Π½Ρ ΡΠΎΠ²ΠΏΠ°Π΄Π΅Π½ΠΈΡ URL: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "ΠΠ΅Π»ΡΠ·Ρ ΡΠ΄Π°Π»ΠΈΡΡ Π²ΡΠ΅ URL Π½Π΅-ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "Π±ΡΡΡ ΠΌΠ½ΠΎΠ³ΠΎΡΠ»ΠΎΠ²Π½Π΅Π΅; Π΄ΠΎΠ»ΠΆΠ½ΠΎ ΡΡΠΎΡΡΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ" @@ -9998,10 +10295,6 @@ msgstr "ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎΠ΅ ΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅" msgid "exit with a zero status even if nothing matched" msgstr "Π²ΡΡ
ΠΎΠ΄ Ρ Π½ΡΠ»Π΅Π²ΡΠΌ ΠΊΠΎΠ΄ΠΎΠΌ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°, Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "ΠΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΡΠΉΡΠ΅ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² .gitmodules ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ ΠΈΡ
, ΡΡΠΎΠ±Ρ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10192,80 +10485,178 @@ msgstr "ΠΏΡΠΎΠΏΡΡΡΠΈΡΡ ΠΈ ΡΠ΄Π°Π»ΠΈΡΡ Π²ΡΠ΅ ΡΡΡΠΎΠΊΠΈ, Π½Π°ΡΠΈΠ½Π° msgid "prepend comment character and space to each line" msgstr "Π΄ΠΎΠ±Π°Π²ΠΈΡΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠ°ΠΆΠ΄ΠΎΠΉ ΡΡΡΠΎΠΊΠΎΠΉ ΡΠΈΠΌΠ²ΠΎΠ» ΠΊΠΎΠΌΠΌΠ΅ΡΠ°ΡΠΈΡ ΠΈ ΠΏΡΠΎΠ±Π΅Π»" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "ΠΠ΅Ρ ΡΠ°ΠΊΠΎΠΉ ΡΡΡΠ»ΠΊΠΈ: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "ΠΠΆΠΈΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»Π½ΠΎΠ΅ ΠΈΠΌΡ ΡΡΡΠ»ΠΊΠΈ, Π° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΎ %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±ΡΠ΅Π·Π°ΡΡ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ url Β«%sΒ»" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "Π°Π»ΡΡΠ΅ΡΠ½Π°ΡΠΈΠ²Π½ΡΠΉ ΡΠΈΠΌΠ²ΠΎΠ» Π΄Π»Ρ ΠΎΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΡΡ
ΠΏΡΡΠ΅ΠΉ" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ΠΏΡΡΡ>] [<ΠΏΡΡΡ>β¦]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "URL Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«%sΒ» Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² .gitmodules" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Π‘Π±ΠΎΠΉ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ Π°Π΄ΡΠ΅ΡΠ° Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ» (%s) Π·Π°ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠΎΠ²Π°Π½ ΠΏΠΎ ΠΏΡΡΠΈ Β«%sΒ»\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "Π²Π½ΠΈΠΌΠ°Π½ΠΈΠ΅: ΠΏΡΠ΅Π΄ΠΏΠΎΠ»Π°Π³Π°Π΅ΠΌΡΠΉ ΡΠ΅ΠΆΠΈΠΌ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "Π‘Π±ΠΎΠΉ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ ΡΠ΅ΠΆΠΈΠΌΠ° ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "ΠΠ΅ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<ΠΏΡΡΡ>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ΠΏΡΡΡ>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΈΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ Π² .gitmodules Π΄Π»Ρ ΠΏΡΡΠΈ Β«%sΒ»" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "ΠΊΡΠ΄Π° Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ Π½ΠΎΠ²ΡΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "ΠΈΠΌΡ Π½ΠΎΠ²ΠΎΠ³ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "url ΠΎΡΠΊΡΠ΄Π° Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΠ» ΡΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ Π½ΠΎΠ²ΡΠΉ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "Π³Π»ΡΠ±ΠΈΠ½Π° Π΄Π»Ρ ΡΠ°ΡΡΠΈΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½Π°" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] " -"[<path>...]" -msgstr "git submodule--helper clone [--prefix=<ΠΏΡΡΡ>] [--quiet] [--reference <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ>] [--name <ΠΈΠΌΡ>] [--url <url>][--depth <Π³Π»ΡΠ±ΠΈΠ½Π°>] [--] [<ΠΏΡΡΡ>β¦]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<ΠΏΡΡΡ>] [--quiet] [--reference <ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ>] [--name <ΠΈΠΌΡ>] [--depth <Π³Π»ΡΠ±ΠΈΠ½Π°>] --url <url> --path <ΠΏΡΡΡ>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ Β«%sΒ» Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«%sΒ»" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ°ΠΉΠ» Β«%sΒ»" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΡΡΡΡ ΡΠ°ΠΉΠ» %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°: ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π° submodule--helper Π΄ΠΎΠ»ΠΆΠ½Π° Π²ΡΠ·ΡΠ²Π°ΡΡΡΡ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Ρ" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«%sΒ» Π½Π΅ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Ρ Ρ
ΠΎΡΠ΅Π»ΠΈ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Β«update --initΒ»?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "ΠΡΠΎΠΏΡΡΠΊ Π½Π΅ ΡΠ»ΠΈΡΠΎΠ³ΠΎ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ %s" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:660 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°: Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ submodule--helper" +msgid "Skipping submodule '%s'" +msgstr "ΠΡΠΎΠΏΡΡΠΊ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«%sΒ»" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "ΠΏΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "ΠΏΡΡΡ Π² ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅, Π² ΠΏΡΠ΅Π΄Π΅Π»Π°Ρ
Π³ΡΠ°Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout ΠΈΠ»ΠΈ none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ ΡΠ°ΡΡΠΈΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½, ΠΎΠ³ΡΠ°Π½ΠΈΡΠ΅Π½Π½ΡΠΉ ΡΠΊΠ°Π·Π°Π½Π½ΡΠΌ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎΠΌ ΡΠ΅Π΄Π°ΠΊΡΠΈΠΉ" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "ΠΏΠ°ΡΠ°Π»Π»Π΅Π»ΡΠ½ΡΠ΅ Π·Π°Π΄Π°ΡΠΈ" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "Π²Ρ Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ΅ΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<ΠΏΡΡΡ>] [<ΠΏΡΡΡ>β¦]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "ΠΏΠ»ΠΎΡ
ΠΎΠ΅ Π·Π½Π°ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠ° update" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π° submodule--helper Π΄ΠΎΠ»ΠΆΠ½Π° Π²ΡΠ·ΡΠ²Π°ΡΡΡΡ Ρ ΡΠΊΠ°Π·Π°Π½ΠΈΠ΅ΠΌ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Ρ" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10315,27 +10706,22 @@ msgstr "git tag -l [-n[<ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ>]] [--contains <ΠΊΠΎΠΌΠΌΠΈΡ>] [--p msgid "git tag -v <tagname>..." msgstr "git tag -v <ΠΈΠΌΡ-ΠΌΠ΅ΡΠΊΠΈ>β¦" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "ΡΠ»ΠΈΡΠΊΠΎΠΌ Π΄Π»ΠΈΠ½Π½ΠΎΠ΅ ΠΈΠΌΡ ΠΌΠ΅ΡΠΊΠΈ: %.*sβ¦" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "ΠΌΠ΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½Π°." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "ΠΠ΅ΡΠΊΠ° Β«%sΒ» ΡΠ΄Π°Π»Π΅Π½Π° (Π±ΡΠ»Π° %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΈΡΡ ΠΌΠ΅ΡΠΊΡ Β«%sΒ»" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10344,7 +10730,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "\nΠΠ²Π΅Π΄ΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΌΠ΅ΡΠΊΠΈ:\n %s\nΠ‘ΡΡΠΎΠΊΠΈ, Π½Π°ΡΠΈΠ½Π°ΡΡΠΈΠ΅ΡΡ Ρ Β«%cΒ» Π±ΡΠ΄ΡΡ ΠΏΡΠΎΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Ρ.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10470,21 +10856,21 @@ msgstr "ΠΎΠΏΡΠΈΠΈ --merged ΠΈ --no-merged ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Ρ msgid "only one -F or -m option is allowed." msgstr "-F ΠΈ -m Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "ΠΏΠ΅ΡΠ΅Π΄Π°Π½ΠΎ ΡΠ»ΠΈΡΠΊΠΎΠΌ ΠΌΠ½ΠΎΠ³ΠΎ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΠΎΠ²" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΌ ΠΈΠΌΠ΅Π½Π΅ΠΌ ΠΌΠ΅ΡΠΊΠΈ." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "ΠΌΠ΅ΡΠΊΠ° Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "ΠΠ΅ΡΠΊΠ° Β«%sΒ» ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π° (Π±ΡΠ»Π° %s)\n" @@ -10732,7 +11118,7 @@ msgstr "git verify-commit [-v | --verbose] <ΠΊΠΎΠΌΠΌΠΈΡ>β¦" msgid "print commit contents" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "Π²ΡΠ²ΠΎΠ΄ΠΈΡΡ ΡΡΡΠΎΠΉ Π²ΡΠ²ΠΎΠ΄ ΡΡΠ°ΡΡΡΠ° ΠΎΡ gpg" @@ -10752,7 +11138,7 @@ msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΎΠ»ΡΠΊΠΎ ΡΡΠ°ΡΠΈΡΡΠΈΠΊΡ" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <ΠΌΠ΅ΡΠΊΠ°>β¦" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΠΌΠ΅ΡΠΊΠΈ" @@ -10768,68 +11154,72 @@ msgstr "git worktree prune [<ΠΎΠΏΡΠΈΠΈ>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<ΠΎΠΏΡΠΈΠΈ>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠΌ" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: ΡΠ°ΠΉΠ» gitdir Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ ΡΠ°ΠΉΠ» gitdir (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» gitdir" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠΈΡ
ΠΊΠ°ΡΠ°Π»ΠΎΠ³ΠΎΠ²/%s: gitdir ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° Π½Π΅ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠ΅Π΅ ΡΠ°ΡΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ: %s" +msgid "failed to remove '%s'" +msgstr "ΡΠ±ΠΎΠΉ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ Β«%sΒ»" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«%sΒ»" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "ΠΠΎΠ΄Π³ΠΎΡΠΎΠ²ΠΊΠ° %s (ΠΈΠ΄Π΅Π½ΡΠΈΡΠΈΠΊΠ°ΡΠΎΡ %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" -msgstr "ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° <Π²Π΅ΡΠΊΠ°> Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ ΠΎΠ½Π° ΡΠΆΠ΅ Π°ΠΊΡΠΈΠ²Π½Π° Π² Π΄ΡΡΠ³ΠΎΠΌ ΡΠ°Π±ΠΎΡΠ΅ΡΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" +msgstr "ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° <Π²Π΅ΡΠΊΠ°> Π΄Π°ΠΆΠ΅ Π΅ΡΠ»ΠΈ ΠΎΠ½Π° ΡΠΆΠ΅ Π°ΠΊΡΠΈΠ²Π½Π° Π² Π΄ΡΡΠ³ΠΎΠΌ ΡΠ°Π±ΠΎΡΠ΅ΡΠΌ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π΅" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "ΡΠΎΠ·Π΄Π°ΡΡ ΠΈΠ»ΠΈ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π²Π΅ΡΠΊΡ" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ HEAD Π½Π° ΡΠΊΠ°Π·Π°Π½Π½ΠΎΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ΅" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "Π½Π°ΠΏΠΎΠ»Π½ΠΈΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B ΠΈ --detach Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" @@ -10849,7 +11239,7 @@ msgstr "Π²ΡΠ²Π΅ΡΡΠΈ ΠΎΠ±ΡΠ΅ΠΊΡ Π΄Π΅ΡΠ΅Π²Π° Π΄Π»Ρ ΠΏΠΎΠ΄ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° Ρ msgid "only useful for debugging" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠ΅ΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ ΠΎΡΠ»Π°Π΄ΠΊΠ΅" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "Π²ΡΠ²ΠΎΠ΄ ΠΎΡΠ»Π°Π΄ΠΎΡΠ½ΡΡ
ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ Π½Π° stderr" @@ -10860,7 +11250,7 @@ msgid "" "to read about a specific subcommand or concept." msgstr "Β«git help -Π°Β» ΠΈ Β«git help -gΒ» Π²ΡΠ²ΠΎΠ΄ΠΈΡ ΡΠΏΠΈΡΠΎΠΊ Π΄ΠΎΡΡΡΠΏΠ½ΡΡ
ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄ ΠΈ\nΠ½Π΅ΠΊΠΎΡΠΎΡΡΠ΅ ΡΡΠΊΠΎΠ²ΠΎΠ΄ΡΡΠ²Π° ΠΏΠΎ ΡΠ΅ΠΌΠ°ΠΌ. ΠΠ°ΠΏΡΡΡΠΈΡΠ΅ Β«git help <ΠΊΠΎΠΌΠ°Π½Π΄Π°>Β» ΠΈΠ»ΠΈ\nΒ«git help <ΡΠ΅ΡΠΌΠΈΠ½>Β», ΡΡΠΎΠ±Ρ ΠΏΡΠΎΡΠ΅ΡΡΡ ΠΎ ΠΊΠΎΠ½ΠΊΡΠ΅ΡΠ½ΡΡ
ΠΏΠΎΠ΄ΠΊΠΎΠΌΠ°Π½Π΄Π΅ ΠΈΠ»ΠΈ ΡΠ΅ΠΌΠ΅." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Public key pinning Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΡΡΡ Ρ cURL < 7.44.0" @@ -10988,7 +11378,7 @@ msgstr "ΡΠΈΡ
ΠΈΠΉ ΡΠ΅ΠΆΠΈΠΌ" msgid "use <n> digits to display SHA-1s" msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ <n> ΡΠΈΡΡ Π΄Π»Ρ Π²ΡΠ²ΠΎΠ΄Π° SHA-1" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΏΠ΅ΡΠ΅ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°, Π΅ΡΠ»ΠΈ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ" @@ -11180,58 +11570,54 @@ msgid "" "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 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "ΠΡΠΈΠΌΠ΅Π½Π΅Π½ΠΎ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΠΏΡΡΡΠ°Π½ΡΠ΅." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 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 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "ΠΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊ ΠΏΡΠ΅-ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ ΠΎΡΠΊΠ°Π·Π°Π» Π² ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, git-am Π²ΡΠΏΠΎΠ»Π½ΡΠ΅ΡΡΡ. ΠΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅ Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "ΠΠΏΡΠΈΡ --exec Π΄ΠΎΠ»ΠΆΠ½Π° ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ Π²ΠΌΠ΅ΡΡΠ΅ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "ΠΠ΅Ρ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "ΠΠ΅ΠΉΡΡΠ²ΠΈΠ΅ --edit-todo ΠΌΠΎΠΆΠ΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΏΡΠΈ ΠΈΠ½ΡΠ΅ΡΠ°ΠΊΡΠΈΠ²Π½ΠΎΠΌ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠΈ." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΡΠΈΡΠ°ΡΡ HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 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:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π°Π·Π°Π΄ Π½Π° $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11244,64 +11630,64 @@ msgid "" "valuable there." msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΠΊΠ°ΡΠ°Π»ΠΎΠ³ $state_dir_base ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Ρ ΠΏΡΠ΅Π΄ΠΏΠΎΠ»Π°Π³Π°Ρ, ΡΡΠΎ Π²Ρ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ Π΄ΡΡΠ³ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΡ. ΠΡΠ»ΠΈ ΡΡΠΎ ΡΠ°ΠΊ, ΠΏΠΎΠΏΡΠΎΠ±ΡΠΉΡΠ΅\n\t$cmd_live_rebase\nΠΡΠ»ΠΈ Π½Π΅Ρ\n\t$cmd_clear_stale_rebase\nΠΈ Π·Π°ΠΏΡΡΡΠΈΡΠ΅ ΠΌΠ΅Π½Ρ ΡΠ½ΠΎΠ²Π°. Π― ΠΎΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°ΡΡΡ, ΡΡΠΎΠ±Ρ Π²Ρ Π½Π΅ ΠΏΠΎΡΠ΅ΡΡΠ»ΠΈ ΡΡΠΎ-ΡΠΎ Π²Π°ΠΆΠ½ΠΎΠ΅." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "Π½Π΅Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½Π°Ρ Π²ΡΡΠ΅ΡΡΠΎΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ΠΈΠΌΠ΅Π΅ΡΡΡ Π±ΠΎΠ»ΡΡΠ΅ ΠΎΠ΄Π½ΠΎΠΉ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: Π½Π΅Ρ Π±Π°Π·Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "ΠΠ΅ ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅Ρ ΡΠ°ΠΊΠΎΠΉ Π²Π΅ΡΠΊΠΈ: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΎΠ΅ ΠΏΡΡΡΠ°Π½ΡΠ΅" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ ΡΠΏΡΡΡΠ°Π½Ρ: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Π‘Π΄Π΅Π»Π°ΠΉΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈΠ»ΠΈ ΡΠΏΡΡΡΡΡΠ΅ ΠΈΡ
." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Π’Π΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° $branch_name ΡΠΆΠ΅ ΡΠ²Π΅ΠΆΠ°Ρ." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Π’Π΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ° $branch_name ΡΠΆΠ΅ ΡΠ²Π΅ΠΆΠ°Ρ, ΠΏΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΠ΅ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΈΠ΅." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΎΡ $mb Π΄ΠΎ $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "Π‘Π½Π°ΡΠ°Π»Π° ΠΏΠ΅ΡΠ΅ΠΌΠ°ΡΡΠ²Π°Π΅ΠΌ ΡΠΊΠ°Π·Π°ΡΠ΅Π»Ρ ΡΠ΅ΠΊΡΡΠ΅Π³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°, ΡΡΠΎΠ±Ρ ΠΏΡΠΈΠΌΠ΅Π½ΠΈΡΡ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎΠ²Π΅ΡΡ
Π½Π΅Π³ΠΎβ¦" -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "ΠΠ΅ΡΠ΅ΠΌΠΎΡΠ°Π½Π° Π²ΠΏΠ΅ΡΠ΅Π΄ $branch_name Π΄ΠΎ $onto_name." @@ -11442,26 +11828,21 @@ msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ΠΎ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ" msgid "(To restore them type \"git stash apply\")" msgstr "(Π§ΡΠΎΠ±Ρ Π²ΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΈΡ
, Π½Π°Π±Π΅ΡΠΈΡΠ΅ Β«git stash applyΒ»)" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΡΠ΅Π·Π°ΡΡ ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΏΠΎΠ½Π΅Π½Ρ Π°Π΄ΡΠ΅ΡΠ° Β«$remoteurlΒ»" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "ΠΡΠ½ΠΎΡΠΈΡΠ΅Π»ΡΠ½ΡΠΉ ΠΏΡΡΡ ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π½Π°Ρ
ΠΎΠ΄ΡΡΡ Π½Π° Π²Π΅ΡΡΠΈΠ½Π΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ: Β«$repoΒ» Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±ΡΡΡ Π°Π±ΡΠΎΠ»ΡΡΠ½ΡΠΌ ΠΈΠ»ΠΈ Π½Π°ΡΠΈΠ½Π°ΡΡΡΡ Ρ ./|../" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "Β«$sm_pathΒ» ΡΠΆΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11469,235 +11850,217 @@ msgid "" "Use -f if you really want to add it." msgstr "Π‘Π»Π΅Π΄ΡΡΡΠΈΠ΅ ΠΏΡΡΠΈ ΠΈΠ³Π½ΠΎΡΠΈΡΡΡΡΡΡ ΠΎΠ΄Π½ΠΈΠΌ ΠΈΠ· Π²Π°ΡΠΈΡ
ΡΠ°ΠΉΠ»ΠΎΠ² .gitignore:\n$sm_path\nΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ -f, Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΅Π³ΠΎ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "ΠΠΎΠ±Π°Π²Π»ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΈΠ· Β«$sm_pathΒ» Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "Β«$sm_pathΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ ΠΈ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ git" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ git Π΄Π»Ρ Β«$sm_nameΒ» Π½Π°ΠΉΠ΄Π΅Π½ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎ Π½Π° Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡΡ
:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "ΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΠ΅ΡΠ΅ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git Π²ΠΌΠ΅ΡΡΠΎ ΠΏΠΎΠ²ΡΠΎΡΠ½ΠΎΠ³ΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΡ ΠΈΠ·" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr ", ΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ ΠΎΠΏΡΠΈΡ Β«--forceΒ». ΠΡΠ»ΠΈ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ git Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΡΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "ΠΈΠ»ΠΈ Π΅ΡΠ»ΠΈ Π²Ρ Π½Π΅ ΠΏΠΎΠ½ΡΠ»ΠΈ, ΡΡΠΎ ΡΡΠΎ Π·Π½Π°ΡΠΈΡ, ΡΠΎ ΠΏΡΠΎΡΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π΄ΡΡΠ³ΠΎΠ΅ ΠΈΠΌΡ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΎΠΏΡΠΈΠΈ Β«--nameΒ»." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "ΠΠΎΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° git Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_nameΒ»." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_pathΒ»" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_pathΒ»" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Π‘Π±ΠΎΠΉ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_pathΒ»" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$sm_pathΒ»" -#: git-submodule.sh:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "ΠΠ°Ρ
ΠΎΠ΄ΠΈΠΌ Π² Β«$prefix$displaypathΒ»" - -#: git-submodule.sh:437 -#, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "ΠΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Π΅ΠΌΡΡ Π½Π° Β«$prefix$displaypathΒ»; ΡΡΠ΅Π½Π°ΡΠΈΠΉ Π²Π΅ΡΠ½ΡΠ» Π½Π΅ Π½ΡΠ»Π΅Π²ΠΎΠΉ ΠΊΠΎΠ΄ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°." - -#: git-submodule.sh:483 +#: git-submodule.sh:355 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "ΠΠ΄ΡΠ΅Ρ Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ» Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² .gitmodules" +msgid "Entering '$displaypath'" +msgstr "ΠΠ°Ρ
ΠΎΠ΄ΠΈΠΌ Π² Β«$displaypathΒ»" -#: git-submodule.sh:492 +#: git-submodule.sh:375 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "Π‘Π±ΠΎΠΉ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ Π°Π΄ΡΠ΅ΡΠ΅ Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ»" +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "ΠΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Π΅ΠΌΡΡ Π½Π° Β«$displaypathΒ»; ΡΡΠ΅Π½Π°ΡΠΈΠΉ Π²Π΅ΡΠ½ΡΠ» Π½Π΅ Π½ΡΠ»Π΅Π²ΠΎΠΉ ΠΊΠΎΠ΄ Π²ΠΎΠ·Π²ΡΠ°ΡΠ°." -#: git-submodule.sh:494 +#: git-submodule.sh:448 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$nameΒ» ($url) Π·Π°ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠΎΠ²Π°Π½ Π΄Π»Ρ ΠΏΡΡΠΈ Β«$displaypathΒ»" +msgid "pathspec and --all are incompatible" +msgstr "ΡΠΏΠ΅ΡΠΈΡΠΈΠΊΠ°ΡΠΈΡ ΠΏΡΡΠΈ ΠΈ --all Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ" -#: git-submodule.sh:511 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "Π‘Π±ΠΎΠΉ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ ΡΠ΅ΠΆΠΈΠΌΠ° ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΏΡΡΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ»" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«--allΒ», Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΄Π΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ" -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«.Β», Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π΄Π΅ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "Π Π°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ .git" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "(ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«rm -rfΒ», Π΅ΡΠ»ΠΈ Π²Ρ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ΄Π°Π»ΠΈΡΡ Π΅Π³ΠΎ, Π²ΠΊΠ»ΡΡΠ°Ρ Π²ΡΡ Π΅Π³ΠΎ ΠΈΡΡΠΎΡΠΈΡ)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to" " discard them" msgstr "Π Π°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ» ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ; ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«-fΒ», ΡΡΠΎΠ±Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΈΡ
" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "ΠΡΠΈΡΠ΅Π½ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ Β«$displaypathΒ»" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ»" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΠΏΡΡΡΠΎΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ»" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$nameΒ» ($url) Π±ΡΠ» ΡΠ½ΡΡ Ρ ΡΠ΅Π³ΠΈΡΡΡΠ°ΡΠΈΠΈ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ» Π½Π΅ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½\nΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π²Π°ΠΌ Π½ΡΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Β«update --initΒ»?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡΡΡ ΡΠ΅Π΄Π°ΠΊΡΠΈΡ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$sm_pathΒ»" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Β«$sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΡΡΡ Π½Π° ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Β«$sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»: Π·Π°Π±ΡΠ°Π½ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ Β«$sha1Β»" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΡΠΈΡΡ Β«$sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»: ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ Π½Π°Π΄ Β«$sha1Β»" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Ρ Β«$sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»: ΡΠ»ΠΈΡΠΎ Ρ Β«$sha1Β»" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "Π‘Π±ΠΎΠΉ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Β«$command $sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$prefix$sm_pathΒ»" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "Π‘Π±ΠΎΠΉ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ Β«$command $sha1Β» Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$prefix$sm_pathΒ»: Β«$command $sha1Β»" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "ΠΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»: Β«$command $sha1Β»" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$displaypathΒ»" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "ΠΠΏΡΠΈΡ --cached Π½Π΅Π»ΡΠ·Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ ΠΎΠ΄Π½ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½ΠΎ Ρ ΠΎΠΏΡΠΈΠ΅ΠΉ --files" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΡΠΉ ΡΠ΅ΠΆΠΈΠΌ $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: $display_name Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡ $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: $display_name Π½Π΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡ $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "Π΄Π²ΠΎΠΈΡΠ½ΡΠΉ ΠΎΠ±ΡΠ΅ΠΊΡ" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ ΠΏΠΎ ΠΏΡΡΠΈ Β«$sm_pathΒ»" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Π‘ΠΈΠ½Ρ
ΡΠΎΠ½ΠΈΠ·Π°ΡΠΈΡ url Π΄Π»Ρ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ Β«$displaypathΒ»" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "ΠΠ»Ρ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ, ΡΠΌΠΎΡΡΠΈΡΠ΅ git-${cmd}(1)." @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.8.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-15 22:35+0100\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-27 14:04+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -31,7 +31,7 @@ msgstr "" "RΓ€tta dem i din arbetskatalog och anvΓ€nd sedan \"git add/rm <fil>\"\n" "som lΓ€mpligt fΓΆr att ange lΓΆsning och checka in." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -75,7 +75,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "prefix" @@ -83,9 +83,9 @@ 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:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -119,7 +119,8 @@ msgstr "komprimera bΓ€ttre" msgid "list supported archive formats" msgstr "visa understΓΆdda arkivformat" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "arkiv" @@ -271,11 +272,16 @@ msgstr "Objektnamnet Γ€r tvetydigt: \"%s\"." msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten Γ€r inte giltig: \"%s\"" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" Γ€r redan utcheckad pΓ₯ \"%s\"" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -286,7 +292,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:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "kunde inte ΓΆppna \"%s\"" @@ -295,10 +301,10 @@ msgstr "kunde inte ΓΆppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nΓΆdvΓ€ndiga incheckningar:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -337,21 +343,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:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "okΓ€nt argument: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "VΓ€grar skapa ett tomt paket (bundle)." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack dog" @@ -360,8 +366,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt fΓ€rgvΓ€rde: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -395,21 +401,21 @@ msgstr "felaktigt numeriskt konfigurationsvΓ€rde \"%s\" fΓΆr \"%s\": %s" msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera anvΓ€ndarkatalog i: \"%s\"" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt lΓ€ge fΓΆr skapande av objekt: %s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "okΓ€nt fel uppstod vid lΓ€sning av konfigurationsfilerna" @@ -428,24 +434,27 @@ msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" pΓ₯ rad %d" msgid "%s has multiple values" msgstr "%s har flera vΓ€rden" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "kunde inte stΓ€lla in \"%s\" till \"%s\"" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "Kunde inte stΓ€lla in \"%s\" till \"%s\"" +msgid "could not unset '%s'" +msgstr "kunde inte ta bort instΓ€llning fΓΆr \"%s\"" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Kunde inte kΓΆra \"git rev-list\"" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "kunde inte skriva till rev-list: %s" +msgid "failed write to rev-list" +msgstr "kunde inte skriva till rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "kunde inte stΓ€nga rev-list:s standard in: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "kunde inte stΓ€nga rev-list:s standard in" #: date.c:95 msgid "in the future" @@ -520,26 +529,26 @@ msgstr[1] "%lu Γ₯r sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte lΓ€sa orderfilen \"%s\"" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "UtfΓΆr onΓΆjaktig namnbytesdetektering" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskΓ€rningsprocentandel \"%s\"\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " OkΓ€nd dirstat-parameter \"%s\"\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "OkΓ€nt vΓ€rde fΓΆr konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -548,16 +557,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow krΓ€ver exakt en sΓΆkvΓ€gsangivelse" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -566,20 +575,20 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "misslyckades hΓ€mta kΓ€rnans namn och information" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "OspΓ₯rad cache Γ€r inaktiverad pΓ₯ systemet eller platsen." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "kunde inte kΓΆra gpg." @@ -593,28 +602,28 @@ msgstr "gpg misslyckades signera data" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "kunde inte skapa temporΓ€ra filen \"%s\": %s" +msgid "could not create temporary file '%s'" +msgstr "kunde inte skapa temporΓ€ra filen \"%s\"" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "misslyckades skriva fristΓ₯ende signatur till \"%s\": %s" +msgid "failed writing detached signature to '%s'" +msgstr "misslyckades skriva fristΓ₯ende signatur till \"%s\"" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte lΓ€sa %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "\"%s\": %s" +msgid "failed to stat '%s'" +msgstr "misslyckades ta status pΓ₯ \"%s\"" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "\"%s\": kort lΓ€sning %s" +msgid "'%s': short read" +msgstr "\"%s\": kort lΓ€sning" #: help.c:205 #, c-format @@ -680,12 +689,37 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Kunde inte skapa \"%s.lock\": %s.\n" +"\n" +"Det verkar som en annan git-process kΓΆr i det hΓ€r arkivet, t.ex.\n" +"ett textredigeringsprogram startat av \"git commit\". Se till att\n" +"alla processer avslutats och fΓΆrsΓΆk sedan igen. Om det fortfarande\n" +"misslyckas kanske en git-process har kraschat i det hΓ€r arkivet\n" +"tidigare:\n" +"ta bort filen manuellt fΓΆr att fortsΓ€tta." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "kunde inte skapa \"%s.lock\": %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "misslyckades lΓ€sa cachen" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -732,7 +766,7 @@ msgstr "kan inte lΓ€sa objektet %s: \"%s\"" msgid "blob expected for %s '%s'" msgstr "blob fΓΆrvΓ€ntades fΓΆr %s \"%s\"" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "misslyckades ΓΆppna \"%s\"" @@ -866,7 +900,7 @@ msgstr "Hoppade ΓΆver %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "SlΓ₯r ihop %s automatiskt" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "undermodul" @@ -894,50 +928,50 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. LΓ€gger till %s som %s" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "LΓ€gger till %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Γdesdigert sammanslagningsfel, borde inte intrΓ€ffa." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Redan Γ jour!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av trΓ€den %s och %s misslyckades" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sΓΆkvΓ€g??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "SlΓ₯r ihop:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, 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:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -967,28 +1001,28 @@ msgstr "Felaktigt vΓ€rde pΓ₯ %s: \"%s\"" msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "anvΓ€ndning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-TAL" @@ -997,7 +1031,7 @@ msgstr "-TAL" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte gΓΆra %s skrivbar fΓΆr gruppen" @@ -1067,7 +1101,7 @@ msgstr "" "Ingenting att exkludera frΓ₯n med :(exkludera)-mΓΆnster.\n" "GlΓΆmde du kanske att antingen lΓ€gga till \":/\" eller \".\"?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format fΓΆr --pretty" @@ -1093,23 +1127,23 @@ msgstr "" "GIT_INDEX_VERSION satt, men vΓ€rdet Γ€r ogiltigt.\n" "AnvΓ€nder version %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte ΓΆppna \"%s\" fΓΆr skrivning" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" @@ -1248,93 +1282,93 @@ msgstr "format: atomen %%(end) saknas" msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hΓ€mta bΓ₯de %s och %s till %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spΓ₯rar vanligtvis %s, inte %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spΓ₯rar bΓ₯de %s och %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte pΓ₯ en gren" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "okΓ€nd gren: \"%s\"" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppstrΓΆm angiven fΓΆr grenen \"%s\"" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "uppstrΓΆmsgrenen \"%s\" Γ€r inte lagrad som en fjΓ€rrspΓ₯rande gren" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-mΓ₯let \"%s\" pΓ₯ fjΓ€rren \"%s\" har ingen lokalt spΓ₯rande gren" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjΓ€rr fΓΆr \"push\"" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation fΓΆr \"%s\" innehΓ₯ller inte \"%s\"" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mΓ₯l (push.default Γ€r \"ingenting\")" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mΓ₯l" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren Γ€r baserad pΓ₯ \"%s\", men den har fΓΆrsvunnit uppstrΓΆms.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (anvΓ€nd \"git branch --unset-upstream\" fΓΆr att rΓ€tta)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren Γ€r Γ jour med \"%s\".\n" -#: remote.c:2084 +#: remote.c:2085 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger fΓΆre \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger fΓΆre \"%s\" med %d incheckningar.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (anvΓ€nd \"git push\" fΓΆr att publicera dina lokala incheckningar)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1344,11 +1378,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (anvΓ€nd \"git pull\" fΓΆr att uppdatera din lokala gren)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1363,20 +1397,20 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (anvΓ€nd \"git pull\" fΓΆr att slΓ₯ ihop fjΓ€rrgrenen med din egen)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehΓ₯ller Γ€nnu inte nΓ₯gra incheckningar" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent Γ€r inkompatibelt med --bisect" @@ -1427,7 +1461,7 @@ msgstr "" "med \"git add <sΓΆkvΓ€gar>\" eller \"git rm <sΓΆkvΓ€gar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" @@ -1585,12 +1619,12 @@ msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pΓ₯gΓ₯r" @@ -1602,63 +1636,72 @@ msgstr "kan inte bestΓ€mma HEAD" msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta frΓ₯n en gren som Γ€nnu inte Γ€r fΓΆdd" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "kan inte ΓΆppna %s: %s" +msgid "cannot open %s" +msgstr "kan inte ΓΆppna %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "kan inte lΓ€sa %s: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "ovΓ€ntat filslut" -#: sequencer.c:888 +#: sequencer.c:887 #, 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:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte gΓΆra \"cherry-pick\" pΓ₯ typen \"%s\"" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Kan inte Γ₯ngra som fΓΆrsta incheckning" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Kan inte gΓΆra \"cherry-pick\" i ett tomt huvud" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "misslyckades lΓ€sa %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "FΓΆrvΓ€ntade git-arkivversion <= %d, hittade %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "okΓ€nda arkivutΓΆkningar hittades:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "offset fΓΆre slutet av packfilen (trasig .idx?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset fΓΆre slutet av packindex fΓΆr %s (trasigt index?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex fΓΆr %s (trunkerat index?)" @@ -1685,31 +1728,40 @@ msgstr "" "UndersΓΆk referenserna och ta kanske bort dem. StΓ€ng av meddelandet\n" "genom att kΓΆra \"git config advice.objectNameWarning false\"" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kan inte Γ€ndra .gitmodules-fil som inte slagits ihop, lΓΆs " "sammanslagningskonflikter fΓΆrst" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Hittade inte nΓ₯gon sektion i .gitmodules dΓ€r sΓΆkvΓ€g=%s" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten fΓΆr %s" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "misslyckades kΓΆa uppdaterad .gitmodules" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "negativa vΓ€rden Γ€r inte tillΓ₯tna fΓΆr submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "ogiltigt vΓ€rde fΓΆr %s" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1769,7 +1821,231 @@ msgstr "kunde inte byta nman pΓ₯ temporΓ€ra file till %s" msgid "Could not read ref %s" msgstr "Kunde inte lΓ€sa referensen %s" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"Dina lokala Γ€ndringar av fΓΆljande filer skulle skrivas ΓΆver av utcheckning:\n" +"%%sChecka in dina Γ€ndringar eller anvΓ€nd \"stash\" innan du byter gren." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Dina lokala Γ€ndringar av fΓΆljande filer skulle skrivas ΓΆver av utcheckning:\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"Dina lokala Γ€ndringar av fΓΆljande filer skulle skrivas ΓΆver av " +"sammanslagning:\n" +"%%sChecka in dina Γ€ndringar eller anvΓ€nd \"stash\" innan du byter gren." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Dina lokala Γ€ndringar av fΓΆljande filer skulle skrivas ΓΆver av " +"sammanslagning:\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"Dina lokala Γ€ndringar av fΓΆljande filer skulle skrivas ΓΆver av \"%s\":\n" +"%%sChecka in dina Γ€ndringar eller anvΓ€nd \"stash\" innan du kan utfΓΆra \"%s" +"\"." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Dina lokala Γ€ndringar av fΓΆljande filer skulle skrivas ΓΆver av \"%s\":\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"Uppdatering av fΓΆljande kataloger gΓΆr att ospΓ₯rade filer gΓ₯r fΓΆrlorade i " +"dem:\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" +"%%sFlytta eller ta bort dem innan du byter gren." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle tas bort av " +"sammanslagningen:\n" +"%%sFlytta eller ta bort dem innan du byter gren." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle tas bort av " +"sammanslagningen:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle tas bort av \"%s\":\n" +"%%sFlytta eller ta bort dem innan du kan utfΓΆra \"%s\"." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle tas bort av \"%s\":\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle skrivas ΓΆver av " +"utcheckningen:\n" +"%%sFlytta eller ta bort dem innan du byter gren." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle skrivas ΓΆver av " +"utcheckningen:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle skrivas ΓΆver av " +"sammanslagningen:\n" +"%%sFlytta eller ta bort dem innan du byter gren." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle skrivas ΓΆver av " +"sammanslagningen:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle skrivas ΓΆver av \"%s\":\n" +"%%sFlytta eller ta bort dem innan du kan \"%s\"." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"FΓΆljande ospΓ₯rade filer i arbetskatalogen skulle skrivas ΓΆver av \"%s\":\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Posten \"%s\" ΓΆverlappar \"%s\". Kan inte binda." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Kan inte uppdatera gles utcheckning: fΓΆljande poster Γ€r inte Γ jour:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"FΓΆljande filer i arbetskatalogen skulle skrivas ΓΆver av uppdatering av gles " +"utcheckning:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"FΓΆljande filer i arbetskatalogen skulle tas bort av uppdatering av gles " +"utcheckning:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Avbryter\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Checkar ut filer" @@ -1807,198 +2083,194 @@ msgstr "felaktigt \"..\"-sΓΆkvΓ€gssegment" msgid "could not open '%s' for reading and writing" msgstr "kunde inte ΓΆppna \"%s\" fΓΆr lΓ€sning och skrivning" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte ΓΆppna \"%s\" fΓΆr skrivning" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte ΓΆppna \"%s\" fΓΆr lΓ€sning" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "kan inte komma Γ₯t \"%s\": %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma Γ₯t \"%s\"" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "kan inte hΓ€mta aktuell arbetskatalog" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "kunde inte ΓΆppna %s fΓΆr skrivning" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "kunde inte skriva till %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "kunde inte stΓ€nga %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sΓΆkvΓ€gar:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (anvΓ€nd \"git reset %s <fil>...\" fΓΆr att ta bort frΓ₯n kΓΆ)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (anvΓ€nd \"git rm --cached <fil>...\" fΓΆr att ta bort frΓ₯n kΓΆ)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (anvΓ€nd \"git add <fil>...\" fΓΆr att ange lΓΆsning)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (anvΓ€nd \"git add/rm <fil>...\" som lΓ€mpligt fΓΆr att ange lΓΆsning)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (anvΓ€nd \"git rm <fil>...\" fΓΆr att ange lΓΆsning)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Γndringar att checka in:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "Γndringar ej i incheckningskΓΆn:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (anvΓ€nd \"git add <fil>...\" fΓΆr att uppdatera vad som skall checkas in)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (anvΓ€nd \"git add/rm <fil>...\" fΓΆr att uppdatera vad som skall checkas in)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (anvΓ€nd \"git checkout -- <fil>...\" fΓΆr att fΓΆrkasta Γ€ndringar i " "arbetskatalogen)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller fΓΆrkasta ospΓ₯rat eller Γ€ndrat innehΓ₯ll i undermoduler)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (anvΓ€nd \"git %s <fil>...\" fΓΆr att ta med i det som skall checkas in)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "borttaget av bΓ€gge:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "tillagt av bΓ€gge:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "Γ€ndrat av bΓ€gge:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "programfel: ej hanterad \"unmerged\"-status %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "Γ€ndrad:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "okΓ€nd:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "Γ€ndrat innehΓ₯ll, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "ospΓ₯rat innehΓ₯ll, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "Undermoduler Γ€ndrade men inte uppdaterade:" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Undermodulers Γ€ndringar att checka in:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2006,39 +2278,39 @@ msgstr "" "RΓΆr inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sΓΆkvΓ€gar." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (rΓ€tta konflikter och kΓΆr \"git commit\")" -#: wt-status.c:954 +#: wt-status.c:956 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:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (anvΓ€nd \"git commit\" fΓΆr att slutfΓΆra sammanslagningen)" -#: wt-status.c:967 +#: wt-status.c:969 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:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Aktuell patch Γ€r tom." -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rΓ€tta konflikter och kΓΆr sedan \"git am --continue\")" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (anvΓ€nd \"git am --skip\" fΓΆr att hoppa ΓΆver patchen)" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (anvΓ€nd \"git am --abort\" fΓΆr att Γ₯terstΓ€lla ursprungsgrenen)" @@ -2185,43 +2457,43 @@ 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:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "PΓ₯ grenen " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pΓ₯gΓ₯r; ovanpΓ₯" -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "ombasering pΓ₯gΓ₯r; ovanpΓ₯" -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD frΓ₯nkopplad vid " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD frΓ₯nkopplad frΓ₯n " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Inte pΓ₯ nΓ₯gon gren fΓΆr nΓ€rvarande." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "FΓΆrsta incheckning" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "OspΓ₯rade filer" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2233,32 +2505,32 @@ msgstr "" "lΓ€gga till nya filer sjΓ€lv (se \"git help status\")." # %s Γ€r nΓ€sta strΓ€ng eller tom. -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "OspΓ₯rade filer visas ej%s" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (anvΓ€nd flaggan -u fΓΆr att visa ospΓ₯rade filer)" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "Inga Γ€ndringar" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "inga Γ€ndringar att checka in\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2267,52 +2539,52 @@ msgstr "" "inget kΓΆat fΓΆr incheckning, men ospΓ₯rade filer finns (spΓ₯ra med \"git add" "\")\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, 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:1525 +#: wt-status.c:1547 #, 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:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, 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:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "FΓΆrsta incheckning pΓ₯ " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "fΓΆrsvunnen" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "efter " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "fΓΆre " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort lΓ€nken \"%s\"" @@ -2326,7 +2598,7 @@ msgstr "git add [<flaggor>] [--] <sΓΆkvΓ€g>..." msgid "unexpected diff status %c" msgstr "diff-status %c fΓΆrvΓ€ntades inte" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -2339,7 +2611,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "OkΓΆade Γ€ndringar efter att ha uppdaterat indexet:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Kunde inte lΓ€sa indexet" @@ -2375,14 +2647,14 @@ 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:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "testkΓΆrning" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" @@ -2390,7 +2662,7 @@ msgstr "var pratsam" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "vΓ€lj stycken interaktivt" @@ -2458,16 +2730,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "kunde inte lΓ€sa \"%s\"" @@ -2495,16 +2767,6 @@ msgstr "Misslyckades kopiera anteckningar frΓ₯n \"%s\" till \"%s\"" msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "kunde inte ΓΆppna \"%s\" fΓΆr lΓ€sning: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "Kunde inte ΓΆppna \"%s\" fΓΆr skrivning: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2514,76 +2776,76 @@ msgstr "kunde inte tolka patchen \"%s\"" msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillΓ€mpas Γ₯t gΓ₯ngen" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "ogiltig tidsstΓ€mpel" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "NΓ€r du har lΓΆst problemet, kΓΆr \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa ΓΆver patchen, kΓΆr \"%s --skip\" i stΓ€llet." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "FΓΆr att Γ₯tergΓ₯ till ursprunglig gren och sluta patcha, kΓΆr \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "Patchen Γ€r tom. Delades den upp felaktigt?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behΓΆvs fΓΆr att falla tillbaka pΓ₯ 3-" "vΓ€gssammanslagning." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "AnvΓ€nder indexinfo fΓΆr att Γ₯terskapa ett bastrΓ€d..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2591,39 +2853,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillΓ€mpas pΓ₯ blobbar som antecknats i dess index." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka pΓ₯ att patcha grundversionen och trevΓ€gssammanslagning..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "Misslyckades slΓ₯ ihop Γ€ndringarna." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett trΓ€d" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "tillΓ€mpar pΓ₯ en tom historik" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte Γ₯teruppta: %s finns inte." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte Γ€r ansluten till en terminal." -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "Incheckningskroppen Γ€r:" @@ -2631,35 +2893,35 @@ msgstr "Incheckningskroppen Γ€r:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "TillΓ€mpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillΓ€mpa patchar (smutsiga: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "TillΓ€mpar: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "Inga Γ€ndringar -- Patchen har redan tillΓ€mpats." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades pΓ₯ %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "En kopia av patchen som misslyckades finns i: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2669,7 +2931,7 @@ msgstr "" "Om det inte Γ€r nΓ₯got kvar att kΓΆa kan det hΓ€nda att nΓ₯got annat redan\n" "introducerat samma Γ€ndringar; kanske du bΓΆr hoppa ΓΆver patchen." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2677,17 +2939,17 @@ msgstr "" "Du har fortfarande sΓΆkvΓ€gar som inte slagits samman i ditt index.\n" "GlΓΆmde du anvΓ€nda \"git add\"?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "misslyckades stΓ€da upp indexet" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2695,152 +2957,154 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Γ
terstΓ€ller inte till ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt vΓ€rde fΓΆr --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "kΓΆr interaktivt" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "tillΓ₯t falla tillbaka pΓ₯ trevΓ€gssammanslagning om nΓΆdvΓ€ndigt" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "lΓ€gg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "sΓ€nd flaggan -k till git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "sΓ€nd flaggan -b till git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "sΓ€nd flaggan -m till git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sΓ€nd flaggan --keep-cr till git-mailsplit fΓΆr mbox-formatet" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sΓ€nd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "ta bort allting fΓΆre en saxlinje" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "Γ₯tgΓ€rd" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "sΓ€nd det genom git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "rot" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "sΓΆkvΓ€g" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "antal" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "format" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "format fΓΆr patch(ar)" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "ΓΆverstyr felmeddelanden nΓ€r patchfel uppstΓ₯r" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "fortsΓ€tt applicera patchar efter att ha lΓΆst en konflikt" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "hoppa ΓΆver den aktuella grenen" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "Γ₯terstΓ€ll originalgrenen och avbryt patchningen." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "anvΓ€nd nuvarande tidsstΓ€mpel fΓΆr fΓΆrfattardatum" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(anvΓ€nds internt av git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2848,16 +3112,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion lΓ€nge, och\n" "kommer tas bort. Vi ber dig att inte anvΓ€nda den lΓ€ngre." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "misslyckades lΓ€sa indexet" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2866,7 +3130,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "AnvΓ€nd \"git am --abort\" fΓΆr att ta bort den." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "LΓΆsningsoperation pΓ₯gΓ₯r inte, vi Γ₯terupptar inte." @@ -2899,37 +3163,37 @@ msgstr "regexec returnerade %d fΓΆr indata: %s" msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen pΓ₯ rad %d" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, 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:944 +#: builtin/apply.c:942 #, 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:945 +#: builtin/apply.c:943 #, 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:952 +#: builtin/apply.c:949 #, 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: fΓΆrvΓ€ntade rad: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud pΓ₯ rad %d: %.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2945,77 +3209,77 @@ msgstr[1] "" "sΓΆkvΓ€gskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "ny fil beror pΓ₯ gammalt innehΓ₯ll" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehΓ₯ll" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch pΓ₯ rad %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror pΓ₯ gammalt innehΓ₯ll" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehΓ₯ll" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, 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:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binΓ€rpatch pΓ₯ rad %d: %.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binΓ€rpatchen pΓ₯ rad %d kΓ€nns inte igen" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skrΓ€p pΓ₯ rad %d" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte lΓ€sa symboliska lΓ€nken %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "kunde inte ΓΆppna eller lΓ€sa %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning pΓ₯ rad: \"%c\"" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, 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:2908 +#: builtin/apply.c:2906 #, 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:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3024,319 +3288,329 @@ msgstr "" "vid sΓΆkning efter:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binΓ€ra patchdata fΓΆr \"%s\"" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binΓ€rpatchen kan inte tillΓ€mpas pΓ₯ \"%s\"" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, 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:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "misslyckades lΓ€sa %s" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, 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:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "sΓΆkvΓ€gen %s har Γ€ndrat namn/tagits bort" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "patch fΓΆr borttagning lΓ€mnar kvar filinnehΓ₯ll" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, fΓΆrvΓ€ntade %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sΓΆkvΓ€g: %s" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, 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:3774 +#: builtin/apply.c:3772 #, 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:3794 +#: builtin/apply.c:3792 #, 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:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillΓ€mpas" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades fΓΆr sΓΆkvΓ€gen \"%s\"" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s frΓ₯n indexet" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch fΓΆr undermodulen %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status pΓ₯ nyligen skapade filen \"%s\"" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, 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:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lΓ€gga till cachepost fΓΆr %s" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "stΓ€nger filen \"%s\"" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" lΓ€ge %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "TillΓ€mpade patchen %s rent." -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, 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:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "kan inte ΓΆppna %s: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillΓ€mpades rent." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Ignorerar patch \"%s\"." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "indata kΓ€nns inte igen" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "kan inte lΓ€sa indexfilen" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "tillΓ€mpa inte Γ€ndringar som motsvarar given sΓΆkvΓ€g" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "tillΓ€mpa Γ€ndringar som motsvarar given sΓΆkvΓ€g" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 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:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ignorera tillΓ€gg gjorda av patchen" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 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:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 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:4526 +#: builtin/apply.c:4528 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:4528 +#: builtin/apply.c:4530 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:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "tillΓ€mpa en patch utan att rΓΆra arbetskatalogen" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rΓΆr filer utanfΓΆr arbetskatalogen" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillΓ€mpa ocksΓ₯ patchen (anvΓ€nd med --stat/--summary/--check)" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 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:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporΓ€rt index baserat pΓ₯ inbyggd indexinformation" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "sΓΆkvΓ€gar avdelas med NUL-tecken" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "se till att Γ₯tminstone <n> rader sammanhang Γ€r lika" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller Γ€ndrade rader som har fel i blanktecken" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ignorera Γ€ndringar i blanktecken fΓΆr sammanhang" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "tillΓ€mpa patchen baklΓ€nges" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "fΓΆrvΓ€nta inte minst en rad sammanhang" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lΓ€mna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "tillΓ₯t ΓΆverlappande stycken" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte pΓ₯ antalet linjer i styckehuvuden" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "lΓ€gg till <rot> i alla filnamn" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way utanfΓΆr arkiv" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index utanfΓΆr arkiv" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached utanfΓΆr arkiv" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "kan inte ΓΆppna patchen \"%s\"" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, 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:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3402,99 +3676,99 @@ msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter nΓ€r vi hittar dem, interaktivt" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 fΓΆr grΓ€nsincheckningar (Standard: av)" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som grΓ€nser (Standard: av)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Visa statistik ΓΆver arbetskostnad" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Tvinga fΓΆrloppsrapportering" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Visa utdatapoΓ€ng fΓΆr klandringsposter" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett fΓΆr maskinkonsumtion" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 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:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Visa rΓ₯ tidsstΓ€mpel (Standard: av)" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lΓ₯ng inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck fΓΆrfattarnamn och tidsstΓ€mpel (Standard: av)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 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:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Ignorera Γ€ndringar i blanksteg" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "SlΓΆsa extra cykler med att hitta bΓ€ttre trΓ€ff" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 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:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "AnvΓ€nd <fil>s innehΓ₯ll som slutgiltig bild" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "poΓ€ng" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med bΓΆrjan pΓ₯ 1" @@ -3504,31 +3778,31 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4 Γ₯r, 11 mΓ₯nader sedan" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3537,7 +3811,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men Γ€nnu inte slagits ihop med HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3546,12 +3820,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slΓ₯ upp incheckningsobjekt fΓΆr \"%s\"" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3560,340 +3834,361 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du Γ€r sΓ€ker pΓ₯ att du vill ta bort den, kΓΆr \"git branch -D %s\"." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slΓ₯ upp incheckningsobjekt fΓΆr HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig pΓ₯ fΓΆr nΓ€rvarande." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Kan inte ta bort grenen \"%s\" som Γ€r utcheckad pΓ₯ \"%s\"" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjΓ€rrspΓ₯rande grenen \"%s\" hittades inte." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjΓ€rrspΓ₯rande grenen \"%s\"" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjΓ€rrspΓ₯rande grenen %s (var %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: fΓΆrsvunnen]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: fΓΆre %d] " -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[fΓΆre %d] " -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: fΓΆre %d, bakom %d] " -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[fΓΆre %d, bakom %d] " -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad pΓ₯ %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frΓ₯nkopplat vid %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frΓ₯nkopplat frΓ₯n %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "Grenen %s ombaseras pΓ₯ %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "Grenen %s Γ€r i en \"bisect\" pΓ₯ %s" + +#: builtin/branch.c:560 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:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn pΓ₯ gren: \"%s\"" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Misslyckades byta namn pΓ₯ gren" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn pΓ₯ en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, 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:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "kunde inte skriva grenbeskrivningsmall: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "kunde inte skriva grenbeskrivningsmall" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "AllmΓ€nna flaggor" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och Γ€renderad, ange tvΓ₯ gΓ₯nger fΓΆr uppstrΓΆmsgren" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "stΓ€ll in spΓ₯rningslΓ€ge (se git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "Γ€ndra uppstrΓΆmsinformation" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "uppstrΓΆms" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "Γ€ndra uppstrΓΆmsinformationen" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "anvΓ€nd fΓ€rgad utdata" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "arbeta pΓ₯ fjΓ€rrspΓ₯rande grenar" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehΓ₯ller incheckningen" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-Γ₯tgΓ€rder:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "visa bΓ₯de fjΓ€rrspΓ₯rande och lokala grenar" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "ta bort gren (Γ€ven om inte helt sammanslagen)" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, Γ€ven om mΓ₯let finns" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "lista namn pΓ₯ grenar" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "redigera beskrivning fΓΆr grenen" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnΓ€ndring, borttagande" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "nyckel" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "fΓ€ltnamn att sortera pΓ₯" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "objekt" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "visa endast grenar fΓΆr objektet" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slΓ₯ upp HEAD som giltig referens" -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose Γ€r inkompatibla" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "grennamn krΓ€vs" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frΓ₯nkopplad HEAD" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning fΓΆr mer Γ€n en gren" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar pΓ₯ grenen \"%s\" Γ€nnu" -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "fΓΆr mΓ₯nga grenar fΓΆr namnbyte" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "fΓΆr mΓ₯nga grenar fΓΆr att byta uppstrΓΆm" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, 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:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "okΓ€nd gren \"%s\"" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "fΓΆr mΓ₯nga grenar fΓΆr att ta bort uppstrΓΆm" -#: builtin/branch.c:784 +#: builtin/branch.c:820 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:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppstrΓΆmsinformation" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:810 +#: builtin/branch.c:846 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:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3902,7 +4197,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. AnvΓ€nd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3913,16 +4208,6 @@ msgstr "" "Om du vill gΓΆra sΓ₯ att \"%s\" spΓ₯rar \"%s\" gΓΆr du sΓ₯ hΓ€r:\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4021,7 +4306,7 @@ msgstr "lΓ€s filnamn frΓ₯n standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "undertryck fΓΆrloppsrapportering" @@ -4111,8 +4396,9 @@ msgid "write the content to temporary files" msgstr "skriv innehΓ₯ll till temporΓ€ra filer" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "strΓ€ng" @@ -4162,79 +4448,79 @@ msgstr "sΓΆkvΓ€g \"%s\": kan inte slΓ₯ ihop" msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lΓ€gga till sammanslagningsresultat fΓΆr \"%s\"" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte anvΓ€ndas vid uppdatering av sΓΆkvΓ€gar" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte anvΓ€ndas med %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sΓΆkvΓ€gar och vΓ€xla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "indexfilen Γ€r trasig" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "sΓΆkvΓ€gen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "du mΓ₯ste lΓΆsa ditt befintliga index fΓΆrst" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg fΓΆr \"%s\": %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD Γ€r nu pΓ₯" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Γ
terstΓ€ll gren \"%s\"\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Redan pΓ₯ \"%s\"\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "VΓ€xlade till och nollstΓ€llde grenen \"%s\"\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "VΓ€xlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "VΓ€xlade till grenen \"%s\"\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4257,7 +4543,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4284,151 +4570,151 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "internt fel vid genomgΓ₯ng av revisioner (revision walk)" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "Tidigare position fΓΆr HEAD var" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Du Γ€r pΓ₯ en gren som Γ€nnu inte Γ€r fΓΆdd" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens fΓΆrvΓ€ntades, %d gavs." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "referensen Γ€r inte ett trΓ€d: %s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "sΓΆkvΓ€gar kan inte anvΓ€ndas vid byte av gren" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte anvΓ€ndas vid byte av gren" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte anvΓ€ndas med \"%s\"" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte vΓ€xla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "skapa/nollstΓ€ll och checka ut en gren" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "skapa reflogg fΓΆr ny gren" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "koppla frΓ₯n HEAD vid namngiven incheckning" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "sΓ€tt uppstrΓΆmsinformation fΓΆr ny gren" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "ny gren utan fΓΆrΓ€lder" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "checka ut vΓ₯r version fΓΆr ej sammanslagna filer" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "checka ut deras version fΓΆr ej sammanslagna filer" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala Γ€ndringar)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "utfΓΆr en 3-vΓ€gssammanslagning fΓΆr den nya grenen" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "stil" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "begrΓ€nsa inte sΓΆkvΓ€gar till endast glesa poster" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "fΓΆrutspΓ₯ \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog hΓ₯ller den angivna referensen" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "tvinga fΓΆrloppsrapportering" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan Γ€r ΓΆmsesidigt uteslutande" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track behΓΆver ett namn pΓ₯ en gren" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; fΓΆrsΓΆk med -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "felaktig sΓΆkvΓ€gsangivelse" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4437,12 +4723,12 @@ msgstr "" "Kan inte uppdatera sΓΆkvΓ€gar och vΓ€xla till grenen \"%s\" samtidigt.\n" "Ville du checka ut \"%s\" som inte kan lΓΆsas som en utcheckning?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sΓΆkvΓ€g som argument \"%s\"" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4595,8 +4881,8 @@ msgstr "stΓ€da interaktivt" msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "mΓΆnster" @@ -4636,104 +4922,113 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "skapa inte nΓ₯gon utcheckning" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "fΓΆr att klona frΓ₯n ett lokalt arkiv" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hΓ₯rda lΓ€nkar, kopiera alltid" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "antal undermoduler som klonas parallellt" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "katalog att anvΓ€nda mallar frΓ₯n" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "anvΓ€nd --reference endast under kloningen" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "namn" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "anvΓ€nd <namn> istΓ€llet fΓΆr \"origin\" fΓΆr att spΓ₯ra uppstrΓΆms" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istΓ€llet fΓΆr fjΓ€rrens HEAD" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "sΓΆkvΓ€g till git-upload-pack pΓ₯ fjΓ€rren" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "djup" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon pΓ₯ detta djup" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "klonade undermoduler kommer vara grunda" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "separera gitkatalogen frΓ₯n arbetskatalogen" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "nyckel=vΓ€rde" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "stΓ€ll in konfiguration i det nya arkivet" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "anvΓ€nd endast IPv4-adresser" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "anvΓ€nd endast IPv6-adresser" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4741,57 +5036,52 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog pΓ₯ kommandoraden" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en lΓ€nkad utcheckning stΓΆds inte Γ€nnu." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" Γ€r inte ett lokalt arkiv." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" Γ€r grunt" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" Γ€r ympat" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "misslyckades ta status pΓ₯ \"%s\"" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och Γ€r ingen katalog" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status pΓ₯ %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa lΓ€nken \"%s\"" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4801,129 +5091,129 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och fΓΆrsΓΆka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjΓ€rrgrenen %s fΓΆr att klona." # Vague original, not networking-related, but rather related to the actual # objects downloaded. -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Kontrollerar om vi fick alla objekt..." -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "fjΓ€rren sΓ€nde inte alla nΓΆdvΓ€ndiga objekt" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjΓ€rren pekar pΓ₯ en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "kan inte packa om fΓΆr att stΓ€da upp" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporΓ€r \"alternates\"-fil" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "FΓΆr mΓ₯nga argument." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Du mΓ₯ste ange ett arkiv att klona." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s Γ€r inkompatibla." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir Γ€r inkompatibla." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s Γ€r inte ett positivt tal" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssΓΆkvΓ€gen \"%s\" finns redan och Γ€r inte en tom katalog." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "arbetstrΓ€det \"%s\" finns redan." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger fΓΆr \"%s\"" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; anvΓ€nd file:// istΓ€llet" -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "kΓ€llarkivet Γ€r grunt, ignorerar --local" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "FjΓ€rrgrenen %s hittades inte i uppstrΓΆmsarkivet %s" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -5063,66 +5353,66 @@ msgstr "" "\"git cherry-pick --continue\" kommer dΓ€refter att Γ₯teruppta\n" "cherry-pick fΓΆr Γ₯terstΓ₯ende incheckningar.\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trΓ€dobjekt" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "kunde inte skapa temporΓ€r indexfil" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "interaktiv tillΓ€ggning misslyckades" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporΓ€rt index" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cachetrΓ€det" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "kan inte utfΓΆra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:447 +#: builtin/commit.c:449 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:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "kan inte lΓ€sa indexet" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporΓ€r indexfil" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar fΓΆrfattarhuvud" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat fΓΆrfattarhuvud" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5130,38 +5420,38 @@ msgstr "" "kunde inte vΓ€lja ett kommentarstecken som inte anvΓ€nts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slΓ₯ upp incheckningen %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lΓ€ser loggmeddelande frΓ₯n standard in)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "kunde inte lΓ€sa logg frΓ₯n standard in" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte lΓ€sa loggfilen \"%s\"" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "kunde inte lΓ€sa MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "kunde inte lΓ€sa SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "kunde inte lΓ€sa MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5176,7 +5466,7 @@ msgstr "" "\t%s\n" "och fΓΆrsΓΆker igen.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5191,7 +5481,7 @@ msgstr "" "\t%s\n" "och fΓΆrsΓΆker igen.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5201,7 +5491,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5212,146 +5502,146 @@ 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:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFΓΆrfattare: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Kan inte lΓ€sa indexet" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Fel vid byggande av trΓ€d" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' Γ€r inte 'Namn <epost>' och matchar ingen befintlig fΓΆrfattare" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt lΓ€ge fΓΆr ospΓ₯rade filer: \"%s\"" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long och -z Γ€r inkompatibla" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 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:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Du har inget att utΓΆka." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 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:1151 +#: builtin/commit.c:1162 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:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte anvΓ€ndas samtidigt" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 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:1166 +#: builtin/commit.c:1177 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:1174 +#: builtin/commit.c:1185 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:1191 +#: builtin/commit.c:1202 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:1193 +#: builtin/commit.c:1204 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:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utΓΆka den senaste med smutsigt index." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 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:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt stΓ€dningslΓ€ge %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sΓΆkvΓ€gar med -a." -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "maskinlΓ€sbar utdata" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "visa status i lΓ₯ngt format (standard)" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "lΓ€ge" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 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:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "nΓ€r" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5359,201 +5649,201 @@ msgstr "" "ignorera Γ€ndringar i undermoduler, valfritt nΓ€r: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "visa ospΓ₯rade filer i spalter" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "kunde inte slΓ₯ upp en precis skapad incheckning" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "frΓ₯nkopplad HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgΓ₯ngsrik incheckning" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "visa diff i mallen fΓΆr incheckningsmeddelandet" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Alternativ fΓΆr incheckningsmeddelande" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "lΓ€s meddelande frΓ₯n fil" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "fΓΆrfattare" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "ΓΆverstyr fΓΆrfattare fΓΆr incheckningen" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "datum" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "ΓΆverstyr datum fΓΆr incheckningen" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "Γ₯teranvΓ€nd och redigera meddelande frΓ₯n angiven incheckning" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "Γ₯teranvΓ€nd meddelande frΓ₯n angiven incheckning" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "anvΓ€nd autosquash-formaterat meddelande fΓΆr att fixa angiven incheckning" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 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:1587 +#: builtin/commit.c:1603 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:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lΓ€gg till Signed-off-by:" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "anvΓ€nd angiven mallfil" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "standard" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort frΓ₯n meddelande" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "inkludera status i mallen fΓΆr incheckningsmeddelandet" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Alternativ fΓΆr incheckningens innehΓ₯ll" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "checka in alla Γ€ndrade filer" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "lΓ€gg till angivna filer till indexet fΓΆr incheckning" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "lΓ€gg till filer interaktivt" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "lΓ€gg till Γ€ndringar interaktivt" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "fΓΆrbigΓ₯ pre-commit-krok" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "lΓ€gg till fΓΆregΓ₯ende incheckning" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "fΓΆrbigΓ₯ post-rewrite-krok" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "ok att registrera en tom Γ€ndring" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "ok att registrera en Γ€ndring med tomt meddelande" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "kunde inte lΓ€sa MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte lΓ€sa incheckningsmeddelande: %s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter pΓ₯ grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5700,7 +5990,7 @@ msgstr "visa konfigurationskΓ€lla (fil, standard in, blob, kommandorad)" msgid "unable to parse default color value" msgstr "kan inte tolka standardfΓ€rgvΓ€rde" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5715,7 +6005,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" @@ -5751,7 +6041,7 @@ msgstr "den annoterade taggen %s har inget inbΓ€ddat namn" msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" Γ€r i verkligheten \"%s\" hΓ€r" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet Γ€r inte giltigt: %s" @@ -5844,7 +6134,7 @@ msgstr "ΓΆvervΓ€g de <n> nyaste taggarna (standard: 10)" msgid "only consider tags matching <pattern>" msgstr "ΓΆvervΓ€g endast taggar som motsvarar <mΓΆnster>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "visa fΓΆrkortade incheckningsobjekt som standard" @@ -5878,21 +6168,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk lΓ€nk" msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs Γ€r felaktigt." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer Γ€n tvΓ₯ blobbar angavs: \"%s\"" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -5965,19 +6255,19 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "hΓ€mta frΓ₯n alla fjΓ€rrar" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 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:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "sΓΆkvΓ€g till upload pack pΓ₯ fjΓ€rren" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "tvinga ΓΆverskrivning av lokal gren" @@ -5985,7 +6275,7 @@ msgstr "tvinga ΓΆverskrivning av lokal gren" msgid "fetch from multiple remotes" msgstr "hΓ€mta frΓ₯n flera fjΓ€rrar" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "hΓ€mta alla taggar och associerade objekt" @@ -5997,19 +6287,19 @@ msgstr "hΓ€mta inte alla taggar (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hΓ€mtas parallellt" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjΓ€rrspΓ₯rande grenar ej lΓ€ngre pΓ₯ fjΓ€rren" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hΓ€mtning av undermoduler" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "behΓ₯ll hΓ€mtade paket" @@ -6017,15 +6307,15 @@ msgstr "behΓ₯ll hΓ€mtade paket" msgid "allow updating of HEAD ref" msgstr "tillΓ₯t uppdatering av HEAD-referens" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "fΓΆrdjupa historik fΓΆr grund klon" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "kat" @@ -6037,15 +6327,15 @@ msgstr "lΓ€gg till i bΓΆrjan av undermodulens sΓΆkvΓ€gsutdata" msgid "default mode for recursion" msgstr "standardlΓ€ge fΓΆr rekursion" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "ange referenskarta fΓΆr \"fetch\"" @@ -6103,11 +6393,6 @@ msgstr "tvingad uppdatering" msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "kan inte ΓΆppna %s: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6309,57 +6594,57 @@ msgstr "Kontrollerar konnektivitet" msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "visa onΓ₯bara objekt" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "gΓΆr indexojekt till huvudnoder" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "gΓΆr refloggar till huvudnoder (standard)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "ta Γ€ven hΓ€nsyn till paket och alternativa objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "visa fΓΆrlopp" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -6462,214 +6747,214 @@ msgstr "kunde inte lΓ€sa trΓ€d (%s)" msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" frΓ₯n objekt av typen %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt vΓ€rde" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "kan inte ΓΆppna \"%s\"" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "sΓΆk i indexet istΓ€llet fΓΆr i arbetskatalogen" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "sΓΆk i innehΓ₯ll som inte hanteras av git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "sΓΆk i bΓ₯de spΓ₯rade och ospΓ₯rade filer" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "visa rader som inte trΓ€ffas" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "skiftlΓ€gesokΓ€nslig sΓΆkning" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "matcha endast mΓΆnster vid ordgrΓ€nser" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "hantera binΓ€rfiler som text" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "trΓ€ffa inte mΓΆnster i binΓ€rfiler" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "hantera binΓ€rfiler med textconv-filter" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "gΓ₯ som mest ned <djup> nivΓ₯er" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "anvΓ€nd utΓΆkade POSIX-reguljΓ€ra uttryck" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "anvΓ€nd grundlΓ€ggande POSIX-reguljΓ€ra uttryck (standard)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "tolka mΓΆnster som fixerade strΓ€ngar" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "anvΓ€nd Perlkompatibla reguljΓ€ra uttryck" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istΓ€llet fΓΆr trΓ€ffade rader" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "synonym fΓΆr --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "visa endast namn pΓ₯ filer utan trΓ€ffar" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "visa antal trΓ€ffar istΓ€llet fΓΆr trΓ€ffade rader" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "ljusmarkera trΓ€ffar" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan trΓ€ffar frΓ₯n olika filer" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gΓ₯ng ovanfΓΆr trΓ€ffar frΓ₯n samma fil" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang fΓΆre och efter trΓ€ffar" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang fΓΆre trΓ€ffar" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter trΓ€ffar" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "anvΓ€nd <n> jobbtrΓ₯dar" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "genvΓ€g fΓΆr -C NUM" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet fΓΆre trΓ€ffen" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "lΓ€s mΓΆnster frΓ₯n fil" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "trΓ€ffa <mΓΆnster>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "kombinera mΓΆnster som anges med -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "ange trΓ€ff med slutstatuskod utan utdata" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "visa endast trΓ€ffar frΓ₯n filer som trΓ€ffar alla mΓΆnster" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "visa analystrΓ€d fΓΆr grep-uttryck" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "blΓ€ddrare" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "visa trΓ€ffade filer i filblΓ€ddraren" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillΓ₯t anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "inget mΓΆnster angavs." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trΓ₯dar angivet (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte anvΓ€ndas med --no-index." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte anvΓ€ndas med revisioner." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard kan inte anvΓ€ndas fΓΆr spΓ₯rat innehΓ₯ll." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "bΓ₯de --cached och trΓ€d angavs." @@ -6759,8 +7044,8 @@ msgstr "emacsclient version \"%d\" fΓΆr gammal (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "exec misslyckades fΓΆr \"%s\": %s" +msgid "failed to exec '%s'" +msgstr "exec misslyckades fΓΆr \"%s\"" #: builtin/help.c:205 #, c-format @@ -7018,107 +7303,109 @@ msgstr "fΓΆrvirrad bortom vanvett" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "slutfΓΆrdes med %d lokala objekt" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "slutfΓΆrdes med %d lokalt objekt" +msgstr[1] "slutfΓΆrdes med %d lokala objekt" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "OvΓ€ntad svanschecksumma fΓΆr %s (trasig disk?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utfΓΆra \"deflate\" pΓ₯ tillagt objekt (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s Γ€r trasigt" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "fel vid stΓ€ngning av paketfil" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stΓ€nga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "trΓ₯dstΓΆd saknas, ignorerar %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte ΓΆppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, 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:1587 +#: builtin/index-pack.c:1589 #, 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:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "Kan inte gΓ₯ tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte anvΓ€ndas med --stdin" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -7157,27 +7444,27 @@ msgstr "kan inte kopiera \"%s\" till \"%s\"" msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "mallarna hittades inte %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "kopierade inte mallar frΓ₯n felaktig formatversion %d frΓ₯n \"%s\"" +msgid "not copying templates from '%s': %s" +msgstr "kopierade inte mallar frΓ₯n \"%s\": %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" @@ -7185,24 +7472,24 @@ msgstr "kan inte flytta %s till %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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-arkiv i %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "Ominitierade befintligt" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "Initierade tomt" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " delat" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7210,25 +7497,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behΓΆrigheter>]] [<katalog>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "behΓΆrigheter" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera anvΓ€ndare" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7237,7 +7524,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillΓ₯tet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma Γ₯t arbetskatalogen \"%s\"" @@ -7283,273 +7570,320 @@ msgstr "git show [<flaggor>] <objekt>..." msgid "invalid --decorate option: %s" msgstr "ogiltig flagga fΓΆr --decorate: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "visa kΓ€llkod" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "AnvΓ€nd e-postmappningsfil" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med bΓΆrjan pΓ₯ 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Kunde inte lΓ€sa objektet %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "OkΓ€nd typ: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers utan vΓ€rde" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "namnet pΓ₯ utdatakatalogen Γ€r fΓΆr lΓ₯ngt" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte ΓΆppna patchfilen %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "BehΓΆver precis ett intervall." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behΓΆver e-postformat" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "TvΓ₯ utdatakataloger?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "OkΓ€nd incheckning %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Kunde inte slΓ₯ upp \"%s\" som en giltig referens." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Kunde inte hitta exakt sammanslagningsbas." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"Kunde inte hΓ€mta uppstrΓΆm, om du vill lagra basincheckningen automatiskt,\n" +"anvΓ€nd git branch --set-upstream-to fΓΆr att spΓ₯ra en fjΓ€rrgren.\n" +"Eller sΓ₯ kan du ange basincheckning med --base=<bas-inchecknings-id> " +"manuellt." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Kunde inte hitta exakt sammanslagningsbas" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "basincheckningen bΓΆr vara fΓΆrfader till revisionslistan" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "basincheckningen bΓΆr inte vara i revisionslistan" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "kan inte hΓ€mta patch-id" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "anvΓ€nd [PATCH n/m] Γ€ven fΓΆr en ensam patch" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "anvΓ€nd [PATCH] Γ€ven fΓΆr flera patchar" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "skriv patcharna pΓ₯ standard ut" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "generera ett fΓΆljebrev" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "anvΓ€nd enkel nummersekvens fΓΆr utdatafilnamn" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "anvΓ€nd <sfx> istΓ€llet fΓΆr \".patch\"" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "bΓΆrja numrera patchar pΓ₯ <n> istΓ€llet fΓΆr 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te fΓΆrsΓΆk" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "AnvΓ€nd [<prefix>] istΓ€llet fΓΆr [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lΓ€gg till [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "skriv inte binΓ€ra diffar" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "anvΓ€nd hashvΓ€rde med nollor i From-huvud" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppstrΓΆmsincheckning" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istΓ€llet fΓΆr standard (patch + stat)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "huvud" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "lΓ€gg till e-posthuvud" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "epost" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "LΓ€gg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "LΓ€gg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "ident" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sΓ€tt FrΓ₯n-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "GΓΆr det fΓΆrsta brevet ett svar till <meddelande-id>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "grΓ€ns" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "gΓΆr patchen ett inline-objekt" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrΓ₯dning, typer: shallow, deep" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "signatur" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "lΓ€gg till signatur" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "basincheckning" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "lΓ€gg till fΓΆrhandskrΓ€vd trΓ€dinfo i patchserien" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "lΓ€gg till signatur frΓ₯n fil" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "visa inte filnamn fΓΆr patchar" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte anvΓ€ndas samtidigt." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte anvΓ€ndas samtidigt." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "kan inte anvΓ€nda --name-only" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "kan inte anvΓ€nda --name-status" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "kan inte anvΓ€nda --check" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte lΓ€sa signaturfil \"%s\"" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppstrΓΆm> [<huvud> [<grΓ€ns>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spΓ₯rad fjΓ€rrgren, ange <uppstrΓΆm> manuellt.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "OkΓ€nd incheckning %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" @@ -7740,173 +8074,177 @@ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behΓΆver ett vΓ€rde" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "TillgΓ€ngliga strategier Γ€r:" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "TillgΓ€ngliga skrΓ€ddarsydda strategier Γ€r:" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat nΓ€r sammanslagningen Γ€r fΓ€rdig" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat nΓ€r sammanslagningen Γ€r fΓ€rdig" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lΓ€gg till (som mest <n>) poster frΓ₯n shortlog till incheckningsmeddelandet" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istΓ€llet fΓΆr en sammanslagning" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "utfΓΆr en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "tillΓ₯t snabbspolning (standard)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte Γ€r mΓΆjlig" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "BekrΓ€fta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att anvΓ€nda" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "alternativ=vΓ€rde" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "alternativ fΓΆr vald sammanslagningsstrategi" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande fΓΆr (icke snabbspolande) sammanslagning" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "avbryt den pΓ₯gΓ₯ende sammanslagningen" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "tillΓ₯t sammanslagning av orelaterade historier" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "kunde kΓΆra stash." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Avslutar SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka pΓ₯ en incheckning" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-strΓ€ng: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte nΓ₯got annat Γ€n en sammanslagning av tvΓ₯ huvuden." -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga fΓΆr merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte lΓ€sa frΓ₯n \"%s\"" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; anvΓ€nd \"git commit\" fΓΆr att slutfΓΆra " "den.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7922,53 +8260,53 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slΓ₯ ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" Γ€r inte en incheckning" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Inte pΓ₯ nΓ₯gon gren." -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Ingen fjΓ€rr fΓΆr aktuell gren." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppstrΓΆm angiven fΓΆr aktuell gren." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjΓ€rrspΓ₯rande gren fΓΆr %s frΓ₯n %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "kunde inte stΓ€nga \"%s\"" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7976,7 +8314,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina Γ€ndringar innan du slΓ₯r ihop." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7984,102 +8322,106 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina Γ€ndringar innan du slΓ₯r ihop." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream Γ€r ej satt." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "StΓΆder inte en tillplattningsincheckning pΓ₯ ett tomt huvud Γ€nnu" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte anvΓ€ndas med ett tomt huvud" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte nΓ₯got vi kan slΓ₯ ihop" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slΓ₯ ihop en enda incheckning i ett tomt huvud." -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som pΓ₯stΓ₯s vara gjord av %s." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som pΓ₯stΓ₯s vara gjord av %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte nΓ₯gon GPG-signatur." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "vΓ€grar slΓ₯ samman orelaterad historik" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "FΓΆrsΓΆker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Γ
terspolar trΓ€det till orΓΆrt...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "FΓΆrsΓΆker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "AnvΓ€nder %s fΓΆr att fΓΆrbereda lΓΆsning fΓΆr hand.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8190,7 +8532,7 @@ msgstr "git mv [<flaggor>] <kΓ€lla>... <mΓ₯l>" msgid "Directory %s is in index and no submodule?" msgstr "Katalogen %s Γ€r i indexet och inte en undermodul?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "KΓΆa dina Γ€ndringar i .gitmodules eller anvΓ€nd \"stash\" fΓΆr att fortsΓ€tta" @@ -8269,48 +8611,48 @@ 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:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn pΓ₯ \"%s\"" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "anvΓ€nd endast taggar fΓΆr att namnge incheckningar" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "anvΓ€nd endast referenser som motsvarar <mΓΆnster>" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nΓ₯s alla referenser" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "lΓ€s frΓ₯n standard in" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "tillΓ₯t att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (anvΓ€nds internt)" @@ -8458,24 +8800,16 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "The note contents have been left in %s" msgstr "Anteckningens innehΓ₯ll har lΓ€mnats kvar i %s" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "kunde inte lΓ€sa \"%s\"" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte ΓΆppna eller lΓ€sa \"%s\"" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Kunde inte slΓ₯ upp \"%s\" som en giltig referens." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8488,7 +8822,7 @@ msgstr "kan inte lΓ€sa anteckningsdata frΓ₯n icke-blob-objektet \"%s\"." #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "fΓΆr mΓ₯nga parametrar" @@ -8535,7 +8869,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Skriver ΓΆver befintliga anteckningar fΓΆr objektet %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning fΓΆr objektet %s\n" @@ -8575,15 +8909,15 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte fΓΆr underkommandot \"edit\".\n" "AnvΓ€nd \"git notes add -f -m/-F/-c/-C\" istΓ€llet.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "AllmΓ€nna flaggor" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Flaggor fΓΆr sammanslagning" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8591,51 +8925,51 @@ msgstr "" "lΓ€s konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" "fΓ€rdigstΓ€ll sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Avbryt lΓΆsning av sammanslagning av anteckningar" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Sammanslagning av anteckningar till %s Γ€r redan igΓ₯ngsatt pΓ₯ %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "fΓΆrsΓΆk att ta bort icke-existerande anteckningar Γ€r inte ett fel" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "lΓ€s objektnamn frΓ₯n standard in" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "anvΓ€nd anteckningar frΓ₯n <anteckningsref>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "OkΓ€nt underkommando: %s" @@ -8657,165 +8991,170 @@ msgstr "" msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" +"inaktiverar skrivning av bitkarta, paket delas pΓ₯ grund av pack.packSizeLimit" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 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:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stΓΆds ej" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "visa inte fΓΆrloppsindikator" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "visa fΓΆrloppsindikator" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "visa fΓΆrloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress nΓ€r fΓΆrloppsindikatorn visas" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "maximal storlek pΓ₯ varje utdatapaketfil" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lΓ₯nade objekt frΓ₯n alternativa objektlager" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "begrΓ€nsa paketfΓΆnster efter objekt" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 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:2614 +#: builtin/pack-objects.c:2619 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:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "Γ₯teranvΓ€nd befintliga delta" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "Γ₯teranvΓ€nd befintliga objekt" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "anvΓ€nd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 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:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "fΓΆrsΓΆk inte skapa tom paketutdata" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "lΓ€s revisionsargument frΓ₯n standard in" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 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:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nΓ₯s frΓ₯n nΓ₯gon referens" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras frΓ₯n referensloggposter" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras frΓ₯n indexet" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "skriv paket pΓ₯ standard ut" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "behΓ₯ll onΓ₯bara objekt" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onΓ₯bara objekt nyare Γ€n <tid>" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lΓ€mpade fΓΆr grunda hΓ€mtningar" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhΓΆrande .keep-fil" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "komprimeringsgrad fΓΆr paket" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "gΓΆm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 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:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "anvΓ€nd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "RΓ€knar objekt" @@ -8843,15 +9182,15 @@ msgstr "Tar bort duplicerade objekt" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "lΓ₯t tid gΓ₯ ut fΓΆr objekt Γ€ldre Γ€n <tid>" @@ -8863,49 +9202,53 @@ msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "Alternativ gΓ€llande sammanslagning" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma Γ€ndringar genom ombasering i stΓ€llet fΓΆr sammanslagning" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "tillΓ₯t snabbspolning" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "bekrΓ€fta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "utfΓΆr automatiskt stash/stash pop fΓΆre och efter ombasering" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "Alternativ gΓ€llande hΓ€mtningar" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hΓ€mtas parallellt" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt vΓ€rde fΓΆr pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "Kan inte hΓ€mta med ombasering: Du har okΓΆade Γ€ndringar." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "Dessutom innehΓ₯ller dit index Γ€ndringar som inte har checkats in." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Kan inte hΓ€mta med ombasering: Ditt index innehΓ₯ller oincheckade Γ€ndringar." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -8913,14 +9256,14 @@ msgstr "" "Det finns ingen kandidat fΓΆr ombasering bland referenserna du precis har " "hΓ€mtat." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat fΓΆr sammanslagning bland referenserna du precis har " "hΓ€mtat." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -8928,7 +9271,7 @@ msgstr "" "Det betyder vanligtvis att du anvΓ€nt en jokertecken-refspec som inte\n" "motsvarade nΓ₯got i fjΓ€rrΓ€nden." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8939,38 +9282,42 @@ msgstr "" "gren. Eftersom det inte Γ€r den fjΓ€rr som Γ€r konfigurerad som\n" "standard fΓΆr aktuell gren mΓ₯ste du ange en gren pΓ₯ kommandoraden." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du Γ€r inte pΓ₯ nΓ₯gon gren fΓΆr nΓ€rvarande." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slΓ₯ samman med." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) fΓΆr detaljer." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<fjΓ€rr>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<gren>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spΓ₯rningsinformation fΓΆr aktuell gren." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "" -"Om du vill ange spΓ₯rningsinformation fΓΆr grenen kan du gΓΆra det med:\n" -"\n" -" git branch --set-upstream-to=%s/<gren> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "Om du vill ange spΓ₯rningsinformation fΓΆr grenen kan du gΓΆra det med:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -8979,11 +9326,15 @@ msgstr "" "Dina instΓ€llningar anger sammanslagning med referensen \"%s\"\n" "frΓ₯n fjΓ€rren, men nΓ₯gon sΓ₯dan referens togs inte emot." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash Γ€r endast giltig med --rebase." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofΓΆdd gren med Γ€ndringar som lagts till i indexet." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8994,7 +9345,7 @@ msgstr "" "snabbspolar din arbetskatalog frΓ₯n\n" "incheckningen %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9011,11 +9362,11 @@ msgstr "" "$ git reset --hard\n" "fΓΆr att Γ₯tergΓ₯." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slΓ₯ ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpΓ₯ flera grenar." @@ -9376,6 +9727,18 @@ msgstr "hoppa ΓΆver att applicera filter fΓΆr gles utcheckning" msgid "debug unpack-trees" msgstr "felsΓΆk unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-katalog>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "tyst" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Du mΓ₯ste ange en katalog." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9699,176 +10062,178 @@ msgstr "* fjΓ€rr %s" msgid " Fetch URL: %s" msgstr " HΓ€mt-URL: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " SΓ€nd-URL: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD pΓ₯ fjΓ€rr Γ€r tvetydig, kan vara en av fΓΆljande):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " FjΓ€rrgren:%s" msgstr[1] " FjΓ€rrgrenar:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (status inte fΓΆrfrΓ₯gad)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad fΓΆr \"git pull\":" msgstr[1] " Lokala grenar konfigurerade fΓΆr \"git pull\":" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad fΓΆr \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade fΓΆr \"git push\"%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sΓ€tt refs/remotes/<namn>/HEAD enligt fjΓ€rren" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestΓ€mma HEAD pΓ₯ fjΓ€rren" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar pΓ₯ fjΓ€rren. VΓ€lj en explicit med:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Kunde inte stΓ€lla in %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "rensa fjΓ€rrar efter hΓ€mtning" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Ingen sΓ₯dan fjΓ€rr \"%s\"" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "lΓ€gg till gren" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "ingen fjΓ€rr angavs" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "frΓ₯ga sΓ€nd-URL:er istΓ€llet fΓΆr hΓ€mta-URL:er" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna fΓΆr fjΓ€rren \"%s\"" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipulera URL:ar fΓΆr sΓ€ndning" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "lΓ€gg till URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mΓΆnster: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Ingen sΓ₯dan URL hittades: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sΓ€nd-URL:er" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; mΓ₯ste skrivas fΓΆre ett underkommando" @@ -10376,11 +10741,6 @@ msgstr "tillΓ₯t rekursiv borttagning" msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus Γ€ven om inget trΓ€ffades" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"KΓΆa dina Γ€ndringar i .gitmodules eller anvΓ€nd \"stash\" fΓΆr att fortsΓ€tta" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10583,84 +10943,180 @@ msgstr "hoppa ΓΆver och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lΓ€gg in kommentarstecken och blanksteg fΓΆrst pΓ₯ varje rad" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "Ingen sΓ₯dan referens: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "FΓΆrvΓ€ntade fullt referensnamn, fick %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "kan inte ta bort en komponent frΓ₯n url:en \"%s\"" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "alternativa ankare fΓΆr relativa sΓΆkvΓ€gar" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sΓΆkvΓ€g>] [<sΓΆkvΓ€g>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "Hittade ingen url fΓΆr undermodulsΓΆkvΓ€gen \"%s\" i .gitmodules" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Misslyckades registrera url fΓΆr undermodulsΓΆkvΓ€g \"%s\"" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "Undermodulen \"%s\" (%s) registrerad fΓΆr sΓΆkvΓ€gen \"%s\"\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "varning: kommandouppdateringslΓ€ge fΓΆreslogs fΓΆr undermodulen \"%s\"\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "Misslyckades registrera uppdateringslΓ€ge fΓΆr undermodulsΓΆkvΓ€g \"%s\"" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "DΓΆlj utdata frΓ₯n initiering av undermodul" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<sΓΆkvΓ€g>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sΓΆkvΓ€g>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules fΓΆr sΓΆkvΓ€gen \"%s\"" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "namn pΓ₯ den nya undermodulen" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen frΓ₯n" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "djup fΓΆr grunda kloner" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<sΓΆkvΓ€g>] [--quiet] [--reference " -"<arkvi>] [--name <namn>] [--url <url>][--depth <djup>] [--] [<sΓΆkvΓ€g>...]" +"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sΓΆkvΓ€g>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsΓΆkvΓ€gen \"%s\"" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "kan inte ΓΆppna filen \"%s\"" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "kunde inte stΓ€nga filen %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte fΓ₯ tag i undermodulkatalog fΓΆr \"%s\"" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "" -"ΓΆdesdigert: underkommandot submodule--helper mΓ₯ste anropas med ett " -"underkommando" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "UndermodulsΓΆkvΓ€gen \"%s\" har inte initierats" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Kanske menade du att anvΓ€nda \"update --init\"?" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:639 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "" -"ΓΆdesdigert: \"%s\" Γ€r inte ett giltigt underkommando till submodule--helper" +msgid "Skipping unmerged submodule %s" +msgstr "Hoppar ΓΆver ej sammanslagen undermodul %s" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Hoppar ΓΆver undermodulen \"%s\"" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "sΓΆkvΓ€g inuti arbetskatalogen" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "sΓΆkvΓ€g inuti arbetskatalogen, genom nΓ€stlade undermodulgrΓ€nser" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout eller none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "parallella jobb" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "skriv inte klonfΓΆrlopp" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<sΓΆkvΓ€g>] [<sΓΆkvΓ€g>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "felaktigt vΓ€rde fΓΆr parametern update" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "underkommandot submodule--helper mΓ₯ste anropas med ett underkommando" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "\"%s\" Γ€r inte ett giltigt underkommando till submodule--helper" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10715,27 +11171,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <taggnamn>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "taggnamnet fΓΆr lΓ₯ngt: %.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "kunde inte bekrΓ€fta taggen \"%s\"" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10748,7 +11199,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10880,21 +11331,21 @@ msgstr "flaggorna --merged och --no-merged tillΓ₯ts endast tillsammans med -l" msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillΓ₯ts." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "fΓΆr mΓ₯nga parametrar" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" Γ€r inte ett giltigt taggnamn." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -11145,7 +11596,7 @@ msgstr "git verify-commit [-v | --verbose] <incheckning>..." msgid "print commit contents" msgstr "visa innehΓ₯ll fΓΆr incheckning" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "visa rΓ₯a gpg-statusdata" @@ -11165,7 +11616,7 @@ msgstr "visa endast statistik" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <tagg>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "visa innehΓ₯ll fΓΆr tag" @@ -11181,69 +11632,73 @@ msgstr "git worktree prune [<flaggor>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte lΓ€sa gitdir-filen (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar pΓ₯ en ickeexisterande plats" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "misslyckades ta bort: %s" +msgid "failed to remove '%s'" +msgstr "misslyckades ta bort \"%s\"" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "FΓΆrbereder %s (identifieraren %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> Γ€ven om den redan Γ€r utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "skapa eller Γ₯terstΓ€ll en gren" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "koppla frΓ₯n HEAD vid namngiven incheckning" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "befolka den nya arbetskatalogen" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach Γ€r ΓΆmsesidigt uteslutande" @@ -11263,7 +11718,7 @@ msgstr "visa trΓ€dobjekt fΓΆr underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast anvΓ€ndbart vid felsΓΆkning" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "skriv felsΓΆkningsmeddelanden pΓ₯ standard fel" @@ -11277,7 +11732,7 @@ msgstr "" "nΓ₯gra konceptvΓ€gledningar. Se \"git help <kommando>\" eller \"git help\n" "<koncept>\" fΓΆr att lΓ€sa mer om specifika underkommandon och koncept." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "FastnΓ₯lning av ΓΆppen nyckel stΓΆds inte av cURL < 7.44.0" @@ -11405,7 +11860,7 @@ msgstr "var mer tyst" msgid "use <n> digits to display SHA-1s" msgstr "anvΓ€nd <n> siffror fΓΆr att visa SHA-1:or" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med Γ₯teranvΓ€nd konfliktlΓΆsning om mΓΆjligt" @@ -11623,16 +12078,16 @@ msgstr "" "Om du vill hoppa ΓΆver patchen kΓΆr du istΓ€llet \"git rebase --skip\".\n" "FΓΆr att Γ₯terstΓ€lla originalgrenen och avbryta kΓΆr du \"git rebase --abort\"." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "TillΓ€mpade autostash." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11642,31 +12097,27 @@ msgstr "" "Dina Γ€ndringar Γ€r sΓ€kra i stashen.\n" "Du kan nΓ€r som helst anvΓ€nda \"git stash pop\" eller \"git stash drop\".\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vΓ€grade ombaseringen." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Det verkar som en git-am kΓΆrs. Kan inte ombasera." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "Flaggan --exec mΓ₯ste anvΓ€ndas tillsammans med flaggan --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Ingen ombasering pΓ₯gΓ₯r?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Γ
tgΓ€rden --edit-todo kan endast anvΓ€ndas under interaktiv ombasering." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Kan inte lΓ€sa HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11674,12 +12125,12 @@ msgstr "" "Du mΓ₯ste redigera alla sammanslagningskonflikter och\n" "dΓ€refter markera dem som lΓΆsta med git add" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11700,65 +12151,65 @@ msgstr "" "och kΓΆr programmet igen. Jag avslutar ifall du fortfarande har\n" "nΓ₯got av vΓ€rde dΓ€r." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppstrΓΆm $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer Γ€n en sammanslagningsbas finns" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka pΓ₯ en giltig incheckning: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ΓΆdesdigert: ingen sΓ₯dan gren: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Kan inte utfΓΆra \"autostash\"" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Checka in eller anvΓ€nd \"stash\" pΓ₯ dem." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name Γ€r Γ jour." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name Γ€r Γ jour, ombasering framtvingad." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Γndringar frΓ₯n $mb till $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "FΓΆrst, spolar tillbaka huvudet fΓΆr att spela av ditt arbete ovanpΓ₯ det..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -11902,26 +12353,21 @@ msgstr "Inget grennamn angavs" msgid "(To restore them type \"git stash apply\")" msgstr "(FΓΆr att Γ₯terstΓ€lla dem, skriv \"git stash apply\")" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "kan inte ta bort en komponent frΓ₯n url:en \"$remoteurl\"" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Relativ sΓΆkvΓ€g kan endast anvΓ€ndas frΓ₯n arbetskatalogens toppnivΓ₯" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" mΓ₯ste vara absolut eller bΓΆrja med ./|../" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11932,22 +12378,22 @@ msgstr "" "$sm_path\n" "AnvΓ€nd -f om du verkligen vill lΓ€gga till den" -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "LΓ€gger till befintligt arkiv i \"$sm_path\" i indexet" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "\"$sm_path\" finns redan och Γ€r inte ett giltigt git-arkiv" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "En git-katalog fΓΆr \"$sm_name\" hittades lokalt med fjΓ€rr(ar):" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -11955,14 +12401,14 @@ msgstr "" "FΓΆr att Γ₯teranvΓ€nda den lokala git-katalogen istΓ€llet fΓΆr att pΓ₯ nytt klona " "frΓ₯n" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "anvΓ€nd flaggan \"--force\". Om den lokala git-katalogen inte Γ€r riktigt arkiv" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -11971,81 +12417,61 @@ msgstr "" "eller om du Γ€r osΓ€ker pΓ₯ vad det innebΓ€r, vΓ€lj nytt namn med flaggan \"--name" "\"." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Aktiverar lokal git-katalog fΓΆr undermodulen \"$sm_name\" pΓ₯ nytt." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lΓ€gga till undermodulen \"$sm_path\"" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "GΓ₯r in i \"$prefix$displaypath\"" +msgid "Entering '$displaypath'" +msgstr "GΓ₯r in i \"$displaypath\"" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -"Stoppar pΓ₯ \"$prefix$displaypath\"; skriptet returnerade en status skild " -"frΓ₯n noll." +"Stoppar pΓ₯ \"$displaypath\"; skriptet returnerade en status skild frΓ₯n noll." -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"Hittade ingen url fΓΆr undermodulsΓΆkvΓ€gen \"$displaypath\" i .gitmodules" +msgid "pathspec and --all are incompatible" +msgstr "sΓΆkvΓ€gsangivelse och --all Γ€r inkompatibla" -#: git-submodule.sh:492 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "Misslyckades registrera url fΓΆr undermodulsΓΆkvΓ€g \"$displaypath\"" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "AnvΓ€nd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "" -"Undermodulen \"$name\" ($url) registrerad fΓΆr sΓΆkvΓ€gen \"$displaypath\"" - -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Misslyckades registrera uppdateringslΓ€ge fΓΆr undermodulsΓΆkvΓ€g \"$displaypath" -"\"" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "AnvΓ€nd \".\" om du verkligen vill avinitiera alla undermoduler" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Undermodulens arbetskatalog \"$displaypath\" innehΓ₯ller katalogen \".git\"" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "(anvΓ€nd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12054,138 +12480,174 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala Γ€ndringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad fΓΆr sΓΆkvΓ€gen \"$displaypath\"" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Undermodulen \"$displaypath\" har inte initierats\n" -"Kanske du vill kΓΆra \"update --init\"?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsΓΆkvΓ€gen \"$displaypath\"" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hΓ€mta i undermodulsΓΆkvΓ€g \"$sm_path\"" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hΓ€mta i undermodulsΓΆkvΓ€g \"$displaypath\"" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsΓΆkvΓ€gen \"$displaypath\"" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "UndermodulsΓΆkvΓ€gen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsΓΆkvΓ€gen \"$displaypath\"" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "UndermodulsΓΆkvΓ€gen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slΓ₯ ihop \"$sha1\" i undermodulsΓΆkvΓ€gen \"$displaypath\"" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "UndermodulsΓΆkvΓ€gen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -"Misslyckades kΓΆra \"$command $sha1\" i undermodulsΓΆkvΓ€gen \"$prefix$sm_path\"" +"Misslyckades kΓΆra \"$command $sha1\" i undermodulsΓΆkvΓ€gen \"$displaypath\"" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "UndermodulsΓΆkvΓ€gen \"$prefix$sm_path\": \"$command $sha1\"" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "UndermodulsΓΆkvΓ€gen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsΓΆkvΓ€gen \"$displaypath\"" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte anvΓ€ndas med flaggan --files" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "ovΓ€ntat lΓ€ge $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehΓ₯ller inte incheckningen $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehΓ₯ller inte incheckningen $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Varning: $display_name innehΓ₯ller inte incheckningarna $sha1_src och " "$sha1_dst" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsΓΆkvΓ€gen \"$sm_path\"" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url fΓΆr \"$displaypath\"" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Se git-${cmd}(1) fΓΆr detaljer." + +#~ msgid "'%s': %s" +#~ msgstr "\"%s\": %s" + +#~ msgid "unable to access '%s': %s" +#~ msgstr "kan inte komma Γ₯t \"%s\": %s" + +#~ msgid "could not open '%s' for reading: %s" +#~ msgstr "kunde inte ΓΆppna \"%s\" fΓΆr lΓ€sning: %s" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "Kunde inte ΓΆppna \"%s\" fΓΆr skrivning: %s" + +#~ msgid " git branch -d %s\n" +#~ msgstr " git branch -d %s\n" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "kan inte ΓΆppna %s: %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "KΓΆa dina Γ€ndringar i .gitmodules eller anvΓ€nd \"stash\" fΓΆr att fortsΓ€tta" + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "kunde inte bekrΓ€fta taggen \"%s\"" + +#~ msgid "failed to remove: %s" +#~ msgstr "misslyckades ta bort: %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "Flaggan --exec mΓ₯ste anvΓ€ndas tillsammans med flaggan --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Undermodulen \"$displaypath\" har inte initierats\n" +#~ "Kanske du vill kΓΆra \"update --init\"?" + #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "FramΓ₯tanpassa lokala kommandon pΓ₯ uppdaterat uppstrΓΆmshuvud" @@ -12253,9 +12715,6 @@ msgstr "Synkroniserar undermodul-url fΓΆr \"$displaypath\"" #~ msgid "Could not append '%s'" #~ msgstr "Kunde inte lΓ€gga till pΓ₯ \"%s\"" -#~ msgid "Could not set '%s'" -#~ msgstr "Kunde inte sΓ€tta \"%s\"" - #~ msgid "Missing author: %s" #~ msgstr "FΓΆrfattare saknas: %s" @@ -12384,13 +12843,6 @@ msgstr "Synkroniserar undermodul-url fΓΆr \"$displaypath\"" #~ msgstr "" #~ "Du kan inte gΓΆra en \"pull\" dΓ₯ du har Γ€ndringar som inte checkats in." -#~ msgid "" -#~ "You have not concluded your merge (MERGE_HEAD exists).\n" -#~ "Please, commit your changes before you can merge." -#~ msgstr "" -#~ "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" -#~ "Checka in dina Γ€ndringar innan du kan slΓ₯ ihop." - #~ msgid "no branch specified" #~ msgstr "inget grennamn angavs" @@ -12593,13 +13045,6 @@ msgstr "Synkroniserar undermodul-url fΓΆr \"$displaypath\"" #~ msgstr "sΓΆkvΓ€gar avdelas med null-tecken" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "FΓΆljande ospΓ₯rade Γ€ndringar skulle INTE sparas utan mΓ₯ste tas bort med " -#~ "\"stash save\":" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "" #~ "Avbryter. ΓvervΓ€g att anvΓ€nda antingen flaggan --force eller --include-" @@ -6,12 +6,12 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.8.0-rc0\n" +"Project-Id-Version: git v2.9.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-21 07:14+0700\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-25 07:39+0700\n" "Last-Translator: TrαΊ§n Ngα»c QuΓ’n <vnwildman@gmail.com>\n" -"Language-Team: Vietnamese <gnome-vi-list@gnome.org>\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" @@ -36,7 +36,7 @@ msgstr "" "vΓ sau ΔΓ³ dΓΉng lα»nh βgit add/rm <tαΊp-tin>β\n" "dΓ nh riΓͺng cho viα»c ΔΓ‘nh dαΊ₯u cαΊ§n giαΊ£i quyαΊΏt vΓ tαΊ‘o lαΊ§n chuyα»n giao." -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "BαΊ‘n chΖ°a kαΊΏt thΓΊc viα»c hΓ²a trα»n (MERGE_HEAD vαΊ«n tα»n tαΊ‘i)." @@ -80,7 +80,7 @@ msgstr "Δα»nh_dαΊ‘ng" msgid "archive format" msgstr "Δα»nh dαΊ‘ng lΖ°u trα»―" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "tiα»n_tα»" @@ -88,9 +88,9 @@ 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:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549 #: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459 #: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561 #: builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -124,7 +124,8 @@ msgstr "nΓ©n nhα» hΖ‘n" msgid "list supported archive formats" msgstr "liα»t kΓͺ cΓ‘c kiα»u nΓ©n Δược hα» trợ" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "kho" @@ -277,11 +278,16 @@ msgstr "TΓͺn Δα»i tượng chΖ°a rΓ΅ rΓ ng: β%sβ." msgid "Not a valid branch point: '%s'." msgstr "NhΓ‘nh khΓ΄ng hợp lα»: β%sβ." -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "β%sβ ΔΓ£ sαΊ΅n Δược lαΊ₯y ra tαΊ‘i β%sβ" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD của cΓ’y lΓ m viα»c %s chΖ°a Δược cαΊp nhαΊt" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -292,7 +298,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:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "khΓ΄ng thα» mα» β%sβ" @@ -301,10 +307,10 @@ 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 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "cΓ i ΔαΊ·t viα»c di chuyα»n qua cΓ‘c Δiα»m xΓ©t duyα»t gαΊ·p lα»i" @@ -341,21 +347,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:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "Δα»i sα» khΓ΄ng Δược thα»«a nhαΊn: %s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Tα»« chα»i tαΊ‘o mα»t bΓ³ dα»― liα»u trα»ng rα»ng." -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "khΓ΄ng thα» tαΊ‘o β%sβ" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "mα»₯c lα»₯c gΓ³i ΔΓ£ chαΊΏt" @@ -364,8 +370,8 @@ msgstr "mα»₯c lα»₯c gΓ³i ΔΓ£ chαΊΏt" msgid "invalid color value: %.*s" msgstr "giΓ‘ trα» mΓ u khΓ΄ng hợp lα»: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "khΓ΄ng thα» phΓ’n tΓch cΓΊ phΓ‘p %s" @@ -399,21 +405,21 @@ msgstr "sai giΓ‘ trα» bαΊ±ng sα» của cαΊ₯u hΓ¬nh β%sβ cho β%sβ: %s" 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:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "mα»©c nΓ©n zlib %d lΓ sai" -#: config.c:891 +#: 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:1220 +#: config.c:1228 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:1281 +#: config.c:1284 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" @@ -432,24 +438,27 @@ msgstr "sai biαΊΏn cαΊ₯u hΓ¬nh β%sβ trong tαΊp tin β%sβ tαΊ‘i dΓ²ng %d" msgid "%s has multiple values" msgstr "%s cΓ³ Δa giΓ‘ trα»" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "khΓ΄ng thα» ΔαΊ·t β%sβ thΓ nh β%sβ" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" -msgstr "KhΓ΄ng thα» ΔαΊ·t β%sβ thΓ nh β%sβ" +msgid "could not unset '%s'" +msgstr "khΓ΄ng thα» thΓ΄i ΔαΊ·t β%sβ" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "KhΓ΄ng thα» chαΊ‘y βgit rev-listβ" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "gαΊ·p lα»i khi ghi vΓ o rev-list: %s" +msgid "failed write to rev-list" +msgstr "gαΊ·p lα»i khi ghi vΓ o rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "gαΊ·p lα»i khi ΔΓ³ng ΔαΊ§u vΓ o chuαΊ©n stdin của rev-list: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "gαΊ·p lα»i khi ΔΓ³ng ΔαΊ§u vΓ o chuαΊ©n stdin của rev-list" #: date.c:95 msgid "in the future" @@ -515,26 +524,26 @@ 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:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Δang thα»±c hiα»n dΓ² tΓ¬m Δα»i tΓͺn khΓ΄ng chΓnh xΓ‘c" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " GαΊ·p lα»i khi phΓ’n tΓch dirstat cαΊ―t bα» phαΊ§n trΔm β%sβ\n" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " KhΓ΄ng hiα»u Δα»i sα» dirstat β%sβ\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "KhΓ΄ng hiα»u giΓ‘ trα» cho biαΊΏn cαΊ₯u hΓ¬nh βdiff.submoduleβ: β%sβ" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -543,16 +552,16 @@ msgstr "" "TΓ¬m thαΊ₯y cΓ‘c lα»i trong biαΊΏn cαΊ₯u hΓ¬nh βdiff.dirstatβ:\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, 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:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow cαΊ§n chΓnh xΓ‘c mα»t ΔαΊ·c tαΊ£ ΔΖ°α»ng dαΊ«n" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -561,20 +570,20 @@ msgstr "" "GαΊ·p lα»i khi phΓ’n tΓch Δα»i sα» tΓΉy chα»n --dirstat/-X:\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "GαΊ·p lα»i khi phΓ’n tΓch Δα»i sα» tΓΉy chα»n --submodule: β%sβ" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "gαΊ·p lα»i khi lαΊ₯y tΓͺn vΓ thΓ΄ng tin của nhΓ’n" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "Bα» nhα» tαΊ‘m khΓ΄ng theo vαΊΏt bα» tαΊ―t trΓͺn hα» thα»ng hay vα» trΓ nΓ y." -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "khΓ΄ng thα» chαΊ‘y gpg." @@ -588,28 +597,28 @@ msgstr "gpg gαΊ·p lα»i khi kΓ½ dα»― liα»u" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "khΓ΄ng thα» tαΊ‘o tαΊp tin tαΊ‘m thα»i β%sβ: %s" +msgid "could not create temporary file '%s'" +msgstr "khΓ΄ng thα» tαΊ‘o tαΊp tin tαΊ‘m thα»i β%sβ" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "gαΊ·p lα»i khi ghi chα»― kΓ½ ΔΓnh kΓ¨m vΓ o β%sβ: %s" +msgid "failed writing detached signature to '%s'" +msgstr "gαΊ·p lα»i khi ghi chα»― kΓ½ ΔΓnh kΓ¨m vΓ o β%sβ" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "β%sβ: khΓ΄ng thα» Δα»c %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "β%sβ: %s" +msgid "failed to stat '%s'" +msgstr "gαΊ·p lα»i khi lαΊ₯y thα»ng kΓͺ vα» β%sβ" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "β%sβ: Δα»c ngαΊ―n %s" +msgid "'%s': short read" +msgstr "β%sβ: Δα»c ngαΊ―n" #: help.c:205 #, c-format @@ -672,12 +681,36 @@ msgstr[0] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"KhΓ΄ng thα» tαΊ‘o β%s.lockβ: %s.\n" +"\n" +"TiαΊΏn trΓ¬nh git khΓ‘c cΓ³ lαΊ½ Δang chαΊ‘y α» kho nΓ y, vΓ dα»₯\n" +"mα»t trΓ¬nh soαΊ‘n thαΊ£o Δược mα» bα»i βgit commitβ. Vui lΓ²ng chαΊ―c chαΊ―n\n" +"rαΊ±ng mα»i tiαΊΏn trΓ¬nh ΔΓ£ chαΊ₯m dα»©t vΓ sau ΔΓ³ thα» lαΊ‘i. NαΊΏu vαΊ«n lα»i,\n" +"mα»t tiαΊΏn trΓ¬nh git cΓ³ lαΊ½ ΔΓ£ Δα» vα»‘ khi thα»±c hiα»n α» kho nΓ y trΖ°α»c ΔΓ³:\n" +"gΓ΅ bα» tαΊp tin mα»t cΓ‘ch thủ cΓ΄ng Δα» tiαΊΏp tα»₯c." + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "KhΓ΄ng thα» tαΊ‘o β%s.lockβ: %s" + #: merge.c:41 msgid "failed to read the cache" msgstr "gαΊ·p lα»i khi Δα»c bα» nhα» Δα»m" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "khΓ΄ng thα» ghi tαΊp tin lΖ°u bαΊ£ng mα»₯c lα»₯c mα»i" @@ -724,7 +757,7 @@ msgstr "khΓ΄ng thα» Δα»c Δα»i tượng %s β%sβ" msgid "blob expected for %s '%s'" msgstr "Δα»i tượng blob Δược mong Δợi cho %s β%sβ" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "gαΊ·p lα»i khi mα» β%sβ" @@ -859,7 +892,7 @@ msgstr "ΔΓ£ bα» qua %s (ΔΓ£ cΓ³ sαΊ΅n lαΊ§n hΓ²a trα»n nΓ y)" msgid "Auto-merging %s" msgstr "Tα»±-Δα»ng-hΓ²a-trα»n %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "mΓ΄-Δun-con" @@ -888,49 +921,49 @@ msgstr "" "XUNG Δα»T (%s): α» ΔΓ’y khΓ΄ng cΓ³ thΖ° mα»₯c nΓ o cΓ³ tΓͺn %s trong %s. ThΓͺm %s nhΖ° lΓ " "%s" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "ThΓͺm \"%s\"" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Viα»c hΓ²a trα»n hα»ng nghiΓͺm trα»ng, khΓ΄ng nΓͺn Δα» xαΊ£y ra." -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "ΔΓ£ cαΊp nhαΊt rα»i!" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "hΓ²a trα»n cΓ‘c cΓ’y %s vΓ %s gαΊ·p lα»i" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "ΔΖ°α»ng dαΊ«n chΖ°a Δược xα» lΓ½??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Δang trα»n:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, 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:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "hΓ²a trα»n khΓ΄ng trαΊ£ vα» lαΊ§n chuyα»n giao nΓ o" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "KhΓ΄ng thα» phΓ’n tΓch Δα»i tượng β%sβ" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "KhΓ΄ng thα» ghi bαΊ£ng mα»₯c lα»₯c" @@ -962,28 +995,28 @@ msgstr "GiΓ‘ trα» %s sai: β%sβ" msgid "unable to parse object: %s" msgstr "khΓ΄ng thα» phΓ’n tΓch Δα»i tượng: β%sβ" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "β¦" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "cΓ‘ch dΓΉng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " hoαΊ·c: %s" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-Sα»" @@ -992,7 +1025,7 @@ msgstr "-Sα»" msgid "malformed object name '%s'" msgstr "tΓͺn Δα»i tượng dα» hΓ¬nh β%sβ" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "KhΓ΄ng thα» lΓ m %s Δược ghi bα»i nhΓ³m" @@ -1062,7 +1095,7 @@ msgstr "" "α» ΔΓ’y khΓ΄ng cΓ³ gΓ¬ bα» loαΊ‘i trα»« bα»i: cΓ‘c mαΊ«u (loαΊ‘i trα»«).\n" "CΓ³ lαΊ½ bαΊ‘n ΔΓ£ quΓͺn thΓͺm hoαΊ·c lΓ β:/β hoαΊ·c lΓ β.β?" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "khΓ΄ng thα» phΓ’n tΓch Δα»nh dαΊ‘ng --pretty" @@ -1088,23 +1121,23 @@ msgstr "" "GIT_INDEX_VERSION Δược ΔαΊ·t, nhΖ°ng giΓ‘ trα» của nΓ³ lαΊ‘i khΓ΄ng hợp lα».\n" "DΓΉng phiΓͺn bαΊ£n %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "KhΓ΄ng thα» mα» β%sβ Δα» ghi" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "khΓ΄ng thα» xΓ³a bα» tham chiαΊΏu %s: %s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "khΓ΄ng thα» xΓ³a bα» tham chiαΊΏu: %s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "khΓ΄ng thα» gα»‘ bα» tham chiαΊΏu: %s" @@ -1243,94 +1276,94 @@ msgstr "Δα»nh dαΊ‘ng: thiαΊΏu nguyΓͺn tα» %%(end)" msgid "malformed object name %s" msgstr "tΓͺn Δα»i tượng dα» hΓ¬nh %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "KhΓ΄ng thα» lαΊ₯y vα» cαΊ£ %s vΓ %s cho %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s thΖ°α»ng theo dΓ΅i %s, khΓ΄ng phαΊ£i %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s theo dΓ΅i cαΊ£ %s vΓ %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "Lα»i nα»i bα»" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD khΓ΄ng chα» ΔαΊΏn mα»t nhΓ‘nh nΓ o cαΊ£" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "khΓ΄ng cΓ³ nhΓ‘nh nΓ o nhΖ° thαΊΏ: β%sβ" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "khΓ΄ng cΓ³ thượng nguα»n Δược cαΊ₯u hΓ¬nh cho nhΓ‘nh β%sβ" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "nhΓ‘nh thượng nguα»n β%sβ khΓ΄ng Δược lΖ°u lαΊ‘i nhΖ° lΓ mα»t nhΓ‘nh theo dΓ΅i mΓ‘y chủ" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "ΔαΊ©y lΓͺn ΔΓch β%sβ trΓͺn mΓ‘y chủ β%sβ khΓ΄ng cΓ³ nhΓ‘nh theo dΓ΅i nα»i bα»" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "nhΓ‘nh β%sβ khΓ΄ng cΓ³ mΓ‘y chủ Δα» ΔαΊ©y lΓͺn" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "ΔαΊ©y refspecs cho β%sβ khΓ΄ng bao gα»m β%sβ" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "ΔαΊ©y lΓͺn mΓ khΓ΄ng cΓ³ ΔΓch (push.default lΓ βnothingβ)" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "khΓ΄ng thα» phΓ’n giαΊ£i ΔαΊ©y βΔΖ‘n giαΊ£nβ ΔαΊΏn mα»t ΔΓch ΔΖ‘n" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "NhΓ‘nh của bαΊ‘n dα»±a trΓͺn cΖ‘ sα» lΓ β%sβ, nhΖ°ng trΓͺn thượng nguα»n khΓ΄ng cΓ²n.\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (dΓΉng \" git branch --unset-upstream\" Δα» sα»a)\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "NhΓ‘nh của bαΊ‘n ΔΓ£ cαΊp nhαΊt vα»i β%sβ.\n" -#: remote.c:2084 +#: remote.c:2085 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "NhΓ‘nh của bαΊ‘n Δα»©ng trΖ°α»c β%sβ %d lαΊ§n chuyα»n giao.\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (dΓΉng \"git push\" Δα» xuαΊ₯t bαΊ£n cΓ‘c lαΊ§n chuyα»n giao nα»i bα» của bαΊ‘n)\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1339,11 +1372,11 @@ msgstr[0] "" "NhΓ‘nh của bαΊ‘n Δα»©ng ΔαΊ±ng sau β%sβ %d lαΊ§n chuyα»n giao, vΓ cΓ³ thα» Δược chuyα»n-" "tiαΊΏp-nhanh.\n" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (dΓΉng \"git pull\" Δα» cαΊp nhαΊt nhΓ‘nh nα»i bα» của bαΊ‘n)\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1356,22 +1389,22 @@ msgstr[0] "" "vΓ cΓ³ %d vΓ %d lαΊ§n chuyα»n giao khΓ‘c nhau cho tα»«ng cΓ‘i,\n" "tΖ°Ζ‘ng α»©ng vα»i mα»i lαΊ§n.\n" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (dΓΉng \"git pull\" Δα» hΓ²a trα»n nhΓ‘nh trΓͺn mΓ‘y chủ vΓ o trong nhΓ‘nh của " "bαΊ‘n)\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "nhΓ‘nh hiα»n tαΊ‘i của bαΊ‘n cΓ³ vαΊ» nhΖ° bα» hα»ng" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "nhΓ‘nh hiα»n tαΊ‘i của bαΊ‘n β%sβ khΓ΄ng cΓ³ mα»t lαΊ§n chuyα»n giao nΓ o cαΊ£" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent xung khαΊ―c vα»i --bisect" @@ -1422,7 +1455,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:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "KhΓ΄ng thα» ghi vΓ o %s" @@ -1582,12 +1615,12 @@ msgstr "hΓ£y thα» \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "KhΓ΄ng thα» tαΊ‘o thΖ° mα»₯c xαΊΏp dΓ£y %s" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Lα»i bao bα»c %s." -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "khΓ΄ng cherry-pick hay hoΓ n nguyΓͺn trong tiαΊΏn trΓ¬nh" @@ -1599,63 +1632,72 @@ msgstr "khΓ΄ng thα» phΓ’n giαΊ£i HEAD" msgid "cannot abort from a branch yet to be born" msgstr "khΓ΄ng thα» hủy bα» tα»« mα»t nhΓ‘nh mΓ nΓ³ cΓ²n chΖ°a Δược tαΊ‘o ra" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "khΓ΄ng thα» mα» %s: %s" +msgid "cannot open %s" +msgstr "khΓ΄ng mα» Δược β%sβ" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "khΓ΄ng thα» Δα»c %s: %s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "gαΊ·p kαΊΏt thΓΊc tαΊp tin Δα»t xuαΊ₯t" -#: sequencer.c:888 +#: sequencer.c:887 #, 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:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "KhΓ΄ng thα» Δα»nh dαΊ‘ng β%sβ." -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: khΓ΄ng thα» cherry-pick mα»t %s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s: Δiα»m xΓ©t duyα»t sai" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "KhΓ΄ng thα» hoΓ n nguyΓͺn mα»t lαΊ§n chuyα»n giao khα»i tαΊ‘o" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "KhΓ΄ng thα» cherry-pick vΓ o mα»t ΔαΊ§u (head) trα»ng rα»ng" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "gαΊ·p lα»i khi Δα»c %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "CαΊ§n phiΓͺn bαΊ£n kho git <= %d, nhΖ°ng lαΊ‘i nhαΊn Δược %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "tΓ¬m thαΊ₯y phαΊ§n mα» rα»ng kho chΖ°a biαΊΏt:" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "vα» trΓ tΖ°Ζ‘ng Δα»i trΖ°α»c Δiα»m kαΊΏt thΓΊc của tαΊp tin gΓ³i (.idx hα»ng Γ ?)" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "vα» trΓ tΖ°Ζ‘ng Δα»i nαΊ±m trΖ°α»c chα» mα»₯c gΓ³i cho %s (mα»₯c lα»₯c bα» hα»ng Γ ?)" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -1685,31 +1727,40 @@ msgstr "" "nΓ y\n" "bαΊ±ng cΓ‘ch chαΊ‘y lα»nh \"git config advice.objectNameWarning false\"" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "KhΓ΄ng thα» thay Δα»i .gitmodules chΖ°a hΓ²a trα»n, hΓ£y giαΊ£i quyαΊΏt xung Δα»t trα»n " "trΖ°α»c" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "KhΓ΄ng thα» tΓ¬m thαΊ₯y phαΊ§n trong .gitmodules nΖ‘i mΓ ΔΖ°α»ng_dαΊ«n=%s" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "KhΓ΄ng thα» cαΊp nhαΊt mα»₯c .gitmodules %s" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "KhΓ΄ng thα» gα»‘ bα» mα»₯c .gitmodules dΓ nh cho %s" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "gαΊ·p lα»i khi tα» chα»©c .gitmodules ΔΓ£ cαΊp nhαΊt" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "khΓ΄ng cho phΓ©p giΓ‘ trα» Γ’m α» submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "giΓ‘ trα» cho %s khΓ΄ng hợp lα»" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1769,7 +1820,241 @@ msgstr "khΓ΄ng thα» Δα»i tΓͺn tαΊp tin tαΊ‘m thα»i thΓ nh %s" msgid "Could not read ref %s" msgstr "KhΓ΄ng thα» Δα»c tham chiαΊΏu %s" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"CΓ‘c thay Δα»i nα»i bα» của bαΊ‘n vα»i cΓ‘c tαΊp tin sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"checkout:\n" +"%%sVui lΓ²ng chuyα»n giao cΓ‘c thay Δα»i hay tαΊ‘m cαΊ₯t chΓΊng Δi trΖ°α»c khi bαΊ‘n cΓ³ " +"thα» chuyα»n nhΓ‘nh." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"CΓ‘c thay Δα»i nα»i bα» của bαΊ‘n vα»i cΓ‘c tαΊp tin sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"checkout:\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"CΓ‘c thay Δα»i nα»i bα» của bαΊ‘n vα»i cΓ‘c tαΊp tin sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"hΓ²a trα»n:\n" +"%%sVui lΓ²ng chuyα»n giao cΓ‘c thay Δα»i hay tαΊ‘m cαΊ₯t chΓΊng Δi trΖ°α»c khi bαΊ‘n cΓ³ " +"thα» hΓ²a trα»n." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"CΓ‘c thay Δα»i nα»i bα» của bαΊ‘n vα»i cΓ‘c tαΊp tin sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"hΓ²a trα»n:\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"CΓ‘c thay Δα»i nα»i bα» của bαΊ‘n vα»i cΓ‘c tαΊp tin sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"%s:\n" +"%%sVui lΓ²ng chuyα»n giao cΓ‘c thay Δα»i hay tαΊ‘m cαΊ₯t chΓΊng Δi trΖ°α»c khi bαΊ‘n cΓ³ " +"thα» %s." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"CΓ‘c thay Δα»i nα»i bα» của bαΊ‘n vα»i cΓ‘c tαΊp tin sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"%s:\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"Viα»c cαΊp nhαΊt cΓ‘c thΖ° mα»₯c sau ΔΓ’y cΓ³ thα» lΓ m mαΊ₯t cΓ‘c tαΊp tin theo dΓ΅i trong " +"nΓ³:\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» gα»‘ bα» bα»i lα»nh " +"checkout:\n" +"%%sVui lΓ²ng di chuyα»n hay gα»‘ bα» chΓΊng trΖ°α»c khi bαΊ‘n cΓ³ thα» chuyα»n nhΓ‘nh." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» gα»‘ bα» bα»i lα»nh " +"checkout:\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» gα»‘ bα» bα»i lα»nh hΓ²a " +"trα»n:\n" +"%%sVui lΓ²ng di chuyα»n hay gα»‘ bα» chΓΊng trΖ°α»c khi bαΊ‘n cΓ³ thα» hΓ²a trα»n." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» gα»‘ bα» bα»i lα»nh hΓ²a " +"trα»n:\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» gα»‘ bα» bα»i %s:\n" +"%%sVui lΓ²ng di chuyα»n hay gα»‘ bα» chΓΊng trΖ°α»c khi bαΊ‘n cΓ³ thα» %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» gα»‘ bα» bα»i %s:\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"checkout:\n" +"%%sVui lΓ²ng di chuyα»n hay gα»‘ bα» chΓΊng trΖ°α»c khi bαΊ‘n cΓ³ thα» chuyα»n nhΓ‘nh." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"checkout:\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"hΓ²a trα»n:\n" +"%%sVui lΓ²ng di chuyα»n hay gα»‘ bα» chΓΊng trΖ°α»c khi bαΊ‘n cΓ³ thα» hΓ²a trα»n." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"hΓ²a trα»n:\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"%s:\n" +"%%sVui lΓ²ng di chuyα»n hay gα»‘ bα» chΓΊng trΖ°α»c khi bαΊ‘n cΓ³ thα» %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i lα»nh " +"%s:\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Mα»₯c β%sβ ΔΓ¨ lΓͺn β%sβ. KhΓ΄ng thα» buα»c." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"KhΓ΄ng thα» cαΊp nhαΊt checkout rαΊ£i rΓ‘c: cΓ‘c mα»₯c tin sau ΔΓ’y chΖ°a cαΊp nhαΊt:\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» ghi ΔΓ¨ bα»i cαΊp " +"nhαΊt checkout rαΊ£i rΓ‘c:\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"CΓ‘c tαΊp tin cΓ’y lΓ m viα»c chΖ°a Δược theo dΓ΅i sau ΔΓ’y sαΊ½ bα» xΓ³a bα» bα»i cαΊp " +"nhαΊt checkout rαΊ£i rΓ‘c:\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "BΓ£i bα»\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Δang lαΊ₯y ra cΓ‘c tαΊp tin" @@ -1807,200 +2092,196 @@ msgstr "ΔoαΊ‘n ΔΖ°α»ng dαΊ«n β..β khΓ΄ng hợp lα»" msgid "could not open '%s' for reading and writing" msgstr "khΓ΄ng thα» mα» β%sβ Δα» Δα»c vΓ ghi" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "khΓ΄ng thα» mα» β%sβ Δα» ghi" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "khΓ΄ng thα» mα» β%sβ Δα» Δα»c" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "khΓ΄ng thα» truy cαΊp β%sβ: %s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "khΓ΄ng thα» truy cαΊp β%sβ" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "KhΓ΄ng thα» lαΊ₯y thΖ° mα»₯c lΓ m viα»c hiα»n hΓ nh" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "khΓ΄ng thα» mα» %s Δα» ghi" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "khΓ΄ng thα» ghi vΓ o %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "khΓ΄ng thα» ΔΓ³ng %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Nhα»―ng ΔΖ°α»ng dαΊ«n chΖ°a Δược hΓ²a trα»n:" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (dΓΉng \"git reset %s <tαΊp-tin>β¦\" Δα» bα» ra khα»i bα» phΓ³ng)" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (dΓΉng \"git rm --cached <tαΊp-tin>β¦\" Δα» bα» ra khα»i bα» phΓ³ng)" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (dΓΉng \"git add <tαΊp-tin>β¦\" Δα» ΔΓ‘nh dαΊ₯u lΓ cαΊ§n giαΊ£i quyαΊΏt)" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (dΓΉng \"git add/rm <tαΊp-tin>β¦\" nhΖ° lΓ mα»t cΓ‘ch thΓch hợp Δα» ΔΓ‘nh dαΊ₯u lΓ " "cαΊ§n Δược giαΊ£i quyαΊΏt)" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dΓΉng \"git rm <tαΊp-tin>β¦\" Δα» ΔΓ‘nh dαΊ₯u lΓ cαΊ§n giαΊ£i quyαΊΏt)" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "Nhα»―ng thay Δα»i sαΊ½ Δược chuyα»n giao:" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "CΓ‘c thay Δα»i chΖ°a Δược ΔαΊ·t lΓͺn bα» phΓ³ng Δα» chuyα»n giao:" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (dΓΉng \"git add <tαΊp-tin>β¦\" Δα» cαΊp nhαΊt nhα»―ng gΓ¬ sαΊ½ chuyα»n giao)" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (dΓΉng \"git add/rm <tαΊp-tin>β¦\" Δα» cαΊp nhαΊt nhα»―ng gΓ¬ sαΊ½ Δược chuyα»n giao)" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (dΓΉng \"git checkout -- <tαΊp-tin>β¦\" Δα» loαΊ‘i bα» cΓ‘c thay Δα»i trong thΖ° mα»₯c " "lΓ m viα»c)" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (chuyα»n giao hoαΊ·c lΓ loαΊ‘i bα» cΓ‘c nα»i dung chΖ°a Δược theo dΓ΅i hay ΔΓ£ sα»a " "chα»―a trong mΓ΄-Δun-con)" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (dΓΉng \"git %s <tαΊp-tin>β¦\" Δα» thΓͺm vΓ o nhα»―ng gΓ¬ cαΊ§n Δược chuyα»n giao)" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "bα» xΓ³a bα»i cαΊ£ hai:" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "Δược thΓͺm vΓ o bα»i chΓΊng ta:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "bα» xΓ³a Δi bα»i hα»:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "Δược thΓͺm vΓ o bα»i hα»:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "bα» xΓ³a bα»i chΓΊng ta:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "Δược thΓͺm vΓ o bα»i cαΊ£ hai:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "bα» sα»a bα»i cαΊ£ hai:" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "lα»i: khΓ΄ng thα» tiαΊΏp nhαΊn trαΊ‘ng thΓ‘i chΖ°a hΓ²a trα»n %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "tαΊp tin mα»i:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "ΔΓ£ chΓ©p:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "ΔΓ£ xΓ³a:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "ΔΓ£ sα»a:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "ΔΓ£ Δα»i tΓͺn:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "Δα»i-kiα»u:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "khΓ΄ng hiα»u:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "chΖ°a hΓ²a trα»n:" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "lαΊ§n chuyα»n giao mα»i, " -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "nα»i dung bα» sα»a Δα»i, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "nα»i dung chΖ°a Δược theo dΓ΅i, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format 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:754 +#: wt-status.c:755 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:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "Nhα»―ng mΓ΄-Δun-con thay Δα»i ΔΓ£ Δược chuyα»n giao:" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2008,39 +2289,39 @@ msgstr "" "KhΓ΄ng Δα»ng ΔαΊΏn ΔΖ°α»ng α» trΓͺn.\n" "Mα»i thα»© phΓa dΖ°α»i sαΊ½ Δược xΓ³a bα»." -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "BαΊ‘n cΓ³ nhα»―ng ΔΖ°α»ng dαΊ«n chΖ°a Δược hΓ²a trα»n." -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " (sα»a cΓ‘c xung Δα»t rα»i chαΊ‘y \"git commit\")" -#: wt-status.c:954 +#: wt-status.c:956 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:957 +#: wt-status.c:959 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:967 +#: wt-status.c:969 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:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "MiαΊΏng vΓ‘ hiα»n tαΊ‘i bα» trα»ng rα»ng." -#: wt-status.c:974 +#: wt-status.c:976 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:976 +#: wt-status.c:978 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:978 +#: wt-status.c:980 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)" @@ -2197,43 +2478,43 @@ msgstr "BαΊ‘n hiα»n tαΊ‘i Δang thα»±c hiα»n viα»c bisect (di chuyα»n nα»a 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:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "TrΓͺn nhΓ‘nh " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "rebase α» chαΊΏ Δα» tΖ°Ζ‘ng tΓ‘c Δang Δược thα»±c hiα»n; lΓͺn trΓͺn " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "rebase Δang Δược thα»±c hiα»n: lΓͺn trΓͺn " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD Δược tΓ‘ch rα»i tαΊ‘i " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD Δược tΓ‘ch rα»i tα»« " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Hiα»n tαΊ‘i chαΊ³ng α» nhΓ‘nh nΓ o cαΊ£." -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "LαΊ§n chuyα»n giao khα»i tαΊ‘o" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Nhα»―ng tαΊp tin chΖ°a Δược theo dΓ΅i" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Nhα»―ng tαΊp tin bα» lα» Δi" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2245,32 +2526,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:1500 +#: wt-status.c:1522 #, 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:1502 +#: wt-status.c:1524 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:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "KhΓ΄ng cΓ³ thay Δα»i nΓ o" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, 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:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2279,57 +2560,57 @@ 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:1522 +#: wt-status.c:1544 #, 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:1525 +#: wt-status.c:1547 #, 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:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "khΓ΄ng cΓ³ gΓ¬ Δα» chuyα»n giao\n" -#: wt-status.c:1531 +#: wt-status.c:1553 #, 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:1535 +#: wt-status.c:1557 #, 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:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "LαΊ§n chuyα»n giao khα»i tαΊ‘o trΓͺn " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEAD (khΓ΄ng nhΓ‘nh)" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "ΔΓ£ ra Δi" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "ΔαΊ±ng sau " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "phΓa trΖ°α»c " -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "gαΊ·p lα»i khi bα» liΓͺn kαΊΏt (unlink) β%sβ" @@ -2343,7 +2624,7 @@ msgstr "git add [<cΓ‘c-tΓΉy-chα»n>] [--] <pathspec>β¦" 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:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "CαΊp nhαΊt tαΊp tin gαΊ·p lα»i" @@ -2357,7 +2638,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "ΔΖ°a ra khα»i bα» phΓ³ng cΓ‘c thay Δα»i sau khi lΓ m tΖ°Ζ‘i mα»i lαΊ‘i bαΊ£ng mα»₯c lα»₯c:" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "KhΓ΄ng thα» Δα»c bαΊ£ng mα»₯c lα»₯c" @@ -2395,14 +2676,14 @@ msgstr "" "của bαΊ‘n:\n" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "chαΊ‘y thα»" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "chi tiαΊΏt" @@ -2410,7 +2691,7 @@ msgstr "chi tiαΊΏt" msgid "interactive picking" msgstr "sα»a bαΊ±ng cΓ‘ch tΖ°Ζ‘ng tΓ‘c" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "chα»n βhunksβ theo kiα»u tΖ°Ζ‘ng tΓ‘c" @@ -2482,16 +2763,16 @@ 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:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "tαΊp tin ghi bαΊ£ng mα»₯c lα»₯c bα» hα»ng" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "KhΓ΄ng thα» ghi tαΊp tin lΖ°u bαΊ£ng mα»₯c lα»₯c mα»i" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "KhΓ΄ng thα» Δα»c β%sβ." @@ -2519,16 +2800,6 @@ msgstr "GαΊ·p lα»i khi sao chΓ©p ghi chΓΊ (note) tα»« β%sβ tα»i β%sβ" msgid "fseek failed" msgstr "fseek gαΊ·p lα»i" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "khΓ΄ng thα» mα» β%sβ Δα» Δα»c: %s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "KhΓ΄ng thα» mα» β%sβ Δα» ghi: %s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2538,75 +2809,75 @@ msgstr "khΓ΄ng thα» phΓ’n tΓch cΓΊ phΓ‘p β%sβ" msgid "Only one StGIT patch series can be applied at once" msgstr "Chα» cΓ³ mα»t sΓͺ-ri miαΊΏng vΓ‘ StGIT Δược Γ‘p dα»₯ng mα»t lΓΊc" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "dαΊ₯u thα»i gian khΓ΄ng hợp lα»" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "dΓ²ng NgΓ y thΓ‘ng khΓ΄ng hợp lα»" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "Δα» lα»ch mΓΊi giα» khΓ΄ng hợp lα»" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "DΓ² tΓ¬m Δα»nh dαΊ‘ng miαΊΏng vΓ‘ gαΊ·p lα»i." -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "tαΊ‘o thΖ° mα»₯c \"%s\" gαΊ·p lα»i" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "GαΊ·p lα»i khi chia nhα» cΓ‘c miαΊΏng vΓ‘." -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "khΓ΄ng thα» ghi tαΊp tin lΖ°u mα»₯c lα»₯c" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Khi bαΊ‘n ΔΓ£ phΓ’n giαΊ£i xong trα»₯c trαΊ·c nΓ y, hΓ£y chαΊ‘y \"%s --continue\"." -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "NαΊΏu bαΊ‘n muα»n bα» qua miαΊΏng vΓ‘ nΓ y, hΓ£y chαΊ‘y lα»nh \"%s --skip\" Δα» thay thαΊΏ." -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Δα» phα»₯c hα»i lαΊ‘i nhΓ‘nh gα»c vΓ dα»«ng vΓ‘, hΓ£y chαΊ‘y \"%s --abort\"." -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "MiαΊΏng vΓ‘ trα»ng rα»ng. QuΓ‘ trΓ¬nh chia nhα» miαΊΏng vΓ‘ cΓ³ lα»i?" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "dΓ²ng thα»₯t lα» khΓ΄ng hợp lα»: %s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "khΓ΄ng thα» phΓ’n tΓch lαΊ§n chuyα»n giao β%sβ" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Kho thiαΊΏu Δα»i tượng blob cαΊ§n thiαΊΏt Δα» trα» vα» trΓͺn β3-way mergeβ." -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" "Sα» dα»₯ng thΓ΄ng tin trong bαΊ£ng mα»₯c lα»₯c Δα» cαΊ₯u trΓΊc lαΊ‘i mα»t cΓ’y (tree) cΖ‘ sα»β¦" -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2614,38 +2885,38 @@ msgstr "" "BαΊ‘n ΔΓ£ sα»a miαΊΏng vΓ‘ của mΓ¬nh bαΊ±ng cΓ‘ch thủ cΓ΄ng Γ ?\n" "NΓ³ khΓ΄ng thα» Γ‘p dα»₯ng cΓ‘c blob ΔΓ£ Δược ghi lαΊ‘i trong bαΊ£ng mα»₯c lα»₯c của nΓ³." -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "Δang trα» lαΊ‘i Δα» vΓ‘ cΖ‘ sα» vΓ βhΓ²a trα»n 3-ΔΖ°α»ngββ¦" -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "GαΊ·p lα»i khi trα»n vΓ o cΓ‘c thay Δα»i." -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "lα»nh git write-tree gαΊ·p lα»i khi ghi mα»t cΓ’y" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "Γ‘p dα»₯ng vΓ o mα»t lα»ch sα» trα»ng rα»ng" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "gαΊ·p lα»i khi ghi Δα»i tượng chuyα»n giao" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "khΓ΄ng thα» phα»₯c hα»i: %s khΓ΄ng tα»n tαΊ‘i." -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "khΓ΄ng thα» Δược tΖ°Ζ‘ng tΓ‘c mΓ khΓ΄ng cΓ³ stdin kαΊΏt nα»i vα»i mα»t thiαΊΏt bα» cuα»i" -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "ThΓ’n của lαΊ§n chuyα»n giao lΓ :" @@ -2653,37 +2924,37 @@ msgstr "ThΓ’n của lαΊ§n chuyα»n giao lΓ :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Γp dα»₯ng? Δα»ng Γ½ [y]/khΓ΄[n]g/chα»nh sα»a [e]/hiα»n thα» miαΊΏng [v]Γ‘/chαΊ₯p nhαΊn tαΊ₯t " "cαΊ£ [a]: " -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "BαΊ£ng mα»₯c lα»₯c bαΊ©n: khΓ΄ng thα» Γ‘p dα»₯ng cΓ‘c miαΊΏng vΓ‘ (bαΊ©n: %s)" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "Γp dα»₯ng: %.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "KhΓ΄ng thay Δα»i gΓ¬ cαΊ£ -- MiαΊΏng vΓ‘ ΔΓ£ Δược Γ‘p dα»₯ng rα»i." -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "GαΊ·p lα»i khi vΓ‘ tαΊ‘i %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "BαΊ£n sao chΓ©p của miαΊΏng vΓ‘ mΓ nΓ³ gαΊ·p lα»i thΓ¬ Δược tΓ¬m thαΊ₯y trong: %s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2694,7 +2965,7 @@ msgstr "" "ΔΓ£ sαΊ΅n Δược ΔΖ°a vΓ o vα»i cΓΉng nα»i dung thay Δα»i; bαΊ‘n cΓ³ lαΊ½ muα»n bα» qua miαΊΏng " "vΓ‘ nΓ y." -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2702,17 +2973,17 @@ msgstr "" "BαΊ‘n vαΊ«n cΓ³ nhα»―ng ΔΖ°α»ng dαΊ«n chΖ°a Δược hΓ²a trα»n trong bαΊ£ng mα»₯c lα»₯c của mΓ¬nh.\n" "BαΊ‘n ΔΓ£ quΓͺn sα» dα»₯ng lα»nh βgit addβ Γ ?" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "khΓ΄ng thα» phΓ’n tΓch Δα»i tượng β%sβ." -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "gαΊ·p lα»i khi dα»n bαΊ£ng mα»₯c lα»₯c" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2720,153 +2991,155 @@ msgstr "" "BαΊ‘n cΓ³ lαΊ½ ΔΓ£ cΓ³ HEAD ΔΓ£ bα» di chuyα»n Δi kα» tα»« lαΊ§n βamβ thαΊ₯t bαΊ‘i cuα»i cΓΉng.\n" "KhΓ΄ng thα» chuyα»n tα»i ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "GiΓ‘ trα» khΓ΄ng hợp lα» cho --patch-format: %s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<cΓ‘c-tΓΉy-chα»n>] [(<mbox>|<Maildir>)β¦]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<cΓ‘c-tΓΉy-chα»n>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "chαΊ‘y kiα»u tΖ°Ζ‘ng tΓ‘c" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "tΓΉy chα»n lα»ch sα» -- khΓ΄ng-toΓ‘n-tα»" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "cho phΓ©p quay trα» lαΊ‘i Δα» hΓ²a trα»n kiα»u β3wayβ nαΊΏu cαΊ§n" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "im lαΊ·ng" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "ThΓͺm dΓ²ng Signed-off-by cho ghi chΓΊ của lαΊ§n chuyα»n giao" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "chuyα»n mΓ£ thΓ nh utf8 (mαΊ·c Δα»nh)" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "chuyα»n cα» -k cho git-mailinfo" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "chuyα»n cα» -b cho git-mailinfo" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "chuyα»n cα» -m cho git-mailinfo" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "chuyα»n cα» --keep-cr cho git-mailsplit vα»i Δα»nh dαΊ‘ng mbox" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "Δα»«ng chuyα»n cα» --keep-cr cho git-mailsplit khΓ΄ng phα»₯ thuα»c vΓ o am.keepcr" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "cαΊ―t mα»i thα»© trΖ°α»c dΓ²ng scissors" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "hΓ nh Δα»ng" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "chuyα»n nΓ³ qua git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "gα»c" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "ΔΖ°α»ng-dαΊ«n" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 #: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "sα»" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "Δα»nh dαΊ‘ng" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "Δα»nh dαΊ‘ng (cΓ‘c) miαΊΏng vΓ‘ theo" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "ΔΓ¨ lΓͺn cΓ‘c lα»i nhαΊ―n lα»i khi xαΊ£y ra lα»i vΓ‘ nghiΓͺm trα»ng" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "tiαΊΏp tα»₯c Γ‘p dα»₯ng cΓ‘c miαΊΏng vΓ‘ sau khi giαΊ£i quyαΊΏt xung Δα»t" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "Δα»ng nghΔ©a vα»i --continue" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "bα» qua miαΊΏng vΓ‘ hiα»n hΓ nh" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "phα»₯c hα»i lαΊ‘i nhΓ‘nh gα»c vΓ loαΊ‘i bα» thao tΓ‘c vΓ‘." -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "nΓ³i dα»i vα» ngΓ y chuyα»n giao" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "dΓΉng dαΊ₯u thα»i gian hiα»n tαΊ‘i cho ngΓ y tΓ‘c giαΊ£" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "mΓ£-sα»-khΓ³a" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "lαΊ§n chuyα»n giao kΓ½-GPG" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "(dΓΉng nα»i bα» cho git-rebase)" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2874,16 +3147,16 @@ msgstr "" "TΓΉy chα»n -b/--binary ΔΓ£ khΓ΄ng dΓΉng tα»« lΓ’u rα»i, vΓ \n" "nΓ³ sαΊ½ Δược bα» Δi. Xin Δα»«ng sα» dα»₯ng nΓ³ thΓͺm nα»―a." -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "gαΊ·p lα»i Δα»c bαΊ£ng mα»₯c lα»₯c" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "thΖ° mα»₯c rebase trΖ°α»c %s khΓ΄ng sαΊ΅n cΓ³ nhΖ°ng mbox lαΊ‘i ΔΖ°a ra." -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2892,7 +3165,7 @@ msgstr "" "TΓ¬m thαΊ₯y thΖ° mα»₯c lαΊ‘c %s.\n" "DΓΉng \"git am --abort\" Δα» loαΊ‘i bα» nΓ³ Δi." -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tΓ‘c phΓ’n giαΊ£i khΓ΄ng Δược tiαΊΏn hΓ nh, chΓΊng ta khΓ΄ng phα»₯c hα»i lαΊ‘i." @@ -2927,38 +3200,38 @@ msgstr "thi hΓ nh biα»u thα»©c chΓnh quy trαΊ£ vα» %d cho ΔαΊ§u vΓ o: %s" 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:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff sai - cαΊ§n /dev/null, nhΖ°ng lαΊ‘i nhαΊn Δược %s trΓͺn dΓ²ng %d" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, 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:945 +#: builtin/apply.c:943 #, 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:952 +#: builtin/apply.c:949 #, 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiαΊΏt: dΓ²ng khΓ΄ng cαΊ§n: %.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, 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:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2970,76 +3243,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:1655 +#: builtin/apply.c:1646 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:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "tαΊp tin ΔΓ£ xΓ³a vαΊ«n cΓ²n nα»i dung" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "miαΊΏng vΓ‘ hα»ng tαΊ‘i dΓ²ng %d" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, 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:1721 +#: builtin/apply.c:1712 #, 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:1724 +#: builtin/apply.c:1715 #, 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:1870 +#: builtin/apply.c:1861 #, 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:1899 +#: builtin/apply.c:1895 #, 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:2050 +#: builtin/apply.c:2048 #, 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:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "khΓ΄ng thα» Δα»c liΓͺn kαΊΏt mα»m %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "khΓ΄ng thα» mα» hay Δα»c %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khα»i ΔαΊ§u dΓ²ng: β%cβ" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, 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:2908 +#: builtin/apply.c:2906 #, 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:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3048,324 +3321,334 @@ msgstr "" "trong khi Δang tΓ¬m kiαΊΏm cho:\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, 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:3035 +#: builtin/apply.c:3033 #, 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:3041 +#: builtin/apply.c:3039 #, 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:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "gαΊ·p lα»i khi vΓ‘: %s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "khΓ΄ng thα» lαΊ₯y ra %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "Δα»c %s gαΊ·p lα»i" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, 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:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, 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:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, 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:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s: khΓ΄ng khα»p trong mα»₯c lα»₯c" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "loαΊ‘i bα» miαΊΏng vΓ‘ Δα» lαΊ‘i nα»i dung tαΊp tin" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiα»u" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s cΓ³ kiα»u %o, cαΊ§n %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "ΔΖ°α»ng dαΊ«n khΓ΄ng hợp lα» β%sβ" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s: ΔΓ£ cΓ³ tα»« trΖ°α»c trong bαΊ£ng mα»₯c lα»₯c" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, 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:3769 +#: builtin/apply.c:3767 #, 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:3774 +#: builtin/apply.c:3772 #, 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:3794 +#: builtin/apply.c:3792 #, 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:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s: miαΊΏng vΓ‘ khΓ΄ng Δược Γ‘p dα»₯ng" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Δang kiα»m tra miαΊΏng vΓ‘ %sβ¦" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gαΊ·p lα»i Δα»i vα»i ΔΖ°α»ng dαΊ«n β%sβ" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "khΓ΄ng thα» gα»‘ bα» %s tα»« mα»₯c lα»₯c" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "miαΊΏng vΓ‘ sai hα»ng cho mΓ΄-Δun-con %s" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, 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:4086 +#: builtin/apply.c:4084 #, 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:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, 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:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "Δang ΔΓ³ng tαΊp tin β%sβ" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, 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:4258 +#: builtin/apply.c:4256 #, 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:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "lα»i nα»i bα»" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, 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:4279 +#: builtin/apply.c:4277 #, 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:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "khΓ΄ng thα» mα» %s: %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khα»i nhα» #%d Δược Γ‘p dα»₯ng gα»n gΓ ng." -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "ΔoαΊ‘n dα»― liα»u #%d bα» tα»« chα»i." -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "bα» qua ΔΖ°α»ng dαΊ«n β%sβ." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "khΓ΄ng thα»«a nhαΊn ΔαΊ§u vΓ o" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 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:4507 +#: builtin/apply.c:4509 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:4510 +#: builtin/apply.c:4512 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:4513 +#: builtin/apply.c:4515 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:4516 +#: builtin/apply.c:4518 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:4518 +#: builtin/apply.c:4520 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:4522 +#: builtin/apply.c:4524 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:4524 +#: builtin/apply.c:4526 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:4526 +#: builtin/apply.c:4528 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:4528 +#: builtin/apply.c:4530 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:4530 +#: builtin/apply.c:4532 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:4532 +#: builtin/apply.c:4534 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:4534 +#: builtin/apply.c:4536 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:4536 +#: builtin/apply.c:4538 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:4538 +#: builtin/apply.c:4540 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:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 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:4543 +#: builtin/apply.c:4545 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:4545 +#: builtin/apply.c:4547 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:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 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:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "Γ‘p dα»₯ng miαΊΏng vΓ‘ theo chiα»u ngược" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 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:4558 +#: builtin/apply.c:4560 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:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "cho phΓ©p chα»ng khα»i nhα»" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 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:4566 +#: builtin/apply.c:4568 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:4569 +#: builtin/apply.c:4571 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:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way α» ngoΓ i mα»t kho chα»©a" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index α» ngoΓ i mα»t kho chα»©a" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached α» ngoΓ i mα»t kho chα»©a" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "khΓ΄ng thα» mα» miαΊΏng vΓ‘ β%sβ" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, 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:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3431,101 +3714,101 @@ msgstr "<rev-opts> Δược mΓ΄ tαΊ£ trong tΓ i liα»u git-rev-list(1)" msgid "Blaming lines" msgstr "CΓ‘c dΓ²ng blame" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 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:2531 +#: builtin/blame.c:2532 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:2532 +#: builtin/blame.c:2533 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:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Hiα»n thα» thα»ng kΓͺ cΓ΄ng sα»©c lΓ m viα»c" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "Γp buα»c bΓ‘o cΓ‘o tiαΊΏn triα»n cΓ΄ng viα»c" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 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:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Hiα»n thα» tΓͺn tαΊp tin gα»c (MαΊ·c Δα»nh: auto)" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Hiα»n thα» sα» dΓ²ng gα»c (MαΊ·c Δα»nh: off)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 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:2539 +#: builtin/blame.c:2540 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:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "DΓΉng cΓΉng chαΊΏ Δα» xuαΊ₯t ra vα»i git-annotate (MαΊ·c Δα»nh: off)" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 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:2542 +#: builtin/blame.c:2543 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:2543 +#: builtin/blame.c:2544 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:2544 +#: builtin/blame.c:2545 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:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Bα» qua cΓ‘c khΓ‘c biα»t do khoαΊ£ng trαΊ―ng gΓ’y ra" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 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:2547 +#: builtin/blame.c:2548 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:2548 +#: builtin/blame.c:2549 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:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "Δiα»m sα»" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 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:2550 +#: builtin/blame.c:2551 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:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "Xα» lΓ½ chα» dΓ²ng vΓΉng n,m, tΓnh tα»« 1" @@ -3535,31 +3818,31 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4 nΔm, 11 thΓ‘ng trΖ°α»c" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<cΓ‘c-tΓΉy-chα»n>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 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:27 +#: builtin/branch.c:28 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:28 +#: builtin/branch.c:29 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:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<cΓ‘c-tΓΉy-chα»n>] [-r | -a] [--points-at]" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3568,7 +3851,7 @@ msgstr "" "Δang xΓ³a nhΓ‘nh β%sβ mΓ nΓ³ lαΊ‘i ΔΓ£ Δược hΓ²a trα»n vΓ o\n" " β%sβ, nhΖ°ng vαΊ«n chΖ°a Δược hΓ²a trα»n vΓ o HEAD." -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3577,12 +3860,12 @@ msgstr "" "khΓ΄ng xΓ³a nhΓ‘nh β%sβ cΓ‘i mΓ chΖ°a Δược hΓ²a trα»n vΓ o\n" " β%sβ, cho dΓΉ lΓ nΓ³ ΔΓ£ Δược hΓ²a trα»n vΓ o HEAD." -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "KhΓ΄ng thα» tΓ¬m kiαΊΏm Δα»i tượng chuyα»n giao cho β%sβ" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3591,298 +3874,319 @@ msgstr "" "NhΓ‘nh β%sβ khΓ΄ng Δược trα»n mα»t cΓ‘ch ΔαΊ§y Δủ.\n" "NαΊΏu bαΊ‘n thα»±c sα»± muα»n xΓ³a nΓ³, thΓ¬ chαΊ‘y lα»nh βgit branch -D %sβ." -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "CαΊp nhαΊt tαΊp tin cαΊ₯u hΓ¬nh gαΊ·p lα»i" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "khΓ΄ng thα» dΓΉng tΓΉy chα»n -a vα»i -d" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "KhΓ΄ng thα» tΓ¬m kiαΊΏm Δα»i tượng chuyα»n giao cho HEAD" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "KhΓ΄ng thα» xΓ³a nhΓ‘nh β%sβ cΓ‘i mΓ bαΊ‘n hiα»n nay Δang α»." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "KhΓ΄ng thα» xΓ³a nhΓ‘nh β%sβ ΔΓ£ Δược lαΊ₯y ra tαΊ‘i β%sβ" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "khΓ΄ng tΓ¬m thαΊ₯y nhΓ‘nh theo dΓ΅i mΓ‘y chủ β%sβ." -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "khΓ΄ng tΓ¬m thαΊ₯y nhΓ‘nh β%sβ." -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "GαΊ·p lα»i khi Δang xΓ³a nhΓ‘nh theo dΓ΅i mΓ‘y chủ β%sβ" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "GαΊ·p lα»i khi xΓ³a bα» nhΓ‘nh β%sβ" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "ΔΓ£ xΓ³a nhΓ‘nh theo dΓ΅i mΓ‘y chủ \"%s\" (tα»«ng lΓ %s).\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "NhΓ‘nh β%sβ ΔΓ£ bα» xΓ³a (tα»«ng lΓ %s)\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: ΔΓ£ ra Δi]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: Δα»©ng sau %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[ΔαΊ±ng sau %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: phΓa trΖ°α»c %d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[phΓa trΖ°α»c %d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: trΖ°α»c %d, sau %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[trΖ°α»c %d, sau %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** tham chiαΊΏu khΓ΄ng hợp lα» ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(khΓ΄ng nhΓ‘nh, Δang cαΊ£i tα» %s)" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(khΓ΄ng nhΓ‘nh, di chuyα»n nα»a bΖ°α»c Δược bαΊ―t ΔαΊ§u tαΊ‘i %s)" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD Δược tΓ‘ch rα»i tαΊ‘i %s)" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD Δược tΓ‘ch rα»i tα»« %s)" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(khΓ΄ng nhΓ‘nh)" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "NhΓ‘nh %s Δang Δược cαΊ£i tα» lαΊ‘i tαΊ‘i %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "NhΓ‘nh %s Δang Δược di chuyα»n phΓ’n ΔΓ΄i (bisect) tαΊ‘i %s" + +#: builtin/branch.c:560 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:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "TΓͺn nhΓ‘nh khΓ΄ng hợp lα»: β%sβ" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "GαΊ·p lα»i khi Δα»i tΓͺn nhΓ‘nh" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "ΔΓ£ Δα»i tΓͺn nhΓ‘nh khuyαΊΏt danh β%sβ Δi" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, 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:564 +#: builtin/branch.c:601 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:586 -#, 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:623 +msgid "could not write branch description template" +msgstr "khΓ΄ng thα» ghi mαΊ«u mΓ΄ tαΊ£ nhΓ‘nh" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "TΓΉy chα»n chung" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "hiα»n thα» mΓ£ bΔm vΓ chủ Δα», ΔΖ°a ra hai lαΊ§n cho nhΓ‘nh thượng nguα»n" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "khΓ΄ng xuαΊ₯t cΓ‘c thΓ΄ng tin" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "cΓ i ΔαΊ·t chαΊΏ Δα» theo dΓ΅i (xem git-pull(1))" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "thay Δα»i thΓ΄ng tin thượng nguα»n" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "thượng nguα»n" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "thay Δα»i thΓ΄ng tin thượng nguα»n" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "tΓ΄ mΓ u kαΊΏt xuαΊ₯t" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "thao tΓ‘c trΓͺn nhΓ‘nh βremote-trackingβ" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 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:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "HΓ nh Δα»ng git-branch:" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "liα»t kΓͺ cαΊ£ nhΓ‘nh βremote-trackingβ vΓ nα»i bα»" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "xΓ³a mα»t toΓ n bα» nhΓ‘nh ΔΓ£ hΓ²a trα»n" -#: builtin/branch.c:636 +#: builtin/branch.c:672 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:637 +#: builtin/branch.c:673 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:638 +#: builtin/branch.c:674 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:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "liα»t kΓͺ cΓ‘c tΓͺn nhΓ‘nh" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "tαΊ‘o reflog của nhΓ‘nh" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "sα»a mΓ΄ tαΊ£ cho nhΓ‘nh" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "buα»c tαΊ‘o, di chuyα»n/Δα»i tΓͺn, xΓ³a" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "chα» hiα»n thα» nhα»―ng nhΓ‘nh mΓ nΓ³ Δược hΓ²a trα»n" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "chα» hiα»n thα» nhα»―ng nhΓ‘nh mΓ nΓ³ khΓ΄ng Δược hΓ²a trα»n" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "liα»t kΓͺ cΓ‘c nhΓ‘nh trong cΓ‘c cα»t" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "khΓ³a" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "tΓͺn trΖ°α»ng cαΊ§n sαΊ―p xαΊΏp" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "Δα»i tượng" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "chα» hiα»n thα» cΓ‘c nhΓ‘nh của Δα»i tượng" -#: builtin/branch.c:669 +#: builtin/branch.c:705 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:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "khΓ΄ng tΓ¬m thαΊ₯y HEAD α» dΖ°α»i refs/heads!" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "tΓΉy chα»n --column vΓ --verbose xung khαΊ―c nhau" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "cαΊ§n chα» ra tΓͺn nhΓ‘nh" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "KhΓ΄ng thα» ΔΖ°a ra mΓ΄ tαΊ£ HEAD ΔΓ£ tΓ‘ch rα»i" -#: builtin/branch.c:727 +#: builtin/branch.c:763 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:734 +#: builtin/branch.c:770 #, 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:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "KhΓ΄ng cΓ³ nhΓ‘nh nΓ o cΓ³ tΓͺn β%sβ." -#: builtin/branch.c:752 +#: builtin/branch.c:788 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:757 +#: builtin/branch.c:793 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:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3890,40 +4194,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:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "khΓ΄ng cΓ³ nhΓ‘nh nΓ o nhΖ° thαΊΏ β%sβ" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "chΖ°a cΓ³ nhΓ‘nh β%sβ" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "quΓ‘ nhiα»u nhΓ‘nh Δα» bα» ΔαΊ·t thượng nguα»n" -#: builtin/branch.c:784 +#: builtin/branch.c:820 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:790 +#: builtin/branch.c:826 #, 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:804 +#: builtin/branch.c:840 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:810 +#: builtin/branch.c:846 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:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3932,7 +4236,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:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3943,16 +4247,6 @@ msgstr "" "NαΊΏu bαΊ‘n muα»n β%sβ theo dΓ΅i β%sβ, thα»±c hiα»n lα»nh sau:\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4051,7 +4345,7 @@ msgstr "Δα»c tΓͺn tαΊp tin tα»« ΔαΊ§u vΓ o tiΓͺu chuαΊ©n" msgid "terminate input and output records by a NUL character" msgstr "chαΊ₯m dα»©t cΓ‘c bαΊ£n ghi vΓ o vΓ ra bαΊ±ng kΓ½ tα»± NULL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "chαΊ·n cΓ‘c bΓ‘o cΓ‘o tiαΊΏn trΓ¬nh hoαΊ‘t Δα»ng" @@ -4142,8 +4436,9 @@ msgid "write the content to temporary files" msgstr "ghi nα»i dung vΓ o tαΊp tin tαΊ‘m" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "chuα»i" @@ -4193,80 +4488,80 @@ msgstr "ΔΖ°α»ng dαΊ«n β%sβ: khΓ΄ng thα» hΓ²a trα»n" msgid "Unable to add merge result for '%s'" msgstr "KhΓ΄ng thα» thΓͺm kαΊΏt quαΊ£ hΓ²a trα»n cho β%sβ" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "khΓ΄ng Δược dΓΉng β%sβ vα»i cΓ‘c ΔΖ°α»ng dαΊ«n cαΊp nhαΊt" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "khΓ΄ng Δược dΓΉng β%sβ vα»i %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "KhΓ΄ng thα» cαΊp nhαΊt cΓ‘c ΔΖ°α»ng dαΊ«n vΓ chuyα»n ΔαΊΏn nhΓ‘nh β%sβ cΓΉng mα»t lΓΊc." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "tαΊp tin ghi bαΊ£ng mα»₯c lα»₯c bα» hα»ng" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "ΔΖ°α»ng dαΊ«n β%sβ khΓ΄ng Δược hΓ²a trα»n" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "bαΊ‘n cαΊ§n phαΊ£i giαΊ£i quyαΊΏt bαΊ£ng mα»₯c lα»₯c hiα»n tαΊ‘i của bαΊ‘n trΖ°α»c ΔΓ£" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "KhΓ΄ng thα» thα»±c hiα»n reflog cho β%sβ: %s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD hiα»n giα» tαΊ‘i" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "khΓ΄ng thα» cαΊp nhαΊt HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "ΔαΊ·t lαΊ‘i nhΓ‘nh β%sβ\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "ΔΓ£ sαΊ΅n sΓ ng trΓͺn β%sβ\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "ΔΓ£ chuyα»n tα»i vΓ ΔαΊ·t lαΊ‘i nhΓ‘nh β%sβ\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "ΔΓ£ chuyα»n ΔαΊΏn nhΓ‘nh mα»i β%sβ\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "ΔΓ£ chuyα»n ΔαΊΏn nhΓ‘nh β%sβ\n" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " β¦ vΓ nhiα»u hΖ‘n %d.\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4285,7 +4580,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4306,152 +4601,152 @@ msgstr[0] "" " git branch <tΓͺn_nhΓ‘nh_mα»i> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "lα»i nα»i bα» trong khi di chuyα»n qua cΓ‘c Δiα»m xΓ©t duyα»t" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "Vα» trΓ trΖ°α»c kia của HEAD lΓ " -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "BαΊ‘n tαΊ‘i nhΓ‘nh mΓ nΓ³ chΖ°a hα» Δược sinh ra" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "chα» cαΊ§n mα»t tham chiαΊΏu, nhΖ°ng lαΊ‘i ΔΖ°a ra %d." -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "tham chiαΊΏu khΓ΄ng hợp lα»: %s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiαΊΏu khΓ΄ng phαΊ£i lΓ mα»t cΓ’y:%s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "cΓ‘c ΔΖ°α»ng dαΊ«n khΓ΄ng thα» dΓΉng cΓΉng vα»i cΓ‘c nhΓ‘nh chuyα»n" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "β%sβ khΓ΄ng thα» Δược sα» dα»₯ng vα»i cΓ‘c nhΓ‘nh chuyα»n" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "β%sβ khΓ΄ng thα» Δược dΓΉng vα»i β%sβ" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "KhΓ΄ng thα» chuyα»n nhΓ‘nh ΔαΊΏn mα»t thα»© khΓ΄ng phαΊ£i lΓ lαΊ§n chuyα»n giao β%sβ" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "nhΓ‘nh" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "tαΊ‘o vΓ checkout mα»t nhΓ‘nh mα»i" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "tαΊ‘o/ΔαΊ·t_lαΊ‘i vΓ checkout mα»t nhΓ‘nh" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "tαΊ‘o reflog cho nhΓ‘nh mα»i" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "rα»i bα» HEAD tαΊ‘i lαΊ§n chuyα»n giao danh nghΔ©a" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "ΔαΊ·t thΓ΄ng tin thượng nguα»n cho nhΓ‘nh mα»i" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "nhΓ‘nh-mα»i" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "nhΓ‘nh khΓ΄ng cha mα»i" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "" "lαΊ₯y ra (checkout) phiΓͺn bαΊ£n của chΓΊng ta cho cΓ‘c tαΊp tin chΖ°a Δược hΓ²a trα»n" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "" "lαΊ₯y ra (checkout) phiΓͺn bαΊ£n của chΓΊng hα» cho cΓ‘c tαΊp tin chΖ°a Δược hΓ²a trα»n" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "Γ©p buα»c lαΊ₯y ra (bα» Δi nhα»―ng thay Δα»i nα»i bα»)" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "thα»±c hiα»n hΓ²a trα»n kiα»u 3-way vα»i nhΓ‘nh mα»i" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "cαΊp nhαΊt cΓ‘c tαΊp tin bα» bα» qua (mαΊ·c Δα»nh)" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "kiα»u" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "xung Δα»t kiα»u (hΓ²a trα»n hoαΊ·c diff3)" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 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:1159 +#: builtin/checkout.c:1158 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:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "khΓ΄ng kiα»m tra nαΊΏu cΓ’y lΓ m viα»c khΓ‘c Δang giα»― tham chiαΊΏu ΔΓ£ cho" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "Γ©p buα»c bΓ‘o cΓ‘o tiαΊΏn triα»n cΓ΄ng viα»c" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "CΓ‘c tΓΉy chα»n -b, -B vΓ --orphan loαΊ‘i tα»« lαΊ«n nhau" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track cαΊ§n tΓͺn mα»t nhΓ‘nh" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "ThiαΊΏu tΓͺn nhΓ‘nh; hΓ£y thα» -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "ΔΖ°α»ng dαΊ«n ΔΓ£ cho khΓ΄ng hợp lα»" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4461,12 +4756,12 @@ msgstr "" "BαΊ‘n ΔΓ£ cΓ³ Γ½ Δα»nh checkout β%sβ cΓ‘i mΓ khΓ΄ng thα» Δược phΓ’n giαΊ£i nhΖ° lΓ lαΊ§n " "chuyα»n giao?" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach khΓ΄ng nhαΊn mα»t Δα»i sα» ΔΖ°α»ng dαΊ«n β%sβ" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4617,8 +4912,8 @@ msgstr "dα»n bαΊ±ng kiα»u tΖ°Ζ‘ng tΓ‘c" msgid "remove whole directories" msgstr "gα»‘ bα» toΓ n bα» thΖ° mα»₯c" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "mαΊ«u" @@ -4658,103 +4953,112 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<cΓ‘c-tΓΉy-chα»n>] [--] <kho> [<t.mα»₯c>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "khΓ΄ng tαΊ‘o mα»t checkout" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "tαΊ‘o kho thuαΊ§n" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "tαΊ‘o kho bαΊ£n sao (Γ½ lΓ kho thuαΊ§n)" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "Δα» nhΓ’n bαΊ£n tα»« kho nα»i bα»" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "khΓ΄ng sα» dα»₯ng liΓͺn kαΊΏt cα»©ng nα»i bα», luΓ΄n sao chΓ©p" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "cΓ i ΔαΊ·t ΔΓ’y lΓ kho chia sαΊ»" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "khα»i tαΊ‘o mΓ΄-Δun-con trong bαΊ£n sao" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "sα» lượng mΓ΄-Δun-con Δược nhΓ’n bαΊ£n Δα»ng thα»i" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "thΖ°-mα»₯c-mαΊ«u" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "thΖ° mα»₯c mΓ tαΊ‘i ΔΓ³ cΓ‘c mαΊ«u sαΊ½ Δược dΓΉng" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "kho tham chiαΊΏu" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "chα» dΓΉng --reference khi nhΓ’n bαΊ£n" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "tΓͺn" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "dΓΉng <tΓͺn> thay cho βoriginβ Δα» theo dΓ΅i thượng nguα»n" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "lαΊ₯y ra <nhΓ‘nh> thay cho HEAD của mΓ‘y chủ" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "ΔΖ°α»ng dαΊ«n ΔαΊΏn git-upload-pack trΓͺn mΓ‘y chủ" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "Δα»-sΓ’u" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "tαΊ‘o bαΊ£n sao khΓ΄ng ΔαΊ§y Δủ cho mα»©c sΓ’u ΔΓ£ cho" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "chα» nhΓ’n bαΊ£n mα»t nhΓ‘nh, HEAD hoαΊ·c --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "mα»i mΓ΄-Δun-con nhΓ’n bαΊ£n sαΊ½ lΓ shallow (nΓ΄ng)" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "khΓ΄ng dΓΉng chung thΖ° mα»₯c dΓ nh riΓͺng cho git vΓ thΖ° mα»₯c lΓ m viα»c" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "khΓ³a=giΓ‘_trα»" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "ΔαΊ·t cαΊ₯u hΓ¬nh bΓͺn trong mα»t kho chα»©a mα»i" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "chα» dΓΉng Δα»a chα» IPv4" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "chα» dΓΉng Δα»a chα» IPv6" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4762,57 +5066,52 @@ msgstr "" "KhΓ΄ng ΔoΓ‘n Δược thΖ° mα»₯c tΓͺn lΓ gΓ¬.\n" "Vui lΓ²ng chα» Δα»nh tΓͺn mα»t thΖ° mα»₯c trΓͺn dΓ²ng lα»nh" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "kho tham chiαΊΏu β%sβ nhΖ° lΓ lαΊ₯y ra liΓͺn kαΊΏt vαΊ«n chΖ°a Δược hα» trợ." -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "kho tham chiαΊΏu β%sβ khΓ΄ng phαΊ£i lΓ mα»t kho nα»i bα»." -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiαΊΏu β%sβ lΓ nΓ΄ng" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiαΊΏu β%sβ bα» cαΊ₯y ghΓ©p" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "gαΊ·p lα»i khi lαΊ₯y thα»ng kΓͺ vα» β%sβ" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s cΓ³ tα»n tαΊ‘i nhΖ°ng lαΊ‘i khΓ΄ng phαΊ£i lΓ mα»t thΖ° mα»₯c" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "gαΊ·p lα»i khi lαΊ₯y thΓ΄ng tin thα»ng kΓͺ vα» %s\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "gαΊ·p lα»i khi tαΊ‘o Δược liΓͺn kαΊΏt mα»m %s" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "gαΊ·p lα»i khi sao chΓ©p tαΊp tin vΓ β%sβ" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "hoΓ n tαΊ₯t.\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4822,126 +5121,126 @@ msgstr "" "BαΊ‘n kiα»m tra kα»Ή xem cΓ‘i gΓ¬ Δược lαΊ₯y ra bαΊ±ng lα»nh βgit statusβ\n" "vΓ thα» lαΊ₯y ra vα»i lα»nh βgit checkout -f HEADβ\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "KhΓ΄ng tΓ¬m thαΊ₯y nhΓ‘nh mΓ‘y chủ %s Δα» nhΓ’n bαΊ£n (clone)." -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Δang kiα»m tra kαΊΏt nα»iβ¦ " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "mΓ‘y chủ ΔΓ£ khΓ΄ng gα»i tαΊ₯t cαΊ£ cΓ‘c Δα»i tượng cαΊ§n thiαΊΏt" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "khΓ΄ng thα» cαΊp nhαΊt %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD mΓ‘y chủ chα» ΔαΊΏn ref khΓ΄ng tα»n tαΊ‘i, khΓ΄ng thα» lαΊ₯y ra.\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "khΓ΄ng thα» lαΊ₯y ra (checkout) cΓ’y lΓ m viα»c" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "khΓ΄ng thα» ghi cΓ‘c tham sα» vΓ o tαΊp tin cαΊ₯u hΓ¬nh" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "khΓ΄ng thα» ΔΓ³ng gΓ³i Δα» dα»n dαΊΉp" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "khΓ΄ng thα» bα» liΓͺn kαΊΏt tαΊp tin thay thαΊΏ tαΊ‘m thα»i" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "CΓ³ quΓ‘ nhiα»u Δα»i sα»." -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "BαΊ‘n phαΊ£i chα» Δα»nh mα»t kho Δα» mΓ nhΓ’n bαΊ£n (clone)." -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tΓΉy chα»n --bare vΓ --origin %s xung khαΊ―c nhau." -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "tΓΉy chα»n --bare vΓ --separate-git-dir xung khαΊ―c nhau." -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "kho chα»©a β%sβ chΖ°a tα»n tαΊ‘i" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "Δα» sΓ’u %s khΓ΄ng phαΊ£i lΓ mα»t sα» nguyΓͺn dΖ°Ζ‘ng" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ΔΖ°α»ng dαΊ«n ΔΓch β%sβ ΔΓ£ cΓ³ tα»« trΖ°α»c vΓ khΓ΄ng phαΊ£i lΓ mα»t thΖ° mα»₯c rα»ng." -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "cΓ’y lΓ m viα»c β%sβ ΔΓ£ sαΊ΅n tα»n tαΊ‘i rα»i." -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, 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:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "khΓ΄ng thα» tαΊ‘o cΓ’y thΖ° mα»₯c lΓ m viα»c dir β%sβ" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, 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:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Δang nhΓ’n bαΊ£n thΓ nh β%sββ¦\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 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:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "kho nguα»n lΓ nΓ΄ng, nΓͺn bα» qua --local" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local bα» lα» Δi" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, 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:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, 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:1056 +#: builtin/clone.c:1070 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." @@ -5092,68 +5391,68 @@ 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:305 +#: builtin/commit.c:307 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:346 +#: builtin/commit.c:348 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:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "gαΊ·p lα»i khi thΓͺm bαΊ±ng cΓ‘ch tΖ°Ζ‘ng" -#: builtin/commit.c:365 +#: builtin/commit.c:367 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:367 +#: builtin/commit.c:369 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:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 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:445 +#: builtin/commit.c:447 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:447 +#: builtin/commit.c:449 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:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "khΓ΄ng Δα»c Δược bαΊ£ng mα»₯c lα»₯c" -#: builtin/commit.c:475 +#: builtin/commit.c:477 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:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "lαΊ§n chuyα»n giao β%sβ thiαΊΏu phαΊ§n tΓ‘c giαΊ£ α» ΔαΊ§u" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "lαΊ§n chuyα»n giao β%sβ cΓ³ phαΊ§n tΓ‘c giαΊ£ α» ΔαΊ§u dα» dαΊ‘ng" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "Δα»i sα» cho --author bα» dα» hΓ¬nh" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "ngΓ y thΓ‘ng khΓ΄ng hợp lα»: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5161,38 +5460,38 @@ msgstr "" "khΓ΄ng thα» chα»n mα»t kΓ½ tα»± ghi chΓΊ cΓ‘i mΓ khΓ΄ng Δược dΓΉng\n" "trong phαΊ§n ghi chΓΊ hiα»n tαΊ‘i" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, 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:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, 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:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "khΓ΄ng thα» Δα»c nhαΊt kΓ½ tα»« ΔαΊ§u vΓ o tiΓͺu chuαΊ©n" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "khΓ΄ng Δα»c Δược tα»p nhαΊt kΓ½ β%sβ" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "khΓ΄ng thα» Δα»c MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "khΓ΄ng thα» Δα»c SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "khΓ΄ng thα» Δα»c MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "khΓ΄ng thα» ghi mαΊ«u chuyα»n giao" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5207,7 +5506,7 @@ msgstr "" "\t%s\n" "vΓ thα» lαΊ‘i.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5222,7 +5521,7 @@ msgstr "" "\t%s\n" "vΓ thα» lαΊ‘i.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5233,7 +5532,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:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5245,157 +5544,157 @@ 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:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTΓ‘c giαΊ£: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sNgΓ y thΓ‘ng: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgΖ°α»i chuyα»n giao: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "KhΓ΄ng Δα»c Δược bαΊ£ng mα»₯c lα»₯c" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "GαΊ·p lα»i khi xΓ’y dα»±ng cΓ’y" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hΓ£y cung cαΊ₯p lα»i chΓΊ giαΊ£i hoαΊ·c lΓ dΓΉng tΓΉy chα»n -m hoαΊ·c lΓ -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author β%sβ khΓ΄ng phαΊ£i lΓ βHα» vΓ tΓͺn <thΖ° Δiα»n tα»l>β vΓ khΓ΄ng khα»p bαΊ₯t kα»³ " "tΓ‘c giαΊ£ nΓ o sαΊ΅n cΓ³" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, 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:1107 +#: builtin/commit.c:1118 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:1137 +#: builtin/commit.c:1148 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:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "KhΓ΄ng cΓ³ gΓ¬ Δα» mΓ βtu bα»β cαΊ£." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 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:1151 +#: builtin/commit.c:1162 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:1154 +#: builtin/commit.c:1165 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:1164 +#: builtin/commit.c:1175 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:1166 +#: builtin/commit.c:1177 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:1174 +#: builtin/commit.c:1185 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:1191 +#: builtin/commit.c:1202 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:1193 +#: builtin/commit.c:1204 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:1195 +#: builtin/commit.c:1206 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:1197 +#: builtin/commit.c:1208 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:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "ChαΊΏ Δα» dα»n dαΊΉp khΓ΄ng hợp lα» %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 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:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "hiα»n thα» trαΊ‘ng thΓ‘i α» dαΊ‘ng sΓΊc tΓch" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "hiα»n thα» thΓ΄ng tin nhΓ‘nh" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "kαΊΏt xuαΊ₯t dαΊ‘ng mΓ‘y-cΓ³-thα»-Δα»c" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 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:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "chαΊ₯m dα»©t cΓ‘c mα»₯c bαΊ±ng NUL" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "chαΊΏ Δα»" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 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:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "hiα»n thα» cΓ‘c tαΊp tin αΊ©n" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "khi" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5403,205 +5702,205 @@ 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:1344 +#: builtin/commit.c:1355 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:1430 +#: builtin/commit.c:1441 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:1432 +#: builtin/commit.c:1443 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:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "ΔΓ£ rα»i khα»i HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 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:1576 +#: builtin/commit.c:1592 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:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "CΓ‘c tΓΉy chα»n ghi chΓΊ commit" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "Δα»c chΓΊ thΓch tα»« tαΊp tin" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "tΓ‘c giαΊ£" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "ghi ΔΓ¨ tΓ‘c giαΊ£ cho commit" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "ngΓ y thΓ‘ng" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "ghi ΔΓ¨ ngΓ y thΓ‘ng cho lαΊ§n chuyα»n giao" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "chΓΊ thΓch" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "chΓΊ thΓch của lαΊ§n chuyα»n giao" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "lαΊ§n_chuyα»n_giao" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 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:1584 +#: builtin/commit.c:1600 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:1585 +#: builtin/commit.c:1601 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:1586 +#: builtin/commit.c:1602 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:1587 +#: builtin/commit.c:1603 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:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "(nΓͺn dΓΉng) thΓͺm dΓ²ng Signed-off-by:" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "sα» dα»₯ng tαΊp tin mαΊ«u ΔΓ£ cho" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "Γ©p buα»c sα»a lαΊ§n commit" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "mαΊ·c Δα»nh" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "lΓ m thαΊΏ nΓ o Δα» cαΊ―t bα» khoαΊ£ng trαΊ―ng vΓ #ghichΓΊ tα»« mαΊ©u tin nhαΊ―n" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 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:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "kΓ½ lαΊ§n chuyα»n giao dΓΉng GPG" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "CΓ‘c tΓΉy nα»i dung ghi chΓΊ commit" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "chuyα»n giao tαΊ₯t cαΊ£ cΓ‘c tαΊp tin cΓ³ thay Δα»i" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 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:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "thΓͺm cΓ‘c tαΊp-tin bαΊ±ng tΖ°Ζ‘ng tΓ‘c" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "thΓͺm cΓ‘c thay Δα»i bαΊ±ng tΖ°Ζ‘ng tΓ‘c" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "chα» chuyα»n giao cΓ‘c tαΊp tin ΔΓ£ chα» ra" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "vΓ²ng qua mΓ³c (hook) pre-commit" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "hiα»n thα» xem cΓ‘i gΓ¬ cΓ³ thα» Δược chuyα»n giao" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "βtu bα»β (amend) lαΊ§n commit trΖ°α»c" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "vΓ²ng qua mΓ³c (hook) post-rewrite" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "ok Δα» ghi lαΊ‘i mα»t thay Δα»i trα»ng rα»ng" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 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:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "khΓ΄ng thα» phΓ’n tΓch commit (lαΊ§n chuyα»n giao) HEAD" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "TαΊp tin MERGE_HEAD sai hα»ng (%s)" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "khΓ΄ng thα» Δα»c MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, 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:1735 +#: builtin/commit.c:1755 #, 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:1740 +#: builtin/commit.c:1760 #, 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:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5750,7 +6049,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "khΓ΄ng thα» phΓ’n tΓch giΓ‘ trα» mΓ u mαΊ·c Δα»nh" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5765,7 +6064,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "khΓ΄ng thα» tαΊ‘o tαΊp tin cαΊ₯u hΓ¬nh β%sβ" @@ -5801,7 +6100,7 @@ msgstr "thαΊ» Δược chΓΊ giαΊ£i %s khΓ΄ng cΓ³ tΓͺn nhΓΊng" msgid "tag '%s' is really '%s' here" msgstr "thαΊ» β%sβ ΔΓ£ thα»±c sα»± α» ΔΓ’y β%sβ rα»i" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "KhΓ΄ng phαΊ£i tΓͺn Δα»i tượng %s hợp lα»" @@ -5894,7 +6193,7 @@ msgstr "coi nhΖ° <n> thαΊ» gαΊ§n ΔΓ’y nhαΊ₯t (mαΊ·c Δα»nh: 10)" msgid "only consider tags matching <pattern>" msgstr "chα» cΓ’n nhαΊ―c ΔαΊΏn nhα»―ng thαΊ» khα»p vα»i <mαΊ«u>" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "hiα»n thα» Δα»i tượng chuyα»n giao vαΊ―n tαΊ―t nhΖ° lΓ fallback" @@ -5928,21 +6227,21 @@ msgstr "β%sβ: khΓ΄ng phαΊ£i tαΊp tin bΓ¬nh thΖ°α»ng hay liΓͺn kαΊΏt mα»m" msgid "invalid option: %s" msgstr "tΓΉy chα»n khΓ΄ng hợp lα»: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "KhΓ΄ng phαΊ£i lΓ kho git" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "Δα»i tượng ΔΓ£ cho β%sβ khΓ΄ng hợp lα»." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "ΔΓ£ cho nhiα»u hΖ‘n hai Δα»i tượng blob: β%sβ" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "ΔΓ£ cho Δα»i tượng khΓ΄ng thα» nαΊ―m giα»― β%sβ." @@ -6015,19 +6314,19 @@ msgstr "git fetch --multiple [<cΓ‘c-tΓΉy-chα»n>] [(<kho> | <nhΓ³m>)β¦]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<cΓ‘c-tΓΉy-chα»n>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "lαΊ₯y vα» tα»« tαΊ₯t cαΊ£ cΓ‘c mΓ‘y chủ" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 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:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 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:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "Γ©p buα»c ghi ΔΓ¨ lΓͺn nhΓ‘nh nα»i bα»" @@ -6035,7 +6334,7 @@ msgstr "Γ©p buα»c ghi ΔΓ¨ lΓͺn nhΓ‘nh nα»i bα»" msgid "fetch from multiple remotes" msgstr "lαΊ₯y tα»« nhiα»u mΓ‘y chủ cΓΉng lΓΊc" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 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Γ³" @@ -6047,21 +6346,21 @@ msgstr "khΓ΄ng lαΊ₯y tαΊ₯t cαΊ£ cΓ‘c thαΊ» (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "sα» lượng mΓ΄-Δun-con Δược lαΊ₯y Δα»ng thα»i" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 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:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "khi-cαΊ§n" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 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:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "giα»― lαΊ‘i gΓ³i ΔΓ£ tαΊ£i vα»" @@ -6069,15 +6368,15 @@ msgstr "giα»― lαΊ‘i gΓ³i ΔΓ£ tαΊ£i vα»" msgid "allow updating of HEAD ref" msgstr "cho phΓ©p cαΊp nhαΊt th.chiαΊΏu HEAD" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "lΓ m sΓ’u hΖ‘n lα»ch sα» của bαΊ£n sao" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "chuyα»n Δα»i hoΓ n toΓ n sang kho git" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "tmα»₯c" @@ -6089,15 +6388,15 @@ msgstr "soαΊ‘n sαΊ΅n cΓ‘i nΓ y cho kαΊΏt xuαΊ₯t ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con" msgid "default mode for recursion" msgstr "chαΊΏ Δα» mαΊ·c Δα»nh cho Δα» qui" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "chαΊ₯p nhαΊn tham chiαΊΏu cαΊp nhαΊt .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "chα» ra refmap cαΊ§n lαΊ₯y vα»" @@ -6155,11 +6454,6 @@ msgstr "cΖ°α»‘ng bα»©c cαΊp nhαΊt" msgid "(non-fast-forward)" msgstr "(khΓ΄ng-chuyα»n-tiαΊΏp-nhanh)" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "khΓ΄ng thα» mα» %s: %s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6362,55 +6656,55 @@ msgstr "Δang kiα»m tra kαΊΏt nα»i" msgid "Checking object directories" msgstr "Δang kiα»m tra cΓ‘c thΖ° mα»₯c Δα»i tượng" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<cΓ‘c-tΓΉy-chα»n>] [<Δα»i-tượng>β¦]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "hiα»n thα» cΓ‘c Δα»i tượng khΓ΄ng thα» Δα»c Δược" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "hiα»n thα» cΓ‘c Δα»i tượng khΓ΄ng Δược quαΊ£n lΓ½" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "bΓ‘o cΓ‘o cΓ‘c thαΊ»" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "bΓ‘o cΓ‘o node gα»c" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "tαΊ‘o βindex objects head nodesβ" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "tαΊ‘o βreflogs head nodesβ (mαΊ·c Δα»nh)" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "cΕ©ng cΓ’n nhαΊ―c ΔαΊΏn cΓ‘c Δα»i tượng gΓ³i vΓ thay thαΊΏ" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "chα» kiα»m tra kαΊΏt nα»i" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "cho phΓ©p kiα»m tra hαΊ‘n chαΊΏ hΖ‘n" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "ghi cΓ‘c Δα»i tượng khΓ΄ng Δược quαΊ£n lΓ½ trong .git/lost-found" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "hiα»n thα» quΓ‘ trΓ¬nh" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Δang kiα»m tra cΓ‘c Δα»i tượng" @@ -6515,217 +6809,217 @@ msgstr "khΓ΄ng thα» Δα»c cΓ’y (%s)" msgid "unable to grep from object of type %s" msgstr "khΓ΄ng thα» thα»±c hiα»n lα»nh grep (lα»c tΓ¬m) tα»« Δα»i tượng thuα»c kiα»u %s" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "chuyα»n ΔαΊΏn β%cβ cαΊ§n mα»t giΓ‘ trα» bαΊ±ng sα»" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "khΓ΄ng mα» Δược β%sβ" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "tΓ¬m trong bαΊ£ng mα»₯c lα»₯c thay vΓ¬ trong cΓ’y lΓ m viα»c" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "tΓ¬m trong nα»i dung khΓ΄ng Δược quαΊ£n lΓ½ bα»i git" -#: builtin/grep.c:648 +#: builtin/grep.c:650 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:650 +#: builtin/grep.c:652 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:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "hiα»n thα» nhα»―ng dΓ²ng khΓ΄ng khα»p vα»i mαΊ«u" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "phΓ’n biα»t HOA/thΖ°α»ng" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "chα» khα»p mαΊ«u tαΊ‘i ΔΖ°α»ng ranh giα»i tα»«" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "xα» lΓ½ tαΊp tin nhα» phΓ’n nhΖ° lΓ dαΊ‘ng vΔn bαΊ£n thΖ°α»ng" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "khΓ΄ng khα»p mαΊ«u trong cΓ‘c tαΊp tin nhα» phΓ’n" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "xα» lΓ½ tαΊp tin nhα» phΓ’n vα»i cΓ‘c bα» lα»c βtextconvβ" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "hαΊ‘ xuα»ng Γt nhαΊ₯t lΓ mα»©c <sΓ’u>" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "dΓΉng biα»u thα»©c chΓnh qui POSIX cΓ³ mα» rα»ng" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "sα» dα»₯ng biα»u thα»©c chΓnh quy kiα»u POSIX (mαΊ·c Δα»nh)" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "diα»
n dα»ch cΓ‘c mαΊ«u nhΖ° lΓ chuα»i cα» Δα»nh" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "sα» dα»₯ng biα»u thα»©c chΓnh quy tΖ°Ζ‘ng thΓch Perl" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "hiα»n thα» sα» của dΓ²ng" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "khΓ΄ng hiα»n thα» tΓͺn tαΊp tin" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "hiα»n thα» cΓ‘c tΓͺn tαΊp tin" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "hiα»n thα» tΓͺn tαΊp tin tΖ°Ζ‘ng Δα»i vα»i thΖ° mα»₯c Δα»nh (top)" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "chα» hiα»n thα» tΓͺn tαΊp tin thay vΓ¬ nhα»―ng dΓ²ng khα»p vα»i mαΊ«u" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "Δα»ng nghΔ©a vα»i --files-with-matches" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "chα» hiα»n thα» tΓͺn cho nhα»―ng tαΊp tin khΓ΄ng khα»p vα»i mαΊ«u" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "thΓͺm NUL vΓ o sau tΓͺn tαΊp tin" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "hiα»n thα» sα» lượng khα»p thay vΓ¬ nhα»―ng dΓ²ng khα»p vα»i mαΊ«u" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "tΓ΄ sΓ‘ng phαΊ§n khα»p mαΊ«u" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "hiα»n thα» dΓ²ng trα»ng giα»―a cΓ‘c lαΊ§n khα»p tα»« cΓ‘c tαΊp tin khΓ‘c biα»t" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "hiα»n thα» tΓͺn tαΊp tin mα»t lαΊ§n phΓa trΓͺn cΓ‘c lαΊ§n khα»p tα»« cΓΉng mα»t tαΊp tin" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "hiα»n thα» <n> dΓ²ng nα»i dung phΓa trΖ°α»c vΓ sau cΓ‘c lαΊ§n khα»p" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "hiα»n thα» <n> dΓ²ng nα»i dung trΖ°α»c khα»p" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "hiα»n thα» <n> dΓ²ng nα»i dung sau khα»p" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "dΓΉng <n> tuyαΊΏn trΓ¬nh lΓ m viα»c" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "dαΊ‘ng viαΊΏt tαΊ―t của -C Sα»" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "hiα»n thα» dΓ²ng vΓ³i tΓͺn hΓ m trΖ°α»c cΓ‘c lαΊ§n khα»p" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "hiα»n thα» hΓ m bao quanh" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "Δα»c mαΊ«u tα»« tαΊp-tin" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "match <mαΊ«u>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "tα» hợp mαΊ«u Δược chα» ra vα»i tΓΉy chα»n -e" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "ΔΖ°a ra gợi Γ½ vα»i trαΊ‘ng thΓ‘i thoΓ‘t mΓ khΓ΄ng cΓ³ kαΊΏt xuαΊ₯t" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "chα» hiα»n thα» nhα»―ng cΓ‘i khα»p tα»« tαΊp tin mΓ nΓ³ khα»p toΓ n bα» cΓ‘c mαΊ«u" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "hiα»n thα» cΓ’y phΓ’n tΓch cΓΊ phΓ‘p cho biα»u thα»©c βgrepβ (tΓ¬m kiαΊΏm)" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "dΓ n trang" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "hiα»n thα» cΓ‘c tαΊp tin khα»p trong trang giαΊ₯y" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "cho phΓ©p gα»i grep(1) (bα» bα» qua bα»i lαΊ§n dα»ch nΓ y)" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "chΖ°a chα» ra mαΊ«u." -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "sα» tuyαΊΏn chα» ra khΓ΄ng hợp lα» (%d)" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chα» lΓ m viα»c trΓͺn cΓ’y-lΓ m-viα»c" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached hay --untracked khΓ΄ng Δược sα» dα»₯ng vα»i --no-index." -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "--no-index hay --untracked khΓ΄ng Δược sα» dα»₯ng cΓΉng vα»i cΓ‘c tΓΉy chα»n liΓͺn " "quan ΔαΊΏn revs." -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard khΓ΄ng thα» sα» dα»₯ng cho nα»i dung lΖ°u dαΊ₯u vαΊΏt." -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "cαΊ£ hai --cached vΓ cΓ‘c cΓ’y phαΊ£i Δược chα» ra." @@ -6814,8 +7108,8 @@ msgstr "phiΓͺn bαΊ£n của emacsclient β%dβ quΓ‘ cΕ© (< 22)." #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "gαΊ·p lα»i khi thα»±c thi β%sβ: %s" +msgid "failed to exec '%s'" +msgstr "gαΊ·p lα»i khi thα»±c thi β%sβ" #: builtin/help.c:205 #, c-format @@ -7071,104 +7365,105 @@ msgstr "lα»n xα»n hΖ‘n cαΊ£ ΔiΓͺn rα»" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "ΔαΊ§y Δủ vα»i %d Δα»i tượng nα»i bα»" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "ΔαΊ§y Δủ vα»i %d Δα»i tượng nα»i bα»" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "Tα»ng kiα»m tra tail khΓ΄ng nhΖ° mong Δợi cho %s (ΔΔ©a hα»ng?)" +msgstr "GαΊ·p tα»ng kiα»m tra tail khΓ΄ng cαΊ§n cho %s (ΔΔ©a hα»ng?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "gΓ³i cΓ³ %d delta chΖ°a Δược giαΊ£i quyαΊΏt" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, 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:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "Δα»i tượng nα»i bα» %s bα» hα»ng" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "gαΊ·p lα»i trong khi ΔΓ³ng tαΊp tin gΓ³i" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "khΓ΄ng thα» ghi tαΊp tin giα»― lαΊ‘i β%sβ" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, 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:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "khΓ΄ng thα» lΖ°u tαΊp tin gΓ³i" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "khΓ΄ng thα» lΖ°u trα»― tαΊp tin ghi mα»₯c lα»₯c" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "khΓ΄ng hα» trợ Δa tuyαΊΏn, bα» qua %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, 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:1540 +#: builtin/index-pack.c:1542 #, 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:1587 +#: builtin/index-pack.c:1589 #, 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:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, 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:1638 msgid "Cannot come back to cwd" msgstr "KhΓ΄ng thα» quay lαΊ‘i cwd" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 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:1713 builtin/index-pack.c:1722 -#, 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:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "dΓΉng tΓΉy chα»n --verify mΓ khΓ΄ng ΔΖ°a ra tΓͺn packfile" @@ -7207,27 +7502,27 @@ msgstr "khΓ΄ng thα» sao chΓ©p β%sβ sang β%sβ" msgid "ignoring template %s" msgstr "Δang lα» Δi mαΊ«u β%sβ" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "cΓ‘c mαΊ«u khΓ΄ng Δược tΓ¬m thαΊ₯y %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "khΓ΄ng sao chΓ©p cΓ‘c mαΊ«u của phiΓͺn bαΊ£n sai Δα»nh dαΊ‘ng %d tα»« β%sβ" +msgid "not copying templates from '%s': %s" +msgstr "khΓ΄ng sao chΓ©p cΓ‘c mαΊ«u tα»« β%sβ: %s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s ΔΓ£ cΓ³ tα»« trΖ°α»c rα»i" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "khΓ΄ng thα» xα» lΓ½ (handle) tαΊp tin kiα»u %d" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "khΓ΄ng di chuyα»n Δược %s vΓ o %s" @@ -7235,24 +7530,24 @@ msgstr "khΓ΄ng di chuyα»n Δược %s vΓ o %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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s kho Git trong %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "Khα»i tαΊ‘o lαΊ‘i ΔΓ£ sαΊ΅n cΓ³ rα»i" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "Khα»i tαΊ‘o trα»ng rα»ng" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr " ΔΓ£ chia sαΊ»" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7260,25 +7555,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<thΖ°-mα»₯c-tαΊ‘m>] [--shared[=<cΓ‘c-" "quyα»n>]] [thΖ°-mα»₯c]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "cΓ‘c quyα»n" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "chα» ra cΓ‘i mΓ kho git Δược chia sαΊ» giα»―a nhiα»u ngΖ°α»i dΓΉng" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "khΓ΄ng thα» mkdir (tαΊ‘o thΖ° mα»₯c): %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "khΓ΄ng thα» chdir (chuyα»n Δα»i thΖ° mα»₯c) sang %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7287,7 +7582,7 @@ msgstr "" "%s (hoαΊ·c --work-tree=<thΖ°-mα»₯c>) khΓ΄ng cho phΓ©p khΓ΄ng chα» Δα»nh %s (hoαΊ·c --git-" "dir=<thΖ°-mα»₯c>)" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "khΓ΄ng thα» truy cαΊp cΓ’y (tree) lΓ m viα»c β%sβ" @@ -7333,264 +7628,316 @@ msgstr "git show [<cΓ‘c-tΓΉy-chα»n>] <Δα»i-tượng>β¦" msgid "invalid --decorate option: %s" msgstr "tΓΉy chα»n--decorate khΓ΄ng hợp lα»: %s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "chαΊ·n mα»i kαΊΏt xuαΊ₯t tα»« diff" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "hiα»n thα» mΓ£ nguα»n" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "Sα» dα»₯ng tαΊp tin Γ‘nh xαΊ‘ thΖ°" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "cΓ‘c tΓΉy chα»n trang trΓ" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "Xα» lΓ½ chα» dΓ²ng vΓΉng n,m trong tαΊp tin, tΓnh tα»« 1" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "KαΊΏt xuαΊ₯t cuα»i cΓΉng: %d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai tαΊp tin" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "KhΓ΄ng thα» Δα»c Δα»i tượng %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "KhΓ΄ng nhαΊn ra kiα»u: %d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers khΓ΄ng cΓ³ giΓ‘ trα» cα»₯ thα»" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "tΓͺn của thΖ° mα»₯c kαΊΏt xuαΊ₯t quΓ‘ dΓ i" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "KhΓ΄ng thα» mα» tαΊp tin miαΊΏng vΓ‘: %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "CαΊ§n chΓnh xΓ‘c mα»t vΓΉng." -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "KhΓ΄ng phαΊ£i lΓ mα»t vΓΉng." -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "βCover letterβ cαΊ§n cho Δα»nh dαΊ‘ng thΖ°" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to ΔiΓͺn rα»: %s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 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:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Hai thΖ° mα»₯c kαΊΏt xuαΊ₯t?" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "KhΓ΄ng hiα»u lαΊ§n chuyα»n giao %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "GαΊ·p lα»i khi phΓ’n giαΊ£i β%sβ nhΖ° lΓ mα»t tham chiαΊΏu hợp lα»." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "KhΓ΄ng tΓ¬m thαΊ₯y nα»n hΓ²a trα»n chΓnh xΓ‘c." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"GαΊ·p lα»i khi lαΊ₯y thượng nguα»n, nαΊΏu bαΊ‘n muα»n ghi lαΊ‘i lαΊ§n chuyα»n giao nα»n mα»t\n" +"cΓ‘ch tα»± Δα»ng, vui lΓ²ng dΓΉng \"git branch --set-upstream-to\" Δα» theo dΓ΅i\n" +"nhΓ‘nh mΓ‘y chủ. HoαΊ·c lΓ bαΊ‘n cΓ³ thα» chα» Δα»nh lαΊ§n chuyα»n giao nα»n bαΊ±ng\n" +"\"--base=<base-commit-id>\" mα»t cΓ‘ch thủ cΓ΄ng." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "GαΊ·p lα»i khi tΓ¬m nα»n hΓ²a trα»n chΓnh xΓ‘c." + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "lαΊ§n chuyα»n giao nα»n khΓ΄ng lΓ tα» tiΓͺn của danh sΓ‘ch Δiα»m xΓ©t duyα»t" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "lαΊ§n chuyα»n giao nα»n khΓ΄ng Δược trong danh sΓ‘ch Δiα»m xΓ©t duyα»t" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "khΓ΄ng thα» lαΊ₯y mΓ£ miαΊΏng vΓ‘" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "dΓΉng [PATCH n/m] ngay cαΊ£ vα»i miαΊΏng vΓ‘ ΔΖ‘n" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "dΓΉng [VΓ] ngay cαΊ£ vα»i cΓ‘c miαΊΏng vΓ‘ phα»©c tαΊ‘p" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "hiα»n thα» miαΊΏng vΓ‘ ra ΔαΊ§u ra chuαΊ©n" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "tαΊ‘o bΓ¬ thΖ°" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "sα» dα»₯ng chα»i dΓ£y sα» dαΊ‘ng ΔΖ‘n giαΊ£n cho tΓͺn tαΊp-tin xuαΊ₯t ra" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "sα» dα»₯ng <sfx> thay cho β.patchβ" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "bαΊ―t ΔαΊ§u ΔΓ‘nh sα» miαΊΏng vΓ‘ tα»« <n> thay vΓ¬ 1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "ΔΓ‘nh dαΊ₯u chuα»i nα»i tiαΊΏp dαΊ‘ng thα»©-N re-roll" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "DΓΉng [<tiα»n-tα»>] thay cho [VΓ]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "lΖ°u cΓ‘c tαΊp tin kαΊΏt quαΊ£ trong <t.mα»₯c>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "khΓ΄ng strip/add [VΓ]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "khΓ΄ng kαΊΏt xuαΊ₯t diff (nhα»―ng khΓ‘c biα»t) nhα» phΓ’n" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "xuαΊ₯t mα»i mΓ£ bΔm all-zero trong phαΊ§n ΔαΊ§u From" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "khΓ΄ng bao gα»m miαΊΏng vΓ‘ khα»p vα»i mα»t lαΊ§n chuyα»n giao thượng nguα»n" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "hiα»n thα» Δα»nh dαΊ‘ng miαΊΏng vΓ‘ thay vΓ¬ mαΊ·c Δα»nh (miαΊΏng vΓ‘ + thα»ng kΓͺ)" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Lα»i nhαΊ―n" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "ΔαΊ§u Δα» thΖ°" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "thΓͺm ΔαΊ§u Δα» thΖ°" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "thΖ° Δiα»n tα»" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "thΓͺm To: ΔαΊ§u Δα» thΖ°" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "thΓͺm Cc: ΔαΊ§u Δα» thΖ°" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "thα»₯t lα»" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "ΔαΊ·t βΔα»a chα» gα»iβ thΓ nh <thα»₯ lα»> (hoαΊ·c thα»₯t lα» ngΖ°α»i commit nαΊΏu bα» quΓͺn)" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "dΓΉng thΖ° ΔαΊ§u tiΓͺn Δα» trαΊ£ lα»i <message-id>" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "ranh giα»i" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "ΔΓnh kΓ¨m miαΊΏng vΓ‘" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "dΓΉng miαΊΏng vΓ‘ lΓ m nα»i dung" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "cho phΓ©p luα»ng lα»i nhαΊ―n, kiα»u: βshallowβ, βdeepβ" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "chα»― kΓ½" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "thΓͺm chα»― kΓ½" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "lαΊ§n_chuyα»n_giao_nα»n" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "add trΖ°α»c hαΊΏt ΔΓ²i hα»i thΓ΄ng tin cΓ’y tα»i sΓͺ-ri miαΊΏng vΓ‘" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "thΓͺm chα»― kΓ½ tα»« mα»t tαΊp tin" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "khΓ΄ng hiα»n thα» cΓ‘c tΓͺn tαΊp tin của miαΊΏng vΓ‘" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n vΓ -k loαΊ‘i tα»« lαΊ«n nhau." -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix vΓ -k xung khαΊ―c nhau." -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only khΓ΄ng hợp lΓ½" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status khΓ΄ng hợp lΓ½" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check khΓ΄ng hợp lΓ½" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "ΔαΊ§u ra chuαΊ©n, hay thΖ° mα»₯c, chα»n cΓ‘i nΓ o?" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "KhΓ΄ng thα» tαΊ‘o thΖ° mα»₯c β%sβ" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "khΓ΄ng thα» Δα»c tαΊp tin chα»― kΓ½ β%sβ" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "GαΊ·p lα»i khi tαΊ‘o cΓ‘c tαΊp tin kαΊΏt xuαΊ₯t" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguα»n> [<ΔαΊ§u> [<giα»i-hαΊ‘n>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7598,11 +7945,6 @@ msgstr "" "KhΓ΄ng tΓ¬m thαΊ₯y nhΓ‘nh mαΊ‘ng Δược theo dΓ΅i, hΓ£y chα» Δα»nh <thượng-nguα»n> mα»t " "cΓ‘ch thủ cΓ΄ng.\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "KhΓ΄ng hiα»u lαΊ§n chuyα»n giao %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<cΓ‘c-tΓΉy-chα»n>] [<tαΊp-tin>β¦]" @@ -7796,174 +8138,178 @@ msgstr "git merge [<cΓ‘c-tΓΉy-chα»n>] <tin-nhαΊ―n> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "switch βmβ yΓͺu cαΊ§u mα»t giΓ‘ trα»" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "KhΓ΄ng tΓ¬m thαΊ₯y chiαΊΏn lược hΓ²a trα»n β%sβ.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "CΓ‘c chiαΊΏn lược sαΊ΅n sΓ ng lΓ :" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "CΓ‘c chiαΊΏn lược tΓΉy chα»nh sαΊ΅n sΓ ng lΓ :" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "khΓ΄ng hiα»n thα» thα»ng kΓͺ khΓ‘c biα»t tαΊ‘i cuα»i của lαΊ§n hΓ²a trα»n" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "hiα»n thα» thα»ng kΓͺ khΓ‘c biα»t tαΊ‘i cuα»i của hΓ²a trα»n" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(Δα»ng nghΔ©a vα»i --stat)" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "thΓͺm (Γt nhαΊ₯t <n>) mα»₯c tα»« shortlog cho ghi chΓΊ chuyα»n giao hΓ²a trα»n" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "tαΊ‘o mα»t lαΊ§n chuyα»n giao ΔΖ°on thay vΓ¬ thα»±c hiα»n viα»c hΓ²a trα»n" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "thα»±c hiα»n chuyα»n giao nαΊΏu hΓ²a trα»n thΓ nh cΓ΄ng (mαΊ·c Δα»nh)" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "sα»a chΓΊ thΓch trΖ°α»c khi chuyα»n giao" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "cho phΓ©p chuyα»n-tiαΊΏp-nhanh (mαΊ·c Δα»nh)" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "bα» qua nαΊΏu chuyα»n-tiαΊΏp-nhanh khΓ΄ng thα» Δược" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "ThαΊ©m tra xem lαΊ§n chuyα»n giao cΓ³ tΓͺn ΔΓ³ cΓ³ chα»― kΓ½ GPG hợp lα» hay khΓ΄ng" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "chiαΊΏn lược" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "chiαΊΏn lược hΓ²a trα»n sαΊ½ dΓΉng" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "tΓΉy_chα»n=giΓ‘_trα»" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "tΓΉy chα»n cho chiαΊΏn lược hΓ²a trα»n ΔΓ£ chα»n" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "hΓ²a trα»n ghi chΓΊ của lαΊ§n chuyα»n giao (dΓ nh cho hΓ²a trα»n khΓ΄ng-chuyα»n-tiαΊΏp-" "nhanh)" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "bΓ£i bα» quΓ‘ trΓ¬nh hΓ²a trα»n hiα»n tαΊ‘i Δang thα»±c hiα»n" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "cho phΓ©p hΓ²a trα»n lα»ch sα» khΓ΄ng liΓͺn quan" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "khΓ΄ng thα» chαΊ‘y stash." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "lα»nh tαΊ‘m cαΊ₯t gαΊ·p lα»i" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "khΓ΄ng phαΊ£i lΓ mα»t Δα»i tượng hợp lα»: %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree gαΊ·p lα»i" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (khΓ΄ng cΓ³ gΓ¬ Δα» squash)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- khΓ΄ng cαΊp nhαΊt HEAD\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "KhΓ΄ng thα» ghi vΓ o β%sβ" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Δang ghi SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "HoΓ n thΓ nh SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "KhΓ΄ng cΓ³ lα»i chΓΊ thΓch hΓ²a trα»n -- nΓͺn khΓ΄ng cαΊp nhαΊt HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "β%sβ khΓ΄ng chα» ΔαΊΏn mα»t lαΊ§n chuyα»n giao nΓ o cαΊ£" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuα»i branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "KhΓ΄ng cαΊ§m nαΊ―m gΓ¬ ngoΓ i hai head hΓ²a trα»n" -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "KhΓ΄ng hiα»u tΓΉy chα»n cho merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "khΓ΄ng thα» ghi %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "KhΓ΄ng thα» Δα»c tα»« β%sβ" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "VαΊ«n chΖ°a hΓ²a trα»n cΓ‘c lαΊ§n chuyα»n giao; sα» dα»₯ng lα»nh βgit commitβ Δα» hoΓ n tαΊ₯t " "viα»c hΓ²a trα»n.\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7981,55 +8327,55 @@ msgstr "" "rα»ng\n" "sαΊ½ hủy bα» lαΊ§n chuyα»n giao.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "ChΓΊ thΓch của lαΊ§n commit (chuyα»n giao) bα» trα»ng rα»ng." -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Tuyα»t vα»i.\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Viα»c tα»± Δα»ng hΓ²a trα»n gαΊ·p lα»i; hΓ£y sα»a cΓ‘c xung Δα»t sau ΔΓ³ chuyα»n giao kαΊΏt " "quαΊ£.\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "%s khΓ΄ng phαΊ£i lΓ mα»t lαΊ§n commit (chuyα»n giao)" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "khΓ΄ng phαΊ£i nhΓ‘nh hiα»n hΓ nh" -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "KhΓ΄ng cΓ³ mΓ‘y chủ cho nhΓ‘nh hiα»n hΓ nh." -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "KhΓ΄ng cΓ³ thượng nguα»n mαΊ·c Δα»nh Δược Δα»nh nghΔ©a cho nhΓ‘nh hiα»n hΓ nh." -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "KhΓ΄ng nhΓ‘nh mαΊ‘ng theo dΓ΅i cho %s tα»« %s" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "khΓ΄ng thα» ΔΓ³ng β%sβ" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "α» ΔΓ’y khΓ΄ng cΓ³ lαΊ§n hΓ²a trα»n nΓ o Δược hủy bα» giα»―a chα»«ng cαΊ£ (thiαΊΏu MERGE_HEAD)." -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8037,7 +8383,7 @@ msgstr "" "BαΊ‘n chΖ°a kαΊΏt thΓΊc viα»c hΓ²a trα»n (MERGE_HEAD vαΊ«n tα»n tαΊ‘i).\n" "HΓ£y chuyα»n giao cΓ‘c thay Δα»i trΖ°α»c khi bαΊ‘n cΓ³ thα» hΓ²a trα»n." -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8045,103 +8391,107 @@ msgstr "" "BαΊ‘n chΖ°a kαΊΏt thΓΊc viα»c cherry-pick (CHERRY_PICK_HEAD vαΊ«n tα»n tαΊ‘i).\n" "HΓ£y chuyα»n giao cΓ‘c thay Δα»i trΖ°α»c khi bαΊ‘n cΓ³ thα» hΓ²a trα»n." -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "BαΊ‘n chΖ°a kαΊΏt thΓΊc viα»c cherry-pick (CHERRY_PICK_HEAD vαΊ«n tα»n tαΊ‘i)." -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "BαΊ‘n khΓ΄ng thα» kαΊΏt hợp --squash vα»i --no-ff." -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "KhΓ΄ng chα» ra lαΊ§n chuyα»n giao vΓ merge.defaultToUpstream chΖ°a Δược ΔαΊ·t." -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit vΓ o mα»t head trα»ng rα»ng vαΊ«n chΖ°a Δược hα» trợ" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Chuyα»n giao khΓ΄ng-chuyα»n-tiαΊΏp-nhanh khΓ΄ng hợp lΓ½ α» trong mα»t head trα»ng rα»ng" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - khΓ΄ng phαΊ£i lΓ mα»t sα» thα»© chΓΊng tΓ΄i cΓ³ thα» hΓ²a trα»n" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "" "KhΓ΄ng thα» hΓ²a trα»n mα»t cΓ‘ch ΔΓΊng ΔαΊ―n mα»t lαΊ§n chuyα»n giao vΓ o mα»t head rα»ng" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "LαΊ§n chuyα»n giao %s cΓ³ mα»t chα»― kΓ½ GPG khΓ΄ng ΔΓ‘ng tin, Δược cho lΓ bα»i %s." -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "LαΊ§n chuyα»n giao %s cΓ³ mα»t chα»― kΓ½ GPG sai, Δược cho lΓ bα»i %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "LαΊ§n chuyα»n giao %s khΓ΄ng cΓ³ chα»― kΓ½ GPG." -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "LαΊ§n chuyα»n giao %s cΓ³ mα»t chα»― kΓ½ GPG tα»t bα»i %s\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "tα»« chα»i hΓ²a trα»n lα»ch sα» khΓ΄ng liΓͺn quan" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Δang cαΊp nhαΊt %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Δang thα» hΓ²a trα»n kiα»u βtrivial in-indexββ¦\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "KhΓ΄ng.\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "Thα»±c hiα»n lα»nh chuyα»n-tiαΊΏp-nhanh lΓ khΓ΄ng thα» Δược, Δang bα» qua." -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Δang tua lαΊ‘i cΓ’y thΓ nh thα»i xa xΖ°aβ¦\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Δang thα» chiαΊΏn lược hΓ²a trα»n %sβ¦\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "KhΓ΄ng cΓ³ chiαΊΏn lược hΓ²a trα»n nΓ o Δược nαΊ―m giα»― (handle) sα»± hΓ²a trα»n.\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "HΓ²a trα»n vα»i chiαΊΏn lược %s gαΊ·p lα»i.\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sα» dα»₯ng %s Δα» chuαΊ©n bα» giαΊ£i quyαΊΏt bαΊ±ng tay.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8253,7 +8603,7 @@ msgstr "git mv [<cΓ‘c-tΓΉy-chα»n>] <nguα»n>β¦ <ΔΓch>" msgid "Directory %s is in index and no submodule?" msgstr "ThΖ° mα»₯c β%sβ cΓ³ α» trong chα» mα»₯c mΓ khΓ΄ng cΓ³ mΓ΄-Δun con?" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "HΓ£y ΔΖ°a cΓ‘c thay Δα»i của bαΊ‘n vΓ o .gitmodules hay tαΊ‘m cαΊ₯t chΓΊng Δi Δα» xα» lΓ½" @@ -8332,49 +8682,49 @@ 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:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "gαΊ·p lα»i khi Δα»i tΓͺn β%sβ" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<cΓ‘c-tΓΉy-chα»n>] <commit>β¦" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<cΓ‘c-tΓΉy-chα»n>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<cΓ‘c-tΓΉy-chα»n>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "chα» hiα»n thα» tΓͺn (khΓ΄ng SHA-1)" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "chα» dΓΉng cΓ‘c thαΊ» Δα» ΔαΊ·t tΓͺn cho cΓ‘c lαΊ§n chuyα»n giao" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "chα» sα» dα»₯ng cΓ‘c tham chiαΊΏu khα»p vα»i <mαΊ«u>" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "liα»t kΓͺ tαΊ₯t cαΊ£ cΓ‘c lαΊ§n chuyα»n giao cΓ³ thα» Δα»c Δược tα»« tαΊ₯t cαΊ£ cΓ‘c tham chiαΊΏu" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "Δα»c tα»« ΔαΊ§u vΓ o tiΓͺu chuαΊ©n" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "cho phΓ©p in cΓ‘c tΓͺn βchΖ°a Δα»nh nghΔ©aβ (mαΊ·c Δα»nh)" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 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α»)" @@ -8521,24 +8871,16 @@ msgstr "khΓ΄ng thα» ghi Δα»i tượng ghi chΓΊ (note)" msgid "The note contents have been left in %s" msgstr "Nα»i dung ghi chΓΊ cΓ²n lαΊ‘i %s" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "khΓ΄ng thα» Δα»c β%sβ" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "khΓ΄ng thα» mα» hay Δα»c β%sβ" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "GαΊ·p lα»i khi phΓ’n giαΊ£i β%sβ nhΖ° lΓ mα»t tham chiαΊΏu hợp lα»." - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8551,7 +8893,7 @@ msgstr "khΓ΄ng thα» Δα»c dα»― liα»u ghi chΓΊ tα»« Δα»i tượng khΓ΄ng-blo #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "quΓ‘ nhiα»u Δα»i sα»" @@ -8598,7 +8940,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Δang ghi ΔΓ¨ lΓͺn ghi chΓΊ cΕ© cho Δα»i tượng %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Δang gα»‘ bα» ghi chΓΊ (note) cho Δα»i tượng %s\n" @@ -8638,15 +8980,15 @@ msgstr "" "CΓ‘c tΓΉy chα»n -m/-F/-c/-C ΔΓ£ cα» khΓ΄ng cΓ²n dΓΉng nα»―a cho lα»nh con βeditβ.\n" "Xin hΓ£y sα» dα»₯ng lα»nh sau Δα» thay thαΊΏ: βgit notes add -f -m/-F/-c/-Cβ.\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "TΓΉy chα»n chung" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "TΓΉy chα»n vα» hΓ²a trα»n" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8654,51 +8996,51 @@ msgstr "" "phΓ’n giαΊ£i cΓ‘c xung Δα»t βnotesβ sα» dα»₯ng chiαΊΏn lược ΔΓ£ ΔΖ°a ra (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Chuyα»n giao cΓ‘c note chΖ°a Δược hΓ²a trα»n" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" "cΓ‘c note cuα»i cΓΉng Δược hΓ²a trα»n bα»i cΓ‘c note chΖ°a hΓ²a trα»n của lαΊ§n chuyα»n " "giao" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Hủy bα» phΓ’n giαΊ£i ghi chΓΊ (note) hΓ²a trα»n" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "bα» qua hΓ²a trα»n cΓ‘c ghi chΓΊ (note)" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "CΓ‘c ghi chΓΊ hΓ²a trα»n vΓ o %s ΔΓ£ sαΊ΅n trong quΓ‘ trΓ¬nh xα» lΓ½ tαΊ‘i %s" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "Δα»i tượng %s khΓ΄ng cΓ³ ghi chΓΊ (note)\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "cα» gαΊ―ng gα»‘ bα» mα»t note chΖ°a tα»«ng tα»n tαΊ‘i khΓ΄ng phαΊ£i lΓ mα»t lα»i" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "Δα»c tΓͺn Δα»i tượng tα»« thiαΊΏt bα» nhαΊp chuαΊ©n" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "notes-ref" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "dΓΉng βnotesβ tα»« <notes-ref>" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "KhΓ΄ng hiα»u cΓ’u lα»nh con: %s" @@ -8722,166 +9064,170 @@ msgstr "" msgid "deflate error (%d)" msgstr "lα»i giαΊ£i nΓ©n (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "tαΊ―t ghi bitmap, cΓ‘c gΓ³i bα» chia nhα» bα»i vΓ¬ pack.packSizeLimit" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "Δang ghi lαΊ‘i cΓ‘c Δα»i tượng" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 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:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Δang nΓ©n cΓ‘c Δα»i tượng" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, 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:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "phiΓͺn bαΊ£n mα»₯c lα»₯c sai β%sβ" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "khΓ΄ng hiα»n thα» bα» Δo tiαΊΏn trΓ¬nh" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "hiα»n thα» bα» Δo tiαΊΏn trΓ¬nh" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 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:2599 +#: builtin/pack-objects.c:2604 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:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "phiΓͺn bαΊ£n[,offset]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 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:2604 +#: builtin/pack-objects.c:2609 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:2606 +#: builtin/pack-objects.c:2611 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:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "bα» qua cΓ‘c Δα»i tượng ΔΓ³ng gΓ³i" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 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:2612 +#: builtin/pack-objects.c:2617 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:2614 +#: builtin/pack-objects.c:2619 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:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "dΓΉng lαΊ‘i cΓ‘c delta sαΊ΅n cΓ³" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "dΓΉng lαΊ‘i cΓ‘c Δα»i tượng sαΊ΅n cΓ³" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "dΓΉng cΓ‘c Δα»i tượng OFS_DELTA" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 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:2624 +#: builtin/pack-objects.c:2629 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:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr " Δα»c tham sα» βrevisionβ tα»« thiαΊΏt bα» nhαΊp chuαΊ©n" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 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:2631 +#: builtin/pack-objects.c:2636 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:2634 +#: builtin/pack-objects.c:2639 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:2637 +#: builtin/pack-objects.c:2642 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:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "xuαΊ₯t gΓ³i ra ΔαΊ§u ra tiΓͺu chuαΊ©n" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 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:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "giα»― lαΊ‘i cΓ‘c Δα»i tượng khΓ΄ng thα» Δα»c Δược" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "thα»i-gian" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 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:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "tαΊ‘o gΓ³i nhαΊΉ" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 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:2653 +#: builtin/pack-objects.c:2658 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:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "mα»©c nΓ©n gΓ³i" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 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:2659 +#: builtin/pack-objects.c:2664 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:2661 +#: builtin/pack-objects.c:2666 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:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "Δang ΔαΊΏm cΓ‘c Δα»i tượng" @@ -8909,15 +9255,15 @@ msgstr "Δang gα»‘ cΓ‘c Δα»i tượng trΓΉng lαΊ·p" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <thα»i-gian>] [--] [<head>β¦]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "khΓ΄ng gα»‘ bα», chα» hiα»n thα»" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "bΓ‘o cΓ‘o cΓ‘c Δα»i tượng ΔΓ£ prune" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "cΓ‘c Δα»i tượng hαΊΏt hαΊ‘n cΕ© hΖ‘n khoαΊ£ng <thα»i gian>" @@ -8929,50 +9275,54 @@ msgstr "khΓ΄ng thα» tα»a bα»t trong mα»t kho Δα»i_tượng_vΔ©_ΔαΊ‘i" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<cΓ‘c-tΓΉy-chα»n>] [<kho-chα»©a> [<refspec>β¦]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "CΓ‘c tΓΉy chα»n liΓͺn quan ΔαΊΏn hΓ²a trα»n" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "cΓ‘c thay Δα»i hợp nhαΊ₯t bαΊ±ng cαΊ£i tα» thay vΓ¬ hΓ²a trα»n" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "cho phΓ©p chuyα»n-tiαΊΏp-nhanh" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "thαΊ©m tra xem lαΊ§n chuyα»n giao cΓ³ tΓͺn ΔΓ³ cΓ³ chα»― kΓ½ GPG hợp lα» hay khΓ΄ng" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "tα»± Δα»ng stash/stash pop tΖ°α»c vΓ sau tu bα» (rebase)" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "CΓ‘c tΓΉy chα»n liΓͺn quan ΔαΊΏn lα»nh lαΊ₯y vα»" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "sα» lượng mΓ΄-Δun-con Δược ΔαΊ©y lΓͺn Δα»ng thα»i" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "GiΓ‘ trα» khΓ΄ng hợp lα» cho pull.ff: %s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "KhΓ΄ng thα» pull vα»i cαΊ£i tα»: BαΊ‘n cΓ³ cΓ‘c thay Δα»i chΖ°a Δược ΔΖ°a lΓͺn bα» phΓ³ng." -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "" "ThΓͺm vΓ o ΔΓ³, bαΊ£ng mα»₯c lα»₯c của bαΊ‘n cΓ³ chα»©a cΓ‘c thay Δα»i chΖ°a Δược chuyα»n giao." -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "KhΓ΄ng thα» pull vα»i cαΊ£i tα»: BαΊ‘n cΓ³ cΓ‘c thay Δα»i chΖ°a Δược chuyα»n giao." -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -8980,14 +9330,14 @@ msgstr "" "α» ΔΓ’y khΓ΄ng cΓ³ α»©ng cα» nΓ o Δα» cαΊ£i tα» lαΊ‘i trong sα» cΓ‘c tham chiαΊΏu mΓ bαΊ‘n vα»«a " "lαΊ₯y vα»." -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "α» ΔΓ’y khΓ΄ng cΓ³ α»©ng cα» nΓ o Δα» hΓ²a trα»n trong sα» cΓ‘c tham chiαΊΏu mΓ bαΊ‘n vα»«a lαΊ₯y " "vα»." -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -8996,7 +9346,7 @@ msgstr "" "tα»±\n" "ΔαΊ‘i diα»n mΓ nΓ³ lαΊ‘i khΓ΄ng khα»p trΓͺn Δiα»m cuα»i mΓ‘y phα»₯c vα»₯." -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9008,40 +9358,43 @@ msgstr "" "theo mαΊ·c Δα»nh cho nhΓ‘nh hiα»n tαΊ‘i của bαΊ‘n, bαΊ‘n phαΊ£i chα» Δα»nh\n" "mα»t nhΓ‘nh trΓͺn dΓ²ng lα»nh." -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Hiα»n tαΊ‘i bαΊ‘n chαΊ³ng α» nhΓ‘nh nΓ o cαΊ£." -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Vui lΓ²ng chα» Δα»nh nhΓ‘nh nΓ o bαΊ‘n muα»n cαΊ£i tα» lαΊ‘i." -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Vui lΓ²ng chα» Δα»nh nhΓ‘nh nΓ o bαΊ‘n muα»n hΓ²a trα»n vΓ o." -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "Xem git-pull(1) Δα» biαΊΏt thΓͺm chi tiαΊΏt." -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<mΓ‘y chủ>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<nhΓ‘nh>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "α» ΔΓ’y khΓ΄ng cΓ³ thΓ΄ng tin theo dΓ΅i cho nhΓ‘nh hiα»n hΓ nh." -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -"NαΊΏu bαΊ‘n muα»n theo dΓ΅i thΓ΄ng tin cho nhΓ‘nh nΓ y bαΊ‘n cΓ³ thα» thα»±c hiα»n bαΊ±ng " -"lα»nh:\n" -"\n" -" git branch --set-upstream-to=%s/<nhΓ‘nh> %s\n" -"\n" +"NαΊΏu bαΊ‘n muα»n theo dΓ΅i thΓ΄ng tin cho nhΓ‘nh nΓ y bαΊ‘n cΓ³ thα» thα»±c hiα»n bαΊ±ng lα»nh:" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9050,13 +9403,17 @@ msgstr "" "CΓ‘c ΔαΊ·c tαΊ£ cαΊ₯u hΓ¬nh của bαΊ‘n Δα» hΓ²a trα»n vα»i tham chiαΊΏu β%sβ\n" "tα»« mΓ‘y dα»ch vα»₯, nhΖ°ng khΓ΄ng cΓ³ nhΓ‘nh nΓ o nhΖ° thαΊΏ Δược lαΊ₯y vα»." -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "tΓΉy chα»n --[no-]autostash chα» hợp lα» khi dΓΉng vα»i --rebase." + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Δang cαΊp nhαΊt mα»t nhΓ‘nh chΖ°a Δược sinh ra vα»i cΓ‘c thay Δα»i Δược thΓͺm vΓ o " "bαΊ£ng mα»₯c lα»₯c." -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9067,7 +9424,7 @@ msgstr "" "Δang chuyα»n-tiαΊΏp-nhanh cΓ’y lΓ m viα»c của bαΊ‘n tα»«\n" "lαΊ§n chuyα»n giaot %s." -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9085,11 +9442,11 @@ msgstr "" "$ git reset --hard\n" "Δα» khΓ΄i phα»₯c lαΊ‘i." -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "KhΓ΄ng thα» hΓ²a trα»n nhiα»u nhΓ‘nh vΓ o trong mα»t head trα»ng rα»ng." -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "KhΓ΄ng thα» thα»±c hiα»n lα»nh rebase (cαΊ£i tα») trΓͺn nhiα»u nhΓ‘nh." @@ -9459,6 +9816,18 @@ 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/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <thΖ°-mα»₯c-git>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "im lαΊ·ng" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "BαΊ‘n phαΊ£i chα» Δα»nh thΖ° mα»₯c." + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9780,173 +10149,175 @@ msgstr "* mΓ‘y chủ %s" msgid " Fetch URL: %s" msgstr " URL Δα» lαΊ₯y vα»: %s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(khΓ΄ng cΓ³ URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL Δα» ΔαΊ©y lΓͺn: %s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " NhΓ‘nh HEAD: %s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " nhΓ‘nh HEAD (HEAD mΓ‘y chủ chΖ°a rΓ΅ rΓ ng, cΓ³ lαΊ½ lΓ mα»t trong sα» sau):\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Nhα»―ng nhΓ‘nh trΓͺn mΓ‘y chủ:%s" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (trαΊ‘ng thΓ‘i khΓ΄ng Δược yΓͺu cαΊ§u)" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Nhα»―ng nhΓ‘nh nα»i bα» ΔΓ£ Δược cαΊ₯u hΓ¬nh cho lα»nh βgit pullβ:" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " refs nα»i bα» sαΊ½ Δược phαΊ£n chiαΊΏu bα»i lα»nh βgit pushβ" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Nhα»―ng tham chiαΊΏu nα»i bα» Δược cαΊ₯u hΓ¬nh cho lα»nh βgit pushβ%s:" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "ΔαΊ·t refs/remotes/<tΓͺn>/HEAD cho phΓΉ hợp vα»i mΓ‘y chủ" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "xΓ³a refs/remotes/<tΓͺn>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "KhΓ΄ng thα» xΓ‘c Δα»nh Δược HEAD mΓ‘y chủ" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Nhiα»u nhΓ‘nh HEAD mΓ‘y chủ. HΓ£y chα»n rΓ΅ rΓ ng mα»t:" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "KhΓ΄ng thα» xΓ³a bα» %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "KhΓ΄ng phαΊ£i lΓ tham chiαΊΏu hợp lα»: %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "KhΓ΄ng thα» cΓ i ΔαΊ·t %s" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s sαΊ½ trα» thΓ nh khΓ΄ng ΔαΊ§u (khΓ΄ng Δược quαΊ£n lΓ½)!" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s ΔΓ£ trα» thΓ nh khΓ΄ng ΔαΊ§u (khΓ΄ng Δược quαΊ£n lΓ½)!" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Δang xΓ©n bα»t %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [nΓͺn xΓ©n bα»t] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [ΔΓ£ bα» xΓ©n] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "cαΊ―t mΓ‘y chủ sau khi lαΊ₯y vα»" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "KhΓ΄ng cΓ³ mΓ‘y chủ nΓ o cΓ³ tΓͺn β%sβ" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "thΓͺm nhΓ‘nh" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "chΖ°a chα» ra mΓ‘y chủ nΓ o" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "truy vαΊ₯n ΔαΊ©y URL thay vΓ¬ lαΊ₯y" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "trαΊ£ vα» mα»i URL" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "khΓ΄ng cΓ³ URL nΓ o Δược cαΊ₯u hΓ¬nh cho nhΓ‘nh β%sβ" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "ΔαΊ©y cΓ‘c βURLβ bαΊ±ng tay" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "thΓͺm URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "xΓ³a URLs" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete khΓ΄ng hợp lΓ½" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiα»u mαΊ«u URL cΕ© khΓ΄ng hợp lα»: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "KhΓ΄ng tΓ¬m thαΊ₯y URL nhΖ° vαΊy: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "SαΊ½ khΓ΄ng xΓ³a nhα»―ng Δα»a chα» URL khΓ΄ng-push" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "chi tiαΊΏt; phαΊ£i Δược ΔαΊ·t trΖ°α»c mα»t lα»nh-con" @@ -10450,12 +10821,6 @@ msgstr "cho phΓ©p gα»‘ bα» Δα» qui" msgid "exit with a zero status even if nothing matched" msgstr "thoΓ‘t ra vα»i trαΊ‘ng thΓ‘i khΓ‘c khΓ΄ng thαΊm chΓ nαΊΏu khΓ΄ng cΓ³ gΓ¬ khα»p" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Vui lΓ²ng ΔΖ°a cΓ‘c thay Δα»i của bαΊ‘n vΓ o β.gitmodulesβ hay tαΊ‘m cαΊ₯t chΓΊng Δi Δα» " -"xα» lΓ½" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10662,84 +11027,184 @@ msgstr "giα»― vΓ xΓ³a bα» mα»i dΓ²ng bαΊ―t ΔαΊ§u bαΊ±ng kΓ½ tα»± ghi chΓΊ" msgid "prepend comment character and space to each line" msgstr "treo trΖ°α»c kΓ½ tα»± ghi chΓΊ vΓ kΓ½ tα»± khoαΊ£ng trαΊ―ng cho tα»«ng dΓ²ng" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "KhΓ΄ng cΓ³ tham chiαΊΏu nΓ o nhΖ° thαΊΏ: %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "CαΊ§n tΓͺn tham chiαΊΏu dαΊ‘ng ΔαΊ§y Δủ, nhΖ°ng lαΊ‘i nhαΊn Δược %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "khΓ΄ng thα» cαΊ―t bα» mα»t thΓ nh phαΊ§n ra khα»i β%sβ url" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "Δiα»m neo thay thαΊΏ cho cΓ‘c ΔΖ°α»ng dαΊ«n tΖ°Ζ‘ng Δα»i" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<ΔΖ°α»ng/dαΊ«n>] [<ΔΖ°α»ng/dαΊ«n>β¦]" +msgstr "git submodule--helper list [--prefix=</ΔΖ°α»ng/dαΊ«n>] [</ΔΖ°α»ng/dαΊ«n>β¦]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "KhΓ΄ng tΓ¬m thαΊ₯y url cho ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β%sβ trong .gitmodules" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "GαΊ·p lα»i khi ΔΔng kΓ½ url cho ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β%sβ" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "MΓ΄-Δun-con β%sβ (%s) Δược ΔΔng kΓ½ cho ΔΖ°α»ng dαΊ«n β%sβ\n" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "cαΊ£nh bΓ‘o: chαΊΏ Δα» lα»nh cαΊp nhαΊt Δược gợi Γ½ cho mΓ΄-Δun-con β%sβ\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "GαΊ·p lα»i khi ΔΔng kΓ½ chαΊΏ Δα» cαΊp nhαΊt cho ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β%sβ" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "ChαΊ·n kαΊΏt xuαΊ₯t cho khα»i tαΊ‘o mα»t mΓ΄-Δun-con" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [</ΔΖ°α»ng/dαΊ«n>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <ΔΖ°α»ng/dαΊ«n>" +msgstr "git submodule--helper name </ΔΖ°α»ng/dαΊ«n>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "KhΓ΄ng tΓ¬m thαΊ₯y Γ‘nh xαΊ‘ (mapping) mΓ΄-Δun-con trong .gitmodules cho ΔΖ°α»ng dαΊ«n " "β%sβ" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "nhΓ’n bαΊ£n mΓ΄-Δun-con mα»i vΓ o chα» nΓ o" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "tΓͺn của mΓ΄-Δun-con mα»i" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "url nΖ‘i mΓ nhΓ’n bαΊ£n mΓ΄-Δun-con tα»« ΔΓ³" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "chiα»u sΓ’u lα»ch sα» khi tαΊ‘o bαΊ£n sao" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -"git submodule--helper clone [--prefix=<ΔΖ°α»ng/dαΊ«n>] [--quiet] [--reference " -"<kho>] [--name <tΓͺn>] [--url <url>][--depth <ΔΖ°α»ng/dαΊ«n>] [--] [<ΔΖ°α»ng/dαΊ«n>β¦]" +"git submodule--helper clone [--prefix=</ΔΖ°α»ng/dαΊ«n>] [--quiet] [--reference " +"<kho>] [--name <tΓͺn>] [--depth <sΓ’u>] [--url <url>] [</ΔΖ°α»ng/dαΊ«n>β¦]" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "khΓ΄ng thα» tαΊ‘o thΖ° mα»₯c β%sβ" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "NhΓ’n bαΊ£n β%sβ vΓ o ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β%sβ gαΊ·p lα»i" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "khΓ΄ng thα» mα» tαΊp tin β%sβ" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "khΓ΄ng thα» ΔΓ³ng tαΊp tin %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "khΓ΄ng thα» lαΊ₯y thΖ° mα»₯c mΓ΄-Δun-con cho β%sβ" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β%sβ chΖ°a Δược khα»i tαΊ‘o" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "CΓ³ lαΊ½ bαΊ‘n lΓ bαΊ‘n muα»n dΓΉng \"update --init\" phαΊ£i khΓ΄ng?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Bα» qua cΓ‘c mΓ΄-Δun-con chΖ°a Δược hΓ²a trα»n %s" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Bα» qua mΓ΄-Δun-con β%sβ" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "ΔΖ°α»ng dαΊ«n ΔαΊΏn cΓ’y lΓ m viα»c" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "ΔΖ°α»ng dαΊ«n ΔαΊΏn cΓ’y lΓ m viα»c, chΓ©o biΓͺn giα»i mΓ΄-Δun-con lα»ng nhau" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebase, merge, checkout hoαΊ·c khΓ΄ng lΓ m gΓ¬ cαΊ£" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -"lα»i nghiΓͺm trα»ng: lα»nh con submodule--helper phαΊ£i Δược gΓ³i vα»i mα»t lα»nh con" +"TαΊ‘o mα»t bαΊ£n sao nΓ΄ng Δược cαΊ―t ngαΊ―n thΓ nh sα» lượng Δiα»m xΓ©t duyα»t ΔΓ£ cho" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "cΓ΄ng viα»c Δα»ng thα»i" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "Δα»«ng in tiαΊΏn trΓ¬nh nhΓ’n bαΊ£n" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "" +"git submodule--helper update_clone [--prefix=</ΔΖ°α»ng/dαΊ«n>] [</ΔΖ°α»ng/dαΊ«n>β¦]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "giΓ‘ trα» cho tham sα» cαΊp nhαΊt bα» sai" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "lα»nh con submodule--helper phαΊ£i Δược gα»i vα»i mα»t lα»nh con" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "lα»i nghiΓͺm trα»ng: β%sβ khΓ΄ng phαΊ£i lΓ lα»nh con submodule--helper hợp lα»" +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "β%sβ khΓ΄ng phαΊ£i lΓ lα»nh con submodule--helper hợp lα»" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10794,27 +11259,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <tΓͺn-thαΊ»>β¦" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "tΓͺn thαΊ» quΓ‘ dΓ i: %.*sβ¦" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "khΓ΄ng tΓ¬m thαΊ₯y tΓ¬m thαΊ₯y thαΊ» β%sβ." -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "ThαΊ» ΔΓ£ bα» xΓ³a β%sβ (tα»«ng lΓ %s)\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "khΓ΄ng thα» thαΊ©m tra thαΊ» β%sβ" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10827,7 +11287,7 @@ msgstr "" " %s\n" "Nhα»―ng dΓ²ng Δược bαΊ―t ΔαΊ§u bαΊ±ng β%cβ sαΊ½ Δược bα» qua.\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10959,21 +11419,21 @@ msgstr "tΓΉy chα»n --merged vΓ --no-merged chα» cho phΓ©p dΓΉng vα»i -l." msgid "only one -F or -m option is allowed." msgstr "chα» cΓ³ mα»t tΓΉy chα»n -F hoαΊ·c -m lΓ Δược phΓ©p." -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "quΓ‘ nhiα»u Δα»i sα»" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "β%sβ khΓ΄ng phαΊ£i thαΊ» hợp lα»." -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "ThαΊ» β%sβ ΔΓ£ tα»n tαΊ‘i rα»i" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "ΔΓ£ cαΊp nhαΊt thαΊ» β%sβ (trΖ°α»c lΓ %s)\n" @@ -11227,7 +11687,7 @@ msgstr "git verify-commit [-v | --verbose] <lαΊ§n_chuyα»n_giao>β¦" msgid "print commit contents" msgstr "hiα»n thα» nα»i dung của lαΊ§n chuyα»n giao" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "in kαΊΏt xuαΊ₯t trαΊ‘ng thΓ‘i gpg dαΊ‘ng thΓ΄" @@ -11247,7 +11707,7 @@ msgstr "chα» hiα»n thα» thα»ng kΓͺ" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <thαΊ»>β¦" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "hiα»n thα» nα»i dung của thαΊ»" @@ -11263,68 +11723,72 @@ msgstr "git worktree prune [<cΓ‘c-tΓΉy-chα»n>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<cΓ‘c-tΓΉy-chα»n>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Gα»‘ bα» cΓ’y lΓ m viα»c/%s: khΓ΄ng phαΊ£i lΓ thΖ° mα»₯c hợp lα»" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Gα»‘ bα» cΓ’y lΓ m viα»c/%s: khΓ΄ng cΓ³ tαΊp tin gitdir" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Gα»‘ bα» cΓ’y lΓ m viα»c/%s: khΓ΄ng thα» Δα»c tαΊp tin gitdir (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Gα»‘ bα» cΓ’y lΓ m viα»c/%s: tαΊp tin gitdir khΓ΄ng hợp lα»" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Gα»‘ bα» cΓ’y lΓ m viα»c/%s: tαΊp tin gitdir chα» ΔαΊΏn vα» trΓ khΓ΄ng tα»n tαΊ‘i" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "gαΊ·p lα»i khi gα»‘ bα»: %s" +msgid "failed to remove '%s'" +msgstr "gαΊ·p lα»i khi gα»‘ bα» β%sβ" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "β%sβ ΔΓ£ cΓ³ tα»« trΖ°α»c rα»i" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "khΓ΄ng thα» tαΊ‘o thΖ° mα»₯c của β%sβ" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Δang chuαΊ©n bα» %s (Δα»nh danh %s)" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "lαΊ₯y ra <nhΓ‘nh> ngay cαΊ£ khi nΓ³ ΔΓ£ Δược lαΊ₯y ra α» cΓ’y lΓ m viα»c khΓ‘c" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "tαΊ‘o nhΓ‘nh mα»i" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "tαΊ‘o hay ΔαΊ·t lαΊ‘i mα»t nhΓ‘nh" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "rα»i bα» HEAD tαΊ‘i lαΊ§n chuyα»n giao theo tΓͺn" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "di chuyα»n cΓ’y lΓ m viα»c mα»i" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "CΓ‘c tΓΉy chα»n -b, -B, vΓ --detach loαΊ‘i tα»« lαΊ«n nhau" @@ -11344,7 +11808,7 @@ msgstr "ghi Δα»i tượng cΓ’y (tree) cho <tiα»n tα»> thΖ° mα»₯c con" msgid "only useful for debugging" msgstr "chα» hα»―u Γch khi cαΊ§n gα»‘ lα»i" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "in thΓ΄ng tin gα»‘ lα»i ra ΔαΊ§u ra lα»i tiΓͺu chuαΊ©n" @@ -11358,7 +11822,7 @@ msgstr "" "hΖ°α»ng dαΊ«n vα» khΓ‘i niα»m. Xem βgit help <lα»nh>β hay βgit help <khΓ‘i-niα»m>β\n" "Δα» xem cΓ‘c ΔαΊ·c tαΊ£ cho lα»nh hay khΓ‘i niα»m cα»₯ thα»." -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Chα»t khΓ³a cΓ΄ng khΓ΄ng Δược hα» trợ vα»i cURL < 7.44.0" @@ -11488,7 +11952,7 @@ msgstr "im lαΊ·ng hΖ‘n nα»―a" msgid "use <n> digits to display SHA-1s" msgstr "sα» dα»₯ng <n> chα»― sα» Δα» hiα»n thα» SHA-1s" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "cαΊp nhαΊt bαΊ£ng mα»₯c lα»₯c vα»i phΓ’n giαΊ£i xung Δα»t dΓΉng lαΊ‘i nαΊΏu Δược" @@ -11704,16 +12168,16 @@ msgstr "" "Δα» phα»₯c hα»i lαΊ‘i thΓ nh nhΓ‘nh nguyΓͺn thủy vΓ dα»«ng viα»c vΓ‘ lαΊ‘i thΓ¬ chαΊ‘y \"git " "rebase --abort\"." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "ΔΓ£ Γ‘p dα»₯ng autostash." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "KhΓ΄ng thα» lΖ°u $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11724,35 +12188,31 @@ msgstr "" "BαΊ‘n cΓ³ thα» chαΊ‘y lα»nh \"git stash pop\" hay \"git stash drop\" bαΊ₯t kα»³ lΓΊc " "nΓ o.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "MΓ³c (hook) pre-rebase tα»« chα»i rebase." -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" "HΓ¬nh nhΖ° Δang trong quΓ‘ trΓ¬nh thα»±c hiα»n lα»nh git-am. KhΓ΄ng thα» chαΊ‘y lα»nh " "rebase." -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "TΓΉy chα»n --exec phαΊ£i Δược sα» dα»₯ng cΓΉng vα»i tΓΉy chα»n --interactive" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "KhΓ΄ng cΓ³ tiαΊΏn trΓ¬nh rebase nΓ o phαΊ£i khΓ΄ng?" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "HΓ nh Δα»ng β--edit-todoβ chα» cΓ³ thα» dΓΉng trong quΓ‘ trΓ¬nh βrebaseβ (sα»a lα»ch " "sα») tΖ°Ζ‘ng tΓ‘c." -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "KhΓ΄ng thα» Δα»c HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11760,12 +12220,12 @@ msgstr "" "BαΊ‘n phαΊ£i sα»a tαΊ₯t cαΊ£ cΓ‘c lαΊ§n hΓ²a trα»n xung Δα»t vΓ sau\n" "ΔΓ³ ΔΓ‘nh dαΊ₯u chΓΊng lΓ cαΊ§n xα» lΓ½ sα» dα»₯ng lα»nh git add" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "KhΓ΄ng thα» quay trα» lαΊ‘i $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11786,64 +12246,64 @@ msgstr "" "vΓ chαΊ‘y TΓI lαΊ§n nα»―a. TΓI dα»«ng lαΊ‘i trong trΖ°α»ng hợp bαΊ‘n vαΊ«n\n" "cΓ³ mα»t sα» thα»© quΓ½ giΓ‘ α» ΔΓ’y." -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "thượng nguα»n khΓ΄ng hợp lα» $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: α» ΔΓ’y cΓ³ nhiα»u hΖ‘n mα»t nα»n mΓ³ng hΓ²a trα»n" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: α» ΔΓ’y khΓ΄ng cΓ³ nα»n mΓ³ng hΓ²a trα»n nΓ o" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "KhΓ΄ng chα» ΔαΊΏn mα»t lαΊ§n chuyα»n giao khΓ΄ng hợp lα»: $onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "nghiΓͺm trα»ng: khΓ΄ng cΓ³ nhΓ‘nh nhΖ° thαΊΏ: $branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "KhΓ΄ng thα» autostash" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "ΔΓ£ tαΊ‘o autostash: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Xin hΓ£y chuyα»n giao hoαΊ·c tαΊ‘m cαΊ₯t (stash) chΓΊng." -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "NhΓ‘nh hiα»n tαΊ‘i $branch_name ΔΓ£ Δược cαΊp nhαΊt rα»i." -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "NhΓ‘nh hiα»n tαΊ‘i $branch_name ΔΓ£ Δược cαΊp nhαΊt rα»i, lα»nh rebase Γ©p buα»c." -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Thay Δα»i tα»« $mb thΓ nh $onto:" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "TrΖ°α»c tiΓͺn, di chuyα»n head Δα» xem lαΊ‘i cΓ‘c cΓ΄ng viα»c trΓͺn Δα»nh của nΓ³β¦" -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Chuyα»n-tiαΊΏp-nhanh $branch_name thΓ nh $onto_name." @@ -11989,29 +12449,24 @@ msgstr "ChΖ°a chα» ra tΓͺn của nhΓ‘nh" msgid "(To restore them type \"git stash apply\")" msgstr "(Δα» phα»₯c hα»i lαΊ‘i chΓΊng hΓ£y gΓ΅ \"git stash apply\")" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "khΓ΄ng thα» thΓ‘o bα» mα»t thΓ nh phαΊ§n ra khα»i β$remoteurlβ url" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "ΔΖ°α»ng dαΊ«n tΖ°Ζ‘ng Δα»i chα» cΓ³ thα» dΓΉng tα»« thΖ° mα»₯c α» mα»©c cao nhαΊ₯t của cΓ’y lΓ m " "viα»c" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "repo URL: β$repoβ phαΊ£i lΓ ΔΖ°α»ng dαΊ«n tuyα»t Δα»i hoαΊ·c lΓ bαΊ―t ΔαΊ§u bαΊ±ng ./|../" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "β$sm_pathβ thα»±c sα»± ΔΓ£ tα»n tαΊ‘i α» bαΊ£ng mα»₯c lα»₯c rα»i" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12023,36 +12478,36 @@ msgstr "" "$sm_path\n" "Sα» dα»₯ng -f nαΊΏu bαΊ‘n thα»±c sα»± muα»n thΓͺm nΓ³ vΓ o." -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Δang thΓͺm repo cΓ³ sαΊ΅n tαΊ‘i β$sm_pathβ vΓ o bαΊ£ng mα»₯c lα»₯c" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "β$sm_pathβ ΔΓ£ tα»n tαΊ‘i tα»« trΖ°α»c vΓ khΓ΄ng phαΊ£i lΓ mα»t kho git hợp lα»" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "ThΖ° mα»₯c git cho β$sm_nameβ Δược tΓ¬m thαΊ₯y mα»t cΓ‘ch cα»₯c bα» vα»i cΓ‘c mΓ‘y chủ:" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "NαΊΏu bαΊ‘n muα»n dΓΉng lαΊ‘i thΖ° mα»₯c git nα»i bα» nΓ y thay vΓ¬ nhΓ’n bαΊ£n tα»« nΓ³" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "dΓΉng tΓΉy chα»n β--forceβ. NαΊΏu thΖ° mα»₯c git nα»i bα» khΓ΄ng phαΊ£i lΓ repo (kho) ΔΓΊng" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -12061,71 +12516,53 @@ msgstr "" "hay bαΊ‘n khΓ΄ng chαΊ―c chαΊ―n Δiα»u ΔΓ³ cΓ³ nghΔ©a gΓ¬ chα»n tΓͺn khΓ‘c vα»i tΓΉy chα»n β--" "nameβ." -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" "Phα»₯c hα»i sα»± hoαΊ‘t Δα»ng của thΖ° mα»₯c git nα»i bα» cho mΓ΄-Δun-con β$sm_nameβ." -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "KhΓ΄ng thα» lαΊ₯y ra mΓ΄-Δun-con β$sm_pathβ" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "GαΊ·p lα»i khi thΓͺm mΓ΄-Δun-con β$sm_pathβ" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "GαΊ·p lα»i khi ΔΔng kΓ½ vα»i hα» thα»ng mΓ΄-Δun-con β$sm_pathβ" -#: git-submodule.sh:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Δang vΓ o β$prefix$displaypathβ" - -#: git-submodule.sh:437 -#, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "" -"Dα»«ng lαΊ‘i tαΊ‘i β$prefix$displaypathβ; script trαΊ£ vα» trαΊ‘ng thΓ‘i khΓ‘c khΓ΄ng." - -#: git-submodule.sh:483 +#: git-submodule.sh:355 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"KhΓ΄ng tΓ¬m thαΊ₯y url cho ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ trong .gitmodules" +msgid "Entering '$displaypath'" +msgstr "Δang vΓ o β$displaypathβ" -#: git-submodule.sh:492 +#: git-submodule.sh:375 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "GαΊ·p lα»i khi ΔΔng kΓ½ url cho ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ" +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "Dα»«ng lαΊ‘i tαΊ‘i β$displaypathβ; script trαΊ£ vα» trαΊ‘ng thΓ‘i khΓ‘c khΓ΄ng." -#: git-submodule.sh:494 +#: git-submodule.sh:448 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "MΓ΄-Δun-con β$nameβ ($url) Δược ΔΔng kΓ½ cho ΔΖ°α»ng dαΊ«n β$displaypathβ" - -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"GαΊ·p lα»i khi ΔΔng kΓ½ chαΊΏ Δα» cαΊp nhαΊt cho ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ" +msgid "pathspec and --all are incompatible" +msgstr "ΔαΊ·c tαΊ£ ΔΖ°α»ng dαΊ«n vΓ --all xung khαΊ―c nhau" -#: git-submodule.sh:549 +#: git-submodule.sh:453 #, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "DΓΉng β.β nαΊΏu bαΊ‘n thα»±c sα»± muα»n gα»‘ bα» mα»i mΓ΄-Δun-con" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "DΓΉng β--allβ nαΊΏu bαΊ‘n thα»±c sα»± muα»n hủy khα»i tαΊ‘o mα»i mΓ΄-Δun-con" -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "CΓ’y lΓ m viα»c mΓ΄-Δun-con β$displaypathβ cΓ³ chα»©a thΖ° mα»₯c .git" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -12133,7 +12570,7 @@ msgstr "" "(dΓΉng βrm -rfβ nαΊΏu bαΊ‘n thα»±c sα»± muα»n gα»‘ bα» nΓ³ cΓΉng vα»i tαΊ₯t cαΊ£ lα»ch sα» của " "chΓΊng)" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12142,141 +12579,178 @@ msgstr "" "CΓ’y lΓ m viα»c mΓ΄-Δun-con β$displaypathβ chα»©a cΓ‘c thay Δα»i nα»i bα»; hΓ£y dΓΉng β-" "fβ Δα» loαΊ‘i bα» chΓΊng Δi" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "ΔΓ£ tαΊ‘o thΖ° mα»₯c β$displaypathβ" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "KhΓ΄ng thα» gα»‘ bα» cΓ’y lΓ m viα»c mΓ΄-Δun-con β$displaypathβ" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "KhΓ΄ng thα» tαΊ‘o thΖ° mα»₯c mΓ΄-Δun-con rα»ng β$displaypathβ" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "MΓ΄-Δun-con β$nameβ ($url) Δược bα» ΔΔng kΓ½ cho ΔΖ°α»ng dαΊ«n β$displaypathβ" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ chΖ°a Δược khα»i tαΊ‘o.\n" -"CΓ³ lαΊ½ bαΊ‘n muα»n sα» dα»₯ng lα»nh βupdate --initβ?" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "KhΓ΄ng tΓ¬m thαΊ₯y Δiα»m xΓ©t duyα»t hiα»n hΓ nh trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con " "β$displaypathβ" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "KhΓ΄ng thα» lαΊ₯y vα» trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$sm_pathβ" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "KhΓ΄ng thα» lαΊ₯y vα» trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "KhΓ΄ng thα» lαΊ₯y ra β$sha1β trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ: ΔΓ£ checkout β$sha1β" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "KhΓ΄ng thα» cαΊ£i tα» β$sha1β trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ: Δược rebase vΓ o trong β$sha1β" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "KhΓ΄ng thα» hΓ²a trα»n (merge) β$sha1β trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ: Δược hΓ²a trα»n vΓ o β$sha1β" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Thα»±c hiα»n khΓ΄ng thΓ nh cΓ΄ng lα»nh β$command $sha1β trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con " -"β$prefix$sm_pathβ" +"β$displaypathβ" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$prefix$sm_pathβ: β$command $sha1β" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ: β$command $sha1β" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "GαΊ·p lα»i khi Δα» quy vΓ o trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "TΓΉy chα»n --cached khΓ΄ng thα» dΓΉng cΓΉng vα»i tΓΉy chα»n --files" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chαΊΏ Δα» khΓ΄ng nhΖ° mong chα» $mod_dst" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " CαΊ£nh bΓ‘o: $display_name khΓ΄ng chα»©a lαΊ§n chuyα»n giao $sha1_src" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " CαΊ£nh bΓ‘o: $display_name khΓ΄ng chα»©a lαΊ§n chuyα»n giao $sha1_dst" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " CαΊ£nh bΓ‘o: $display_name khΓ΄ng chα»©a nhα»―ng lαΊ§n chuyα»n giao $sha1_src vΓ " "$sha1_dst" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "GαΊ·p lα»i khi Δα» quy vΓ o trong ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$sm_pathβ" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Url MΓ΄-Δun-con Δα»ng bα» hΓ³a cho β$displaypathβ" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Xem git-${cmd}(1) Δα» biαΊΏt thΓͺm chi tiαΊΏt." + +#~ msgid "'%s': %s" +#~ msgstr "β%sβ: %s" + +#~ msgid "unable to access '%s': %s" +#~ msgstr "khΓ΄ng thα» truy cαΊp β%sβ: %s" + +#~ msgid "could not open '%s' for reading: %s" +#~ msgstr "khΓ΄ng thα» mα» β%sβ Δα» Δα»c: %s" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "KhΓ΄ng thα» mα» β%sβ Δα» ghi: %s" + +#~ msgid " git branch -d %s\n" +#~ msgstr " git branch -d %s\n" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "khΓ΄ng thα» mα» %s: %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "Vui lΓ²ng ΔΖ°a cΓ‘c thay Δα»i của bαΊ‘n vΓ o β.gitmodulesβ hay tαΊ‘m cαΊ₯t chΓΊng Δi " +#~ "Δα» xα» lΓ½" + +#~ msgid "could not verify the tag '%s'" +#~ msgstr "khΓ΄ng thα» thαΊ©m tra thαΊ» β%sβ" + +#~ msgid "failed to remove: %s" +#~ msgstr "gαΊ·p lα»i khi gα»‘ bα»: %s" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "TΓΉy chα»n --exec phαΊ£i Δược sα» dα»₯ng cΓΉng vα»i tΓΉy chα»n --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "ΔΖ°α»ng dαΊ«n mΓ΄-Δun-con β$displaypathβ chΖ°a Δược khα»i tαΊ‘o.\n" +#~ "CΓ³ lαΊ½ bαΊ‘n muα»n sα» dα»₯ng lα»nh βupdate --initβ?" + #~ msgid "Forward-port local commits to the updated upstream head" #~ msgstr "" #~ "Chuyα»n tiαΊΏp nhα»―ng lαΊ§n chuyα»n giao nα»i bα» tα»i head thượng nguα»n ΔΓ£ cαΊp nhαΊt" @@ -12339,9 +12813,6 @@ msgstr "Url MΓ΄-Δun-con Δα»ng bα» hΓ³a cho β$displaypathβ" #~ msgid "Could not append '%s'" #~ msgstr "KhΓ΄ng thα» nα»i thΓͺm β%sβ" -#~ msgid "Could not set '%s'" -#~ msgstr "KhΓ΄ng thα» ΔαΊ·t β%sβ" - #~ 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" @@ -12689,13 +13160,6 @@ msgstr "Url MΓ΄-Δun-con Δα»ng bα» hΓ³a cho β$displaypathβ" #~ msgstr "cΓ‘c ΔΖ°α»ng dαΊ«n Δược ngΔn cΓ‘ch bα»i kΓ½ tα»± null" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "CΓ‘c tαΊp tin chΖ°a Δược theo dΓ΅i sau ΔΓ’y KHΓNG Δược ghi lαΊ‘i nhΖ°ng cαΊ§n Δược " -#~ "gα»‘ bα» bα»i viα»c ghi lαΊ‘i stash:" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "" #~ "BΓ£i bα». CΓ’n nhαΊ―c dΓΉng mα»t trong hai tΓΉy chα»n --force vΓ --include-" diff --git a/po/zh_CN.po b/po/zh_CN.po index a6b06f9..36db9fe 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -135,8 +135,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-03-16 00:16+0800\n" -"PO-Revision-Date: 2016-03-16 00:18+0800\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-06-06 23:05+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -158,7 +158,7 @@ msgstr "" "θ―·ε¨ε·₯δ½εΊζΉζ£ζδ»ΆοΌηΆει
ζ
δ½Ώη¨ 'git add/rm <ζδ»Ά>' ε½δ»€ζ θ°\n" "解ε³ζΉζ‘εΉΆζδΊ€γ" -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "ζ¨ε°ζͺη»ζζ¨ηεεΉΆοΌεε¨ MERGE_HEADοΌγ" @@ -201,7 +201,7 @@ msgstr "ζ ΌεΌ" msgid "archive format" msgstr "ε½ζ‘£ζ ΌεΌ" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "εηΌ" @@ -209,9 +209,9 @@ msgstr "εηΌ" msgid "prepend prefix to each pathname in the archive" msgstr "δΈΊε½ζ‘£δΈζ―δΈͺθ·―εΎεε δΈεηΌ" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -245,7 +245,8 @@ msgstr "εηΌ©ζζζ΄ε₯½" msgid "list supported archive formats" msgstr "εεΊζ―ζηε½ζ‘£ζ ΌεΌ" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "δ»εΊ" @@ -392,11 +393,16 @@ msgstr "ζ§δΉη对豑εοΌ'%s'γ" msgid "Not a valid branch point: '%s'." msgstr "ζ ζηεζ―ηΉοΌ'%s'γ" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ε·²η»ζ£εΊε° '%s'" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "ε·₯δ½εΊ %s η HEAD ζε沑ζθ’«ζ΄ζ°" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -407,7 +413,7 @@ msgstr "'%s' δΈεζ―δΈδΈͺ v2 ηζ¬ηε
ζδ»Ά" msgid "unrecognized header: %s%s (%d)" msgstr "ζͺθ½θ―ε«ηε
倴οΌ%s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "δΈθ½ζεΌ '%s'" @@ -416,10 +422,10 @@ msgstr "δΈθ½ζεΌ '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "δ»εΊδΈηΌΊε°θΏδΊεΏ
ε€ηζδΊ€οΌ" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "ηζ¬ιεθΎη½ε€±θ΄₯" @@ -458,21 +464,21 @@ msgstr "rev-list η»ζ’" msgid "ref '%s' is excluded by the rev-list options" msgstr "εΌη¨ '%s' θ’« rev-list ιι‘Ήζι€" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "ζͺθ½θ―ε«ηεζ°οΌ%s" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "δΈθ½εε»Ίη©Ίε
γ" -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "δΈθ½εε»Ί '%s'" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "index-pack η»ζ’" @@ -481,8 +487,8 @@ msgstr "index-pack η»ζ’" msgid "invalid color value: %.*s" msgstr "ζ ζηι’θ²εΌοΌ%.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "δΈθ½θ§£ζ %s" @@ -516,21 +522,21 @@ msgstr "ι
η½ει '%2$s' ηζ°εεεΌ '%1$s' θΎη½ιθ――: %3$s" msgid "failed to expand user dir in: '%s'" msgstr "ζ ζ³ζ©ε± '%s' δΈηη¨ζ·ηε½" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "ιθ――η zlib εηΌ©ηΊ§ε« %d" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "ζ ζη对豑ε建樑εΌοΌ%s" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "ζ ζ³θ§£ζε½δ»€θ‘δΈηι
η½" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "ε¨θ―»ει
η½ζδ»ΆζΆιε°ζͺη₯ιθ――" @@ -549,24 +555,27 @@ msgstr "ε¨ζδ»Ά '%2$s' η第 %3$d θ‘εη°ιθ――ηι
η½ει '%1$s'" msgid "%s has multiple values" msgstr "%s ζε€δΈͺεεΌ" -#: config.c:2226 +#: config.c:2224 #, c-format -msgid "Could not set '%s' to '%s'" +msgid "could not set '%s' to '%s'" msgstr "δΈθ½θΎη½ '%s' δΈΊ '%s'" +#: config.c:2226 +#, c-format +msgid "could not unset '%s'" +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" +msgid "failed write to rev-list" +msgstr "ζ ζ³εε
₯ rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "ζ ζ³ε
³ι rev-list ηζ εθΎε
₯οΌ%s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "ζ ζ³ε
³ι rev-list ηζ εθΎε
₯" #: date.c:95 msgid "in the future" @@ -641,28 +650,28 @@ msgstr[1] "%lu εΉ΄ε" msgid "failed to read orderfile '%s'" msgstr "ζ ζ³θ―»εζεΊζδ»Ά '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "ζ£ε¨θΏθ‘ιη²Ύη‘ηιε½εζ£ζ΅" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " ζ ζ³θ§£ζ dirstat ζͺζ’οΌcut-offοΌηΎεζ― '%s'\n" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " ζͺη₯η dirstat εζ° '%s'\n" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "ι
η½ει 'diff.submodule' ζͺη₯ηεεΌοΌ'%s'" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -671,16 +680,16 @@ msgstr "" "εη°ι
η½ει 'diff.dirstat' δΈηιθ――οΌ\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "ε€ι¨ diff ιεΊοΌεζ’ε¨ %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow εζ°εεͺθ·δΈδΈͺ pathspec" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -689,20 +698,20 @@ msgstr "" "ζ ζ³θ§£ζ --dirstat/-X ιι‘Ήηεζ°οΌ\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "ζ ζ³θ§£ζ --submodule ιι‘Ήηεζ°οΌ'%s'" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "ζ ζ³θ·εΎε
ζ Έεη§°εδΏ‘ζ―" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "ηΌεζͺθ·θΈͺζδ»Άε¨ζ¬η³»η»ζδ½η½δΈθ’«η¦η¨γ" -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "δΈθ½ζ§θ‘ gpgγ" @@ -716,28 +725,28 @@ msgstr "gpg ζ ζ³δΈΊζ°ζηΎε" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "δΈθ½εε»ΊδΈ΄ζΆζδ»Ά '%s'οΌ%s" +msgid "could not create temporary file '%s'" +msgstr "δΈθ½εε»ΊδΈ΄ζΆζδ»Ά '%s'" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "ζ ζ³ε°ε离εΌηΎεεε
₯ '%s'οΌ%s" +msgid "failed writing detached signature to '%s'" +msgstr "ζ ζ³ε°ε离εΌηΎεεε
₯ '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'οΌζ ζ³θ―»ε %s" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s'οΌ%s" +msgid "failed to stat '%s'" +msgstr "ζ ζ³ζδΈΎ '%s' ηΆζ" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s'οΌθ―»εδΈεζ΄ %s" +msgid "'%s': short read" +msgstr "'%s'οΌθ―»εδΈεζ΄" #: help.c:205 #, c-format @@ -803,12 +812,35 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%sοΌ%s - %s" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"ζ ζ³εε»Ί '%s.lock'οΌ%sγ\n" +"\n" +"δΌΌδΉε¦ε€δΈδΈͺ git θΏη¨ε¨θΏδΈͺδ»εΊδΈθΏθ‘οΌδΎε¦οΌ'git commit' ε½δ»€ζ\n" +"εΌδΊδΈδΈͺηΌθΎε¨γθ―·η‘θ€ζζθΏη¨ι½ε·²η»ε
³ιηΆειθ―γε¦ζδ»ηΆζ₯ιοΌ\n" +"ε―θ½δΉεζδΈδΈͺ git θΏη¨ε¨θΏδΈͺδ»εΊδΈεΌεΈΈιεΊοΌ\n" +"ζε¨ε ι€θΏδΈͺζδ»Άε继η»γ" + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "δΈθ½εε»Ί '%s.lock'οΌ%s" + #: merge.c:41 msgid "failed to read the cache" msgstr "ζ ζ³θ―»εηΌε" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "ζ ζ³εζ°ηη΄’εΌζδ»Ά" @@ -855,7 +887,7 @@ msgstr "δΈθ½θ―»ε对豑 %s '%s'" msgid "blob expected for %s '%s'" msgstr "%s '%s' εΊδΈΊζ°ζ对豑" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "ζ ζ³ζεΌ '%s'" @@ -990,7 +1022,7 @@ msgstr "η₯θΏ %sοΌε·²η»εθΏηΈεεεΉΆοΌ" msgid "Auto-merging %s" msgstr "θͺε¨εεΉΆ %s" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "ε樑η»" @@ -1017,50 +1049,50 @@ msgstr "ηε½/ζδ»Ά" msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "ε²ηͺοΌ%1$sοΌοΌε¨ %3$s δΈζδΈδΈͺεδΈΊ %2$s ηηε½γδ»₯ %5$s δΈΊεζ·»ε %4$s" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "ζ·»ε %s" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "δΈ₯ιηεεΉΆιθ――οΌδΈεΊεηγ" -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "ε·²η»ζ―ζζ°ηοΌ" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "ζ ζ³εεΉΆζ %s ε %s" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "ζͺε€ηηθ·―εΎ??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "εεΉΆοΌ" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "εη° %u δΈͺε
±εη₯ε
οΌ" msgstr[1] "εη° %u δΈͺε
±εη₯ε
οΌ" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "εεΉΆζͺθΏεζδΊ€" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "δΈθ½θ§£ζ对豑 '%s'" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "δΈθ½εε
₯η΄’εΌγ" @@ -1090,29 +1122,29 @@ msgstr "εη %s εΌοΌ'%s'" msgid "unable to parse object: %s" msgstr "δΈθ½θ§£ζ对豑οΌ%s" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "η¨ζ³οΌ%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " ζοΌ%s" # θ―θ
οΌδΈΊδΏθ―ε¨θΎεΊδΈε―Ήι½οΌζ³¨ζθ°ζ΄ε₯δΈη©Ίζ ΌοΌ -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "-ζ°ε" @@ -1121,7 +1153,7 @@ msgstr "-ζ°ε" msgid "malformed object name '%s'" msgstr "ιζ³η对豑ε '%s'" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "δΈθ½θΎη½ %s δΈΊη»ε―ε" @@ -1188,7 +1220,7 @@ msgstr "" "沑ζδΈΊ :(exclude) 樑εΌζδΎθ¦εΏ½η₯ηε
εΉγδΉθΈζ¨εΏθ°δΊ\n" "ζ·»ε ':/' ζ '.' οΌ" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "δΈθ½θ§£ζ --pretty ζ ΌεΌ" @@ -1214,23 +1246,23 @@ msgstr "" "θΎη½δΊ GIT_INDEX_VERSIONοΌδ½ζ―εεΌζ ζγ\n" "δ½Ώη¨ηζ¬ %i" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "ζ ζ³ζεΌ '%s' θΏθ‘εε
₯" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "ζ ζ³ε ι€εΌη¨ %sοΌ%s" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "ζ ζ³ε ι€εΌη¨οΌ%s" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "ζ ζ³ε ι€εΌη¨ %s" @@ -1369,93 +1401,93 @@ msgstr "ζ ΌεΌοΌηΌΊε° %%(end) ε
η΄ " msgid "malformed object name %s" msgstr "ιζ³η对豑ε %s" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "δΈθ½εζΆθ·ε %s ε %s θ³ %s" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s ιεΈΈθ·θΈͺ %sοΌθι %s" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s εζΆθ·θΈͺ %s ε %s" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "ε
ι¨ιθ――" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD 沑ζζεδΈδΈͺεζ―" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "沑ζζ€εζ―οΌ'%s'" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ε°ζͺη»εζ― '%s' θΎη½δΈζΈΈ" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "δΈζΈΈεζ― '%s' 沑ζεε¨δΈΊδΈδΈͺθΏη¨θ·θΈͺεζ―" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "ζ¨ιηζ '%s' θ³θΏη¨ '%s' 沑ζζ¬ε°θ·θΈͺεζ―" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "εζ― '%s' 沑ζθΎη½θ¦ζ¨ιηθΏη¨ζε‘ε¨" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "ε '%s' ζ¨ιεΌη¨θ§ζ Όζͺε
ε« '%s'" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "ζ¨ιζ ηζ οΌpush.default ζ― 'nothing'οΌ" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "ζ ζ³θ§£ζ 'simple' ζ¨ιθ³δΈδΈͺεη¬ηηζ " -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "ζ¨ηεζ―εΊδΊ '%s'οΌδ½ζ€δΈζΈΈεζ―ε·²η»δΈεε¨γ\n" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " οΌδ½Ώη¨ \"git branch --unset-upstream\" ζ₯δΏε€οΌ\n" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "ζ¨ηεζ―δΈδΈζΈΈεζ― '%s' δΈθ΄γ\n" -#: remote.c:2084 +#: remote.c:2085 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "ζ¨ηεζ―ι’ε
'%s' ε
± %d δΈͺζδΊ€γ\n" msgstr[1] "ζ¨ηεζ―ι’ε
'%s' ε
± %d δΈͺζδΊ€γ\n" -#: remote.c:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " οΌδ½Ώη¨ \"git push\" ζ₯εεΈζ¨ηζ¬ε°ζδΊ€οΌ\n" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1464,11 +1496,11 @@ msgstr[0] "ζ¨ηεζ―θ½ε '%s' ε
± %d δΈͺζδΊ€οΌεΉΆδΈε―δ»₯εΏ«θΏγ\n" msgstr[1] "ζ¨ηεζ―θ½ε '%s' ε
± %d δΈͺζδΊ€οΌεΉΆδΈε―δ»₯εΏ«θΏγ\n" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " οΌδ½Ώη¨ \"git pull\" ζ₯ζ΄ζ°ζ¨ηζ¬ε°εζ―οΌ\n" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1484,20 +1516,20 @@ msgstr[1] "" "εΉΆδΈεε«ζ %d ε %d ε€δΈεηζδΊ€γ\n" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " οΌδ½Ώη¨ \"git pull\" ζ₯εεΉΆθΏη¨εζ―οΌ\n" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "ζ¨ηε½εεζ―ε₯½εθ’«ζε" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ζ¨ηε½εεζ― '%s' ε°ζ δ»»δ½ζδΊ€" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent δΈ --bisect δΈε
ΌεΉ" @@ -1545,7 +1577,7 @@ msgstr "" "ε²ηͺ解ε³εζ―εοΌη¨ 'git add <θ·―εΎ>' ζ 'git rm <θ·―εΎ>'\n" "ε―ΉδΏζ£εηζδ»Άεζ θ°οΌηΆεη¨ 'git commit' ζδΊ€" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "δΈθ½εε
₯ %s" @@ -1703,12 +1735,12 @@ msgstr "ε°θ― \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "δΈθ½εε»ΊεΊεηε½ %s" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "ιθ――ζΆε°Ύ %sγ" -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "ζ£ιζθΏεζδ½εΉΆζͺθΏθ‘" @@ -1720,63 +1752,72 @@ msgstr "δΈθ½θ§£ζ HEAD" msgid "cannot abort from a branch yet to be born" msgstr "δΈθ½δ»ε°ζͺε»Ίη«ηεζ―η»ζ’" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "δΈθ½ζεΌ %sοΌ%s" +msgid "cannot open %s" +msgstr "δΈθ½ζεΌ %s" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "δΈθ½θ―»ε %sοΌ%s" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "ζε€ηζδ»Άη»ζ" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "δΏεζ£ιζδΊ€εη HEAD ζδ»Ά '%s' ζε" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "δΈθ½ζ ΌεΌε %sγ" -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%sοΌδΈθ½ζ£ιδΈδΈͺ%s" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%sοΌιθ――ηηζ¬" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "δΈθ½δ½δΈΊεε§ζδΊ€θΏε" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "δΈθ½ζ£ιε°η©Ίεζ―" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "ζ ζ³θ―»ε %s" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "ζζ git δ»εΊηζ¬ <= %dοΌε΄εΎε° %d" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "εη°ζͺη₯ηδ»εΊζ©ε±οΌ" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "ε移ιε¨ε
ζδ»Άη»ζδΉεοΌζεη .idxοΌοΌ" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "ε移ιε¨ %s ηε
η΄’εΌεΌε§δΉεοΌζεηη΄’εΌοΌοΌ" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "ε移ιθΆθΏδΊ %s ηε
η΄’εΌηη»ε°ΎοΌθ’«ζͺζηη΄’εΌοΌοΌ" @@ -1802,29 +1843,38 @@ msgstr "" "ε―θ½ιθ¦ε ι€ε们γη¨ \"git config advice.objectNameWarning false\"\n" "ε½δ»€ε
³ιζ¬ζΆζ―ιη₯γ" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "ζ ζ³δΏζΉζͺεεΉΆη .gitmodulesοΌε
解ε³εεΉΆε²ηͺ" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "ζ ζ³ε¨ .gitmodules δΈζΎε° path=%s ηε°θ" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "δΈθ½ζ΄ζ° .gitmodules ζ‘η %s" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "ζ ζ³η§»ι€ %s η .gitmodules ζ‘η" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "ε°ζ΄ζ°ε .gitmodules ζ·»ε ζεεΊε€±θ΄₯" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "submodule.fetchJobs δΈε
θΈδΈΊθ΄εΌ" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "%s ηεΌζ ζ" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1884,7 +1934,219 @@ msgstr "δΈθ½ιε½εδΈ΄ζΆζδ»ΆδΈΊ %s" msgid "Could not read ref %s" msgstr "δΈθ½θ―»εεΌη¨ %s" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"ζ¨ε―ΉδΈεζδ»Άηζ¬ε°δΏζΉε°θ’«ζ£εΊζδ½θ¦ηοΌ\n" +"%%sθ―·ε¨εζ’εζ―εζδΊ€ζ¨ηδΏζΉζθ
δΏεθΏεΊ¦γ" + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"ζ¨ε―ΉδΈεζδ»Άηζ¬ε°δΏζΉε°θ’«ζ£εΊζδ½θ¦ηοΌ\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"ζ¨ε―ΉδΈεζδ»Άηζ¬ε°δΏζΉε°θ’«εεΉΆζδ½θ¦ηοΌ\n" +"%%sθ―·ε¨εεΉΆεζδΊ€ζ¨ηδΏζΉζθ
δΏεθΏεΊ¦γ" + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"ζ¨ε―ΉδΈεζδ»Άηζ¬ε°δΏζΉε°θ’«εεΉΆζδ½θ¦ηοΌ\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"ζ¨ε―ΉδΈεζδ»Άηζ¬ε°δΏζΉε°θ’« %s θ¦ηοΌ\n" +"%%sθ―·ε¨ %s δΉεζδΊ€ζ¨ηδΏζΉζθ
δΏεθΏεΊ¦γ" + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"ζ¨ε―ΉδΈεζδ»Άηζ¬ε°δΏζΉε°θ’« %s θ¦ηοΌ\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"ζ΄ζ°ε¦δΈηε½ε°δΌδΈ’ε€±ε
ΆδΈζͺθ·θΈͺηζδ»ΆοΌ\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊζ£εΊζδ½θθ’«ε ι€οΌ\n" +"%%sθ―·ε¨εζ’εζ―δΉε移ε¨ζε ι€γ" + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊζ£εΊζδ½θθ’«ε ι€οΌ\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊεεΉΆζδ½θθ’«ε ι€οΌ\n" +"%%sθ―·ε¨εεΉΆε移ε¨ζε ι€γ" + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊεεΉΆζδ½θθ’«ε ι€οΌ\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊ %s ζδ½θθ’«ε ι€οΌ\n" +"%%sθ―·ε¨ %s ε移ε¨ζε ι€γ" + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊ %s ζδ½θθ’«ε ι€οΌ\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊζ£εΊζδ½θθ’«θ¦ηοΌ\n" +"%%sθ―·ε¨εζ’εζ―ε移ε¨ζε ι€γ" + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊζ£εΊζδ½θθ’«θ¦ηοΌ\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊεεΉΆζδ½θθ’«θ¦ηοΌ\n" +"%%sθ―·ε¨εεΉΆε移ε¨ζε ι€γ" + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊεεΉΆζδ½θθ’«θ¦ηοΌ\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊ %s ζδ½θθ’«θ¦ηοΌ\n" +"%%sθ―·ε¨ %s ε移ε¨ζε ι€γ" + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"ε·₯δ½εΊδΈδΈεζͺθ·θΈͺηζδ»Άε°δΌε δΈΊ %s ζδ½θθ’«θ¦ηοΌ\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "ζ‘η '%s' ε '%s' ιε γζ ζ³εεΉΆγ" + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"ζ ζ³ζ΄ζ°η¨ηζ£εΊοΌε¦δΈζ‘ηδΈζ―ζζ°οΌ\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"ε·₯δ½εΊδΈδΈεζδ»Άε°δΌε δΈΊη¨ηζ£εΊθθ’«θ¦ηοΌ\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"ε·₯δ½εΊδΈδΈεζδ»Άε°δΌε δΈΊη¨ηζ£εΊθθ’«ε ι€οΌ\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "η»ζ’δΈ\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "ζ£ε¨ζ£εΊζδ»Ά" @@ -1922,205 +2184,201 @@ msgstr "ζ ζη '..' θ·―εΎηζ΅" msgid "could not open '%s' for reading and writing" msgstr "ζ ζ³ζεΌ '%s' θΏθ‘θ―»ε" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "ζ ζ³ζεΌ '%s' θΏθ‘εε
₯" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "ζ ζ³ζεΌ '%s' θΏθ‘θ―»ε" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "δΈθ½θΏι '%s'οΌ%s" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "δΈθ½θΏι '%s'" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "δΈθ½θ·εε½εε·₯δ½ηε½" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "δΈθ½εε
₯ %s" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "δΈθ½εε
₯ %s" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "δΈθ½ε
³ι %s" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "ζͺεεΉΆηθ·―εΎοΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:176 wt-status.c:203 +#: 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:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " οΌδ½Ώη¨ \"git rm --cached <ζδ»Ά>...\" δ»₯εζΆζεοΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " οΌδ½Ώη¨ \"git add <ζδ»Ά>...\" ζ θ°θ§£ε³ζΉζ‘οΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:184 wt-status.c:188 +#: 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:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " οΌδ½Ώη¨ \"git rm <ζδ»Ά>...\" ζ θ°θ§£ε³ζΉζ‘οΌ" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "θ¦ζδΊ€ηεζ΄οΌ" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "ε°ζͺζεδ»₯ε€ζδΊ€ηεζ΄οΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " οΌδ½Ώη¨ \"git add <ζδ»Ά>...\" ζ΄ζ°θ¦ζδΊ€ηε
εΉοΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " οΌδ½Ώη¨ \"git add/rm <ζδ»Ά>...\" ζ΄ζ°θ¦ζδΊ€ηε
εΉοΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " οΌδ½Ώη¨ \"git checkout -- <ζδ»Ά>...\" δΈ’εΌε·₯δ½εΊηζΉε¨οΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " οΌζδΊ€ζδΈ’εΌε樑η»δΈζͺθ·θΈͺζδΏζΉηε
εΉοΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " οΌδ½Ώη¨ \"git %s <ζδ»Ά>...\" δ»₯ε
ε«θ¦ζδΊ€ηε
εΉοΌ" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "εζΉε ι€οΌ" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "η±ζ们添ε οΌ" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "η±δ»δ»¬ε ι€οΌ" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "η±δ»δ»¬ζ·»ε οΌ" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "η±ζ们ε ι€οΌ" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "εζΉζ·»ε οΌ" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "εζΉδΏζΉοΌ" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "bugοΌζ ζ³ε€ηηζͺεεΉΆηΆζ %x" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "ζ°ζδ»ΆοΌ" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "ζ·θ΄οΌ" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "ε ι€οΌ" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "δΏζΉοΌ" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "ιε½εοΌ" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "η±»εεζ΄οΌ" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "ζͺη₯οΌ" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "ζͺεεΉΆοΌ" # θ―θ
οΌζ«ε°ΎδΈ€δΈͺεθε―θ½θ’«ε εοΌε¦ζηΏ»θ―δΈΊδΈζζ ηΉδΌεΊη°εδΈͺζ±ε -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "ζ°ζδΊ€, " # θ―θ
οΌζ«ε°ΎδΈ€δΈͺεθε―θ½θ’«ε εοΌε¦ζηΏ»θ―δΈΊδΈζζ ηΉδΌεΊη°εδΈͺζ±ε -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "δΏζΉηε
εΉ, " # θ―θ
οΌζ«ε°ΎδΈ€δΈͺεθε―θ½θ’«ε εοΌε¦ζηΏ»θ―δΈΊδΈζζ ηΉδΌεΊη°εδΈͺζ±ε -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "ζͺθ·θΈͺηε
εΉ, " -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "bugοΌζ ζ³ε€ηηε·εΌηΆζ %c" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "ε樑η»ε·²δΏζΉδ½ε°ζͺζ΄ζ°οΌ" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "θ¦ζδΊ€ηε樑η»εζ΄οΌ" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2128,44 +2386,44 @@ msgstr "" "δΈθ¦ζΉε¨δΈι’ηδΈθ‘γ\n" "δΈι’ηζζε
εΉεε°θ’«ε ι€γ" -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "ζ¨ζε°ζͺεεΉΆηθ·―εΎγ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr " οΌθ§£ε³ε²ηͺεΉΆθΏθ‘ \"git commit\"οΌ" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "ζζε²ηͺ已解ε³δ½ζ¨δ»ε€δΊεεΉΆδΈγ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " οΌδ½Ώη¨ \"git commit\" η»ζεεΉΆοΌ" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "ζ¨ζ£ε€δΊ am ζδ½θΏη¨δΈγ" -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "ε½εηθ‘₯δΈδΈΊη©Ίγ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " οΌθ§£ε³ε²ηͺοΌηΆεθΏθ‘ \"git am --continue\"οΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " οΌδ½Ώη¨ \"git am --skip\" θ·³θΏζ€θ‘₯δΈοΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " οΌδ½Ώη¨ \"git am --abort\" ζ’ε€εζεζ―οΌ" @@ -2319,43 +2577,43 @@ msgstr "ζ¨ε¨ζ§θ‘δΊεζ₯ζΎζδ½γ" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " οΌδ½Ώη¨ \"git bisect reset\" δ»₯εε°εζεζ―οΌ" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "δ½δΊεζ― " -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "δΊ€δΊεΌεεΊζδ½ζ£ε¨θΏθ‘δΈοΌθ³ " -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "εεΊζδ½ζ£ε¨θΏθ‘δΈοΌθ³ " -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "倴ζιεη¦»δΊ " -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "倴ζιε离θͺ " -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "ε½εδΈε¨δ»»δ½εζ―δΈγ" -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "εε§ζδΊ€" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "ζͺθ·θΈͺηζδ»Ά" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "εΏ½η₯ηζδ»Ά" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2365,88 +2623,88 @@ msgstr "" "θθ΄ΉδΊ %.2f η§δ»₯ζδΈΎζͺθ·θΈͺηζδ»Άγ'status -uno' δΉθΈθ½ζι«ιεΊ¦οΌ\n" "δ½ζ¨ιθ¦ε°εΏδΈθ¦εΏδΊζ·»ε ζ°ζδ»ΆοΌεθ§ 'git help status'οΌγ" -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "ζͺθ·θΈͺηζ仢沑ζεεΊ%s" # θ―θ
οΌδΈζε符串ζΌζ₯οΌε―ε ι€εε―Όη©Ίζ Ό -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr "οΌδ½Ώη¨ -u εζ°ζΎη€Ίζͺθ·θΈͺηζδ»ΆοΌ" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "沑ζδΏζΉ" -#: wt-status.c:1513 +#: wt-status.c:1535 #, 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:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "δΏζΉε°ζͺε ε
₯ζδΊ€\n" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "ζδΊ€δΈΊη©ΊοΌδ½ζ―εε¨ε°ζͺθ·θΈͺηζδ»ΆοΌδ½Ώη¨ \"git add\" ε»Ίη«θ·θΈͺοΌ\n" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ζδΊ€δΈΊη©ΊοΌδ½ζ―εε¨ε°ζͺθ·θΈͺηζδ»Ά\n" # θ―θ
οΌδΈζε符串ζΌζ₯οΌε―ε ι€εε―Όη©Ίζ Ό -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "ζ ζδ»Άθ¦ζδΊ€οΌεε»Ί/ζ·θ΄ζδ»ΆεΉΆδ½Ώη¨ \"git add\" ε»Ίη«θ·θΈͺοΌ\n" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "ζ ζδ»Άθ¦ζδΊ€\n" # θ―θ
οΌδΈζε符串ζΌζ₯οΌε―ε ι€εε―Όη©Ίζ Ό -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "ζ ζδ»Άθ¦ζδΊ€οΌδ½Ώη¨ -u ζΎη€Ίζͺθ·θΈͺηζδ»ΆοΌ\n" # θ―θ
οΌδΈζε符串ζΌζ₯οΌε―ε ι€εε―Όη©Ίζ Ό -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "ζ ζδ»Άθ¦ζδΊ€οΌεΉ²εηε·₯δ½εΊ\n" # θ―θ
οΌζ³¨ζδΏζε₯ε°Ύη©Ίζ Ό -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "εε§ζδΊ€δΊ " -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "HEADοΌιεζ―οΌ" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "δΈ’ε€±" # θ―θ
οΌζ³¨ζδΏζε₯ε°Ύη©Ίζ Ό -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "θ½ε " -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "ι’ε
" -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "ζ ζ³ε ι€ '%s'" @@ -2460,7 +2718,7 @@ msgstr "git add [<ιι‘Ή>] [--] <θ·―εΎθ§ζ Ό>..." msgid "unexpected diff status %c" msgstr "ζε€ηε·εΌηΆζ %c" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "ζ΄ζ°ζδ»Άε€±θ΄₯" @@ -2473,7 +2731,7 @@ msgstr "ε ι€ '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "ε·ζ°η΄’εΌδΉεε°ζͺθ’«ζεηεζ΄οΌ" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "δΈθ½θ―»εη΄’εΌ" @@ -2509,14 +2767,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "δΈεθ·―εΎζ Ήζζ¨ηδΈδΈͺ .gitignore ζδ»Άθθ’«εΏ½η₯οΌ\n" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "ζΌδΉ " -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "ειΏθΎεΊ" @@ -2524,7 +2782,7 @@ msgstr "ειΏθΎεΊ" msgid "interactive picking" msgstr "δΊ€δΊεΌζ£ι" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "δΊ€δΊεΌζιζ°ζε" @@ -2592,16 +2850,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "δΉθΈζ¨ζ³θ¦ζ§θ‘ 'git add .'οΌ\n" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "η΄’εΌζδ»Άζε" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "ζ ζ³εε
₯ζ°η΄’εΌζδ»Ά" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "δΈθ½θ―»ε '%s'" @@ -2629,16 +2887,6 @@ msgstr "δ» '%s' ζ·θ΄ζ³¨θ§£ε° '%s' ζΆε€±θ΄₯" msgid "fseek failed" msgstr "fseek ε€±θ΄₯" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "ζ ζ³ζεΌ '%s' θΏθ‘θ―»εοΌ%s" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "ζ ζ³ζεΌ '%s' θΏθ‘εε
₯οΌ%s" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2648,73 +2896,73 @@ msgstr "ζ ζ³θ§£ζθ‘₯δΈ '%s'" msgid "Only one StGIT patch series can be applied at once" msgstr "δΈζ¬‘εͺθ½ζδΈδΈͺ StGIT θ‘₯δΈιεθ’«εΊη¨" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "ζ ζηζΆι΄ζ³" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "ζ ζηζ₯ζθ‘" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "ζ ζηζΆεΊε移εΌ" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "θ‘₯δΈζ ΌεΌζ£ζ΅ε€±θ΄₯γ" -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "ζ ζ³εε»Ίηε½ '%s'" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "ζ ζ³ζεθ‘₯δΈγ" -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "ζ ζ³εε
₯η΄’εΌζδ»Ά" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "ε½ζ¨θ§£ε³θΏδΈιι’οΌζ§θ‘ \"%s --continue\"γ" -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "ε¦ζζ¨ζ³θ¦θ·³θΏθΏδΈθ‘₯δΈοΌεζ§θ‘ \"%s --skip\"γ" -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "θ₯θ¦ε€εθ³εε§εζ―εΉΆεζ’θ‘₯δΈζδ½οΌζ§θ‘ \"%s --abort\"γ" -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "θ‘₯δΈδΈΊη©Ίγζ―δΈζ―εειθ――οΌ" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "ε
ε«ζ ζηθΊ«δ»½ζ θ―οΌ%s" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "δΈθ½θ§£ζζδΊ€ %s" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "δ»εΊηΌΊδΉεΏ
θ¦ηζ°ζ对豑δ»₯θΏθ‘δΈζΉεεΉΆγ" -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "δ½Ώη¨η΄’εΌζ₯ιε»ΊδΈδΈͺοΌδΈζΉεεΉΆηοΌεΊη‘ηε½ζ ..." -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2722,37 +2970,37 @@ msgstr "" "ζ¨ζ―ε¦ζΎζε¨ηΌθΎθΏζ¨ηθ‘₯δΈοΌ\n" "ζ ζ³εΊη¨θ‘₯δΈε°η΄’εΌδΈηζ°ζ对豑δΈγ" -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "εθ½ε°εΊη‘ηζ¬δΈζθ‘₯δΈεθΏθ‘δΈζΉεεΉΆ..." -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "ζ ζ³εεΉΆεζ΄γ" -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "git write-tree ζ ζ³εε
₯δΈζ 对豑" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "ζ£εΊη¨ε°δΈδΈͺη©Ίεε²δΈ" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "ζ ζ³εζ亀对豑" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "ζ ζ³η»§η»οΌ%s δΈεε¨γ" -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "ζ εθΎε
₯沑ζεη»η«―ε
³θοΌδΈθ½θΏθ‘δΊ€δΊεΌζδ½γ" -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "ζδΊ€ε
εΉδΈΊοΌ" @@ -2761,35 +3009,35 @@ msgstr "ζδΊ€ε
εΉδΈΊοΌ" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "εΊη¨οΌζ―[y]/ε¦[n]/ηΌθΎ[e]/ζ₯ηθ‘₯δΈ[v]/εΊη¨ζζ[a]οΌ" -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "θη΄’εΌοΌδΈθ½εΊη¨θ‘₯δΈοΌθζδ»ΆοΌ%sοΌ" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "εΊη¨οΌ%.*s" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "沑ζεζ΄ ββ θ‘₯δΈε·²η»εΊη¨θΏγ" -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "ζθ‘₯δΈε€±θ΄₯δΊ %s %.*s" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "ε€±θ΄₯ηθ‘₯δΈζδ»Άε―ζ¬δ½δΊοΌ%s" -#: builtin/am.c:1944 +#: builtin/am.c:1943 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2799,7 +3047,7 @@ msgstr "" "ε¦ζ沑ζδ»δΉθ¦ζ·»ε ε°ζεεΊηοΌεεΎε―θ½ζ―ε
ΆεζδΊ€ε·²η»εΌε
₯δΊηΈεηεζ΄γ\n" "ζ¨δΉθΈζ³θ¦θ·³θΏθΏδΈͺθ‘₯δΈγ" -#: builtin/am.c:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2807,168 +3055,170 @@ msgstr "" "ζ¨ηη΄’εΌδΈδ»ζζͺεεΉΆηθ·―εΎγ\n" "ζ¨ζ―ε¦εΏδΊζ§θ‘ 'git add'οΌ" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "δΈθ½θ§£ζ对豑 '%s'γ" -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "ζ ζ³ζΈ
η©Ίη΄’εΌ" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "ζ¨ε₯½εε¨δΈδΈζ¬‘ 'am' ε€±θ΄₯ε移ε¨δΊ HEADγζͺειθ³ ORIG_HEAD" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "ζ ζη --patch-format εΌοΌ%s" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<ιι‘Ή>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<ιι‘Ή>] (--continue | --skip | --abort)" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "δ»₯δΊ€δΊεΌζΉεΌθΏθ‘" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "θηεζ° ββ ζ δ½η¨" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "ε¦ζεΏ
θ¦οΌε
θΈδ½Ώη¨δΈζΉεεΉΆγ" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "ιι»ζ¨‘εΌ" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "ε¨ζδΊ€θ―΄ζδΈζ·»ε δΈδΈͺ Signed-off-by ηΎε" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "δ½Ώη¨ utf8 ε符ιοΌι»θ€οΌ" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "ε git-mailinfo δΌ ι -k εζ°" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "ε git-mailinfo δΌ ι -b εζ°" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "ε git-mailinfo δΌ ι -m εζ°" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "ιε―Ή mbox ζ ΌεΌοΌε git-mailsplit δΌ ι --keep-cr εζ°" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "δΈε git-mailsplit δΌ ι --keep-cr εζ°οΌθ¦η am.keepcr ηθΎη½" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "δΈ’εΌθ£εηΊΏεηζζε
εΉ" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "ε¨δ½" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "δΌ ιη» git-apply" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "ζ Ήηε½" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "θ·―εΎ" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "ζ°ε" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "ζ ΌεΌ" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "θ‘₯δΈηζ ΌεΌ" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "ζθ‘₯δΈε€±θ΄₯ζΆζΎη€Ίηιθ――δΏ‘ζ―" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "ε²ηͺ解ε³ε继η»εΊη¨θ‘₯δΈ" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "ε --continue εδΉ" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "θ·³θΏε½εθ‘₯δΈ" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "ζ’ε€εε§εζ―εΉΆη»ζ’ζθ‘₯δΈζδ½γ" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "ε°δ½θ
ζ₯ζδ½δΈΊζδΊ€ζ₯ζ" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "η¨ε½εζΆι΄δ½δΈΊδ½θ
ζ₯ζ" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "δ½Ώη¨ GPG ηΎεζδΊ€" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "οΌε
ι¨δ½Ώη¨οΌη¨δΊ git-rebaseοΌ" -#: builtin/am.c:2340 +#: builtin/am.c:2339 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2976,16 +3226,16 @@ msgstr "" "εζ° -b/--binary ε·²η»εΎιΏζΆι΄δΈεδ»»δ½ε质ζδ½δΊοΌεΉΆδΈε°θ’«η§»ι€γ\n" "θ―·δΈθ¦εδ½Ώη¨εδΊγ" -#: builtin/am.c:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "ζ ζ³θ―»εη΄’εΌ" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "δΉεηεεΊηε½ %s δ»ηΆεε¨οΌδ½ε΄ζδΎδΊ mboxγ" -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" @@ -2994,7 +3244,7 @@ msgstr "" "εη°δΊιθ――η %s ηε½γ\n" "δ½Ώη¨ \"git am --abort\" ε ι€εγ" -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "解ε³ζδ½ζͺθΏθ‘οΌζ们δΈδΌη»§η»γ" @@ -3027,37 +3277,37 @@ msgstr "regexec θΏε %dοΌθΎε
₯δΈΊοΌ%s" msgid "unable to find filename in patch at line %d" msgstr "δΈθ½ε¨θ‘₯δΈη第 %d θ‘ζΎε°ζδ»Άε" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git applyοΌιθ――η git-diff - εΊδΈΊ /dev/nullοΌδ½ε¨η¬¬ %2$d θ‘εΎε° %1$s" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git applyοΌιθ――η git-diff - 第 %d θ‘δΈζ°ζδ»ΆεδΈδΈθ΄" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git applyοΌιθ――η git-diff - 第 %d θ‘δΈζ§ζδ»ΆεδΈδΈθ΄" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, 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:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recountοΌζε€ηθ‘οΌ%.*s" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d θ‘ηθ‘₯δΈηζ΅ζ²‘ζ倴俑ζ―οΌ%.*s" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -3068,77 +3318,77 @@ msgid_plural "" msgstr[0] "ε½η§»ι€ %d δΈͺεε―Όθ·―εΎε git diff 倴缺δΉζδ»ΆεδΏ‘ζ―οΌη¬¬ %d θ‘οΌ" msgstr[1] "ε½η§»ι€ %d δΈͺεε―Όθ·―εΎε git diff 倴缺δΉζδ»ΆεδΏ‘ζ―οΌη¬¬ %d θ‘οΌ" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "ζ°ζδ»ΆδΎθ΅ζ§ε
εΉ" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "ε ι€ηζδ»Άδ»ζε
εΉ" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "θ‘₯δΈε¨η¬¬ %d θ‘ζε" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "ζ°ζδ»Ά %s δΎθ΅ζ§ε
εΉ" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "ε ι€ηζδ»Ά %s δ»ζε
εΉ" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** θ¦εοΌζδ»Ά %s ζδΈΊη©Ίζδ»Άδ½εΉΆζͺε ι€" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "δΊθΏεΆθ‘₯δΈε¨η¬¬ %d θ‘ζεοΌ%.*s" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "ζͺθ½θ―ε«ηδΊθΏεΆθ‘₯δΈδ½δΊη¬¬ %d θ‘" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "θ‘₯δΈζδ»Άη第 %d θ‘εͺζεεΎζ°ζ" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "ζ ζ³θ―»ε符ε·ιΎζ₯ %s" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "δΈθ½ζεΌζθ―»ε %s" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "ζ ζηθ‘ι¦ε符οΌ'%c'" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, 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:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "δΈδΈζεε°ε°οΌ%ld/%ldοΌδ»₯ε¨η¬¬ %d θ‘εΊη¨θ‘₯δΈηζ΅" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -3147,319 +3397,329 @@ msgstr "" "ε½ζ₯θ―’οΌ\n" "%.*s" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "ηΌΊε€± '%s' ηδΊθΏεΆθ‘₯δΈζ°ζ" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "δΊθΏεΆθ‘₯δΈζͺεΊη¨ε° '%s'" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "ε° '%s' ηδΊθΏεΆθ‘₯δΈδΊ§ηδΊδΈζ£η‘ηη»ζοΌεΊδΈΊ %sοΌε΄δΈΊ %sοΌ" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "ζθ‘₯δΈε€±θ΄₯οΌ%s:%ld" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "δΈθ½ζ£εΊ %s" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "θ―»ε %s ε€±θ΄₯" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "θ―»εδ½δΊη¬¦ε·ιΎζ₯δΈη '%s'" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "θ·―εΎ %s ε·²η»θ’«ιε½ε/ε ι€" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%sοΌδΈεε¨δΊη΄’εΌδΈ" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%sοΌ%s" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%sοΌεη΄’εΌδΈεΉι
" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "移ι€θ‘₯δΈδ»ηδΈδΊζδ»Άε
εΉ" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%sοΌιθ――η±»ε" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ηη±»εζ― %oοΌεΊδΈΊ %o" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "ζ ζθ·―εΎ '%s'" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%sοΌε·²η»εε¨δΊη΄’εΌδΈ" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%sοΌε·²η»εε¨δΊε·₯δ½εΊδΈ" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s ηζ°ζ¨‘εΌοΌ%1$oοΌεζ§ζ¨‘εΌοΌ%3$oοΌδΈεΉι
" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, 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:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "εε½±εηζδ»Ά '%s' δ½δΊη¬¦ε·ιΎζ₯δΈ" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%sοΌθ‘₯δΈζͺεΊη¨" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "ζ£ζ₯θ‘₯δΈ %s..." -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "ε―Ήθ·―εΎ '%s' η make_cache_entry ζδ½ε€±θ΄₯" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "δΈθ½δ»η΄’εΌδΈη§»ι€ %s" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "εζ¨‘η» %s ζεηθ‘₯δΈ" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "δΈθ½ζδΈΎζ°ε»Ίζδ»Ά '%s' ηηΆζ" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "δΈθ½δΈΊζ°ε»Ίζδ»Ά %s εε»Ίεη«―εε¨" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "ζ ζ³δΈΊ %s ζ·»ε ηΌεζ‘η" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "ε
³ιζδ»Ά '%s'" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "δΈθ½εζδ»Ά '%s' ζι %o" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "ζεεΊη¨θ‘₯δΈ %sγ" -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "ε
ι¨ιθ――" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, 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:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "ζͺη .rej ζδ»ΆεδΈΊ %.*s.rej" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "δΈθ½ζεΌ %sοΌ%s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d δΈͺηζ΅ζεεΊη¨γ" -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "ζη»η¬¬ #%d δΈͺηζ΅γ" -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "η₯θΏθ‘₯δΈ '%s'γ" + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "ζͺθ½θ―ε«ηθΎε
₯" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "ζ ζ³θ―»εη΄’εΌζδ»Ά" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "δΈθ¦εΊη¨δΈη»εΊθ·―εΎεεΉι
ηεζ΄" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "εΊη¨δΈη»εΊθ·―εΎεεΉι
ηεζ΄" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "δ»δΌ η»η diff θ·―εΎδΈη§»ι€ζεζ°ιηεε―ΌζηΊΏ" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "εΏ½η₯θ‘₯δΈδΈηζ·»ε ηζδ»Ά" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "δΈεΊη¨θ‘₯δΈοΌθζ―ζΎη€ΊθΎε
₯ηε·εΌη»θ‘οΌdiffstatοΌ" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "δ»₯εθΏεΆζ°ζΎη€Ίζ·»ε εε ι€ηθ‘ζ°" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "δΈεΊη¨θ‘₯δΈοΌθζ―ζΎη€ΊθΎε
₯ηζ¦θ¦" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "δΈεΊη¨θ‘₯δΈοΌθζ―ζ₯ηθ‘₯δΈζ―ε¦ε―εΊη¨" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "η‘θ€θ‘₯δΈε―δ»₯εΊη¨ε°ε½εη΄’εΌ" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "εΊη¨θ‘₯δΈθδΈδΏζΉε·₯δ½εΊ" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "ζ₯εδΏζΉε·₯δ½εΊδΉε€ζδ»Άηθ‘₯δΈ" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "θΏεΊη¨ζ€θ‘₯δΈοΌδΈ --stat/--summary/--check ιι‘ΉεζΆδ½Ώη¨οΌ" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "ε¦ζδΈδΈͺθ‘₯δΈδΈθ½εΊη¨εε°θ―δΈζΉεεΉΆ" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "εε»ΊδΈδΈͺδΈ΄ζΆη΄’εΌεΊδΊε΅ε
₯ηη΄’εΌδΏ‘ζ―" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "θ·―εΎδ»₯ NUL ε符ει" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "η‘δΏθ³ε°εΉι
<n> θ‘δΈδΈζ" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "ζ£ζ₯ζ°ε’εδΏζΉηθ‘δΈι΄ηη©Ίη½ε符ζ»₯η¨" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ζ₯ζΎδΈδΈζζΆεΏ½η₯η©Ίη½ε符ηεζ΄" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "εεεΊη¨θ‘₯δΈ" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "ζ ιθ³ε°δΈθ‘δΈδΈζ" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "ε°ζη»ηθ‘₯δΈηζ΅δΏεε¨ε―ΉεΊη *.rej ζδ»ΆδΈ" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "ε
θΈιε ηθ‘₯δΈηζ΅" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "ε
θΈδΈζ£η‘ηζδ»Άζ«ε°Ύζ’θ‘符" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "δΈδΏ‘δ»»θ‘₯δΈηζ΅η倴俑ζ―δΈηθ‘ε·" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "δΈΊζζζδ»Άεεζ·»ε <ζ Ήηε½>" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way ε¨δΈδΈͺδ»εΊδΉε€" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index ε¨δΈδΈͺδ»εΊδΉε€" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached ε¨δΈδΈͺδ»εΊδΉε€" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "δΈθ½ζεΌθ‘₯δΈ '%s'" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "ζεΆδΈδ»ζ %d δΈͺη©Ίη½ε符误η¨" msgstr[1] "ζεΆδΈδ»ζ %d δΈͺη©Ίη½ε符误η¨" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3525,99 +3785,99 @@ msgstr "<ηζ¬ιι‘Ή> ηζζ‘£θ°ε½ε¨ git-rev-list(1) δΈ" msgid "Blaming lines" msgstr "θΏ½θΈͺ代η θ‘" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "ε’ιεΌε°ζΎη€Ίεη°η blame ζ‘η" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "θΎΉηζδΊ€ζΎη€Ίη©Ίη SHA-1οΌι»θ€οΌε
³ιοΌ" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "δΈζζ ΉζδΊ€δ½δΈΊθΎΉηοΌι»θ€οΌε
³ιοΌ" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "ζΎη€Ίε½δ»€ζΆθη»θ‘" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "εΌΊεΆθΏεΊ¦ζΎη€Ί" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "ζΎη€Ίε€ζ blame ζ‘ηδ½η§»ηεΎεθ―ζδΏ‘ζ―" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "ζΎη€Ίεε§ζδ»ΆεοΌι»θ€οΌθͺε¨οΌ" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "ζΎη€Ίεε§ηθ‘ε·οΌι»θ€οΌε
³ιοΌ" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "ζΎη€ΊδΈΊδΈδΈͺιεζΊε¨θ―»εηζ ΌεΌ" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "δΈΊζ―δΈθ‘ζΎη€ΊζΊε¨ιη¨ηζδΊ€δΏ‘ζ―" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "δ½Ώη¨ε git-annotate ηΈεηθΎεΊζ¨‘εΌοΌι»θ€οΌε
³ιοΌ" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "ζΎη€Ίεε§ζΆι΄ζ³οΌι»θ€οΌε
³ιοΌ" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "ζΎη€ΊιΏη SHA1 ζδΊ€ε·οΌι»θ€οΌε
³ιοΌ" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "ιθδ½θ
εεεζΆι΄ζ³οΌι»θ€οΌε
³ιοΌ" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "ζΎη€Ίδ½θ
ηιη±θδΈζ―εεοΌι»θ€οΌε
³ιοΌ" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "εΏ½η₯η©Ίη½ε·εΌ" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "θ±θ΄Ήι’ε€ηεΎͺη―ζ₯ζΎε°ζ΄ε₯½ηεΉι
" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "δ½Ώη¨ζ₯θͺ <ζδ»Ά> ηδΏθ’ιθδΈζ―θ°η¨ git-rev-list" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "δ½Ώη¨ <ζδ»Ά> ηε
εΉδ½δΈΊζη»ηεΎη" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "εΎε" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "ζΎε°ζδ»Άε
εθ·¨ζδ»Άηθ‘ζ·θ΄" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "ζΎε°ζδ»Άε
εθ·¨ζδ»Άηθ‘移ε¨" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "εͺε€ηθ‘θε΄ε¨ n ε m δΉι΄ηοΌδ» 1 εΌε§" @@ -3627,32 +3887,32 @@ 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:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "4 εΉ΄ 11 δΈͺζε" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<ιι‘Ή>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<ιι‘Ή>] [-l] [-f] <εζ―ε> [<θ΅·ε§ηΉ>]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<ιι‘Ή>] [-r] (-d | -D) <εζ―ε>..." -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<ιι‘Ή>] (-m | -M) [<ζ§εζ―>] <ζ°εζ―>" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<ιι‘Ή>] [-r | -a] [--points-at]" # θ―θ
οΌδΏζεζ’θ‘ζ ΌεΌοΌε¨θΎεΊζΆ %s ηζΏδ»£ε
εΉδΌθ©ε符串ειΏ -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3662,7 +3922,7 @@ msgstr "" " '%s'οΌδ½ζͺεεΉΆε° HEADγ" # θ―θ
οΌδΏζεζ’θ‘ζ ΌεΌοΌε¨θΎεΊζΆ %s ηζΏδ»£ε
εΉδΌθ©ε符串ειΏ -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3671,12 +3931,12 @@ msgstr "" "εΉΆζͺε ι€εζ― '%s'οΌ θ½ηΆεε·²η»εεΉΆε° HEADοΌ\n" " ηΆθε΄ε°ζͺθ’«εεΉΆε°εζ― '%s' γ" -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "ζ ζ³ζ₯θ―’ '%s' ζεηζ亀对豑" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3685,335 +3945,356 @@ msgstr "" "εζ― '%s' 沑ζεε
¨εεΉΆγ\n" "ε¦ζζ¨η‘θ€θ¦ε ι€εοΌζ§θ‘ 'git branch -D %s'γ" -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "ζ ζ³ζ΄ζ° config ζδ»Ά" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "δΈθ½ε° -a ε -d εζΆδ½Ώη¨" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "ζ ζ³ζ₯θ―’ HEAD ζεηζ亀对豑" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "ζ ζ³ε ι€ζ¨ε½εζε¨ηεζ― '%s'γ" +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "ζ ζ³ε ι€ζ£εΊδΊ '%2$s' ηεζ― '%1$s'γ" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "ζͺθ½ζΎε°θΏη¨θ·θΈͺεζ― '%s'γ" -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "εζ― '%s' ζͺεη°γ" -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "ζ ζ³ε ι€θΏη¨θ·θΈͺεζ― '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "ζ ζ³ε ι€εζ― '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "ε·²ε ι€θΏη¨θ·θΈͺεζ― %sοΌζΎδΈΊ %sοΌγ\n" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "ε·²ε ι€εζ― %sοΌζΎδΈΊ %sοΌγ\n" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: δΈ’ε€±]" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%sοΌθ½ε %d]" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[θ½ε %d]" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%sοΌι’ε
%d]" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[ι’ε
%d]" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%sοΌι’ε
%dοΌθ½ε %d]" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[ι’ε
%dοΌθ½ε %d]" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** ζ ζεΌη¨ ****" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "οΌιεζ―οΌζ£εεΊ %sοΌ" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "οΌιεζ―οΌδΊεζ₯ζΎεΌε§δΊ %sοΌ" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "οΌε€΄ζιεη¦»δΊ %sοΌ" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "οΌε€΄ζιε离θͺ %sοΌ" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "οΌιεζ―οΌ" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "εζ― %s ζ£θ’«εεΊε° %s" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "εζ― %s ζ£θ’«δΊεζ₯ζΎδΊ %s" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "ζ ζ³ιε½εε½εεζ―ε δΈΊδΈε€δΊδ»»δ½εζ―δΈγ" -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "ζ ζηεζ―εοΌ'%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "εζ―ιε½εε€±θ΄₯" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "ιε½εζδΈδΈͺιθ――ε½εηζ§εζ― '%s'" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "εζ―ιε½εδΈΊ %sοΌδ½ HEAD 沑ζζ΄ζ°οΌ" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "εζ―θ’«ιε½εοΌδ½ζ΄ζ° config ζδ»Άε€±θ΄₯" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" -msgstr "δΈθ½εεζ―ζ述樑ηοΌ%s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "δΈθ½εεζ―ζ述樑η" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "ιη¨ιι‘Ή" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "ζΎη€ΊεεΈεΌεδΈ»ι’οΌθ₯εζ°εΊη°δΈ€ζ¬‘εζΎη€ΊδΈζΈΈεζ―" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "δΈζΎη€ΊδΏ‘ζ―" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "θΎη½θ·θΈͺ樑εΌοΌεθ§ git-pull(1)οΌ" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "ζΉεδΈζΈΈδΏ‘ζ―" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "δΈζΈΈ" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "ζΉεδΈζΈΈδΏ‘ζ―" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "δ½Ώη¨ε½©θ²θΎεΊ" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "δ½η¨δΊθΏη¨θ·θΈͺεζ―" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "εͺζε°ε
ε«θ―₯ζδΊ€ηεζ―" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "ε
·δ½η git-branch ε¨δ½οΌ" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "εεΊθΏη¨θ·θΈͺεζ¬ε°εζ―" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "ε ι€εε
¨εεΉΆηεζ―" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "ε ι€εζ―οΌε³δ½Ώζ²‘ζεεΉΆοΌ" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "移ε¨/ιε½εδΈδΈͺεζ―οΌδ»₯εεηεΌη¨ζ₯εΏ" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "移ε¨/ιε½εδΈδΈͺεζ―οΌε³δ½Ώηζ ε·²εε¨" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "εεΊεζ―ε" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "εε»Ίεζ―ηεΌη¨ζ₯εΏ" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "ζ θ°εζ―ηζθΏ°" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "εΌΊεΆεε»Ίγ移ε¨/ιε½εγε ι€" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "εͺζε°ε·²η»εεΉΆηεζ―" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "εͺζε°ε°ζͺεεΉΆηεζ―" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "δ»₯εηζΉεΌζΎη€Ίεζ―" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "key" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "ζεΊηεζ΅ε" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "对豑" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "εͺζε°ζεθ―₯对豑ηεζ―" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "ζ ζ³ε° HEAD 解ζδΈΊζζεΌη¨γ" -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD 沑ζδ½δΊ /refs/heads δΉδΈοΌ" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column ε --verbose δΈε
ΌεΉ" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "εΏ
ι‘»ζδΎεζ―ε" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "δΈθ½εε离倴ζιζδΎζθΏ°" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "δΈθ½δΈΊδΈδΈͺδ»₯δΈηεζ―ηΌθΎζθΏ°" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "εζ― '%s' ε°ζ ζδΊ€γ" -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "沑ζεζ― '%s'γ" -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "δΈΊιε½εζδ½ζδΎδΊε€ͺε€ηεζ―ε" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "δΈΊθΎη½ζ°δΈζΈΈζδΎδΊε€ͺε€ηεζ―ε" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, 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:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "沑ζζ€εζ― '%s'" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "εζ― '%s' δΈεε¨" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "δΈΊεζΆδΈζΈΈθΎη½ζδ½ζδΎδΊε€ͺε€ηεζ―ε" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "ζ ζ³εζΆ HEAD ηδΈζΈΈθΎη½ε δΈΊε沑ζζεδΈδΈͺεζ―" -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "εζ― '%s' 沑ζδΈζΈΈδΏ‘ζ―" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "ζε·₯εε»Ί 'HEAD' 沑ζζδΉ" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' η -a ε -r ιι‘ΉεΈ¦δΈδΈͺεζ―εεζ°ζ²‘ζζδΉ" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -4021,7 +4302,7 @@ msgid "" msgstr "" "ιι‘Ή --set-upstream ε·²εΌη¨εΉΆε°θ’«η§»ι€γθθδ½Ώη¨ --track ζ --set-upstream-to\n" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -4032,16 +4313,6 @@ msgstr "" "ε¦ζδ½ ζ³η¨ '%s' θ·θΈͺ '%s', θΏδΉεοΌ\n" "\n" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -4139,7 +4410,7 @@ msgstr "δ»ζ εθΎε
₯θ―»εΊζδ»Άε" msgid "terminate input and output records by a NUL character" msgstr "θΎε
₯εθΎεΊηθ°ε½δ½Ώη¨ NUL ε符η»η»" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "δΈζΎη€ΊθΏεΊ¦ζ₯ε" @@ -4229,8 +4500,9 @@ msgid "write the content to temporary files" msgstr "ε°ε
εΉεε
₯δΈ΄ζΆζδ»Ά" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "ε符串" @@ -4280,80 +4552,80 @@ msgstr "path '%s'οΌζ ζ³εεΉΆ" msgid "Unable to add merge result for '%s'" msgstr "ζ ζ³δΈΊ '%s' ζ·»ε εεΉΆη»ζ" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' δΈθ½ε¨ζ΄ζ°θ·―εΎζΆδ½Ώη¨" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' δΈθ½ε %s εζΆδ½Ώη¨" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "δΈθ½εζΆζ΄ζ°θ·―εΎεΉΆεζ’ε°εζ―'%s'γ" -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "ζεηη΄’εΌζδ»Ά" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "θ·―εΎ '%s' ζͺεεΉΆ" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "ζ¨ιθ¦ε
解ε³ε½εη΄’εΌηε²ηͺ" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "δΈθ½ε―Ή '%s' ζ§θ‘ reflog ζδ½οΌ%s\n" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD ηεδ½δΊ" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "δΈθ½ζ΄ζ° HEAD" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "ιη½εζ― '%s'\n" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "ε·²η»δ½δΊ '%s'\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "εζ’εΉΆιη½εζ― '%s'\n" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "εζ’ε°δΈδΈͺζ°εζ― '%s'\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "εζ’ε°εζ― '%s'\n" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... εε
Άε %d δΈͺγ\n" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4374,7 +4646,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4401,150 +4673,150 @@ msgstr[1] "" " git branch <ζ°εζ―ε> %s\n" "\n" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "ε¨ηζ¬ιεζΆιε°ε
ι¨ιθ――" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "δΉεη HEAD δ½η½ζ―" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "ζ¨δ½δΊδΈδΈͺε°ζͺεε§εηεζ―" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "εͺθ¦δΈδΈͺεΌη¨οΌε΄η»εΊδΊ %d δΈͺ" -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "ζ ζεΌη¨οΌ%s" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "εΌη¨δΈζ―δΈδΈͺζ οΌ%s" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "θ·―εΎδΈθ½εεζ’εζ―εζΆδ½Ώη¨" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' δΈθ½εεζ’εζ―εζΆδ½Ώη¨" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' δΈθ½ε '%s' εζΆδ½Ώη¨" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "δΈθ½εζ’εζ―ε°δΈδΈͺιζδΊ€ '%s'" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "εζ―" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "εε»ΊεΉΆζ£εΊδΈδΈͺζ°ηεζ―" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "εε»Ί/ιη½εΉΆζ£εΊδΈδΈͺεζ―" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "δΈΊζ°ηεζ―εε»ΊεΌη¨ζ₯εΏ" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "ζδΈΊζεθ―₯ζδΊ€ηε离倴ζι" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "δΈΊζ°ηεζ―θΎη½δΈζΈΈδΏ‘ζ―" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "ζ°εζ―" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "ζ°η沑ζηΆζδΊ€ηεζ―" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "ε―Ήε°ζͺεεΉΆηζδ»Άζ£εΊζ们ηηζ¬" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "ε―Ήε°ζͺεεΉΆηζδ»Άζ£εΊδ»δ»¬ηηζ¬" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "εΌΊεΆζ£εΊοΌδΈ’εΌζ¬ε°δΏζΉοΌ" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "εζ°ηεζ―ζ§θ‘δΈζΉεεΉΆ" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "ζ΄ζ°εΏ½η₯ηζδ»ΆοΌι»θ€οΌ" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "ι£ζ Ό" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "ε²ηͺθΎεΊι£ζ ΌοΌmerge ζ diff3οΌ" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "ε―Ήθ·―εΎδΈεη¨ηζ£εΊηιεΆ" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "δΊζ¬‘ηζ΅'git checkout <ζ ζ€εζ―>'" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "δΈζ£ζ₯ζεηεΌη¨ζ―ε¦θ’«ε
Άδ»ε·₯δ½εΊζε η¨" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "εΌΊεΆζΎη€ΊθΏεΊ¦ζ₯ε" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-bγ-B ε --orphan ζ―δΊζ₯η" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track ιθ¦δΈδΈͺεζ―ε" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "ηΌΊε°εζ―εοΌε°θ― -b" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "ζ ζηθ·―εΎθ§ζ Ό" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4553,12 +4825,12 @@ msgstr "" "δΈθ½εζΆζ΄ζ°θ·―εΎεΉΆεζ’ε°εζ―'%s'γ\n" "ζ¨ζ―ζ³θ¦ζ£εΊ '%s' δ½ε
Άζͺθ½θ§£ζδΈΊζδΊ€δΉοΌ" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkoutοΌ--detach δΈθ½ζ₯ζΆθ·―εΎεζ° '%s'" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4709,8 +4981,8 @@ msgstr "δΊ€δΊεΌζΈ
ι€" msgid "remove whole directories" msgstr "ε ι€ζ΄δΈͺηε½" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "樑εΌ" @@ -4748,104 +5020,113 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<ιι‘Ή>] [--] <δ»εΊ> [<θ·―εΎ>]" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "δΈεε»ΊδΈδΈͺζ£εΊ" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "εε»ΊδΈδΈͺηΊ―δ»εΊ" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "εε»ΊδΈδΈͺιεδ»εΊοΌδΉζ―ηΊ―δ»εΊοΌ" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "δ»ζ¬ε°δ»εΊε
ι" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "δΈδ½Ώη¨ζ¬ε°η‘¬ιΎζ₯οΌε§η»ε€εΆ" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "θΎη½δΈΊε
±δΊ«δ»εΊ" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "ε¨ε
ιζΆεε§εε樑η»" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "εΉΆεε
ιηε樑η»ηζ°ι" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "樑ζΏηε½" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "樑ζΏηε½ε°θ’«δ½Ώη¨" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "εθδ»εΊ" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "δ»
ε¨ε
ιζΆεθ --reference ζεηζ¬ε°δ»εΊ" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "εη§°" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "δ½Ώη¨ <εη§°> θδΈζ― 'origin' ε»θ·θΈͺδΈζΈΈ" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "ζ£εΊ <εζ―> θδΈζ―θΏη¨ HEAD" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "θΏη¨ git-upload-pack θ·―εΎ" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "ζ·±εΊ¦" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "εε»ΊδΈδΈͺζεζ·±εΊ¦ηζ΅
ε
ι" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "εͺε
ιδΈδΈͺεζ―γHEAD ζ --branch" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "ε樑η»ε°δ»₯ζ΅
δΈθ½½ζ¨‘εΌε
ι" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitηε½" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "gitηε½εε·₯δ½εΊε离" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "ε¨ζ°δ»εΊδΈθΎη½ι
η½δΏ‘ζ―" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "εͺδ½Ώη¨ IPv4 ε°ε" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "εͺδ½Ώη¨ IPv6 ε°ε" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4853,57 +5134,52 @@ msgstr "" "ζ ζ³ηε°ηε½εγ\n" "θ―·ε¨ε½δ»€θ‘ζεδΈδΈͺηε½" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ε°δΈζ―ζε°εθδ»εΊ '%s' δ½δΈΊδΈδΈͺιΎζ₯ζ£εΊγ" -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "εθδ»εΊ '%s' δΈζ―δΈδΈͺζ¬ε°δ»εΊγ" -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "εθδ»εΊ '%s' ζ―δΈδΈͺζ΅
ε
ι" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "εθδ»εΊ '%s' ε·²θ’«ε«ζ₯" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "ζ ζ³ζδΈΎ '%s' ηΆζ" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s εε¨δΈδΈζ―δΈδΈͺηε½" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "ζ ζ³ζδΈΎ %s ηΆζ\n" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "ζ ζ³εε»ΊιΎζ₯ '%s'" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "ζ ζ³ζ·θ΄ζδ»Άθ³ '%s'" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "εζγ\n" -#: builtin/clone.c:459 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4913,126 +5189,126 @@ msgstr "" "ζ¨ε―δ»₯ιθΏ 'git status' ζ£ζ₯εͺδΊε·²θ’«ζ£εΊοΌηΆεδ½Ώη¨ε½δ»€\n" "'git checkout -f HEAD' ιθ―\n" -#: builtin/clone.c:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "δΈθ½εη°θ¦ε
ιηθΏη¨εζ― %sγ" -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "ζ£ζ₯θΏζ₯... " -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "θΏη¨ζ²‘ζειζζεΏ
ι‘»η对豑" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "δΈθ½ζ΄ζ° %s" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "θΏη¨ HEAD ζεδΈδΈͺδΈεε¨ηεΌη¨οΌζ ζ³ζ£εΊγ\n" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "δΈθ½ζ£εΊε·₯δ½εΊ" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "ζ ζ³ε°εζ°εε
₯ι
η½ζδ»Ά" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "ζ ζ³ζ§θ‘ repack ζ₯ζΈ
η" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "ζ ζ³ε ι€δΈ΄ζΆη alternates ζδ»Ά" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "ε€ͺε€εζ°γ" -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "ζ¨εΏ
ι‘»ζεδΈδΈͺδ»εΊζ₯ε
ιγ" -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare ε --origin %s ιι‘ΉδΈε
ΌεΉγ" -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare ε --separate-git-dir ιι‘ΉδΈε
ΌεΉγ" -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "δ»εΊ '%s' δΈεε¨" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "ζ·±εΊ¦ %s δΈζ―δΈδΈͺζ£ζ°" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ηζ θ·―εΎ '%s' ε·²η»εε¨οΌεΉΆδΈδΈζ―δΈδΈͺη©Ίηε½γ" -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "ε·₯δ½εΊ '%s' ε·²η»εε¨γ" -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "δΈθ½δΈΊ '%s' εε»Ίε
ε―Όηε½" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "δΈθ½εε»Ίε·₯δ½εΊηε½ '%s'" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "ε
ιε°ηΊ―δ»εΊ '%s'...\n" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "ζ£ε
ιε° '%s'...\n" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ε¨ζ¬ε°ε
ιθ’«εΏ½η₯οΌζΉδΈΊ file:// εθθ―θ―γ" -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "ζΊδ»εΊζ―ζ΅
ε
ιοΌεΏ½η₯ --local" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local θ’«εΏ½η₯" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "δΈη₯ιε¦δ½ε
ι %s" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "θΏη¨εζ― %s ε¨δΈζΈΈ %s ζͺεη°" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "ζ¨δΌΌδΉε
ιδΊδΈδΈͺη©Ίδ»εΊγ" @@ -5166,103 +5442,103 @@ msgstr "" "ηΆεζ§θ‘ \"git cherry-pick --continue\" 继η»ε―Ήε
Άδ½ζδΊ€ζ§θ‘ζ£ι\n" "ζδ½γ\n" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "ζ ζ³θ§£ε
HEAD ζ 对豑" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "δΈθ½εε»ΊδΈ΄ζΆη΄’εΌ" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "δΊ€δΊεΌζ·»ε ε€±θ΄₯" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "ζ ζ³ζ΄ζ°δΈ΄ζΆη΄’εΌ" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "δΈθ½ζ΄ζ°ζ ηδΈ»ηΌε" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "ζ ζ³ε new_index ζδ»Ά" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "ε¨εεΉΆθΏη¨δΈδΈθ½ει¨εζδΊ€γ" -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "ε¨ζ£ιθΏη¨δΈδΈθ½ει¨εζδΊ€γ" -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "ζ ζ³θ―»εη΄’εΌ" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "ζ ζ³εδΈ΄ζΆη΄’εΌζδ»Ά" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "ζδΊ€ '%s' ηΌΊε°δ½θ
δΏ‘ζ―" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "ζδΊ€ '%s' ζιζ³ηδ½θ
δΏ‘ζ―" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "ιζ³η --author εζ°" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "ζ ζηζ₯ζζ ΌεΌοΌ%s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "ζ ζ³ιζ©δΈδΈͺζͺθ’«ε½εζδΊ€θ―΄ζδ½Ώη¨η注ιε符" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "δΈθ½ζ₯θ―’ζδΊ€ %s" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "οΌζ£δ»ζ εθΎε
₯δΈθ―»εζ₯εΏδΏ‘ζ―οΌ\n" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "δΈθ½δ»ζ εθΎε
₯δΈθ―»εζ₯εΏδΏ‘ζ―" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, 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 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "δΈθ½θ―»ε SQUASH_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "δΈθ½θ―»ε MERGE_MSG" + +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "δΈθ½εζ亀樑η" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5276,7 +5552,7 @@ msgstr "" "\t%s\n" "ηΆειθ―γ\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5290,7 +5566,7 @@ msgstr "" "\t%s\n" "ηΆειθ―γ\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5299,7 +5575,7 @@ msgstr "" "θ―·δΈΊζ¨ηεζ΄θΎε
₯ζδΊ€θ―΄ζγδ»₯ '%c' εΌε§ηθ‘ε°θ’«εΏ½η₯οΌθδΈδΈͺη©ΊηζδΊ€\n" "θ―΄ζε°δΌη»ζ’ζδΊ€γ\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5310,346 +5586,346 @@ msgstr "" "δΉε―δ»₯ε ι€ε们γδΈδΈͺη©ΊηζδΊ€θ―΄ζε°δΌη»ζ’ζδΊ€γ\n" # θ―θ
οΌδΈΊδΏθ―ε¨θΎεΊδΈε―Ήι½οΌζ³¨ζθ°ζ΄ε₯δΈη©Ίζ ΌοΌ -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sδ½θ
οΌ %.*s <%.*s>" # θ―θ
οΌδΈΊδΏθ―ε¨θΎεΊδΈε―Ήι½οΌζ³¨ζθ°ζ΄ε₯δΈη©Ίζ ΌοΌ -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sζ₯ζοΌ %s" # θ―θ
οΌδΈΊδΏθ―ε¨θΎεΊδΈε―Ήι½οΌζ³¨ζθ°ζ΄ε₯δΈη©Ίζ ΌοΌ -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sζδΊ€θ
οΌ%.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "ζ ζ³θ―»εη΄’εΌ" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "ζ ζ³εε»Ίζ 对豑" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "θ―·δ½Ώη¨ -m ζ -F ιι‘ΉζδΎζδΊ€θ―΄ζγ\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' δΈζ― 'Name <email>' ζ ΌεΌοΌδΈζͺθ½ε¨η°ζδ½θ
δΈζΎε°εΉι
" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "ζ ζηζͺθΏ½θΈͺζδ»Άεζ° '%s'" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long ε -z ιι‘ΉδΈε
ΌεΉ" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "εζΆδ½Ώη¨ --reset-author ε --author 沑ζζδΉ" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "ζ¨ζ²‘ζε―δΏθ‘₯ηζδΊ€γ" -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "ζ¨ζ£ε€δΊδΈδΈͺεεΉΆθΏη¨δΈ -- ζ ζ³δΏθ‘₯ζδΊ€γ" -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "ζ¨ζ£ε€δΊδΈδΈͺζ£ιθΏη¨δΈ -- ζ ζ³δΏθ‘₯ζδΊ€γ" -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "ιι‘Ή --squash ε --fixup δΈθ½εζΆδ½Ώη¨" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "εͺθ½η¨δΈδΈͺ -c/-C/-F/--fixup ιι‘Ήγ" -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "ιι‘Ή -m δΈθ½ε -c/-C/-F/--fixup εζΆδ½Ώη¨γ" -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author εͺθ½ε -Cγ-c ζ --amend εζΆδ½Ώη¨γ" -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "εͺθ½η¨δΈδΈͺ --include/--only/--all/--interactive/--patch ιι‘Ήγ" -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "εζ° --include/--only δΈθ·θ·―εΎζ²‘ζζδΉγ" -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "θͺζ... η¨θη΄’εΌδΏθ‘₯ζεδΈδΈͺζδΊ€γ" -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "ζεδΊζη‘ηθ·―εΎθ沑ζδ½Ώη¨ -i ζ -o ιι‘ΉοΌθ€δΈΊζ― --only paths..." -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "ζ ζηζΈ
ηζ¨‘εΌ %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "θ·―εΎε -a ιι‘ΉεζΆδ½Ώη¨ζ²‘ζζδΉγ" -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "δ»₯ηζ΄ηζ ΌεΌζΎη€ΊηΆζ" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "ζΎη€Ίεζ―δΏ‘ζ―" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "ζΊε¨ε―θ―»ηθΎεΊ" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "δ»₯ιΏζ ΌεΌζΎη€ΊηΆζοΌι»θ€οΌ" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "ζ‘ηδ»₯ NUL ε符η»ε°Ύ" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "樑εΌ" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "ζΎη€Ίζͺθ·θΈͺηζδ»ΆοΌβ樑εΌβηε―ιεζ°οΌallγnormalγnoγοΌι»θ€οΌallοΌ" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "ζΎη€ΊεΏ½η₯ηζδ»Ά" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "δ½ζΆ" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "εΏ½η₯ε樑η»ηζ΄ζΉοΌβδ½ζΆβηε―ιεζ°οΌallγdirtyγuntrackedγοΌι»θ€οΌallοΌ" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "δ»₯εηζΉεΌζΎη€Ίζͺθ·θΈͺηζδ»Ά" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "ζ ζ³ζΎε°ζ°εε»ΊηζδΊ€" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "δΈθ½θ§£ζζ°εε»ΊηζδΊ€" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "ε离倴ζι" # θ―θ
οΌδΈζε符串ζΌζ₯οΌε―ε ι€εε―Όη©Ίζ Ό -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr "οΌζ ΉζδΊ€οΌ" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "ζδΊ€ζεεδΈζΎη€Ίζ¦θΏ°δΏ‘ζ―" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "ε¨ζδΊ€θ―΄ζ樑ζΏιζΎη€Ίε·εΌ" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "ζδΊ€θ―΄ζιι‘Ή" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "δ»ζδ»ΆδΈθ―»εζδΊ€θ―΄ζ" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "δ½θ
" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "ζδΊ€ζΆθ¦ηδ½θ
" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "ζ₯ζ" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "ζδΊ€ζΆθ¦ηζ₯ζ" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "θ―΄ζ" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "ζδΊ€θ―΄ζ" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "ζδΊ€" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "ιη¨εΉΆηΌθΎζεζδΊ€ηζδΊ€θ―΄ζ" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "ιη¨ζεζδΊ€ηζδΊ€θ―΄ζ" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "δ½Ώη¨ autosquash ζ ΌεΌηζδΊ€θ―΄ζη¨δ»₯δΏζ£ζεηζδΊ€" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "δ½Ώη¨ autosquash ζ ΌεΌηζδΊ€θ―΄ζη¨δ»₯εηΌ©θ³ζεηζδΊ€" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "η°ε¨ε°θ―₯ζδΊ€ηδ½θ
ζΉδΈΊζοΌε -C/-c/--amend εζ°ε
±η¨οΌ" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ζ·»ε Signed-off-by: ηΎε" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "δ½Ώη¨ζεη樑ζΏζδ»Ά" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "εΌΊεΆηΌθΎζδΊ€" # θ―θ
οΌε―ιεΌοΌδΈθ½ηΏ»θ―οΌζζ―εζδΈη¬θ――οΌεΊδΈΊ modeοΌ -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "default" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "θΎη½ε¦δ½ε ι€ζδΊ€θ―΄ζιηη©Ίζ Όε#注ι" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "ε¨ζδΊ€θ―΄ζ樑ζΏιε
ε«ηΆζδΏ‘ζ―" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG ζδΊ€ηΎε" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "ζδΊ€ε
εΉιι‘Ή" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "ζδΊ€ζζζΉε¨ηζδ»Ά" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "ζ·»ε ζεηζδ»Άε°η΄’εΌεΊηεΎ
ζδΊ€" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "δΊ€δΊεΌζ·»ε ζδ»Ά" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "δΊ€δΊεΌζ·»ε εζ΄" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "εͺζδΊ€ζεηζδ»Ά" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "η»θΏ pre-commit ι©ε" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "ζΎη€Ίε°θ¦ζδΊ€ηε
εΉ" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "δΏζΉε
εηζδΊ€" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "η»θΏ post-rewrite ι©ε" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "ε
θΈδΈδΈͺη©ΊζδΊ€" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "ε
θΈη©ΊηζδΊ€θ―΄ζ" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "δΈθ½θ§£ζ HEAD ζδΊ€" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "ζεη MERGE_HEAD ζδ»ΆοΌ%sοΌ" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "δΈθ½θ―»ε MERGE_MODE" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "δΈθ½θ―»εζδΊ€θ―΄ζοΌ%s" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "η»ζ’ζδΊ€οΌζ¨ζͺζ΄ζΉζ₯θͺ樑ηηζδΊ€θ―΄ζγ\n" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "η»ζ’ζδΊ€ε δΈΊζδΊ€θ―΄ζδΈΊη©Ίγ\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5794,7 +6070,7 @@ msgstr "ζΎη€Ίι
η½ηζ₯ζΊοΌζδ»Άγζ εθΎε
₯γζ°ζ对豑οΌζε½δ»€ msgid "unable to parse default color value" msgstr "δΈθ½θ§£ζι»θ€ι’θ²εΌ" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5809,7 +6085,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "δΈθ½εε»Ίι
η½ζδ»Ά %s" @@ -5845,7 +6121,7 @@ msgstr "ι注ζ ηΎ %s 沑ζε΅ε
₯εη§°" msgid "tag '%s' is really '%s' here" msgstr "ζ ηΎ '%s' ηη‘ζ―ε¨ '%s'" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "δΈζ―δΈδΈͺζζη对豑ε %s" @@ -5938,7 +6214,7 @@ msgstr "θθζθΏ <n> δΈͺζ ηΎοΌι»θ€οΌ10οΌ" msgid "only consider tags matching <pattern>" msgstr "εͺθθεΉι
<樑εΌ> ηζ ηΎ" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "ζΎη€ΊηεηζδΊ€ε·δ½δΈΊεε€" @@ -5972,21 +6248,21 @@ msgstr "'%s'οΌδΈζ―δΈδΈͺζ£θ§ζδ»Άζ符ε·ιΎζ₯" msgid "invalid option: %s" msgstr "ζ ζιι‘ΉοΌ%s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "δΈζ―δΈδΈͺ git δ»εΊ" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "ζδΎδΊζ ζ对豑 '%s'γ" -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "ζδΎδΊθΆ
θΏδΈ€δΈͺζ°ζ对豑οΌ'%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "ζ ζ³ε€ηη对豑 '%s'γ" @@ -6059,19 +6335,19 @@ msgstr "git fetch --multiple [<ιι‘Ή>] [(<δ»εΊ> | <η»>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<ιι‘Ή>]" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "δ»ζζηθΏη¨ζε" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "θΏ½ε ε° .git/FETCH_HEAD θδΈζ―θ¦ηε" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "δΈδΌ ε
ε°θΏη¨ηθ·―εΎ" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "εΌΊεΆθ¦ηζ¬ε°εζ―" @@ -6079,7 +6355,7 @@ msgstr "εΌΊεΆθ¦ηζ¬ε°εζ―" msgid "fetch from multiple remotes" msgstr "δ»ε€δΈͺθΏη¨ζε" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "ζεζζηζ ηΎεε
³θ对豑" @@ -6091,20 +6367,20 @@ msgstr "δΈζεδ»»δ½ζ ηΎ(--no-tags)" msgid "number of submodules fetched in parallel" msgstr "ε樑η»θ·εηεΉΆεζ°" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "ζΈ
ι€θΏη¨ε·²η»δΈεε¨ηεζ―ηθ·θΈͺεζ―" # θ―θ
οΌε―ιεΌοΌδΈθ½ηΏ»θ― -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "ζ§εΆε樑η»ηιε½ζε" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "δΏζδΈθ½½ε
" @@ -6112,15 +6388,15 @@ msgstr "δΏζδΈθ½½ε
" msgid "allow updating of HEAD ref" msgstr "ε
θΈζ΄ζ° HEAD εΌη¨" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "ζ·±εζ΅
ε
ιηεε²" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "转ζ’δΈΊδΈδΈͺεζ΄ηδ»εΊ" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "ηε½" @@ -6132,15 +6408,15 @@ msgstr "ε¨ε樑η»θ·―εΎθΎεΊηει’ε δΈζ€ηε½" msgid "default mode for recursion" msgstr "ιε½ηι»θ€ζ¨‘εΌ" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "ζ₯εζ΄ζ° .git/shallow ηεΌη¨" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "εΌη¨ζ ε°" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "ζεθ·εζδ½ηεΌη¨ζ ε°" @@ -6199,11 +6475,6 @@ msgstr "εΌΊεΆζ΄ζ°" msgid "(non-fast-forward)" msgstr "οΌιεΏ«θΏεΌοΌ" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "ζ ζ³ζεΌ %sοΌ%s\n" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6402,55 +6673,55 @@ msgstr "ζ£ζ₯θΏζ₯δΈ" msgid "Checking object directories" msgstr "ζ£ζ₯对豑ηε½δΈ" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<ιι‘Ή>] [<对豑>...]" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "ζΎη€ΊδΈε―θΎΎη对豑" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "ζΎη€Ίζζη对豑" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "ζ₯εζ ηΎ" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "ζ₯εζ ΉθηΉ" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "ε°η΄’εΌδΊ¦δ½δΈΊζ£ζ₯η倴θηΉ" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "ε°εΌη¨ζ₯εΏδ½δΈΊζ£ζ₯η倴θηΉοΌι»θ€οΌ" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "δΉθθε
εε€η¨ε―Ήθ±‘" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "δ»
ζ£ζ₯θΏιζ§" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "ε―η¨ζ΄δΈ₯ζ Όηζ£ζ₯" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "ε°ζζ对豑εε
₯ .git/lost-found δΈ" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "ζΎη€ΊθΏεΊ¦" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "ζ£ζ₯对豑δΈ" @@ -6549,215 +6820,215 @@ msgstr "ζ ζ³θ―»εζ οΌ%sοΌ" msgid "unable to grep from object of type %s" msgstr "ζ ζ³ζεζ₯θͺδΊ %s η±»εη对豑" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "εΌε
³ `%c' ζζδΈδΈͺζ°εεΌ" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "δΈθ½ζεΌ '%s'" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "ε¨η΄’εΌεΊζη΄’θδΈζ―ε¨ε·₯δ½εΊ" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "ε¨ζͺθ’« git η‘ηηε
εΉδΈζ₯ζΎ" # θ―θ
οΌδΈζε符串ζΌζ₯οΌε―ε ι€εε―Όη©Ίζ Ό -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "ε¨θ·θΈͺεζͺθ·θΈͺηζδ»ΆδΈζη΄’" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "εΏ½η₯ '.gitignore' ε
ε«ηζδ»Ά" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "ζΎη€ΊζͺεΉι
ηθ‘" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "δΈεΊε倧ε°εεΉι
" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "εͺε¨εθ―θΎΉηεΉι
樑εΌ" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "ζδΊθΏεΆζδ»Άε½εζζ¬ε€η" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "δΈε¨δΊθΏεΆζδ»ΆδΈεΉι
樑εΌ" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "η¨ textconv θΏζ»€ε¨ε€ηδΊθΏεΆζδ»Ά" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "ζε€δ»₯ζεηζ·±εΊ¦εδΈε―»ζΎ" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "δ½Ώη¨ζ©ε±η POSIX ζ£ε葨达εΌ" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "δ½Ώη¨εΊζ¬η POSIX ζ£ε葨达εΌοΌι»θ€οΌ" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "ζ樑εΌθ§£ζδΈΊεΊεηε符串" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "δ½Ώη¨ Perl ε
ΌεΉηζ£ε葨达εΌ" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "ζΎη€Ίθ‘ε·" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "δΈζΎη€Ίζδ»Άε" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "ζΎη€Ίζδ»Άε" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "ζΎη€ΊηΈε―ΉδΊι‘ΆηΊ§ηε½ηζδ»Άε" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "εͺζΎη€Ίζδ»ΆεθδΈζΎη€ΊεΉι
ηθ‘" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "ε --files-with-matches εδΉ" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "εͺζΎη€ΊζͺεΉι
ηζδ»Άε" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "ε¨ζδ»ΆεεθΎεΊ NUL ε符" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "ζΎη€Ίζ»εΉι
θ‘ζ°οΌθδΈζΎη€ΊεΉι
ηθ‘" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "ι«δΊζΎη€ΊεΉι
ι‘Ή" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "ε¨δΈεζδ»ΆηεΉι
ι‘ΉδΉι΄ζε°η©Ίθ‘" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "εͺε¨εδΈζδ»ΆηεΉι
ι‘ΉηδΈι’ζΎη€ΊδΈζ¬‘ζδ»Άε" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "ζΎη€ΊεΉι
ι‘Ήεεη <n> θ‘δΈδΈζ" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "ζΎη€ΊεΉι
ι‘Ήε <n> θ‘δΈδΈζ" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "ζΎη€ΊεΉι
ι‘Ήε <n> θ‘δΈδΈζ" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "δ½Ώη¨ <n> δΈͺε·₯δ½ηΊΏη¨" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "εΏ«ζ·ι -C ζ°ε" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "ε¨εΉι
ηει’ζΎη€ΊδΈθ‘ε½ζ°ε" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "ζΎη€Ίζε¨ε½ζ°ηεεε
εΉ" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "δ»ζδ»Άθ―»ε樑εΌ" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "εΉι
<樑εΌ>" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "η»εη¨ -e εζ°θΎεη樑εΌ" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "δΈθΎεΊοΌθη¨ιεΊη ζ θ―ε½δΈηΆζ" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "εͺζΎη€ΊεΉι
ζζ樑εΌηζδ»ΆδΈηεΉι
" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "ζΎη€Ί grep 葨达εΌη解ζζ " -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "ει‘΅" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "ει‘΅ζΎη€ΊεΉι
ηζδ»Ά" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "ε
θΈθ°η¨ grep(1)οΌζ¬ζ¬‘ζε»ΊεΏ½η₯οΌ" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "ζͺζδΎζ¨‘εΌεΉι
γ" -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ζεηηΊΏη¨ζ°ζ ζοΌ%dοΌ" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager δ»
η¨δΊε·₯δ½εΊ" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ζ --untracked δΈθ½δΈ --no-index εζΆδ½Ώη¨γ" -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index ζ --untracked δΈθ½εηζ¬εζΆδ½Ώη¨γ" -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard δΈθ½η¨δΊε·²θ·θΈͺε
εΉγ" -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "εζΆη»εΊδΊ --cached εζ 对豑γ" @@ -6846,8 +7117,8 @@ msgstr "emacsclient ηζ¬ '%d' ε€ͺθοΌ< 22οΌγ" #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "ζ ζ³ζ§θ‘ '%s'οΌ%s" +msgid "failed to exec '%s'" +msgstr "ζ ζ³ζ§θ‘ '%s'" #: builtin/help.c:205 #, c-format @@ -7105,107 +7376,109 @@ msgstr "δΈε―ηε»" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "εζ %d δΈͺζ¬ε°ε―Ήθ±‘" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "εζ %d δΈͺζ¬ε°ε―Ήθ±‘" +msgstr[1] "εζ %d δΈͺζ¬ε°ε―Ήθ±‘" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "ε―Ή %s ηε°Ύι¨ζ ‘ιͺεΊη°ζε€οΌη£ηζεοΌοΌ" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "ε
ζ %d δΈͺζͺ解ε³η delta" msgstr[1] "ε
ζ %d δΈͺζͺ解ε³η delta" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "δΈθ½εηΌ©ιε 对豑οΌ%dοΌ" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "ζ¬ε°ε―Ήθ±‘ %s ε·²ζε" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "ε
³ιε
ζδ»ΆζΆεΊι" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "ζ ζ³εδΏηζδ»Ά '%s'" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "ζ ζ³ε
³ιδΏηζδ»Ά '%s'" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "ζ ζ³εε¨ε
ζδ»Ά" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "ζ ζ³εε¨η΄’εΌζδ»Ά" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "εη pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "沑ζηΊΏη¨ζ―ζοΌεΏ½η₯ %s" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "ζ ζ³ζεΌη°εε
ζδ»Ά '%s'" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "ζ ζ³δΈΊ %s ζεΌε
η΄’εΌζδ»Ά" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, 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:1594 +#: builtin/index-pack.c:1596 #, 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:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "ε
ζδ»Άε '%s' 沑ζδ»₯ '.pack' η»ε°Ύ" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "ζ ζ³θΏεε½εε·₯δ½ηε½" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "ιθ――ιι‘Ή %s" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin δΈθ½ε --stdin εζΆδ½Ώη¨" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "ε
ζδ»Άε '%s' 沑ζδ»₯ '.pack' η»ε°Ύ" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify 沑ζζδΎε
ζδ»Άεεζ°" @@ -7244,27 +7517,27 @@ msgstr "δΈθ½ζ·θ΄ '%s' θ³ '%s'" msgid "ignoring template %s" msgstr "εΏ½η₯樑η %s" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "樑ηζͺζΎε° %s" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "沑ζδ» '%2$s' ε€εΆεΈ¦ζιθ――ηζ¬ %1$d η樑η" +msgid "not copying templates from '%s': %s" +msgstr "沑ζδ» '%s' ε€εΆζ¨‘ηοΌ%s" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s ε·²η»εε¨" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "δΈθ½ε€η %d η±»εηζδ»Ά" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "δΈθ½η§»ε¨ %s θ³ %s" @@ -7272,25 +7545,25 @@ 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:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git δ»εΊδΊ %s%s\n" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "ιζ°εε§εη°εη" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "εε§εη©Ίη" # θ―θ
οΌδΈζε符串ζΌζ₯οΌε―ε ι€εε―Όη©Ίζ Ό -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr "ε
±δΊ«" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7298,32 +7571,32 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<樑ζΏηε½>] [--shared[=<ζι>]] " "[<ηε½>]" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "ζι" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "ζε git δ»εΊζ―ε€δΈͺη¨ζ·δΉι΄ε
±δΊ«η" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "δΈθ½εε»Ίηε½ %s" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "δΈθ½εζ’ηε½ε° %s" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, 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:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "δΈθ½θΏιε·₯δ½εΊ '%s'" @@ -7369,273 +7642,319 @@ msgstr "git show [<ιι‘Ή>] <对豑>..." msgid "invalid --decorate option: %s" msgstr "ζ ζη --decorate ιι‘ΉοΌ%s" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "δΈζΎη€Ίε·εΌθΎεΊ" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "ζΎη€ΊζΊ" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "δ½Ώη¨ιδ»Άζ ε°ζδ»Ά" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "δΏι₯°ιι‘Ή" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "ε€ηζδ»ΆδΈη¬¬ n ε° m δΉι΄ηθ‘οΌδ» 1 εΌε§" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "ζη»θΎεΊοΌ%d %s\n" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ζεηζδ»Ά" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "δΈθ½θ―»ε对豑 %s" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "ζͺη₯η±»εοΌ%d" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers 沑ζεΌ" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "θΎεΊηε½εε€ͺιΏ" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "ζ ζ³ζεΌθ‘₯δΈζδ»Ά %s" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "εͺιθ¦δΈδΈͺθε΄γ" -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "δΈζ―δΈδΈͺθε΄γ" -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "δΏ‘ε°ιθ¦ιδ»Άε°εζ ΌεΌ" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "δΈζ£εΈΈη in-reply-toοΌ%s" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<ιι‘Ή>] [<δ»> | <ηζ¬θε΄>]" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "δΈ€δΈͺθΎεΊηε½οΌ" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "ζͺη₯ζδΊ€ %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "ζ ζ³θ§£ζ '%s' δΈΊδΈδΈͺζζεΌη¨γ" + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "δΈθ½ζΎε°εη‘ηεεΉΆεΊηΊΏγ" + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"ζ ζ³εΎε°δΈζΈΈε°εοΌε¦ζδ½ ζ³θͺε¨θ°ε½εΊηΊΏζδΊ€οΌθ―·δ½Ώη¨ε½δ»€\n" +"git branch --set-upstream-to ζ₯θ·θΈͺδΈδΈͺθΏη¨εζ―γζθ
δ½ ε―δ»₯ιθΏ\n" +"εζ° --base=<base-commit-id> ζε¨ζεδΈδΈͺεΊηΊΏζδΊ€γ" + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "ζ ζ³ζΎε°εη‘ηεεΉΆεΊηΊΏ" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "εΊηΊΏζδΊ€εΊθ―₯ζ―ηζ¬ε葨ηη₯ε
" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "εΊηΊΏζδΊ€δΈεΊθ―₯εΊη°ε¨ηζ¬ε葨δΈ" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "ζ ζ³εΎε°θ‘₯δΈ id" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "δ½Ώη¨ [PATCH n/m]οΌε³δ½ΏεͺζδΈδΈͺθ‘₯δΈ" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "δ½Ώη¨ [PATCH]οΌε³δ½Ώζε€δΈͺθ‘₯δΈ" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "ζε°θ‘₯δΈε°ζ εθΎεΊ" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "ηζδΈε°ιδΏ‘" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "δ½Ώη¨ηεηζ°εεΊεδ½δΈΊθΎεΊζδ»Άε" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "εηΌ" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "δ½Ώη¨ <εηΌ> δ»£ζΏ '.patch'" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "θ‘₯δΈδ»₯ <n> εΌε§ηΌε·οΌθδΈζ―1" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "ζ θ°θ‘₯δΈη³»εζ―第ε 欑ιεΆ" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "δ½Ώη¨ [<εηΌ>] δ»£ζΏ [PATCH]" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "ζη»ζζδ»Άεε¨ε¨ <ηε½>" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "δΈε ι€/ζ·»ε [PATCH]" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "δΈθΎεΊδΊθΏεΆε·εΌ" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "ε¨ From 倴俑ζ―δΈθΎεΊε
¨δΈΊιΆηεεΈεΌ" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "δΈε
ε«ε·²ε¨δΈζΈΈζδΊ€δΈηθ‘₯δΈ" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "ζΎη€ΊηΊ―θ‘₯δΈζ ΌεΌθιι»θ€ηοΌθ‘₯δΈ+ηΆζοΌ" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "ιδ»Άει" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "header" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "ζ·»ε ι仢倴" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "ιδ»Άε°ε" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "ζ·»ε ζΆδ»ΆδΊΊ" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "ζ·»ε ζι" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "ζ θ―" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "ε° From ε°εθΎη½δΈΊ <ζ θ―>οΌε¦θ₯δΈζδΎοΌεη¨ζδΊ€θ
ID εδΈΊε°εοΌ" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "ιδ»Άζ θ―" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "使第δΈε°ιδ»Άδ½δΈΊε―Ή <ιδ»Άζ θ―> ηεε€" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "θΎΉη" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "ιδ»ΆζΉεΌζ·»ε θ‘₯δΈ" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "ε
θζΎη€Ίθ‘₯δΈ" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "ε―η¨ιδ»ΆηΊΏη΄’οΌι£ζ ΌοΌζ΅
οΌζ·±" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "ηΎε" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "ζ·»ε δΈδΈͺηΎε" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "εΊηΊΏζδΊ€" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "δΈΊθ‘₯δΈε葨添ε εη½ζ δΏ‘ζ―" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "δ»ζδ»Άζ·»ε δΈδΈͺηΎε" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "δΈθ¦ζε°θ‘₯δΈζδ»Άε" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n ε -k δΊζ₯γ" -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix ε -k δΊζ₯γ" -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only ζ ζδΉ" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status ζ ζδΉ" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check ζ ζδΉ" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "ζ εθΎεΊζηε½οΌεͺδΈδΈͺοΌ" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "δΈθ½εε»Ίηε½ '%s'" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "ζ ζ³θ―»εηΎεζδ»Ά '%s'" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "ζ ζ³εε»ΊθΎεΊζδ»Ά" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<δΈζΈΈ> [<倴> [<ιεΆ>]]]" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "δΈθ½ζΎε°θ·θΈͺηθΏη¨εζ―οΌθ―·ζε·₯ζε <δΈζΈΈ>γ\n" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "ζͺη₯ζδΊ€ %s" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<ιι‘Ή>] [<ζδ»Ά>...]" @@ -7826,171 +8145,175 @@ msgstr "git merge [<ιι‘Ή>] <θ―΄ζ> HEAD <ζδΊ€>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "εΌε
³ `m' ιθ¦δΈδΈͺεΌ" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "δΈθ½ζΎε°εεΉΆηη₯ '%s'γ\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "ε―η¨ηηη₯ζοΌ" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "ε―η¨ηθͺεδΉηη₯ζοΌ" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "ε¨εεΉΆηζεδΈζΎη€Ίε·εΌη»θ‘" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "ε¨εεΉΆηζεζΎη€Ίε·εΌη»θ‘" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "οΌε --stat εδΉοΌ" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "ε¨εεΉΆζδΊ€δΏ‘ζ―δΈζ·»ε οΌζε€ <n> ζ‘οΌη²ΎηζδΊ€θ°ε½" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "εε»ΊδΈδΈͺεη¬ηζδΊ€θδΈζ―εδΈζ¬‘εεΉΆ" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "ε¦ζεεΉΆζεοΌζ§θ‘δΈζ¬‘ζδΊ€οΌι»θ€οΌ" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "ε¨ζδΊ€εηΌθΎζδΊ€θ―΄ζ" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "ε
θΈεΏ«θΏοΌι»θ€οΌ" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "ε¦ζδΈθ½εΏ«θΏε°±ζΎεΌεεΉΆ" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "ιͺθ―ζεηζδΊ€ζ―ε¦ε
ε«δΈδΈͺζζη GPG ηΎε" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "ηη₯" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "θ¦δ½Ώη¨ηεεΉΆηη₯" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "ζιηεεΉΆηη₯ηιι‘Ή" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "εεΉΆηζδΊ€θ―΄ζοΌιε―ΉιεΏ«θΏεΌεεΉΆοΌ" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "ζΎεΌε½εζ£ε¨θΏθ‘ηεεΉΆ" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "ε
θΈεεΉΆδΈηΈε
³ηεε²" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "δΈθ½θΏθ‘θΏεΊ¦δΏεγ" -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "θΏεΊ¦δΏεε€±θ΄₯" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "δΈζ―δΈδΈͺζζ对豑οΌ%s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "θ―»εζ ε€±θ΄₯" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " οΌζ ε―εηΌ©οΌ" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "εηΌ©ζδΊ€ -- ζͺζ΄ζ° HEAD\n" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "δΈθ½εε
₯ '%s'" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "εε
₯ SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "εζ SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "ζ εεΉΆδΏ‘ζ― -- ζͺζ΄ζ° HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 沑ζζεδΈδΈͺζδΊ€" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "εη branch.%s.mergeoptions ε符串οΌ%s" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "δΈθ½ε€ηδΈ€δΈͺ倴εεΉΆδΉε€ηδ»»δ½ζδ½γ" -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive ηζͺη₯ιι‘ΉοΌ-X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "δΈθ½ε %s" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "δΈθ½δ» '%s' θ―»ε" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "ζͺζδΊ€εεΉΆοΌδ½Ώη¨ 'git commit' εζζ€ζ¬‘εεΉΆγ\n" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8004,52 +8327,52 @@ msgstr "" "\n" "δ»₯ '%c' εΌε€΄ηθ‘ε°θ’«εΏ½η₯οΌθδΈη©ΊζδΊ€θ―΄ζε°δΌη»ζ’ζδΊ€γ\n" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "η©ΊζδΊ€δΏ‘ζ―γ" -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "ε€ͺζ£δΊγ\n" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "θͺε¨εεΉΆε€±θ΄₯οΌδΏζ£ε²ηͺηΆεζδΊ€δΏζ£ηη»ζγ\n" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' δΈζ―δΈδΈͺζδΊ€" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "沑ζε½εεζ―γ" -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "ε½εεζ―沑ζε―ΉεΊηθΏη¨δ»εΊγ" -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "ε½εεζ―沑ζεδΉι»θ€ηδΈζΈΈεζ―γ" -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "ε―ΉδΊ %s 沑ζζ₯θͺ %s ηθΏη¨θ·θΈͺεζ―" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "δΈθ½ε
³ι '%s'" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沑ζθ¦η»ζ’ηεεΉΆοΌMERGE_HEAD δΈ’ε€±οΌγ" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8057,7 +8380,7 @@ msgstr "" "ζ¨ε°ζͺη»ζζ¨ηεεΉΆοΌεε¨ MERGE_HEADοΌγ\n" "θ―·ε¨εεΉΆεε
ζδΊ€ζ¨ηδΏζΉγ" -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8065,100 +8388,104 @@ msgstr "" "ζ¨ε°ζͺη»ζζ¨ηζ£ιοΌεε¨ CHERRY_PICK_HEADοΌγ\n" "θ―·ε¨εεΉΆεε
ζδΊ€ζ¨ηδΏζΉγ" -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "ζ¨ε°ζͺη»ζζ¨ηζ£ιοΌεε¨ CHERRY_PICK_HEADοΌγ" -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "ζ¨δΈθ½ε° --squash δΈ --no-ff εζΆδ½Ώη¨γ" -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "ζͺζεζδΊ€εΉΆδΈ merge.defaultToUpstream ζͺθΎη½γ" -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "ε°δΈζ―ζε°η©Ίεζ―ηεηΌ©ζδΊ€" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "ε°η©Ίεζ―ηιεΏ«θΏεΌζ亀沑ζζδΉ" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - δΈθ½θ’«εεΉΆ" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "εͺθ½ε°δΈδΈͺζδΊ€εεΉΆε°η©Ίεζ―δΈ" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "ζδΊ€ %s ζδΈδΈͺιε―δΏ‘ηε£°η§°ζ₯θͺ %s η GPG ηΎεγ" -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "ζδΊ€ %s ζδΈδΈͺιθ――ηε£°η§°ζ₯θͺ %s η GPG ηΎεγ" -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "ζδΊ€ %s 沑ζδΈδΈͺ GPG ηΎεγ" -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "ζδΊ€ %s ζδΈδΈͺζ₯θͺ %s ηε₯½η GPG ηΎεγ\n" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "ζη»εεΉΆζ ε
³ηεε²" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "ζ΄ζ° %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "ε°θ―ιεΈΈε°ηη΄’εΌε
εεΉΆ...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "ζ γ\n" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "ζ ζ³εΏ«θΏοΌη»ζ’γ" -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "ε°ζ εζ»θ³εε§ηΆζ...\n" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "ε°θ―εεΉΆηη₯ %s...\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沑ζεεΉΆηη₯ε€ηζ€εεΉΆγ\n" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "δ½Ώη¨ηη₯ %s εεΉΆε€±θ΄₯γ\n" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "δ½Ώη¨ %s δ»₯εε€ζε·₯解ε³γ\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "θͺε¨εεΉΆθΏε±ι‘Ίε©οΌζθ¦ζ±ε¨ζδΊ€εεζ’\n" @@ -8268,7 +8595,7 @@ msgstr "git mv [<ιι‘Ή>] <ζΊ>... <ηζ >" msgid "Directory %s is in index and no submodule?" msgstr "ηε½ %s ε¨η΄’εΌδΈεΉΆδΈδΈζ―ε樑η»οΌ" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "θ―·ε°ζ¨ηδΏζΉζεε° .gitmodules δΈζδΏεθΏεΊ¦εε继η»" @@ -8346,48 +8673,48 @@ msgstr "%sοΌζΊ=%sοΌηζ =%s" msgid "Renaming %s to %s\n" msgstr "ιε½ε %s θ³ %s\n" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "ιε½ε '%s' ε€±θ΄₯" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<ιι‘Ή>] <ζδΊ€>..." -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<ιι‘Ή>] --all" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<ιι‘Ή>] --stdin" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "εͺζε°εη§°οΌζ SHA-1οΌ" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "εͺδ½Ώη¨ζ ηΎζ₯ε½εζδΊ€" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "εͺδ½Ώη¨ε <樑εΌ> ηΈεΉι
ηεΌη¨" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "εεΊε―δ»₯δ»ζζεΌη¨θΏιηζδΊ€" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "δ»ζ εθΎε
₯θ―»ε" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "ε
θΈζε° `ζͺεδΉ` ηεη§°οΌι»θ€οΌ" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "εε解ζθΎε
₯δΈηζ ηΎοΌε
ι¨δ½Ώη¨οΌ" @@ -8532,24 +8859,16 @@ msgstr "δΈθ½ε注解对豑" msgid "The note contents have been left in %s" msgstr "注解ε
εΉθ’«ηε¨ %s δΈ" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "δΈθ½θ―»ε '%s'" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "δΈθ½ζεΌζθ―»ε '%s'" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "ζ ζ³θ§£ζ '%s' δΈΊδΈδΈͺζζεΌη¨γ" - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8562,7 +8881,7 @@ msgstr "δΈθ½δ»ιζ°ζ对豑 '%s' δΈθ―»ε注解ζ°ζ" #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "εζ°ε€ͺε€" @@ -8607,7 +8926,7 @@ msgstr "δΈθ½ζ·»ε 注解γεη°ε―Ήθ±‘ %s ε·²εε¨ζ³¨θ§£γδ½Ώη¨ '-f' θ¦η msgid "Overwriting existing notes for object %s\n" msgstr "θ¦η对豑 %s η°ε注解\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "ε ι€ε―Ήθ±‘ %s η注解\n" @@ -8645,63 +8964,63 @@ msgstr "" "εε½δ»€ 'edit' ηιι‘Ή -m/-F/-c/-C ε·²εΌη¨γ\n" "θ―·ζ’η¨ 'git notes add -f -m/-F/-c/-C'γ\n" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "ιη¨ιι‘Ή" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "εεΉΆιι‘Ή" -#: builtin/notes.c:771 +#: builtin/notes.c:772 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:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "ζδΊ€ζͺεεΉΆη注解" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "ιθΏζδΊ€ζͺεεΉΆη注解ζ₯εζ注解εεΉΆ" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "δΈζ’注解εεΉΆηζΉζ‘" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "δΈζ’注解εεΉΆ" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "δΈδΈͺε° %s η注解εεΉΆε·²η»ε¨ %s ζ§θ‘δΈ" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "对豑 %s 沑ζ注解\n" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "ε°θ―ε ι€δΈεε¨η注解δΈζ―δΈδΈͺιθ――" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "δ»ζ εθΎε
₯θ―»ε对豑εη§°" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "注解εΌη¨" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "δ» <注解εΌη¨> δ½Ώη¨ζ³¨θ§£" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "ζͺη₯εε½δ»€οΌ%s" @@ -8721,165 +9040,169 @@ msgstr "git pack-objects [<ιι‘Ή>...] <base-name> [< <εΌη¨ε葨> | < <对豑 msgid "deflate error (%d)" msgstr "εηΌ©ιθ―― (%d)" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "η¦η¨ bitmap εε
₯οΌε δΈΊ pack.packSizeLimit θΎη½δ½ΏεΎε
θ’«εεδΈΊε€δΈͺ" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "εε
₯对豑δΈ" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "η¦η¨ bitmap εε
₯οΌε δΈΊδΈδΊε―Ήθ±‘ε°δΈδΌθ’«ζε
" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "ε缩对豑δΈ" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "δΈζ―ζηη΄’εΌηζ¬ %s" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "εηη΄’εΌηζ¬ '%s'" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "δΈζΎη€ΊθΏεΊ¦θ‘¨" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "ζΎη€ΊθΏεΊ¦θ‘¨" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "ε¨ε―Ήθ±‘εε
₯ιΆζ΅ζΎη€ΊθΏεΊ¦θ‘¨" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "ε½θΏεΊ¦θ‘¨ζΎη€ΊζΆη±»δΌΌδΊ --all-progress" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "ηζ¬[,ε移]" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "η¨ζεη idx ζ ΌεΌηζ¬ζ₯εε
η΄’εΌζδ»Ά" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "ζ―δΈͺθΎεΊε
ηζ倧尺寸" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "εΏ½η₯δ»ε€η¨ε―Ήθ±‘εε¨ιεη¨ε―Ήθ±‘" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "εΏ½η₯ε
对豑" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "ιεΆζε
ηͺε£η对豑ζ°" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "ι€ε―Ήθ±‘ζ°ιιεΆε€θΎη½ζε
ηͺε£ηε
ειεΆ" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "ζε
ε
θΈη delta ιΎηζ倧ιΏεΊ¦" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "ιη¨ε·²εε¨η deltas" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "ιη¨ε·²εε¨η对豑" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "δ½Ώη¨ OFS_DELTA 对豑" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "δ½Ώη¨ηΊΏη¨ζ₯θ―’ζδ½³ delta εΉι
" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "δΈεε»Ίη©Ίηε
θΎεΊ" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "δ»ζ εθΎε
₯θ―»εηζ¬ε·εζ°" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "ιεΆι£δΊε°ζͺζε
η对豑" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "ε
ζ¬ε―δ»₯δ»δ»»δ½εΌη¨θΏιε°η对豑" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "ε
ζ¬θ’«εΌη¨ζ₯εΏεΌη¨ε°η对豑" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "ε
ζ¬θ’«η΄’εΌεΌη¨ε°η对豑" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "θΎεΊε
ε°ζ εθΎεΊ" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "ε
ζ¬ι£δΊεΌη¨δΊεΎ
ζε
对豑ηζ ηΎε―Ήθ±‘" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "η»΄ζδΈε―θΎΎη对豑" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "ζΆι΄" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "ε°ζ―η»ε <ζΆι΄> ζ°ηζ ζ³θΏιη对豑解ε
" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "εε»Ίη²Ύηε
" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "εε»Ίιεζ΅
ε
ιδ»εΊθ·εηε
" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "εΏ½η₯ι
ζ .keep ζδ»Άηε
" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "ζε
εηΌ©ηΊ§ε«" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "ζΎη€Ίθ’«ε«ζ₯ιθηζδΊ€" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "δ½Ώη¨ bitmap η΄’εΌοΌε¦ζζηθ―οΌδ»₯ζι«ε―Ήθ±‘θ‘ζ°ζΆηιεΊ¦" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "ε¨ε»Ίη«ε
η΄’εΌηεζΆεε»Ί bitmap η΄’εΌ" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "对豑θ‘ζ°δΈ" @@ -8907,15 +9230,15 @@ msgstr "ζ£ε¨ε ι€ιε€ε―Ήθ±‘" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <ζΆι΄>] [--] [<倴>...]" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "δΈε ι€οΌεͺζΎη€Ί" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "ζ₯εζΈ
ι€η对豑" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "δ½Ώζ©δΊη»εζΆι΄η对豑θΏζ" @@ -8927,65 +9250,69 @@ msgstr "δΈθ½ε¨ηεδ»εΊδΈζ§θ‘ζΈ
ηζδ½" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<ιι‘Ή>] [<δ»εΊ> [<εΌη¨θ§ζ Ό>...]]" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "εεεΉΆηΈε
³ηιι‘Ή" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "δ½Ώη¨εεΊζδ½ε代εεΉΆζδ½δ»₯εε
₯δΏζΉ" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "ε
θΈεΏ«θΏεΌ" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "ιͺθ―ζεηζδΊ€ζ―ε¦ε
ε«δΈδΈͺζζη GPG ηΎε" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "θͺε¨ε¨εεΊζδ½εεζ§θ‘ stash/stash pop" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "εθ·εηΈε
³ηεζ°" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "εΉΆεζεηε樑η»ηζ°ι" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff ηεεΌζ ζοΌ%s" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "ζ ζ³ιθΏεεΊζΉεΌζεοΌζ¨ζζͺζεηεζ΄γ" -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "θδΈζ¨ηη΄’εΌδΈε
ε«ζͺζδΊ€ηεζ΄γ" -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "ζ ζ³ιθΏεεΊζΉεΌζεοΌζ¨ηη΄’εΌδΈε
ε«ζͺζδΊ€ηεζ΄γ" -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "ε¨ζ¨εεθ·εε°ηεΌη¨δΈζ²‘ζεεΊζδ½ηειγ" -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "ε¨ζ¨εεθ·εε°ηεΌη¨δΈζ²‘ζεεΉΆζδ½ηειγ" -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "ιεΈΈθΏζε³ηζ¨ζδΎδΊδΈδΈͺιι
符εΌη¨θ§ζ Όδ½ζͺθ½εθΏη«―εΉι
γ" -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8995,38 +9322,42 @@ msgstr "" "ζ¨θ¦ζ±δ»θΏη¨ '%s' ζεοΌδ½ζ―ζͺζεδΈδΈͺεζ―γε δΈΊθΏδΈζ―ε½ε\n" "εζ―ι»θ€ηθΏη¨δ»εΊοΌζ¨εΏ
ι‘»ε¨ε½δ»€θ‘δΈζεδΈδΈͺεζ―εγ" -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "ζ¨ε½εδΈε¨δΈδΈͺεζ―δΈγ" -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "θ―·ζεζ¨θ¦εεΊε°εͺδΈδΈͺεζ―γ" -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "θ―·ζεζ¨θ¦εεΉΆεͺδΈδΈͺεζ―γ" -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "θ―¦θ§ git-pull(1)γ" -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<θΏη¨>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<εζ―>" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "ε½εεζ―沑ζθ·θΈͺδΏ‘ζ―γ" -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -msgstr "" -"ε¦ζζ¨ζ³θ¦δΈΊζ€εζ―εε»Ίθ·θΈͺδΏ‘ζ―οΌζ¨ε―δ»₯ζ§θ‘οΌ\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "ε¦ζζ¨ζ³θ¦δΈΊζ€εζ―εε»Ίθ·θΈͺδΏ‘ζ―οΌζ¨ε―δ»₯ζ§θ‘οΌ" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9035,11 +9366,15 @@ msgstr "" "ζ¨ηι
η½δΈζεθ¦εεΉΆθΏη¨ηεΌη¨ '%s'οΌ\n" "δ½ζ―沑ζθ·εε°θΏδΈͺεΌη¨γ" -#: builtin/pull.c:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "--[no-]autostash ιι‘Ήεͺε¨δ½Ώη¨ --rebase ζΆζζγ" + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "ζ΄ζ°ε°ζͺθ―ηηεζ―οΌεζ΄ζ·»ε θ³η΄’εΌγ" -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9049,7 +9384,7 @@ msgstr "" "fetch ζ΄ζ°δΊε½εηεζ―γεΏ«θΏζ¨ηε·₯δ½εΊ\n" "θ³ζδΊ€ %sγ" -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9066,11 +9401,11 @@ msgstr "" "$ git reset --hard\n" "ζ’ε€δΉεηηΆζγ" -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "ζ ζ³ε°ε€δΈͺεζ―εεΉΆε°η©Ίεζ―γ" -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "ζ ζ³εεΊε°ε€δΈͺεζ―γ" @@ -9420,6 +9755,18 @@ msgstr "θ·³θΏεΊη¨η¨ηζ£εΊθΏζ»€ε¨" msgid "debug unpack-trees" msgstr "θ°θ― unpack-trees" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-dir>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "ιι»ζ¨‘εΌ" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "ζ¨εΏ
ι‘»ζεδΈδΈͺηε½γ" + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9738,27 +10085,29 @@ msgstr "* θΏη¨ %s" msgid " Fetch URL: %s" msgstr " θ·εε°εοΌ%s" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(ζ URL)" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " ζ¨ιε°εοΌ%s" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " HEAD εζ―οΌ%s" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD εζ―οΌθΏη¨ HEAD 樑η³οΌε―θ½ζ―δΈεδΈηδΈδΈͺοΌοΌ\n" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -9766,151 +10115,151 @@ msgstr[0] " θΏη¨εζ―οΌ%s" msgstr[1] " θΏη¨εζ―οΌ%s" # θ―θ
οΌδΈζε符串ζΌζ₯οΌε―ε ι€εε―Όη©Ίζ Ό -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr "οΌηΆζζͺζ₯θ―’οΌ" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 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:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr " ζ¬ε°εΌη¨ε°ε¨ 'git push' ζΆθ’«ιε" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, 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:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "ζ ΉζθΏη¨θΎη½ refs/remotes/<εη§°>/HEAD" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "ε ι€ refs/remotes/<εη§°>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "ζ ζ³η‘εθΏη¨ HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "ε€δΈͺθΏη¨ HEAD εζ―γθ―·ζη‘ε°ιζ©δΈδΈͺη¨ε½δ»€οΌ" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "ζ ζ³ε ι€ %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "δΈζ―δΈδΈͺζζεΌη¨οΌ%s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "δΈθ½θΎη½ %s" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s ε°ζδΈΊζζηΆζοΌ" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s ε·²ζδΈΊζζηΆζοΌ" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "δΏεͺ %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URLοΌ%s" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [ε°ε ι€] %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [ε·²ε ι€] %s" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "ζεεζΈ
ι€θΏη¨" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "沑ζζ€θΏη¨ '%s'" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "ζ·»ε εζ―" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "ζͺζεθΏη¨" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "ζ₯θ―’ζ¨ι URL ε°εοΌθιθ·ε URL ε°ε" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "θΏεζζ URL ε°ε" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "沑ζη»θΏη¨δ»εΊ '%s' θΎε URL" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "ζδ½ζ¨ι URLS" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "ζ·»ε URL" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "ε ι€ URLS" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete ζ ζδΉ" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ζ ζηζ§ URL εΉι
樑ηοΌ%s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "ζͺζΎε°ζ€ URLοΌ%s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "ε°δΈδΌε ι€ζζιζ¨ι URL ε°ε" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "ειΏθΎεΊοΌεΏ
ι‘»η½δΊεε½δ»€δΉε" @@ -10410,10 +10759,6 @@ msgstr "ε
θΈιε½ε ι€" msgid "exit with a zero status even if nothing matched" msgstr "ε³δ½Ώζ²‘ζεΉι
οΌδΉδ»₯ιΆηΆζιεΊ" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "θ―·ε°ζ¨ηδΏζΉηΌεε° .gitmodules δΈζδΏεθΏεΊ¦εε继η»" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10615,81 +10960,179 @@ msgstr "θ·³θΏε移ι€ζζη注ιθ‘" msgid "prepend comment character and space to each line" msgstr "δΈΊζ―δΈθ‘ηθ‘ι¦ζ·»ε 注ι符εη©Ίζ Ό" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "沑ζθΏζ ·ηεΌη¨οΌ%s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "ζζδΈδΈͺεζ΄ηεΌη¨εη§°οΌε΄εΎε° %s" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "ζ ζ³δ» url '%s' ε₯离δΈδΈͺη»δ»Ά" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "ηΈε―Ήθ·―εΎηζΏδ»£ιθ°οΌanchorοΌ" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<θ·―εΎ>] [<θ·―εΎ>...]" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "ε¨ .gitmodules δΈζͺζΎε°εζ¨‘η» '%s' η url" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "ζ ζ³δΈΊεζ¨‘η» '%s' 注ε url" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "εζ¨‘η» '%s'οΌ%sοΌζͺε―Ήθ·―εΎ '%s' 注ε\n" + +# +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "θ¦εοΌε»Ίθεζ¨‘η» '%s' δ½Ώη¨ε½δ»€ζ΄ζ°ζ¨‘εΌ\n" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "ζ ζ³δΈΊεζ¨‘η» '%s' 注εζ΄ζ°ζ¨‘εΌ" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "εε§εε樑η»ζΆζεΆθΎεΊ" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<θ·―εΎ>]" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <θ·―εΎ>" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "ε¨ .gitmodules δΈζ²‘ζεη°θ·―εΎ '%s' ηε樑η»ζ ε°" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "ζ°ηε樑η»ε°θ¦ε
ιηθ·―εΎ" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "ζ°ε樑η»ηεη§°" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "ε
ιε樑η»η url ε°ε" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "ζ΅
ε
ιηζ·±εΊ¦" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" -msgstr "" -"git submodule--helper clone [--prefix=<θ·―εΎ>] [--quiet] [--reference <δ»εΊ>] " -"[--name <εε>] [--url <ε°ε>][--depth <ζ·±εΊ¦>] [--] [<θ·―εΎ>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<θ·―εΎ>] [--quiet] [--reference <δ»εΊ>] [--name <εε>] [--depth <ζ·±εΊ¦>] --url <url> --path <θ·―εΎ>" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "δΈθ½εε»Ίηε½ '%s'" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "ζ ζ³ε
ι '%s' ε°ε樑η»θ·―εΎ '%s'" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "ζ ζ³ζεΌζδ»Ά '%s'" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "ζ ζ³ε
³ιζδ»Ά %s" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "ζ ζ³εΎε° '%s' ηε樑η»ηε½" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" -msgstr "δΈ₯ιιθ――οΌsubmodule-helper εε½δ»€εΏ
ι‘»η±ε¦ε€ηεε½δ»€θ°η¨" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "εζ¨‘η» '%s' ε°ζͺεε§ε" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "δΉθΈζ¨ζ³θ¦ζ§θ‘ 'update --init'οΌ" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "η₯θΏζͺεεΉΆηεζ¨‘η» %s" + +#: builtin/submodule--helper.c:660 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" -msgstr "δΈ₯ιιθ――οΌ'%s' δΈζ―δΈδΈͺζζη submodule--helper εε½δ»€" +msgid "Skipping submodule '%s'" +msgstr "η₯θΏεζ¨‘η» '%s'" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "ε°ε·₯δ½εΊηθ·―εΎ" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "ε·₯δ½εΊδΈηθ·―εΎοΌιε½ε΅ε₯ε樑η»" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "rebaseγmergeγcheckout ζ none" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "εε»ΊδΈδΈͺζεζ·±εΊ¦ηζ΅
ε
ι" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" +msgstr "εΉΆεδ»»ε‘" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "δΈθ¦θΎεΊε
ιθΏεΊ¦" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<θ·―εΎ>] [<θ·―εΎ>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "update εζ°εεΌιθ――" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "submodule-helper εε½δ»€εΏ
ι‘»η±ε¦ε€ηεε½δ»€θ°η¨" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' δΈζ―δΈδΈͺζζη submodule--helper εε½δ»€" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -10742,27 +11185,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "git tag -v <ζ ηΎε>..." -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "ζ ηΎεη§°ε€ͺιΏοΌ%.*s..." -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "ζͺεη°ζ ηΎ '%s'γ" -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "ε·²ε ι€ζ ηΎ '%s'οΌζΎδΈΊ %sοΌ\n" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "δΈθ½ζ ‘ιͺθ―₯ζ ηΎ '%s'" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10775,7 +11213,7 @@ msgstr "" " %s\n" "δ»₯ '%c' εΌε€΄ηθ‘ε°θ’«εΏ½η₯γ\n" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10906,21 +11344,21 @@ msgstr "ιι‘Ή --merged ε --no-merged εͺθ½ε -l ε
±η¨" msgid "only one -F or -m option is allowed." msgstr "εͺε
θΈδΈδΈͺ -F ζ -m ιι‘Ήγ" -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "ε€ͺε€εζ°" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' δΈζ―δΈδΈͺζζηζ ηΎεη§°γ" -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "ζ ηΎ '%s' ε·²εε¨" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "ε·²ζ΄ζ°ζ ηΎ '%s'οΌζΎδΈΊ %sοΌ\n" @@ -11168,7 +11606,7 @@ msgstr "git verify-commit [-v | --verbose] <ζδΊ€>..." msgid "print commit contents" msgstr "ζε°ζδΊ€ε
εΉ" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "ζε°εε§ gpg ηΆζθΎεΊ" @@ -11188,7 +11626,7 @@ msgstr "εͺζΎη€Ίη»θ‘" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <ζ ηΎ>..." -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "ζε°ζ ηΎε
εΉ" @@ -11204,68 +11642,72 @@ msgstr "git worktree prune [<ιι‘Ή>]" msgid "git worktree list [<options>]" msgstr "git worktree list [<ιι‘Ή>]" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "ε ι€ε·₯δ½εΊ/%sοΌδΈζ―δΈδΈͺζζηηε½" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "ε ι€ worktrees/%sοΌgitdir ζδ»ΆδΈεε¨" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "ε ι€ worktrees/%sοΌζ ζ³θ―»ε gitdir ζδ»Ά (%s)" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "ε ι€ worktrees/%sοΌζ ζη gitdir ζδ»Ά" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "ε ι€ worktrees/%sοΌgitdir ζδ»ΆηζεδΈεε¨" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "ζ ζ³ε ι€οΌ%s" +msgid "failed to remove '%s'" +msgstr "ζ ζ³ε ι€ '%s'" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' ε·²η»εε¨" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "δΈθ½εε»Ίηε½ '%s'" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "εε€ %s οΌζ θ―符 %sοΌ" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "ζ£εΊεζ― <branch> ε³δ½Ώε·²η»θ’«ζ£εΊε°ε
Άεε·₯δ½εΊ" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "εε»ΊδΈδΈͺζ°εζ―" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "εε»Ίζιη½δΈδΈͺεζ―" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "HEAD δ»ζεηζδΊ€ε离" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "ηζζ°ηε·₯δ½εΊ" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-bγ-B ε --detach ζ―δΊζ₯η" @@ -11285,7 +11727,7 @@ msgstr "ε° <εηΌ> εηε½ε
εΉεε°δΈδΈͺζ 对豑" msgid "only useful for debugging" msgstr "εͺε―Ήθ°θ―ζη¨" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "θ°θ―δΏ‘ζ―θΎεΊε°ζ ειθ――" @@ -11299,7 +11741,7 @@ msgstr "" "ζ₯η 'git help <ε½δ»€>' ζ 'git help <ζ¦εΏ΅>' δ»₯θ·εη»εεε½δ»€ζζ¦εΏ΅η\n" "εΈε©γ" -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "δΈζ―ζε
¬ι₯ζδ»ΆιεοΌε δΈΊ cURL < 7.44.0" @@ -11427,7 +11869,7 @@ msgstr "ζ΄ε ει" msgid "use <n> digits to display SHA-1s" msgstr "η¨ <n> δ½ζ°εζΎη€Ί SHA-1 εεΈεΌ" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "ε¦ζε―θ½οΌιη¨ε²ηͺ解ε³ζ΄ζ°η΄’εΌ" @@ -11638,16 +12080,16 @@ msgstr "" "ε¦ζζ¨ζ³θ·³θΏζ€θ‘₯δΈοΌεζ§θ‘ \"git rebase --skip\"γ\n" "θ¦ζ’ε€εεζ―εΉΆεζ’εεΊοΌζ§θ‘ \"git rebase --abort\"γ" -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "ζεεΊη¨ autostashγ" -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "ζ ζ³δΏε $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11657,31 +12099,27 @@ msgstr "" "ζ¨ηδΏζΉεε
¨ε°δΏεε¨ stash δΈγ\n" "ζ¨ε―δ»₯ε¨δ»»δ½ζΆεθΏθ‘ \"git stash pop\" ζ \"git stash drop\"γ\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "ι©ε pre-rebase ζη»εεΊζδ½γ" -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "δΌΌδΉζ£ε€δΊε¨ git-am ηζ§θ‘θΏη¨δΈγζ ζ³εεΊγ" -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "ιι‘Ή --exec εΏ
ι‘»ειι‘Ή --interactive εζΆδ½Ώη¨" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "沑ζζ£ε¨θΏθ‘ηεεΊοΌ" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "ε¨δ½ --edit-todo εͺθ½η¨ε¨δΊ€δΊεΌεεΊθΏη¨δΈγ" -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "δΈθ½θ―»ε HEAD" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11689,12 +12127,12 @@ msgstr "" "ζ¨εΏ
ι‘»ηΌθΎζζηεεΉΆε²ηͺοΌηΆειθΏ git add\n" "ε½δ»€ε°ε们ζ θ°δΈΊε·²θ§£ε³" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "ζ ζ³η§»ε $head_name" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11713,64 +12151,64 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "ηΆεειζ°ζ§θ‘εεΊζδ½γ δΈΊιΏε
δΈ’ε€±ιθ¦ζ°ζοΌζε·²η»εζ’ε½εζδ½γ" -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ζ ζηδΈζΈΈ $upstream_name" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ζδΈδΈͺδ»₯δΈηεεΉΆεΊε" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 沑ζεεΉΆεΊε" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "沑ζζεδΈδΈͺζζηζδΊ€οΌ$onto_name" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "δΈ₯ιιθ――οΌζ ζ€εζ―οΌ$branch_name" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "ζ ζ³ autostash" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "εε»ΊδΊ autostash: $stash_abbrev" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "θ―·ζδΊ€ζδΈΊε们δΏεθΏεΊ¦γ" -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "ε½εεζ― $branch_name ζ―ζζ°ηγ" -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "ε½εεζ― $branch_name ζ―ζζ°ηοΌεΌΊεΆεεΊγ" -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "εζ΄δ» $mb ε° $ontoοΌ" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "ι¦ε
οΌειεζ―δ»₯δΎΏε¨δΈι’ιζΎζ¨ηε·₯δ½..." -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "εΏ«θΏ $branch_name θ³ $onto_nameγ" @@ -11914,26 +12352,21 @@ msgstr "ζͺζεεζ―ε" msgid "(To restore them type \"git stash apply\")" msgstr "οΌδΈΊζ’ε€ζ°ζθΎε
₯ \"git stash apply\"οΌ" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "ζ ζ³δ» url '$remoteurl' ε₯离δΈδΈͺη»δ»Ά" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "εͺθ½ε¨ε·₯δ½εΊηι‘ΆηΊ§ηε½δΈδ½Ώη¨ηΈε―Ήθ·―εΎ" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "δ»εΊ URLοΌ'$repo' εΏ
ι‘»ζ―η»ε―Ήθ·―εΎζδ»₯ ./|../ θ΅·ε§" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ε·²η»εε¨δΊη΄’εΌδΈ" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11944,428 +12377,220 @@ msgstr "" "$sm_path\n" "ε¦ζζ¨η‘εζ³ζ·»ε εοΌδ½Ώη¨ -f εζ°γ" -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "ζ·»ε δ½δΊ '$sm_path' ηη°εδ»εΊε°η΄’εΌ" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ε·²εε¨δΈδΈζ―δΈδΈͺζζη git δ»εΊ" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "ζ¬ε°εη° '$sm_name' ηδΈδΈͺ git ηε½οΌδΈε
Άε―ΉεΊηθΏη¨δ»εΊοΌ" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "ε¦ζζ¨ζ³ιη¨ζ€ζ¬ε° git ηε½θδΈζ―ιζ°ε
ιθͺ" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "δ½Ώη¨ '--force' εζ°γε¦ζζ¬ε° git ηε½δΈζ―ζ£η‘ηδ»εΊ" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "ζθ
ζ¨δΈη‘εε
ΆδΈε«δΉδ½Ώη¨ '--name' εζ°ιζ©ε¦ε€δΈδΈͺεη§°γ" -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "ζΏζ΄»ζ¬ε° git ηε½ε°εζ¨‘η» '$sm_name'γ" -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "δΈθ½ζ£εΊεζ¨‘η» '$sm_path'" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "ζ ζ³ζ·»ε εζ¨‘η» '$sm_path'" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "ζ ζ³ζ³¨εεζ¨‘η» '$sm_path'" -#: git-submodule.sh:417 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "ζ£ε¨θΏε
₯ '$prefix$displaypath'" +msgid "Entering '$displaypath'" +msgstr "ζ£ε¨θΏε
₯ '$displaypath'" -#: git-submodule.sh:437 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "εζ’δΊ '$prefix$displaypath'οΌθζ¬θΏειιΆεΌγ" +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "εζ’δΊ '$displaypath'οΌθζ¬θΏειιΆεΌγ" -#: git-submodule.sh:483 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "ε¨ .gitmodules δΈζͺζΎε°ε樑η»θ·―εΎ '$displaypath' η url" +msgid "pathspec and --all are incompatible" +msgstr "pathspec ε --all δΈε
ΌεΉ" -#: git-submodule.sh:492 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "ζ ζ³δΈΊε樑η»θ·―εΎ '$displaypath' 注ε url" - -#: git-submodule.sh:494 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "εζ¨‘η» '$name' ($url) ζͺε―Ήθ·―εΎ '$displaypath' 注ε" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "ε¦ζζ¨η‘εζ³θ¦ε―Ήζζε樑η»ζ§θ‘εζΆεε§εοΌθ―·δ½Ώη¨ '--all'" -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "ζ ζ³δΈΊε樑η»θ·―εΎ '$displaypath' 注εζ΄ζ°ζ¨‘εΌ" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "δ½Ώη¨ '.' ε¦ζζ¨ηηζ³θ¦ε―Ήζζε樑η»εζΆεε§ε" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "ε樑η»ε·₯δ½εΊ '$displaypath' ε
ε«δΈδΈͺ .git ηε½" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "οΌδ½Ώη¨ 'rm -rf' ε½δ»€ε¦ζζ¨ηηζ³ε ι€εεε
Άε
¨ι¨εε²οΌ" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "ε樑η»ε·₯δ½εΊ '$displaypath' ε
ε«ζ¬ε°δΏζΉοΌδ½Ώη¨ '-f' δΈ’εΌε们" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "ε·²ζΈ
ι€ηε½ '$displaypath'" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "ζ ζ³η§»ι€ε樑η»ε·₯δ½εΊ '$displaypath'" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "δΈθ½εε»Ίη©Ίηε樑η»ηε½ '$displaypath'" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "εζ¨‘η» '$name' ($url) ζͺε―Ήθ·―εΎ '$displaypath' 注ε" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"ε樑η»θ·―εΎ '$displaypath' 沑ζεε§ε\n" -"δΉθΈζ¨ζ³η¨ 'update --init'οΌ" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "ζ ζ³ε¨ε樑η»θ·―εΎ '$displaypath' δΈζΎε°ε½εηζ¬" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "ζ ζ³ε¨ε樑η»θ·―εΎ '$sm_path' δΈθ·ε" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "ζ ζ³ε¨ε樑η»θ·―εΎ '$displaypath' δΈθ·ε" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "ζ ζ³ε¨ε樑η»θ·―εΎ '$displaypath' δΈζ£εΊ '$sha1'" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "ε樑η»θ·―εΎ '$displaypath'οΌζ£εΊ '$sha1'" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "ζ ζ³ε¨ε樑η»θ·―εΎ '$displaypath' δΈεεΊ '$sha1'" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "ε樑η»θ·―εΎ '$displaypath'οΌεεΊθ³ '$sha1'" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "ζ ζ³εεΉΆ '$sha1' ε°ε樑η»θ·―εΎ '$displaypath' δΈ" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "ε樑η»θ·―εΎ '$displaypath'οΌε·²εεΉΆε
₯ '$sha1'" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "ε¨ε樑η»θ·―εΎ '$prefix$sm_path' δΈζ§θ‘ '$command $sha1' ε€±θ΄₯" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" +msgstr "ε¨εζ¨‘η» '$displaypath' δΈζ§θ‘ '$command $sha1' ε€±θ΄₯" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "ε樑η»θ·―εΎ '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "εζ¨‘η» '$displaypath'οΌ'$command $sha1'" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "ζ ζ³ιε½θΏε樑η»θ·―εΎ '$displaypath'" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "ιι‘Ή --cached δΈθ½ειι‘Ή --files εζΆδ½Ώη¨" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "ζε€ηζ¨‘εΌ $mod_dst" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " θ¦εοΌ$display_name ζͺε
ε«ζδΊ€ $sha1_src" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " θ¦εοΌ$display_name ζͺε
ε«ζδΊ€ $sha1_dst" # θ―θ
οΌζ³¨ζδΏζεε―Όη©Ίζ Ό -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, 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:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "ζ°ζ对豑" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "ζ ζ³ιε½θΏε樑η»θ·―εΎ '$sm_path'" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "δΈΊ '$displaypath' εζ₯εζ¨‘η» url" -#~ msgid "Forward-port local commits to the updated upstream head" -#~ msgstr "ζ¬ε°ζ亀转移θ³ζ΄ζ°εηδΈζΈΈεζ―δΈ" - -#~ msgid "unable to parse format" -#~ msgstr "δΈθ½θ§£ζζ ΌεΌ" - -#~ msgid "improper format entered align:%s" -#~ msgstr "θΎε
₯δΊδΈζ£η‘ηζ ΌεΌ align:%s" - -#~ msgid "Could not set core.worktree in %s" -#~ msgstr "δΈθ½ε¨ %s δΈθΎη½ core.worktree" - -# θ―θ
οΌε符串ι¦θ‘θ‘ι¦θ¦ζ·»ε βwarning: βεδΈ²οΌζ
ζ€ι¦θ‘θ¦θΎε
Άδ½θ‘η -#~ 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'\n" -#~ "εζ΄δΈΊ '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" -#~ "\n" -#~ "δ» Git 2.0 εΌε§οΌGit ι»θ€ιη¨ζ΄δΈΊδΏεη 'simple' 樑εΌοΌεͺζ¨ιε½ε\n" -#~ "εζ―ε°θΏη¨ε
³θηεεεζ―οΌε³ 'git push' ζ¨ιε½εεζ―γ\n" -#~ "\n" -#~ "εθ§ 'git help config' εΉΆζ₯ζΎ 'push.default' δ»₯θ·εζ΄ε€δΏ‘ζ―γ\n" -#~ "οΌ'simple' 樑εΌη± Git 1.7.11 ηζ¬εΌε
₯γε¦ζζ¨ζζΆθ¦δ½Ώη¨θηζ¬η GitοΌ\n" -#~ "δΈΊδΏζε
ΌεΉοΌθ―·η¨ 'current' δ»£ζΏ 'simple'οΌ" - -#~ msgid "Could not append '%s'" -#~ msgstr "δΈθ½θΏ½ε '%s'" - -#~ msgid "Could not set '%s'" -#~ msgstr "δΈθ½θΎη½ '%s'" - -# θ―θ
οΌε―ιεΌοΌδΈθ½ηΏ»θ― -#~ msgid "check|on-demand|no" -#~ msgstr "check|on-demand|no" - -#~ msgid "Missing author: %s" -#~ msgstr "ηΌΊε°δ½θ
οΌ%s" - -#~ msgid "Testing " -#~ msgstr "ζ£ε¨ζ΅θ― " - -#~ msgid "unable to look up current user in the passwd file: %s" -#~ msgstr "ζ ζ³ε¨ε£δ»€ζδ»ΆδΈζ₯θ―’ε°ε½εη¨ζ·οΌ%s" - -#~ msgid "no such user" -#~ msgstr "ζ ζ€η¨ζ·" - -#~ msgid "show usage" -#~ msgstr "ζΎη€Ίη¨ζ³" - -#~ msgid "branch '%s' does not point at a commit" -#~ msgstr "εζ― '%s' ζͺζεδΈδΈͺζδΊ€" - -#~ msgid "object '%s' does not point to a commit" -#~ msgstr "对豑 '%s' 沑ζζεδΈδΈͺζδΊ€" - -#~ msgid "print only merged branches" -#~ msgstr "εͺζε°εεΉΆηεζ―" - -#~ msgid "--dissociate given, but there is no --reference" -#~ msgstr "ζδΎδΊεζ° --dissociateοΌδ½ζͺζδΎ --reference" - -#~ msgid "insanely long template name %s" -#~ msgstr "ε€ͺιΏη樑ηε %s" - -#~ msgid "insanely long symlink %s" -#~ msgstr "ε€ͺιΏη符ε·ιΎζ₯ %s" - -#~ msgid "insanely long template path %s" -#~ msgstr "ε€ͺιΏη樑ηθ·―εΎ %s" - -#~ msgid "insane git directory %s" -#~ msgstr "δΈζ£εΈΈη git ηε½ %s" - -#~ msgid "unsupported sort specification '%s'" -#~ msgstr "δΈζ―ζηζεΊθ§ζ Ό '%s'" - -#~ msgid "unsupported sort specification '%s' in variable '%s'" -#~ msgstr "δΈζ―ζει '%2$s' ηζεΊθ§ζ Ό '%1$s'" - -#~ msgid "switch 'points-at' requires an object" -#~ msgstr "εΌε
³ 'points-at' ιθ¦δΈδΈͺ对豑" - -#~ msgid "sort tags" -#~ msgstr "ζεΊζ ηΎ" - -#~ msgid "--sort and -n are incompatible" -#~ msgstr "--sort ε -n δΈε
ΌεΉ" - -#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -#~ msgstr "Gitdir '$a' ε¨ε樑η»θ·―εΎ '$b' δΉδΈζηΈε" - -#~ msgid "false|true|preserve" -#~ msgstr "false|true|preserve" - -#~ msgid "BUG: reopen a lockfile that is still open" -#~ msgstr "BUG: ιζ°ζεΌδΈδΈͺδ»ζεΌηηιζδ»Ά" - -#~ msgid "BUG: reopen a lockfile that has been committed" -#~ msgstr "BUG: ιζ°ζεΌδΈδΈͺε·²ζδΊ€ηιζδ»Ά" - -#~ msgid "option %s does not accept negative form" -#~ msgstr "ιι‘Ή %s δΈζ₯εε¦εζ ΌεΌ" - -#~ msgid "unable to parse value '%s' for option %s" -#~ msgstr "δΈθ½θ§£ζιι‘Ή %1$s ηεΌ '%2$s'" - -#~ msgid "-b and -B are mutually exclusive" -#~ msgstr "-b ε -B δΊζ₯" - -#~ msgid "You need to set your committer info first" -#~ msgstr "ζ¨ιθ¦ε
θΎη½δ½ ηζδΊ€θ
δΏ‘ζ―" - -#~ 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\"γ" - -#~ msgid "Patch format $patch_format is not supported." -#~ msgstr "δΈζ―ζ $patch_format θ‘₯δΈζ ΌεΌγ" - -#~ msgid "Please make up your mind. --skip or --abort?" -#~ msgstr "θ―·δΈε³εΏγ--skip ζζ― --abort οΌ" - -#~ 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\"γ" - -#~ msgid "Patch does not have a valid e-mail address." -#~ msgstr "θ‘₯δΈδΈζ²‘ζδΈδΈͺζζηιδ»Άε°εγ" - -#~ msgid "Applying: $FIRSTLINE" -#~ msgstr "ζ£εΊη¨οΌ$FIRSTLINE" - -#~ msgid "Patch failed at $msgnum $FIRSTLINE" -#~ msgstr "θ‘₯δΈε€±θ΄₯δΊ $msgnum $FIRSTLINE" - -#~ 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 "" -#~ "Pull δΈε―η¨οΌε δΈΊζ¨ε°ζζͺεεΉΆηζδ»Άγθ―·ε
ε¨ε·₯δ½εΊζΉζ£ζδ»ΆοΌ\n" -#~ "ηΆει
ζ
δ½Ώη¨ 'git add/rm <ζδ»Ά>' ζ θ°θ§£ε³ζΉζ‘οΌεεζδΊ€γ" - -#~ msgid "Pull is not possible because you have unmerged files." -#~ msgstr "Pull δΈε―η¨οΌε δΈΊζ¨ε°ζζͺεεΉΆηζδ»Άγ" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "θ―¦θ§ git-${cmd}(1)γ" @@ -16,6 +16,7 @@ static struct cmt_fmt_map { const char *name; enum cmit_fmt format; int is_tformat; + int expand_tabs_in_log; int is_alias; const char *user_format; } *commit_formats; @@ -87,13 +88,13 @@ static int git_pretty_formats_config(const char *var, const char *value, void *c static void setup_commit_formats(void) { struct cmt_fmt_map builtin_formats[] = { - { "raw", CMIT_FMT_RAW, 0 }, - { "medium", CMIT_FMT_MEDIUM, 0 }, - { "short", CMIT_FMT_SHORT, 0 }, - { "email", CMIT_FMT_EMAIL, 0 }, - { "fuller", CMIT_FMT_FULLER, 0 }, - { "full", CMIT_FMT_FULL, 0 }, - { "oneline", CMIT_FMT_ONELINE, 1 } + { "raw", CMIT_FMT_RAW, 0, 0 }, + { "medium", CMIT_FMT_MEDIUM, 0, 8 }, + { "short", CMIT_FMT_SHORT, 0, 0 }, + { "email", CMIT_FMT_EMAIL, 0, 0 }, + { "fuller", CMIT_FMT_FULLER, 0, 8 }, + { "full", CMIT_FMT_FULL, 0, 8 }, + { "oneline", CMIT_FMT_ONELINE, 1, 0 } }; commit_formats_len = ARRAY_SIZE(builtin_formats); builtin_formats_len = commit_formats_len; @@ -172,6 +173,7 @@ void get_commit_format(const char *arg, struct rev_info *rev) rev->commit_format = commit_format->format; rev->use_terminator = commit_format->is_tformat; + rev->expand_tabs_in_log_default = commit_format->expand_tabs_in_log; if (commit_format->format == CMIT_FMT_USERFORMAT) { save_user_format(rev, commit_format->user_format, commit_format->is_tformat); @@ -1020,9 +1022,15 @@ static size_t parse_padding_placeholder(struct strbuf *sb, int width; if (!end || end == start) return 0; - width = strtoul(start, &next, 10); + width = strtol(start, &next, 10); if (next == start || width == 0) return 0; + if (width < 0) { + if (to_column) + width += term_columns(); + if (width < 0) + return 0; + } c->padding = to_column ? -width : width; c->flush_type = flush_type; @@ -1061,7 +1069,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ switch (placeholder[0]) { case 'C': if (starts_with(placeholder + 1, "(auto)")) { - c->auto_color = 1; + c->auto_color = want_color(c->pretty_ctx->color); return 7; /* consumed 7 bytes, "C(auto)" */ } else { int ret = parse_color(sb, placeholder, c); @@ -1297,6 +1305,7 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */ if (!start) start = sb->buf; occupied = utf8_strnwidth(start, -1, 1); + occupied += c->pretty_ctx->graph_width; padding = (-padding) - occupied; } while (1) { @@ -1629,6 +1638,72 @@ void pp_title_line(struct pretty_print_context *pp, strbuf_release(&title); } +static int pp_utf8_width(const char *start, const char *end) +{ + int width = 0; + size_t remain = end - start; + + while (remain) { + int n = utf8_width(&start, &remain); + if (n < 0 || !start) + return -1; + width += n; + } + return width; +} + +static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth, + const char *line, int linelen) +{ + const char *tab; + + while ((tab = memchr(line, '\t', linelen)) != NULL) { + int width = pp_utf8_width(line, tab); + + /* + * If it wasn't well-formed utf8, or it + * had characters with badly defined + * width (control characters etc), just + * give up on trying to align things. + */ + if (width < 0) + break; + + /* Output the data .. */ + strbuf_add(sb, line, tab - line); + + /* .. and the de-tabified tab */ + strbuf_addchars(sb, ' ', tabwidth - (width % tabwidth)); + + /* Skip over the printed part .. */ + linelen -= tab + 1 - line; + line = tab + 1; + } + + /* + * Print out everything after the last tab without + * worrying about width - there's nothing more to + * align. + */ + strbuf_add(sb, line, linelen); +} + +/* + * pp_handle_indent() prints out the intendation, and + * the whole line (without the final newline), after + * de-tabifying. + */ +static void pp_handle_indent(struct pretty_print_context *pp, + struct strbuf *sb, int indent, + const char *line, int linelen) +{ + strbuf_addchars(sb, ' ', indent); + if (pp->expand_tabs_in_log) + strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, line, linelen); + else + strbuf_add(sb, line, linelen); +} + void pp_remainder(struct pretty_print_context *pp, const char **msg_p, struct strbuf *sb, @@ -1653,8 +1728,12 @@ void pp_remainder(struct pretty_print_context *pp, strbuf_grow(sb, linelen + indent + 20); if (indent) - strbuf_addchars(sb, ' ', indent); - strbuf_add(sb, line, linelen); + pp_handle_indent(pp, sb, indent, line, linelen); + else if (pp->expand_tabs_in_log) + strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, + line, linelen); + else + strbuf_add(sb, line, linelen); strbuf_addch(sb, '\n'); } } @@ -43,6 +43,19 @@ void sq_quote_buf(struct strbuf *dst, const char *src) free(to_free); } +void sq_quotef(struct strbuf *dst, const char *fmt, ...) +{ + struct strbuf src = STRBUF_INIT; + + va_list ap; + va_start(ap, fmt); + strbuf_vaddf(&src, fmt, ap); + va_end(ap); + + sq_quote_buf(dst, src.buf); + strbuf_release(&src); +} + void sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen) { int i; @@ -25,10 +25,13 @@ struct strbuf; * sq_quote_buf() writes to an existing buffer of specified size; it * will return the number of characters that would have been written * excluding the final null regardless of the buffer size. + * + * sq_quotef() quotes the entire formatted string as a single result. */ extern void sq_quote_buf(struct strbuf *, const char *src); extern void sq_quote_argv(struct strbuf *, const char **argv, size_t maxlen); +extern void sq_quotef(struct strbuf *, const char *fmt, ...); /* This unwraps what sq_quote() produces in place, but returns * NULL if the input does not look like what sq_quote would have diff --git a/reachable.c b/reachable.c index ed35201..d0199ca 100644 --- a/reachable.c +++ b/reachable.c @@ -119,8 +119,7 @@ static int add_recent_loose(const unsigned char *sha1, */ if (errno == ENOENT) return 0; - return error("unable to stat %s: %s", - sha1_to_hex(sha1), strerror(errno)); + return error_errno("unable to stat %s", sha1_to_hex(sha1)); } add_recent_object(sha1, st.st_mtime, data); diff --git a/read-cache.c b/read-cache.c index d9fb78b..db27766 100644 --- a/read-cache.c +++ b/read-cache.c @@ -630,7 +630,7 @@ void set_object_name_for_intent_to_add_entry(struct cache_entry *ce) hashcpy(ce->sha1, sha1); } -int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags) +int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags, int force_mode) { int size, namelen, was_same; mode_t st_mode = st->st_mode; @@ -659,7 +659,9 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, else ce->ce_flags |= CE_INTENT_TO_ADD; - if (trust_executable_bit && has_symlinks) + if (S_ISREG(st_mode) && force_mode) + ce->ce_mode = create_ce_mode(force_mode); + else if (trust_executable_bit && has_symlinks) ce->ce_mode = create_ce_mode(st_mode); else { /* If there is an existing entry, pick the mode bits and type @@ -720,12 +722,13 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, return 0; } -int add_file_to_index(struct index_state *istate, const char *path, int flags) +int add_file_to_index(struct index_state *istate, const char *path, + int flags, int force_mode) { struct stat st; if (lstat(path, &st)) die_errno("unable to stat '%s'", path); - return add_to_index(istate, path, &st, flags); + return add_to_index(istate, path, &st, flags, force_mode); } struct cache_entry *make_cache_entry(unsigned int mode, diff --git a/reflog-walk.c b/reflog-walk.c index 0ebd1da..a246af2 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -241,6 +241,12 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit) logobj = parse_object(reflog->osha1); } while (commit_reflog->recno && (logobj && logobj->type != OBJ_COMMIT)); + if (!logobj && commit_reflog->recno >= 0 && is_null_sha1(reflog->osha1)) { + /* a root commit, but there are still more entries to show */ + reflog = &commit_reflog->reflogs->items[commit_reflog->recno]; + logobj = parse_object(reflog->nsha1); + } + if (!logobj || logobj->type != OBJ_COMMIT) { commit_info->commit = NULL; commit->parents = NULL; @@ -1080,3 +1080,152 @@ int rename_ref_available(const char *oldname, const char *newname) strbuf_release(&err); return ret; } + +int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) +{ + struct object_id oid; + int flag; + + if (submodule) { + if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0) + return fn("HEAD", &oid, 0, cb_data); + + return 0; + } + + if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag)) + return fn("HEAD", &oid, flag, cb_data); + + return 0; +} + +int head_ref(each_ref_fn fn, void *cb_data) +{ + return head_ref_submodule(NULL, fn, cb_data); +} + +int for_each_ref(each_ref_fn fn, void *cb_data) +{ + return do_for_each_ref(NULL, "", fn, 0, 0, cb_data); +} + +int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) +{ + return do_for_each_ref(submodule, "", fn, 0, 0, cb_data); +} + +int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data) +{ + return do_for_each_ref(NULL, prefix, fn, strlen(prefix), 0, cb_data); +} + +int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken) +{ + unsigned int flag = 0; + + if (broken) + flag = DO_FOR_EACH_INCLUDE_BROKEN; + return do_for_each_ref(NULL, prefix, fn, 0, flag, cb_data); +} + +int for_each_ref_in_submodule(const char *submodule, const char *prefix, + each_ref_fn fn, void *cb_data) +{ + return do_for_each_ref(submodule, prefix, fn, strlen(prefix), 0, cb_data); +} + +int for_each_replace_ref(each_ref_fn fn, void *cb_data) +{ + return do_for_each_ref(NULL, git_replace_ref_base, fn, + strlen(git_replace_ref_base), 0, cb_data); +} + +int for_each_namespaced_ref(each_ref_fn fn, void *cb_data) +{ + struct strbuf buf = STRBUF_INIT; + int ret; + strbuf_addf(&buf, "%srefs/", get_git_namespace()); + ret = do_for_each_ref(NULL, buf.buf, fn, 0, 0, cb_data); + strbuf_release(&buf); + return ret; +} + +int for_each_rawref(each_ref_fn fn, void *cb_data) +{ + return do_for_each_ref(NULL, "", fn, 0, + DO_FOR_EACH_INCLUDE_BROKEN, cb_data); +} + +/* 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 struct strbuf sb_refname = STRBUF_INIT; + int unused_flags; + int symref_count; + + if (!flags) + flags = &unused_flags; + + *flags = 0; + + if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { + if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) || + !refname_is_safe(refname)) { + errno = EINVAL; + return NULL; + } + + /* + * dwim_ref() uses REF_ISBROKEN to distinguish between + * missing refs and refs that were present but invalid, + * to complain about the latter to stderr. + * + * We don't know whether the ref exists, so don't set + * REF_ISBROKEN yet. + */ + *flags |= REF_BAD_NAME; + } + + for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) { + unsigned int read_flags = 0; + + if (read_raw_ref(refname, sha1, &sb_refname, &read_flags)) { + *flags |= read_flags; + if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING)) + return NULL; + hashclr(sha1); + if (*flags & REF_BAD_NAME) + *flags |= REF_ISBROKEN; + return refname; + } + + *flags |= read_flags; + + if (!(read_flags & REF_ISSYMREF)) { + if (*flags & REF_BAD_NAME) { + hashclr(sha1); + *flags |= REF_ISBROKEN; + } + return refname; + } + + refname = sb_refname.buf; + if (resolve_flags & RESOLVE_REF_NO_RECURSE) { + hashclr(sha1); + return refname; + } + if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { + if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) || + !refname_is_safe(refname)) { + errno = EINVAL; + return NULL; + } + + *flags |= REF_ISBROKEN | REF_BAD_NAME; + } + } + + errno = ELOOP; + return NULL; +} @@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err); * msg -- a message describing the change (for the reflog). * * err -- a strbuf for receiving a description of any error that - * might have occured. + * might have occurred. * * The functions make internal copies of refname and msg, so the * caller retains ownership of these parameters. diff --git a/refs/files-backend.c b/refs/files-backend.c index ea78ce9..1f38076 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -513,9 +513,6 @@ static void sort_ref_dir(struct ref_dir *dir) dir->sorted = dir->nr = i; } -/* Include broken references in a do_for_each_ref*() iteration: */ -#define DO_FOR_EACH_INCLUDE_BROKEN 0x01 - /* * Return true iff the reference described by entry can be resolved to * an object in the database. Emit a warning if the referred-to @@ -1272,8 +1269,6 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs) return get_ref_dir(refs->loose); } -/* We allow "recursive" symbolic refs. Only within reason, though */ -#define MAXDEPTH 5 #define MAXREFLEN (1024) /* @@ -1303,7 +1298,7 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs, char buffer[128], *p; char *path; - if (recursion > MAXDEPTH || strlen(refname) > MAXREFLEN) + if (recursion > SYMREF_MAXDEPTH || strlen(refname) > MAXREFLEN) return -1; path = *refs->name ? git_pathdup_submodule(refs->name, "%s", refname) @@ -1371,13 +1366,11 @@ static struct ref_entry *get_packed_ref(const char *refname) } /* - * A loose ref file doesn't exist; check for a packed ref. The - * options are forwarded from resolve_safe_unsafe(). + * A loose ref file doesn't exist; check for a packed ref. */ static int resolve_missing_loose_ref(const char *refname, - int resolve_flags, unsigned char *sha1, - int *flags) + unsigned int *flags) { struct ref_entry *entry; @@ -1388,205 +1381,158 @@ static int resolve_missing_loose_ref(const char *refname, entry = get_packed_ref(refname); if (entry) { hashcpy(sha1, entry->u.value.oid.hash); - if (flags) - *flags |= REF_ISPACKED; - return 0; - } - /* The reference is not a packed reference, either. */ - if (resolve_flags & RESOLVE_REF_READING) { - errno = ENOENT; - return -1; - } else { - hashclr(sha1); + *flags |= REF_ISPACKED; return 0; } + /* refname is not a packed reference. */ + return -1; } -/* This function needs to return a meaningful errno on failure */ -static const char *resolve_ref_1(const char *refname, - int resolve_flags, - unsigned char *sha1, - int *flags, - struct strbuf *sb_refname, - struct strbuf *sb_path, - struct strbuf *sb_contents) +/* + * Read a raw ref from the filesystem or packed refs file. + * + * If the ref is a sha1, fill in sha1 and return 0. + * + * If the ref is symbolic, fill in *symref with the referrent + * (e.g. "refs/heads/master") and return 0. The caller is responsible + * for validating the referrent. Set REF_ISSYMREF in flags. + * + * If the ref doesn't exist, set errno to ENOENT and return -1. + * + * If the ref exists but is neither a symbolic ref nor a sha1, it is + * broken. Set REF_ISBROKEN in flags, set errno to EINVAL, and return + * -1. + * + * If there is another error reading the ref, set errno appropriately and + * return -1. + * + * Backend-specific flags might be set in flags as well, regardless of + * outcome. + * + * sb_path is workspace: the caller should allocate and free it. + * + * It is OK for refname to point into symref. In this case: + * - if the function succeeds with REF_ISSYMREF, symref will be + * overwritten and the memory pointed to by refname might be changed + * or even freed. + * - in all other cases, symref will be untouched, and therefore + * refname will still be valid and unchanged. + */ +int read_raw_ref(const char *refname, unsigned char *sha1, + struct strbuf *symref, unsigned int *flags) { - int depth = MAXDEPTH; - int bad_name = 0; + struct strbuf sb_contents = STRBUF_INIT; + struct strbuf sb_path = STRBUF_INIT; + const char *path; + const char *buf; + struct stat st; + int fd; + int ret = -1; + int save_errno; - if (flags) - *flags = 0; + strbuf_reset(&sb_path); + strbuf_git_path(&sb_path, "%s", refname); + path = sb_path.buf; - if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { - if (flags) - *flags |= REF_BAD_NAME; +stat_ref: + /* + * We might have to loop back here to avoid a race + * condition: first we lstat() the file, then we try + * to read it as a link or as a file. But if somebody + * changes the type of the file (file <-> directory + * <-> symlink) between the lstat() and reading, then + * we don't want to report that as an error but rather + * try again starting with the lstat(). + */ - if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) || - !refname_is_safe(refname)) { - errno = EINVAL; - return NULL; + if (lstat(path, &st) < 0) { + if (errno != ENOENT) + goto out; + if (resolve_missing_loose_ref(refname, sha1, flags)) { + errno = ENOENT; + goto out; } - /* - * dwim_ref() uses REF_ISBROKEN to distinguish between - * missing refs and refs that were present but invalid, - * to complain about the latter to stderr. - * - * We don't know whether the ref exists, so don't set - * REF_ISBROKEN yet. - */ - bad_name = 1; + ret = 0; + goto out; } - for (;;) { - const char *path; - struct stat st; - char *buf; - int fd; - - if (--depth < 0) { - errno = ELOOP; - return NULL; - } - - 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 - * condition: first we lstat() the file, then we try - * to read it as a link or as a file. But if somebody - * changes the type of the file (file <-> directory - * <-> symlink) between the lstat() and reading, then - * we don't want to report that as an error but rather - * try again starting with the lstat(). - */ - stat_ref: - if (lstat(path, &st) < 0) { - if (errno != ENOENT) - return NULL; - if (resolve_missing_loose_ref(refname, resolve_flags, - sha1, flags)) - return NULL; - if (bad_name) { - hashclr(sha1); - if (flags) - *flags |= REF_ISBROKEN; - } - return refname; - } - - /* Follow "normalized" - ie "refs/.." symlinks by hand */ - if (S_ISLNK(st.st_mode)) { - strbuf_reset(sb_contents); - if (strbuf_readlink(sb_contents, path, 0) < 0) { - if (errno == ENOENT || errno == EINVAL) - /* inconsistent with lstat; retry */ - goto stat_ref; - else - return NULL; - } - if (starts_with(sb_contents->buf, "refs/") && - !check_refname_format(sb_contents->buf, 0)) { - strbuf_swap(sb_refname, sb_contents); - refname = sb_refname->buf; - if (flags) - *flags |= REF_ISSYMREF; - if (resolve_flags & RESOLVE_REF_NO_RECURSE) { - hashclr(sha1); - return refname; - } - continue; - } - } - /* Is it a directory? */ - if (S_ISDIR(st.st_mode)) { - errno = EISDIR; - return NULL; - } - - /* - * Anything else, just open it and try to use it as - * a ref - */ - fd = open(path, O_RDONLY); - if (fd < 0) { - if (errno == ENOENT) + /* Follow "normalized" - ie "refs/.." symlinks by hand */ + if (S_ISLNK(st.st_mode)) { + strbuf_reset(&sb_contents); + if (strbuf_readlink(&sb_contents, path, 0) < 0) { + if (errno == ENOENT || errno == EINVAL) /* inconsistent with lstat; retry */ goto stat_ref; else - return NULL; + goto out; } - strbuf_reset(sb_contents); - if (strbuf_read(sb_contents, fd, 256) < 0) { - int save_errno = errno; - close(fd); - errno = save_errno; - return NULL; + if (starts_with(sb_contents.buf, "refs/") && + !check_refname_format(sb_contents.buf, 0)) { + strbuf_swap(&sb_contents, symref); + *flags |= REF_ISSYMREF; + ret = 0; + goto out; } - close(fd); - strbuf_rtrim(sb_contents); + } - /* - * Is it a symbolic ref? - */ - if (!starts_with(sb_contents->buf, "ref:")) { - /* - * Please note that FETCH_HEAD has a second - * line containing other data. - */ - if (get_sha1_hex(sb_contents->buf, sha1) || - (sb_contents->buf[40] != '\0' && !isspace(sb_contents->buf[40]))) { - if (flags) - *flags |= REF_ISBROKEN; - errno = EINVAL; - return NULL; - } - if (bad_name) { - hashclr(sha1); - if (flags) - *flags |= REF_ISBROKEN; - } - return refname; - } - if (flags) - *flags |= REF_ISSYMREF; - buf = sb_contents->buf + 4; + /* Is it a directory? */ + if (S_ISDIR(st.st_mode)) { + errno = EISDIR; + goto out; + } + + /* + * Anything else, just open it and try to use it as + * a ref + */ + fd = open(path, O_RDONLY); + if (fd < 0) { + if (errno == ENOENT) + /* inconsistent with lstat; retry */ + goto stat_ref; + else + goto out; + } + strbuf_reset(&sb_contents); + if (strbuf_read(&sb_contents, fd, 256) < 0) { + int save_errno = errno; + close(fd); + errno = save_errno; + goto out; + } + close(fd); + strbuf_rtrim(&sb_contents); + buf = sb_contents.buf; + if (starts_with(buf, "ref:")) { + buf += 4; while (isspace(*buf)) buf++; - strbuf_reset(sb_refname); - strbuf_addstr(sb_refname, buf); - refname = sb_refname->buf; - if (resolve_flags & RESOLVE_REF_NO_RECURSE) { - hashclr(sha1); - return refname; - } - if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) { - if (flags) - *flags |= REF_ISBROKEN; - - if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) || - !refname_is_safe(buf)) { - errno = EINVAL; - return NULL; - } - bad_name = 1; - } + + strbuf_reset(symref); + strbuf_addstr(symref, buf); + *flags |= REF_ISSYMREF; + ret = 0; + goto out; } -} -const char *resolve_ref_unsafe(const char *refname, int resolve_flags, - unsigned char *sha1, int *flags) -{ - static struct strbuf sb_refname = STRBUF_INIT; - struct strbuf sb_contents = STRBUF_INIT; - struct strbuf sb_path = STRBUF_INIT; - const char *ret; + /* + * Please note that FETCH_HEAD has additional + * data after the sha. + */ + if (get_sha1_hex(buf, sha1) || + (buf[40] != '\0' && !isspace(buf[40]))) { + *flags |= REF_ISBROKEN; + errno = EINVAL; + goto out; + } + + ret = 0; - ret = resolve_ref_1(refname, resolve_flags, sha1, flags, - &sb_refname, &sb_path, &sb_contents); +out: + save_errno = errno; strbuf_release(&sb_path); strbuf_release(&sb_contents); + errno = save_errno; return ret; } @@ -1727,10 +1673,13 @@ static int do_for_each_entry(struct ref_cache *refs, const char *base, * value, stop the iteration and return that value; otherwise, return * 0. */ -static int do_for_each_ref(struct ref_cache *refs, const char *base, - each_ref_fn fn, int trim, int flags, void *cb_data) +int do_for_each_ref(const char *submodule, const char *base, + each_ref_fn fn, int trim, int flags, void *cb_data) { struct ref_entry_cb data; + struct ref_cache *refs; + + refs = get_ref_cache(submodule); data.base = base; data.trim = trim; data.flags = flags; @@ -1745,86 +1694,6 @@ static int do_for_each_ref(struct ref_cache *refs, const char *base, return do_for_each_entry(refs, base, do_one_ref, &data); } -static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data) -{ - struct object_id oid; - int flag; - - if (submodule) { - if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0) - return fn("HEAD", &oid, 0, cb_data); - - return 0; - } - - if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag)) - return fn("HEAD", &oid, flag, cb_data); - - return 0; -} - -int head_ref(each_ref_fn fn, void *cb_data) -{ - return do_head_ref(NULL, fn, cb_data); -} - -int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) -{ - return do_head_ref(submodule, fn, cb_data); -} - -int for_each_ref(each_ref_fn fn, void *cb_data) -{ - return do_for_each_ref(&ref_cache, "", fn, 0, 0, cb_data); -} - -int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) -{ - return do_for_each_ref(get_ref_cache(submodule), "", fn, 0, 0, cb_data); -} - -int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data) -{ - return do_for_each_ref(&ref_cache, prefix, fn, strlen(prefix), 0, cb_data); -} - -int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken) -{ - unsigned int flag = 0; - - if (broken) - flag = DO_FOR_EACH_INCLUDE_BROKEN; - return do_for_each_ref(&ref_cache, prefix, fn, 0, flag, cb_data); -} - -int for_each_ref_in_submodule(const char *submodule, const char *prefix, - each_ref_fn fn, void *cb_data) -{ - return do_for_each_ref(get_ref_cache(submodule), prefix, fn, strlen(prefix), 0, cb_data); -} - -int for_each_replace_ref(each_ref_fn fn, void *cb_data) -{ - return do_for_each_ref(&ref_cache, git_replace_ref_base, fn, - strlen(git_replace_ref_base), 0, cb_data); -} - -int for_each_namespaced_ref(each_ref_fn fn, void *cb_data) -{ - struct strbuf buf = STRBUF_INIT; - int ret; - strbuf_addf(&buf, "%srefs/", get_git_namespace()); - ret = do_for_each_ref(&ref_cache, buf.buf, fn, 0, 0, cb_data); - strbuf_release(&buf); - return ret; -} - -int for_each_rawref(each_ref_fn fn, void *cb_data) -{ - return do_for_each_ref(&ref_cache, "", fn, 0, - DO_FOR_EACH_INCLUDE_BROKEN, cb_data); -} - static void unlock_ref(struct ref_lock *lock) { /* Do not free lock->lk -- atexit() still looks at them */ @@ -3481,7 +3350,8 @@ 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, NULL, 0, &type, &err); + lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, REF_NODEREF, + &type, &err); if (!lock) { error("cannot lock ref '%s': %s", refname, err.buf); strbuf_release(&err); diff --git a/refs/refs-internal.h b/refs/refs-internal.h index c7dded3..3a4f634 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -197,4 +197,19 @@ const char *find_descendant_ref(const char *dirname, int rename_ref_available(const char *oldname, const char *newname); +/* We allow "recursive" symbolic refs. Only within reason, though */ +#define SYMREF_MAXDEPTH 5 + +/* Include broken references in a do_for_each_ref*() iteration: */ +#define DO_FOR_EACH_INCLUDE_BROKEN 0x01 + +/* + * The common backend for the for_each_*ref* functions + */ +int do_for_each_ref(const char *submodule, const char *base, + each_ref_fn fn, int trim, int flags, void *cb_data); + +int read_raw_ref(const char *refname, unsigned char *sha1, + struct strbuf *symref, unsigned int *flags); + #endif /* REFS_REFS_INTERNAL_H */ diff --git a/remote-curl.c b/remote-curl.c index 15e48e2..672b382 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -474,7 +474,7 @@ static int run_slot(struct active_request_slot *slot, static int probe_rpc(struct rpc_state *rpc, struct slot_results *results) { struct active_request_slot *slot; - struct curl_slist *headers = NULL; + struct curl_slist *headers = http_copy_default_headers(); struct strbuf buf = STRBUF_INIT; int err; @@ -503,7 +503,7 @@ static int probe_rpc(struct rpc_state *rpc, struct slot_results *results) static int post_rpc(struct rpc_state *rpc) { struct active_request_slot *slot; - struct curl_slist *headers = NULL; + struct curl_slist *headers = http_copy_default_headers(); int use_gzip = rpc->gzip_request; char *gzip_body = NULL; size_t gzip_size = 0; @@ -8,6 +8,7 @@ #include "ll-merge.h" #include "attr.h" #include "pathspec.h" +#include "sha1-lookup.h" #define RESOLVED 0 #define PUNTED 1 @@ -20,6 +21,29 @@ static int rerere_enabled = -1; /* automatically update cleanly resolved paths to the index */ static int rerere_autoupdate; +static int rerere_dir_nr; +static int rerere_dir_alloc; + +#define RR_HAS_POSTIMAGE 1 +#define RR_HAS_PREIMAGE 2 +static struct rerere_dir { + unsigned char sha1[20]; + int status_alloc, status_nr; + unsigned char *status; +} **rerere_dir; + +static void free_rerere_dirs(void) +{ + int i; + for (i = 0; i < rerere_dir_nr; i++) { + free(rerere_dir[i]->status); + free(rerere_dir[i]); + } + free(rerere_dir); + rerere_dir_nr = rerere_dir_alloc = 0; + rerere_dir = NULL; +} + static void free_rerere_id(struct string_list_item *item) { free(item->util); @@ -27,7 +51,33 @@ static void free_rerere_id(struct string_list_item *item) static const char *rerere_id_hex(const struct rerere_id *id) { - return id->hex; + return sha1_to_hex(id->collection->sha1); +} + +static void fit_variant(struct rerere_dir *rr_dir, int variant) +{ + variant++; + ALLOC_GROW(rr_dir->status, variant, rr_dir->status_alloc); + if (rr_dir->status_nr < variant) { + memset(rr_dir->status + rr_dir->status_nr, + '\0', variant - rr_dir->status_nr); + rr_dir->status_nr = variant; + } +} + +static void assign_variant(struct rerere_id *id) +{ + int variant; + struct rerere_dir *rr_dir = id->collection; + + variant = id->variant; + if (variant < 0) { + for (variant = 0; variant < rr_dir->status_nr; variant++) + if (!rr_dir->status[variant]) + break; + } + fit_variant(rr_dir, variant); + id->variant = variant; } const char *rerere_path(const struct rerere_id *id, const char *file) @@ -35,20 +85,103 @@ const char *rerere_path(const struct rerere_id *id, const char *file) if (!file) return git_path("rr-cache/%s", rerere_id_hex(id)); - return git_path("rr-cache/%s/%s", rerere_id_hex(id), file); + if (id->variant <= 0) + return git_path("rr-cache/%s/%s", rerere_id_hex(id), file); + + return git_path("rr-cache/%s/%s.%d", + rerere_id_hex(id), file, id->variant); +} + +static int is_rr_file(const char *name, const char *filename, int *variant) +{ + const char *suffix; + char *ep; + + if (!strcmp(name, filename)) { + *variant = 0; + return 1; + } + if (!skip_prefix(name, filename, &suffix) || *suffix != '.') + return 0; + + errno = 0; + *variant = strtol(suffix + 1, &ep, 10); + if (errno || *ep) + return 0; + return 1; +} + +static void scan_rerere_dir(struct rerere_dir *rr_dir) +{ + struct dirent *de; + DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->sha1))); + + if (!dir) + return; + while ((de = readdir(dir)) != NULL) { + int variant; + + if (is_rr_file(de->d_name, "postimage", &variant)) { + fit_variant(rr_dir, variant); + rr_dir->status[variant] |= RR_HAS_POSTIMAGE; + } else if (is_rr_file(de->d_name, "preimage", &variant)) { + fit_variant(rr_dir, variant); + rr_dir->status[variant] |= RR_HAS_PREIMAGE; + } + } + closedir(dir); +} + +static const unsigned char *rerere_dir_sha1(size_t i, void *table) +{ + struct rerere_dir **rr_dir = table; + return rr_dir[i]->sha1; +} + +static struct rerere_dir *find_rerere_dir(const char *hex) +{ + unsigned char sha1[20]; + struct rerere_dir *rr_dir; + int pos; + + if (get_sha1_hex(hex, sha1)) + return NULL; /* BUG */ + pos = sha1_pos(sha1, rerere_dir, rerere_dir_nr, rerere_dir_sha1); + if (pos < 0) { + rr_dir = xmalloc(sizeof(*rr_dir)); + hashcpy(rr_dir->sha1, sha1); + rr_dir->status = NULL; + rr_dir->status_nr = 0; + rr_dir->status_alloc = 0; + pos = -1 - pos; + + /* Make sure the array is big enough ... */ + ALLOC_GROW(rerere_dir, rerere_dir_nr + 1, rerere_dir_alloc); + /* ... and add it in. */ + rerere_dir_nr++; + memmove(rerere_dir + pos + 1, rerere_dir + pos, + (rerere_dir_nr - pos - 1) * sizeof(*rerere_dir)); + rerere_dir[pos] = rr_dir; + scan_rerere_dir(rr_dir); + } + return rerere_dir[pos]; } static int has_rerere_resolution(const struct rerere_id *id) { - struct stat st; + const int both = RR_HAS_POSTIMAGE|RR_HAS_PREIMAGE; + int variant = id->variant; - return !stat(rerere_path(id, "postimage"), &st); + if (variant < 0) + return 0; + return ((id->collection->status[variant] & both) == both); } static struct rerere_id *new_rerere_id_hex(char *hex) { struct rerere_id *id = xmalloc(sizeof(*id)); - xsnprintf(id->hex, sizeof(id->hex), "%s", hex); + id->collection = find_rerere_dir(hex); + id->variant = -1; /* not known yet */ return id; } @@ -75,16 +208,26 @@ static void read_rr(struct string_list *rr) char *path; unsigned char sha1[20]; struct rerere_id *id; + int variant; /* There has to be the hash, tab, path and then NUL */ if (buf.len < 42 || get_sha1_hex(buf.buf, sha1)) die("corrupt MERGE_RR"); - if (buf.buf[40] != '\t') + if (buf.buf[40] != '.') { + variant = 0; + path = buf.buf + 40; + } else { + errno = 0; + variant = strtol(buf.buf + 41, &path, 10); + if (errno) + die("corrupt MERGE_RR"); + } + if (*(path++) != '\t') die("corrupt MERGE_RR"); buf.buf[40] = '\0'; - path = buf.buf + 41; id = new_rerere_id_hex(buf.buf); + id->variant = variant; string_list_insert(rr, path)->util = id; } strbuf_release(&buf); @@ -105,9 +248,16 @@ static int write_rr(struct string_list *rr, int out_fd) id = rr->items[i].util; if (!id) continue; - strbuf_addf(&buf, "%s\t%s%c", - rerere_id_hex(id), - rr->items[i].string, 0); + assert(id->variant >= 0); + if (0 < id->variant) + strbuf_addf(&buf, "%s.%d\t%s%c", + rerere_id_hex(id), id->variant, + rr->items[i].string, 0); + else + strbuf_addf(&buf, "%s\t%s%c", + rerere_id_hex(id), + rr->items[i].string, 0); + if (write_in_full(out_fd, buf.buf, buf.len) != buf.len) die("unable to write rerere record"); @@ -351,8 +501,7 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output error("There were errors while writing %s (%s)", path, strerror(io.io.wrerror)); if (io.io.output && fclose(io.io.output)) - io.io.wrerror = error("Failed to flush %s: %s", - path, strerror(errno)); + io.io.wrerror = error_errno("Failed to flush %s", path); if (hunk_no < 0) { if (output) @@ -365,103 +514,6 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output } /* - * Subclass of rerere_io that reads from an in-core buffer that is a - * strbuf - */ -struct rerere_io_mem { - struct rerere_io io; - struct strbuf input; -}; - -/* - * ... and its getline() method implementation - */ -static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_) -{ - struct rerere_io_mem *io = (struct rerere_io_mem *)io_; - char *ep; - size_t len; - - strbuf_release(sb); - if (!io->input.len) - return -1; - ep = memchr(io->input.buf, '\n', io->input.len); - if (!ep) - ep = io->input.buf + io->input.len; - else if (*ep == '\n') - ep++; - len = ep - io->input.buf; - strbuf_add(sb, io->input.buf, len); - strbuf_remove(&io->input, 0, len); - return 0; -} - -static int handle_cache(const char *path, unsigned char *sha1, const char *output) -{ - mmfile_t mmfile[3] = {{NULL}}; - mmbuffer_t result = {NULL, 0}; - const struct cache_entry *ce; - int pos, len, i, hunk_no; - struct rerere_io_mem io; - int marker_size = ll_merge_marker_size(path); - - /* - * Reproduce the conflicted merge in-core - */ - len = strlen(path); - pos = cache_name_pos(path, len); - if (0 <= pos) - return -1; - pos = -pos - 1; - - while (pos < active_nr) { - enum object_type type; - unsigned long size; - - ce = active_cache[pos++]; - if (ce_namelen(ce) != len || memcmp(ce->name, path, len)) - break; - i = ce_stage(ce) - 1; - if (!mmfile[i].ptr) { - mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size); - mmfile[i].size = size; - } - } - for (i = 0; i < 3; i++) - if (!mmfile[i].ptr && !mmfile[i].size) - mmfile[i].ptr = xstrdup(""); - - /* - * NEEDSWORK: handle conflicts from merges with - * merge.renormalize set, too - */ - ll_merge(&result, path, &mmfile[0], NULL, - &mmfile[1], "ours", - &mmfile[2], "theirs", NULL); - for (i = 0; i < 3; i++) - free(mmfile[i].ptr); - - memset(&io, 0, sizeof(io)); - io.io.getline = rerere_mem_getline; - if (output) - io.io.output = fopen(output, "w"); - else - io.io.output = NULL; - strbuf_init(&io.input, 0); - strbuf_attach(&io.input, result.ptr, result.size, result.size); - - /* - * Grab the conflict ID and optionally write the original - * contents with conflict markers out. - */ - hunk_no = handle_path(sha1, (struct rerere_io *)&io, marker_size); - strbuf_release(&io.input); - if (io.io.output) - fclose(io.io.output); - return hunk_no; -} - -/* * Look at a cache entry at "i" and see if it is not conflicting, * conflicting and we are willing to handle, or conflicting and * we are unable to handle, and return the determination in *type. @@ -569,6 +621,33 @@ int rerere_remaining(struct string_list *merge_rr) } /* + * Try using the given conflict resolution "ID" to see + * if that recorded conflict resolves cleanly what we + * got in the "cur". + */ +static int try_merge(const struct rerere_id *id, const char *path, + mmfile_t *cur, mmbuffer_t *result) +{ + int ret; + mmfile_t base = {NULL, 0}, other = {NULL, 0}; + + if (read_mmfile(&base, rerere_path(id, "preimage")) || + read_mmfile(&other, rerere_path(id, "postimage"))) + ret = 1; + else + /* + * A three-way merge. Note that this honors user-customizable + * low-level merge driver settings. + */ + ret = ll_merge(result, path, &base, NULL, cur, "", &other, "", NULL); + + free(base.ptr); + free(other.ptr); + + return ret; +} + +/* * Find the conflict identified by "id"; the change between its * "preimage" (i.e. a previous contents with conflict markers) and its * "postimage" (i.e. the corresponding contents with conflicts @@ -582,30 +661,20 @@ static int merge(const struct rerere_id *id, const char *path) { FILE *f; int ret; - mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0}; + mmfile_t cur = {NULL, 0}; mmbuffer_t result = {NULL, 0}; /* * Normalize the conflicts in path and write it out to * "thisimage" temporary file. */ - if (handle_file(path, NULL, rerere_path(id, "thisimage")) < 0) { - ret = 1; - goto out; - } - - if (read_mmfile(&cur, rerere_path(id, "thisimage")) || - read_mmfile(&base, rerere_path(id, "preimage")) || - read_mmfile(&other, rerere_path(id, "postimage"))) { + if ((handle_file(path, NULL, rerere_path(id, "thisimage")) < 0) || + read_mmfile(&cur, rerere_path(id, "thisimage"))) { ret = 1; goto out; } - /* - * A three-way merge. Note that this honors user-customizable - * low-level merge driver settings. - */ - ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", NULL); + ret = try_merge(id, path, &cur, &result); if (ret) goto out; @@ -614,25 +683,20 @@ static int merge(const struct rerere_id *id, const char *path) * Mark that "postimage" was used to help gc. */ if (utime(rerere_path(id, "postimage"), NULL) < 0) - warning("failed utime() on %s: %s", - rerere_path(id, "postimage"), - strerror(errno)); + warning_errno("failed utime() on %s", + rerere_path(id, "postimage")); /* Update "path" with the resolution */ f = fopen(path, "w"); if (!f) - return error("Could not open %s: %s", path, - strerror(errno)); + return error_errno("Could not open %s", path); if (fwrite(result.ptr, result.size, 1, f) != 1) - error("Could not write %s: %s", path, strerror(errno)); + error_errno("Could not write %s", path); if (fclose(f)) - return error("Writing %s failed: %s", path, - strerror(errno)); + return error_errno("Writing %s failed", path); out: free(cur.ptr); - free(base.ptr); - free(other.ptr); free(result.ptr); return ret; @@ -661,6 +725,13 @@ static void update_paths(struct string_list *update) rollback_lock_file(&index_lock); } +static void remove_variant(struct rerere_id *id) +{ + unlink_or_warn(rerere_path(id, "postimage")); + unlink_or_warn(rerere_path(id, "preimage")); + id->collection->status[id->variant] = 0; +} + /* * The path indicated by rr_item may still have conflict for which we * have a recorded resolution, in which case replay it and optionally @@ -672,12 +743,47 @@ static void do_rerere_one_path(struct string_list_item *rr_item, struct string_list *update) { const char *path = rr_item->string; - const struct rerere_id *id = rr_item->util; + struct rerere_id *id = rr_item->util; + struct rerere_dir *rr_dir = id->collection; + int variant; + + variant = id->variant; + + /* Has the user resolved it already? */ + if (variant >= 0) { + if (!handle_file(path, NULL, NULL)) { + copy_file(rerere_path(id, "postimage"), path, 0666); + id->collection->status[variant] |= RR_HAS_POSTIMAGE; + fprintf(stderr, "Recorded resolution for '%s'.\n", path); + free_rerere_id(rr_item); + rr_item->util = NULL; + return; + } + /* + * There may be other variants that can cleanly + * replay. Try them and update the variant number for + * this one. + */ + } + + /* Does any existing resolution apply cleanly? */ + for (variant = 0; variant < rr_dir->status_nr; variant++) { + const int both = RR_HAS_PREIMAGE | RR_HAS_POSTIMAGE; + struct rerere_id vid = *id; + + if ((rr_dir->status[variant] & both) != both) + continue; + + vid.variant = variant; + if (merge(&vid, path)) + continue; /* failed to replay */ - /* Is there a recorded resolution we could attempt to apply? */ - if (has_rerere_resolution(id)) { - if (merge(id, path)) - return; /* failed to replay */ + /* + * If there already is a different variant that applies + * cleanly, there is no point maintaining our own variant. + */ + if (0 <= id->variant && id->variant != variant) + remove_variant(id); if (rerere_autoupdate) string_list_insert(update, path); @@ -685,15 +791,24 @@ static void do_rerere_one_path(struct string_list_item *rr_item, fprintf(stderr, "Resolved '%s' using previous resolution.\n", path); - } else if (!handle_file(path, NULL, NULL)) { - /* The user has resolved it. */ - copy_file(rerere_path(id, "postimage"), path, 0666); - fprintf(stderr, "Recorded resolution for '%s'.\n", path); - } else { + free_rerere_id(rr_item); + rr_item->util = NULL; return; } - free_rerere_id(rr_item); - rr_item->util = NULL; + + /* None of the existing one applies; we need a new variant */ + assign_variant(id); + + variant = id->variant; + handle_file(path, NULL, rerere_path(id, "preimage")); + if (id->collection->status[variant] & RR_HAS_POSTIMAGE) { + const char *path = rerere_path(id, "postimage"); + if (unlink(path)) + die_errno("cannot unlink stray '%s'", path); + id->collection->status[variant] &= ~RR_HAS_POSTIMAGE; + } + id->collection->status[variant] |= RR_HAS_PREIMAGE; + fprintf(stderr, "Recorded preimage for '%s'\n", path); } static int do_plain_rerere(struct string_list *rr, int fd) @@ -731,24 +846,8 @@ static int do_plain_rerere(struct string_list *rr, int fd) id = new_rerere_id(sha1); string_list_insert(rr, path)->util = id; - /* - * If the directory does not exist, create - * it. mkdir_in_gitdir() will fail with - * EEXIST if there already is one. - * - * NEEDSWORK: make sure "gc" does not remove - * preimage without removing the directory. - */ - if (mkdir_in_gitdir(rerere_path(id, NULL))) - continue; - - /* - * We are the first to encounter this - * conflict. Ask handle_file() to write the - * normalized contents to the "preimage" file. - */ - handle_file(path, NULL, rerere_path(id, "preimage")); - fprintf(stderr, "Recorded preimage for '%s'\n", path); + /* Ensure that the directory exists. */ + mkdir_in_gitdir(rerere_path(id, NULL)); } for (i = 0; i < rr->nr; i++) @@ -812,12 +911,111 @@ int setup_rerere(struct string_list *merge_rr, int flags) int rerere(int flags) { struct string_list merge_rr = STRING_LIST_INIT_DUP; - int fd; + int fd, status; fd = setup_rerere(&merge_rr, flags); if (fd < 0) return 0; - return do_plain_rerere(&merge_rr, fd); + status = do_plain_rerere(&merge_rr, fd); + free_rerere_dirs(); + return status; +} + +/* + * Subclass of rerere_io that reads from an in-core buffer that is a + * strbuf + */ +struct rerere_io_mem { + struct rerere_io io; + struct strbuf input; +}; + +/* + * ... and its getline() method implementation + */ +static int rerere_mem_getline(struct strbuf *sb, struct rerere_io *io_) +{ + struct rerere_io_mem *io = (struct rerere_io_mem *)io_; + char *ep; + size_t len; + + strbuf_release(sb); + if (!io->input.len) + return -1; + ep = memchr(io->input.buf, '\n', io->input.len); + if (!ep) + ep = io->input.buf + io->input.len; + else if (*ep == '\n') + ep++; + len = ep - io->input.buf; + strbuf_add(sb, io->input.buf, len); + strbuf_remove(&io->input, 0, len); + return 0; +} + +static int handle_cache(const char *path, unsigned char *sha1, const char *output) +{ + mmfile_t mmfile[3] = {{NULL}}; + mmbuffer_t result = {NULL, 0}; + const struct cache_entry *ce; + int pos, len, i, hunk_no; + struct rerere_io_mem io; + int marker_size = ll_merge_marker_size(path); + + /* + * Reproduce the conflicted merge in-core + */ + len = strlen(path); + pos = cache_name_pos(path, len); + if (0 <= pos) + return -1; + pos = -pos - 1; + + while (pos < active_nr) { + enum object_type type; + unsigned long size; + + ce = active_cache[pos++]; + if (ce_namelen(ce) != len || memcmp(ce->name, path, len)) + break; + i = ce_stage(ce) - 1; + if (!mmfile[i].ptr) { + mmfile[i].ptr = read_sha1_file(ce->sha1, &type, &size); + mmfile[i].size = size; + } + } + for (i = 0; i < 3; i++) + if (!mmfile[i].ptr && !mmfile[i].size) + mmfile[i].ptr = xstrdup(""); + + /* + * NEEDSWORK: handle conflicts from merges with + * merge.renormalize set, too? + */ + ll_merge(&result, path, &mmfile[0], NULL, + &mmfile[1], "ours", + &mmfile[2], "theirs", NULL); + for (i = 0; i < 3; i++) + free(mmfile[i].ptr); + + memset(&io, 0, sizeof(io)); + io.io.getline = rerere_mem_getline; + if (output) + io.io.output = fopen(output, "w"); + else + io.io.output = NULL; + strbuf_init(&io.input, 0); + strbuf_attach(&io.input, result.ptr, result.size, result.size); + + /* + * Grab the conflict ID and optionally write the original + * contents with conflict markers out. + */ + hunk_no = handle_path(sha1, (struct rerere_io *)&io, marker_size); + strbuf_release(&io.input); + if (io.io.output) + fclose(io.io.output); + return hunk_no; } static int rerere_forget_one_path(const char *path, struct string_list *rr) @@ -838,11 +1036,43 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr) /* Nuke the recorded resolution for the conflict */ id = new_rerere_id(sha1); + + for (id->variant = 0; + id->variant < id->collection->status_nr; + id->variant++) { + mmfile_t cur = { NULL, 0 }; + mmbuffer_t result = {NULL, 0}; + int cleanly_resolved; + + if (!has_rerere_resolution(id)) + continue; + + handle_cache(path, sha1, rerere_path(id, "thisimage")); + if (read_mmfile(&cur, rerere_path(id, "thisimage"))) { + free(cur.ptr); + error("Failed to update conflicted state in '%s'", path); + goto fail_exit; + } + cleanly_resolved = !try_merge(id, path, &cur, &result); + free(result.ptr); + free(cur.ptr); + if (cleanly_resolved) + break; + } + + if (id->collection->status_nr <= id->variant) { + error("no remembered resolution for '%s'", path); + goto fail_exit; + } + filename = rerere_path(id, "postimage"); - if (unlink(filename)) - return (errno == ENOENT - ? error("no remembered resolution for %s", path) - : error("cannot unlink %s: %s", filename, strerror(errno))); + if (unlink(filename)) { + if (errno == ENOENT) + error("no remembered resolution for %s", path); + else + error_errno("cannot unlink %s", filename); + goto fail_exit; + } /* * Update the preimage so that the user can resolve the @@ -861,6 +1091,10 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr) item->util = id; fprintf(stderr, "Forgot resolution for %s\n", path); return 0; + +fail_exit: + free(id); + return -1; } int rerere_forget(struct pathspec *pathspec) @@ -897,29 +1131,16 @@ int rerere_forget(struct pathspec *pathspec) * Garbage collection support */ -/* - * Note that this is not reentrant but is used only one-at-a-time - * so it does not matter right now. - */ -static struct rerere_id *dirname_to_id(const char *name) -{ - static struct rerere_id id; - xsnprintf(id.hex, sizeof(id.hex), "%s", name); - return &id; -} - -static time_t rerere_created_at(const char *dir_name) +static time_t rerere_created_at(struct rerere_id *id) { struct stat st; - struct rerere_id *id = dirname_to_id(dir_name); return stat(rerere_path(id, "preimage"), &st) ? (time_t) 0 : st.st_mtime; } -static time_t rerere_last_used_at(const char *dir_name) +static time_t rerere_last_used_at(struct rerere_id *id) { struct stat st; - struct rerere_id *id = dirname_to_id(dir_name); return stat(rerere_path(id, "postimage"), &st) ? (time_t) 0 : st.st_mtime; } @@ -929,15 +1150,28 @@ static time_t rerere_last_used_at(const char *dir_name) */ static void unlink_rr_item(struct rerere_id *id) { - unlink(rerere_path(id, "thisimage")); - unlink(rerere_path(id, "preimage")); - unlink(rerere_path(id, "postimage")); - /* - * NEEDSWORK: what if this rmdir() fails? Wouldn't we then - * assume that we already have preimage recorded in - * do_plain_rerere()? - */ - rmdir(rerere_path(id, NULL)); + unlink_or_warn(rerere_path(id, "thisimage")); + remove_variant(id); + id->collection->status[id->variant] = 0; +} + +static void prune_one(struct rerere_id *id, time_t now, + int cutoff_resolve, int cutoff_noresolve) +{ + time_t then; + int cutoff; + + then = rerere_last_used_at(id); + if (then) + cutoff = cutoff_resolve; + else { + then = rerere_created_at(id); + if (!then) + return; + cutoff = cutoff_noresolve; + } + if (then < now - cutoff * 86400) + unlink_rr_item(id); } void rerere_gc(struct string_list *rr) @@ -945,8 +1179,8 @@ void rerere_gc(struct string_list *rr) struct string_list to_remove = STRING_LIST_INIT_DUP; DIR *dir; struct dirent *e; - int i, cutoff; - time_t now = time(NULL), then; + int i; + time_t now = time(NULL); int cutoff_noresolve = 15; int cutoff_resolve = 60; @@ -961,25 +1195,32 @@ void rerere_gc(struct string_list *rr) die_errno("unable to open rr-cache directory"); /* Collect stale conflict IDs ... */ while ((e = readdir(dir))) { + struct rerere_dir *rr_dir; + struct rerere_id id; + int now_empty; + if (is_dot_or_dotdot(e->d_name)) continue; - - then = rerere_last_used_at(e->d_name); - if (then) { - cutoff = cutoff_resolve; - } else { - then = rerere_created_at(e->d_name); - if (!then) - continue; - cutoff = cutoff_noresolve; + rr_dir = find_rerere_dir(e->d_name); + if (!rr_dir) + continue; /* or should we remove e->d_name? */ + + now_empty = 1; + for (id.variant = 0, id.collection = rr_dir; + id.variant < id.collection->status_nr; + id.variant++) { + prune_one(&id, now, cutoff_resolve, cutoff_noresolve); + if (id.collection->status[id.variant]) + now_empty = 0; } - if (then < now - cutoff * 86400) + if (now_empty) string_list_append(&to_remove, e->d_name); } closedir(dir); - /* ... and then remove them one-by-one */ + + /* ... and then remove the empty directories */ for (i = 0; i < to_remove.nr; i++) - unlink_rr_item(dirname_to_id(to_remove.items[i].string)); + rmdir(git_path("rr-cache/%s", to_remove.items[i].string)); string_list_clear(&to_remove, 0); rollback_lock_file(&write_lock); } @@ -1000,8 +1241,10 @@ void rerere_clear(struct string_list *merge_rr) for (i = 0; i < merge_rr->nr; i++) { struct rerere_id *id = merge_rr->items[i].util; - if (!has_rerere_resolution(id)) + if (!has_rerere_resolution(id)) { unlink_rr_item(id); + rmdir(rerere_path(id, NULL)); + } } unlink_or_warn(git_path_merge_rr()); rollback_lock_file(&write_lock); @@ -16,8 +16,10 @@ struct pathspec; */ extern void *RERERE_RESOLVED; +struct rerere_dir; struct rerere_id { - char hex[41]; + struct rerere_dir *collection; + int variant; }; extern int setup_rerere(struct string_list *, int); @@ -59,10 +59,10 @@ static void mark_tree_contents_uninteresting(struct tree *tree) while (tree_entry(&desc, &entry)) { switch (object_type(entry.mode)) { case OBJ_TREE: - mark_tree_uninteresting(lookup_tree(entry.sha1)); + mark_tree_uninteresting(lookup_tree(entry.oid->hash)); break; case OBJ_BLOB: - mark_blob_uninteresting(lookup_blob(entry.sha1)); + mark_blob_uninteresting(lookup_blob(entry.oid->hash)); break; default: /* Subproject commit - not in this repository */ @@ -1356,8 +1356,10 @@ void init_revisions(struct rev_info *revs, const char *prefix) revs->skip_count = -1; revs->max_count = -1; revs->max_parents = -1; + revs->expand_tabs_in_log = -1; revs->commit_format = CMIT_FMT_DEFAULT; + revs->expand_tabs_in_log_default = 8; init_grep_defaults(); grep_init(&revs->grep_filter, prefix); @@ -1854,6 +1856,15 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->verbose_header = 1; revs->pretty_given = 1; get_commit_format(arg+9, revs); + } else if (!strcmp(arg, "--expand-tabs")) { + revs->expand_tabs_in_log = 8; + } else if (!strcmp(arg, "--no-expand-tabs")) { + revs->expand_tabs_in_log = 0; + } else if (skip_prefix(arg, "--expand-tabs=", &arg)) { + int val; + if (strtol_i(arg, 10, &val) < 0 || val < 0) + die("'%s': not a non-negative integer", arg); + revs->expand_tabs_in_log = val; } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) { revs->show_notes = 1; revs->show_notes_given = 1; @@ -2327,6 +2338,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->first_parent_only && revs->bisect) die(_("--first-parent is incompatible with --bisect")); + if (revs->expand_tabs_in_log < 0) + revs->expand_tabs_in_log = revs->expand_tabs_in_log_default; + return left; } @@ -148,6 +148,8 @@ struct rev_info { linear:1; struct date_mode date_mode; + int expand_tabs_in_log; /* unset if negative */ + int expand_tabs_in_log_default; unsigned int abbrev; enum cmit_fmt commit_format; diff --git a/run-command.c b/run-command.c index 2d66280..af0c8a1 100644 --- a/run-command.c +++ b/run-command.c @@ -233,7 +233,7 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal) if (waiting < 0) { failed_errno = errno; - error("waitpid for %s failed: %s", argv0, strerror(errno)); + error_errno("waitpid for %s failed", argv0); } else if (waiting != pid) { error("waitpid is confused (%s)", argv0); } else if (WIFSIGNALED(status)) { @@ -420,8 +420,7 @@ fail_pipe: } } if (cmd->pid < 0) - error("cannot fork() for %s: %s", cmd->argv[0], - strerror(errno)); + error_errno("cannot fork() for %s", cmd->argv[0]); else if (cmd->clean_on_exit) mark_child_for_cleanup(cmd->pid); @@ -482,7 +481,7 @@ fail_pipe: cmd->dir, fhin, fhout, fherr); failed_errno = errno; if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT)) - error("cannot spawn %s: %s", cmd->argv[0], strerror(errno)); + error_errno("cannot spawn %s", cmd->argv[0]); if (cmd->clean_on_exit && cmd->pid >= 0) mark_child_for_cleanup(cmd->pid); @@ -703,7 +702,7 @@ int start_async(struct async *async) if (pipe(fdin) < 0) { if (async->out > 0) close(async->out); - return error("cannot create pipe: %s", strerror(errno)); + return error_errno("cannot create pipe"); } async->in = fdin[1]; } @@ -715,7 +714,7 @@ int start_async(struct async *async) close_pair(fdin); else if (async->in) close(async->in); - return error("cannot create pipe: %s", strerror(errno)); + return error_errno("cannot create pipe"); } async->out = fdout[0]; } @@ -740,7 +739,7 @@ int start_async(struct async *async) async->pid = fork(); if (async->pid < 0) { - error("fork (async) failed: %s", strerror(errno)); + error_errno("fork (async) failed"); goto error; } if (!async->pid) { @@ -787,7 +786,7 @@ int start_async(struct async *async) { int err = pthread_create(&async->tid, NULL, run_thread, async); if (err) { - error("cannot create thread: %s", strerror(err)); + error_errno("cannot create thread"); goto error; } } @@ -825,7 +824,10 @@ const char *find_hook(const char *name) static struct strbuf path = STRBUF_INIT; strbuf_reset(&path); - strbuf_git_path(&path, "hooks/%s", name); + if (git_hooks_path) + strbuf_addf(&path, "%s/%s", git_hooks_path, name); + else + strbuf_git_path(&path, "hooks/%s", name); if (access(path.buf, X_OK) < 0) return NULL; return path.buf; @@ -912,7 +914,7 @@ struct parallel_processes { struct strbuf buffered_output; /* of finished children */ }; -static int default_start_failure(struct strbuf *err, +static int default_start_failure(struct strbuf *out, void *pp_cb, void *pp_task_cb) { @@ -920,7 +922,7 @@ static int default_start_failure(struct strbuf *err, } static int default_task_finished(int result, - struct strbuf *err, + struct strbuf *out, void *pp_cb, void *pp_task_cb) { @@ -1004,7 +1006,7 @@ static void pp_cleanup(struct parallel_processes *pp) * When get_next_task added messages to the buffer in its last * iteration, the buffered output is non empty. */ - fputs(pp->buffered_output.buf, stderr); + strbuf_write(&pp->buffered_output, stderr); strbuf_release(&pp->buffered_output); sigchain_pop_common(); @@ -1089,7 +1091,7 @@ static void pp_output(struct parallel_processes *pp) int i = pp->output_owner; if (pp->children[i].state == GIT_CP_WORKING && pp->children[i].err.len) { - fputs(pp->children[i].err.buf, stderr); + strbuf_write(&pp->children[i].err, stderr); strbuf_reset(&pp->children[i].err); } } @@ -1127,11 +1129,11 @@ static int pp_collect_finished(struct parallel_processes *pp) strbuf_addbuf(&pp->buffered_output, &pp->children[i].err); strbuf_reset(&pp->children[i].err); } else { - fputs(pp->children[i].err.buf, stderr); + strbuf_write(&pp->children[i].err, stderr); strbuf_reset(&pp->children[i].err); /* Output all other finished child processes */ - fputs(pp->buffered_output.buf, stderr); + strbuf_write(&pp->buffered_output, stderr); strbuf_reset(&pp->buffered_output); /* diff --git a/run-command.h b/run-command.h index 49ba764..11f76b0 100644 --- a/run-command.h +++ b/run-command.h @@ -141,7 +141,7 @@ void NORETURN async_exit(int code); * return the negative signal number. */ typedef int (*get_next_task_fn)(struct child_process *cp, - struct strbuf *err, + struct strbuf *out, void *pp_cb, void **pp_task_cb); @@ -150,7 +150,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp, * a new process. * * You must not write to stdout or stderr in this function. Add your - * message to the strbuf err instead, which will be printed without + * message to the strbuf out instead, which will be printed without * messing up the output of the other parallel processes. * * pp_cb is the callback cookie as passed into run_processes_parallel, @@ -160,7 +160,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp, * To send a signal to other child processes for abortion, return * the negative signal number. */ -typedef int (*start_failure_fn)(struct strbuf *err, +typedef int (*start_failure_fn)(struct strbuf *out, void *pp_cb, void *pp_task_cb); @@ -168,7 +168,7 @@ typedef int (*start_failure_fn)(struct strbuf *err, * This callback is called on every child process that finished processing. * * You must not write to stdout or stderr in this function. Add your - * message to the strbuf err instead, which will be printed without + * message to the strbuf out instead, which will be printed without * messing up the output of the other parallel processes. * * pp_cb is the callback cookie as passed into run_processes_parallel, @@ -179,7 +179,7 @@ typedef int (*start_failure_fn)(struct strbuf *err, * the negative signal number. */ typedef int (*task_finished_fn)(int result, - struct strbuf *err, + struct strbuf *out, void *pp_cb, void *pp_task_cb); diff --git a/sequencer.c b/sequencer.c index e66f2fe..c6362d6 100644 --- a/sequencer.c +++ b/sequencer.c @@ -875,8 +875,7 @@ static int sequencer_rollback(struct replay_opts *opts) return rollback_single_pick(); } if (!f) - return error(_("cannot open %s: %s"), git_path_head_file(), - strerror(errno)); + return error_errno(_("cannot open %s"), git_path_head_file()); if (strbuf_getline_lf(&buf, f)) { error(_("cannot read %s: %s"), git_path_head_file(), ferror(f) ? strerror(errno) : _("unexpected end of file")); @@ -889,6 +888,10 @@ static int sequencer_rollback(struct replay_opts *opts) git_path_head_file()); goto fail; } + if (is_null_sha1(sha1)) { + error(_("cannot abort from a branch yet to be born")); + goto fail; + } if (reset_for_rollback(sha1)) goto fail; remove_sequencer_state(); @@ -1087,11 +1090,8 @@ int sequencer_pick_revisions(struct replay_opts *opts) walk_revs_populate_todo(&todo_list, opts); if (create_seq_dir() < 0) return -1; - if (get_sha1("HEAD", sha1)) { - if (opts->action == REPLAY_REVERT) - return error(_("Can't revert as initial commit")); - return error(_("Can't cherry-pick into empty head")); - } + if (get_sha1("HEAD", sha1) && (opts->action == REPLAY_REVERT)) + return error(_("Can't revert as initial commit")); save_head(sha1_to_hex(sha1)); save_opts(opts); return pick_commits(todo_list, opts); diff --git a/server-info.c b/server-info.c index 5a86e29..75dd677 100644 --- a/server-info.c +++ b/server-info.c @@ -36,7 +36,7 @@ static int update_info_file(char *path, int (*generate)(FILE *)) out: if (ret) { - error("unable to update %s: %s", path, strerror(errno)); + error_errno("unable to update %s", path); if (fp) fclose(fp); else if (fd >= 0) diff --git a/sha1_file.c b/sha1_file.c index d0f2aa0..d5e1121 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -301,7 +301,7 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base, return -1; } } - if (!strcmp_icase(ent->base, normalized_objdir)) { + if (!fspathcmp(ent->base, normalized_objdir)) { free(ent); return -1; } @@ -1107,9 +1107,8 @@ unsigned char *use_pack(struct packed_git *p, PROT_READ, MAP_PRIVATE, p->pack_fd, win->offset); if (win->base == MAP_FAILED) - die("packfile %s cannot be mapped: %s", - p->pack_name, - strerror(errno)); + die_errno("packfile %s cannot be mapped", + p->pack_name); if (!win->offset && win->len == p->pack_size && !p->do_not_close) close_pack_fd(p); @@ -1279,8 +1278,8 @@ static void prepare_packed_git_one(char *objdir, int local) dir = opendir(path.buf); if (!dir) { if (errno != ENOENT) - error("unable to open object pack directory: %s: %s", - path.buf, strerror(errno)); + error_errno("unable to open object pack directory: %s", + path.buf); strbuf_release(&path); return; } @@ -2984,7 +2983,7 @@ int finalize_object_file(const char *tmpfile, const char *filename) unlink_or_warn(tmpfile); if (ret) { if (ret != EEXIST) { - return error("unable to write sha1 filename %s: %s", filename, strerror(ret)); + return error_errno("unable to write sha1 filename %s", filename); } /* FIXME!!! Collision check here ? */ } @@ -2998,7 +2997,7 @@ out: static int write_buffer(int fd, const void *buf, size_t len) { if (write_in_full(fd, buf, len) < 0) - return error("file write error (%s)", strerror(errno)); + return error_errno("file write error"); return 0; } @@ -3081,7 +3080,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen, if (errno == EACCES) return error("insufficient permission for adding an object to repository database %s", get_object_directory()); else - return error("unable to create temporary file: %s", strerror(errno)); + return error_errno("unable to create temporary file"); } /* Set it up */ @@ -3126,8 +3125,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen, utb.actime = mtime; utb.modtime = mtime; if (utime(tmp_file.buf, &utb) < 0) - warning("failed utime() on %s: %s", - tmp_file.buf, strerror(errno)); + warning_errno("failed utime() on %s", tmp_file.buf); } return finalize_object_file(tmp_file.buf, filename); @@ -3360,7 +3358,7 @@ static int index_core(unsigned char *sha1, int fd, size_t size, if (size == read_in_full(fd, buf, size)) ret = index_mem(sha1, buf, size, type, path, flags); else - ret = error("short read %s", strerror(errno)); + ret = error_errno("short read"); free(buf); } else { void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); @@ -3425,18 +3423,14 @@ int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned case S_IFREG: fd = open(path, O_RDONLY); if (fd < 0) - return error("open(\"%s\"): %s", path, - strerror(errno)); + return error_errno("open(\"%s\")", path); if (index_fd(sha1, fd, st, OBJ_BLOB, path, flags) < 0) return error("%s: failed to insert into database", path); break; case S_IFLNK: - if (strbuf_readlink(&sb, path, st->st_size)) { - char *errstr = strerror(errno); - return error("readlink(\"%s\"): %s", path, - errstr); - } + if (strbuf_readlink(&sb, path, st->st_size)) + return error_errno("readlink(\"%s\")", path); if (!(flags & HASH_WRITE_OBJECT)) hash_sha1_file(sb.buf, sb.len, blob_type, sha1); else if (write_sha1_file(sb.buf, sb.len, blob_type, sha1)) @@ -3492,7 +3486,7 @@ static int for_each_file_in_obj_subdir(int subdir_nr, if (!dir) { if (errno == ENOENT) return 0; - return error("unable to open %s: %s", path->buf, strerror(errno)); + return error_errno("unable to open %s", path->buf); } while ((de = readdir(dir))) { diff --git a/sha1_name.c b/sha1_name.c index 776101e..ca7ddd6 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1215,6 +1215,15 @@ int get_sha1(const char *name, unsigned char *sha1) } /* + * This is like "get_sha1()", but for struct object_id. + */ +int get_oid(const char *name, struct object_id *oid) +{ + return get_sha1(name, oid->hash); +} + + +/* * Many callers know that the user meant to name a commit-ish by * syntactical positions where the object name appears. Calling this * function allows the machinery to disambiguate shorter-than-unique @@ -395,6 +395,12 @@ ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint) return cnt; } +ssize_t strbuf_write(struct strbuf *sb, FILE *f) +{ + return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0; +} + + #define STRBUF_MAXLINK (2*PATH_MAX) int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint) @@ -377,6 +377,8 @@ extern ssize_t strbuf_read_once(struct strbuf *, int fd, size_t hint); /** * Read the contents of a file, specified by its path. The third argument * can be used to give a hint about the file size, to avoid reallocs. + * Return the number of bytes read or a negative value if some error + * occurred while opening or reading the file. */ extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint); @@ -387,6 +389,12 @@ extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint); /** + * Write the whole content of the strbuf to the stream not stopping at + * NUL bytes. + */ +extern ssize_t strbuf_write(struct strbuf *sb, FILE *stream); + +/** * Read a line from a FILE *, overwriting the existing contents of * the strbuf. The strbuf_getline*() family of functions share * this signature, but have different line termination conventions. diff --git a/submodule-config.c b/submodule-config.c index 7f67ec0..debab29 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -59,6 +59,7 @@ static void free_one_config(struct submodule_entry *entry) { free((void *) entry->config->path); free((void *) entry->config->name); + free((void *) entry->config->update_strategy.command); free(entry->config); } @@ -194,6 +195,8 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache, submodule->path = NULL; submodule->url = NULL; + submodule->update_strategy.type = SM_UPDATE_UNSPECIFIED; + submodule->update_strategy.command = NULL; submodule->fetch_recurse = RECURSE_SUBMODULES_NONE; submodule->ignore = NULL; @@ -293,7 +296,7 @@ static int parse_config(const char *var, const char *value, void *data) if (!strcmp(item.buf, "path")) { if (!value) ret = config_error_nonbool(var); - else if (!me->overwrite && submodule->path != NULL) + else if (!me->overwrite && submodule->path) warn_multiple_config(me->commit_sha1, submodule->name, "path"); else { @@ -317,7 +320,7 @@ static int parse_config(const char *var, const char *value, void *data) } else if (!strcmp(item.buf, "ignore")) { if (!value) ret = config_error_nonbool(var); - else if (!me->overwrite && submodule->ignore != NULL) + else if (!me->overwrite && submodule->ignore) warn_multiple_config(me->commit_sha1, submodule->name, "ignore"); else if (strcmp(value, "untracked") && @@ -333,13 +336,23 @@ static int parse_config(const char *var, const char *value, void *data) } else if (!strcmp(item.buf, "url")) { if (!value) { ret = config_error_nonbool(var); - } else if (!me->overwrite && submodule->url != NULL) { + } else if (!me->overwrite && submodule->url) { warn_multiple_config(me->commit_sha1, submodule->name, "url"); } else { free((void *) submodule->url); submodule->url = xstrdup(value); } + } else if (!strcmp(item.buf, "update")) { + if (!value) + ret = config_error_nonbool(var); + else if (!me->overwrite && + submodule->update_strategy.type != SM_UPDATE_UNSPECIFIED) + warn_multiple_config(me->commit_sha1, submodule->name, + "update"); + else if (parse_submodule_update_strategy(value, + &submodule->update_strategy) < 0) + die(_("invalid value for %s"), var); } strbuf_release(&name); diff --git a/submodule-config.h b/submodule-config.h index 9bfa65a..e4857f5 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -2,6 +2,7 @@ #define SUBMODULE_CONFIG_CACHE_H #include "hashmap.h" +#include "submodule.h" #include "strbuf.h" /* @@ -14,6 +15,7 @@ struct submodule { const char *url; int fetch_recurse; const char *ignore; + struct submodule_update_strategy update_strategy; /* the sha1 blob id of the responsible .gitmodules file */ unsigned char gitmodules_sha1[20]; }; diff --git a/submodule.c b/submodule.c index 62c4356..4532b11 100644 --- a/submodule.c +++ b/submodule.c @@ -13,8 +13,10 @@ #include "argv-array.h" #include "blob.h" #include "thread-utils.h" +#include "quote.h" static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND; +static int parallel_jobs = 1; static struct string_list changed_submodule_paths; static int initialized_fetch_ref_tips; static struct sha1_array ref_tips_before_fetch; @@ -169,7 +171,12 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, int submodule_config(const char *var, const char *value, void *cb) { - if (starts_with(var, "submodule.")) + if (!strcmp(var, "submodule.fetchjobs")) { + parallel_jobs = git_config_int(var, value); + if (parallel_jobs < 0) + die(_("negative values not allowed for submodule.fetchJobs")); + return 0; + } else if (starts_with(var, "submodule.")) return parse_submodule_config_option(var, value); else if (!strcmp(var, "fetch.recursesubmodules")) { config_fetch_recurse_submodules = parse_fetch_recurse_submodules_arg(var, value); @@ -210,6 +217,48 @@ void gitmodules_config(void) } } +int parse_submodule_update_strategy(const char *value, + struct submodule_update_strategy *dst) +{ + free((void*)dst->command); + dst->command = NULL; + if (!strcmp(value, "none")) + dst->type = SM_UPDATE_NONE; + else if (!strcmp(value, "checkout")) + dst->type = SM_UPDATE_CHECKOUT; + else if (!strcmp(value, "rebase")) + dst->type = SM_UPDATE_REBASE; + else if (!strcmp(value, "merge")) + dst->type = SM_UPDATE_MERGE; + else if (skip_prefix(value, "!", &value)) { + dst->type = SM_UPDATE_COMMAND; + dst->command = xstrdup(value); + } else + return -1; + return 0; +} + +const char *submodule_strategy_to_string(const struct submodule_update_strategy *s) +{ + struct strbuf sb = STRBUF_INIT; + switch (s->type) { + case SM_UPDATE_CHECKOUT: + return "checkout"; + case SM_UPDATE_MERGE: + return "merge"; + case SM_UPDATE_REBASE: + return "rebase"; + case SM_UPDATE_NONE: + return "none"; + case SM_UPDATE_UNSPECIFIED: + return NULL; + case SM_UPDATE_COMMAND: + strbuf_addf(&sb, "!%s", s->command); + return strbuf_detach(&sb, NULL); + } + return NULL; +} + void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *arg) { @@ -366,7 +415,7 @@ static int submodule_needs_pushing(const char *path, const unsigned char sha1[20 argv[1] = sha1_to_hex(sha1); cp.argv = argv; - cp.env = local_repo_env; + prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.no_stdin = 1; cp.out = -1; @@ -453,7 +502,7 @@ static int push_submodule(const char *path) const char *argv[] = {"push", NULL}; cp.argv = argv; - cp.env = local_repo_env; + prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.no_stdin = 1; cp.dir = path; @@ -499,7 +548,7 @@ static int is_submodule_commit_present(const char *path, unsigned char sha1[20]) argv[3] = sha1_to_hex(sha1); cp.argv = argv; - cp.env = local_repo_env; + prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.no_stdin = 1; cp.dir = path; @@ -682,7 +731,7 @@ static int get_next_submodule(struct child_process *cp, if (is_directory(git_dir)) { child_process_init(cp); cp->dir = strbuf_detach(&submodule_path, NULL); - cp->env = local_repo_env; + prepare_submodule_repo_env(&cp->env_array); cp->git_cmd = 1; if (!spf->quiet) strbuf_addf(err, "Fetching submodule %s%s\n", @@ -750,6 +799,9 @@ int fetch_populated_submodules(const struct argv_array *options, argv_array_push(&spf.args, "--recurse-submodules-default"); /* default value, "--submodule-prefix" and its value are added later */ + if (max_parallel_jobs < 0) + max_parallel_jobs = parallel_jobs; + calculate_changed_submodule_paths(); run_processes_parallel(max_parallel_jobs, get_next_submodule, @@ -794,7 +846,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) argv[2] = "-uno"; cp.argv = argv; - cp.env = local_repo_env; + prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.no_stdin = 1; cp.out = -1; @@ -855,7 +907,7 @@ int submodule_uses_gitfile(const char *path) /* Now test that all nested submodules use a gitfile too */ cp.argv = argv; - cp.env = local_repo_env; + prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.no_stdin = 1; cp.no_stderr = 1; @@ -888,7 +940,7 @@ int ok_to_remove_submodule(const char *path) return 0; cp.argv = argv; - cp.env = local_repo_env; + prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.no_stdin = 1; cp.out = -1; @@ -1094,3 +1146,18 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir) strbuf_release(&rel_path); free((void *)real_work_tree); } + +int parallel_submodules(void) +{ + return parallel_jobs; +} + +void prepare_submodule_repo_env(struct argv_array *out) +{ + const char * const *var; + + for (var = local_repo_env; *var; var++) { + if (strcmp(*var, CONFIG_DATA_ENVIRONMENT)) + argv_array_push(out, *var); + } +} diff --git a/submodule.h b/submodule.h index e06eaa5..2af9390 100644 --- a/submodule.h +++ b/submodule.h @@ -14,6 +14,21 @@ enum { RECURSE_SUBMODULES_ON = 2 }; +enum submodule_update_type { + SM_UPDATE_UNSPECIFIED = 0, + SM_UPDATE_CHECKOUT, + SM_UPDATE_REBASE, + SM_UPDATE_MERGE, + SM_UPDATE_NONE, + SM_UPDATE_COMMAND +}; + +struct submodule_update_strategy { + enum submodule_update_type type; + const char *command; +}; +#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL} + int is_staging_gitmodules_ok(void); int update_path_in_gitmodules(const char *oldpath, const char *newpath); int remove_path_from_gitmodules(const char *path); @@ -22,6 +37,9 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, const char *path); int submodule_config(const char *var, const char *value, void *cb); void gitmodules_config(void); +int parse_submodule_update_strategy(const char *value, + struct submodule_update_strategy *dst); +const char *submodule_strategy_to_string(const struct submodule_update_strategy *s); void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *); void show_submodule_summary(FILE *f, const char *path, const char *line_prefix, @@ -42,5 +60,13 @@ int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_nam struct string_list *needs_pushing); int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name); void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir); +int parallel_submodules(void); + +/* + * Prepare the "env_array" parameter of a "struct child_process" for executing + * a submodule by clearing any repo-specific envirionment variables, but + * retaining any config in the environment. + */ +void prepare_submodule_repo_env(struct argv_array *out); #endif diff --git a/t/helper/.gitignore b/t/helper/.gitignore new file mode 100644 index 0000000..d6e8b36 --- /dev/null +++ b/t/helper/.gitignore @@ -0,0 +1,33 @@ +/test-chmtime +/test-ctype +/test-config +/test-date +/test-delta +/test-dump-cache-tree +/test-dump-split-index +/test-dump-untracked-cache +/test-fake-ssh +/test-scrap-cache-tree +/test-genrandom +/test-hashmap +/test-index-version +/test-line-buffer +/test-match-trees +/test-mergesort +/test-mktemp +/test-parse-options +/test-path-utils +/test-prio-queue +/test-read-cache +/test-regex +/test-revision-walking +/test-run-command +/test-sha1 +/test-sha1-array +/test-sigchain +/test-string-list +/test-submodule-config +/test-subprocess +/test-svn-fe +/test-urlmatch-normalization +/test-wildmatch diff --git a/test-chmtime.c b/t/helper/test-chmtime.c index dfe8a83..dfe8a83 100644 --- a/test-chmtime.c +++ b/t/helper/test-chmtime.c diff --git a/test-config.c b/t/helper/test-config.c index 6a77552..6a77552 100644 --- a/test-config.c +++ b/t/helper/test-config.c diff --git a/test-ctype.c b/t/helper/test-ctype.c index 707a821..707a821 100644 --- a/test-ctype.c +++ b/t/helper/test-ctype.c diff --git a/test-date.c b/t/helper/test-date.c index 63f3735..d9ab360 100644 --- a/test-date.c +++ b/t/helper/test-date.c @@ -1,11 +1,12 @@ #include "cache.h" static const char *usage_msg = "\n" -" test-date show [time_t]...\n" +" test-date relative [time_t]...\n" +" test-date show:<format> [time_t]...\n" " test-date parse [date]...\n" " test-date approxidate [date]...\n"; -static void show_dates(char **argv, struct timeval *now) +static void show_relative_dates(char **argv, struct timeval *now) { struct strbuf buf = STRBUF_INIT; @@ -17,6 +18,29 @@ static void show_dates(char **argv, struct timeval *now) strbuf_release(&buf); } +static void show_dates(char **argv, const char *format) +{ + struct date_mode mode; + + parse_date_format(format, &mode); + for (; *argv; argv++) { + char *arg = *argv; + time_t t; + int tz; + + /* + * Do not use our normal timestamp parsing here, as the point + * is to test the formatting code in isolation. + */ + t = strtol(arg, &arg, 10); + while (*arg == ' ') + arg++; + tz = atoi(arg); + + printf("%s -> %s\n", *argv, show_date(t, tz, &mode)); + } +} + static void parse_dates(char **argv, struct timeval *now) { struct strbuf result = STRBUF_INIT; @@ -61,8 +85,10 @@ int main(int argc, char **argv) argv++; if (!*argv) usage(usage_msg); - if (!strcmp(*argv, "show")) - show_dates(argv+1, &now); + if (!strcmp(*argv, "relative")) + show_relative_dates(argv+1, &now); + else if (skip_prefix(*argv, "show:", &x)) + show_dates(argv+1, x); else if (!strcmp(*argv, "parse")) parse_dates(argv+1, &now); else if (!strcmp(*argv, "approxidate")) diff --git a/test-delta.c b/t/helper/test-delta.c index 4595cd6..4595cd6 100644 --- a/test-delta.c +++ b/t/helper/test-delta.c diff --git a/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c index bb53c0a..bb53c0a 100644 --- a/test-dump-cache-tree.c +++ b/t/helper/test-dump-cache-tree.c diff --git a/test-dump-split-index.c b/t/helper/test-dump-split-index.c index 861d28c..861d28c 100644 --- a/test-dump-split-index.c +++ b/t/helper/test-dump-split-index.c diff --git a/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c index 0a1c285..0a1c285 100644 --- a/test-dump-untracked-cache.c +++ b/t/helper/test-dump-untracked-cache.c diff --git a/test-fake-ssh.c b/t/helper/test-fake-ssh.c index 980de21..980de21 100644 --- a/test-fake-ssh.c +++ b/t/helper/test-fake-ssh.c diff --git a/test-genrandom.c b/t/helper/test-genrandom.c index 54824d0..54824d0 100644 --- a/test-genrandom.c +++ b/t/helper/test-genrandom.c diff --git a/test-hashmap.c b/t/helper/test-hashmap.c index cc2891d..cc2891d 100644 --- a/test-hashmap.c +++ b/t/helper/test-hashmap.c diff --git a/test-index-version.c b/t/helper/test-index-version.c index 05d4699..05d4699 100644 --- a/test-index-version.c +++ b/t/helper/test-index-version.c diff --git a/test-line-buffer.c b/t/helper/test-line-buffer.c index 1e58f04..1e58f04 100644 --- a/test-line-buffer.c +++ b/t/helper/test-line-buffer.c diff --git a/test-match-trees.c b/t/helper/test-match-trees.c index 4dad709..d446b8e 100644 --- a/test-match-trees.c +++ b/t/helper/test-match-trees.c @@ -3,24 +3,24 @@ int main(int ac, char **av) { - unsigned char hash1[20], hash2[20], shifted[20]; + struct object_id hash1, hash2, shifted; struct tree *one, *two; setup_git_directory(); - if (get_sha1(av[1], hash1)) + if (get_oid(av[1], &hash1)) die("cannot parse %s as an object name", av[1]); - if (get_sha1(av[2], hash2)) + if (get_oid(av[2], &hash2)) die("cannot parse %s as an object name", av[2]); - one = parse_tree_indirect(hash1); + one = parse_tree_indirect(hash1.hash); if (!one) die("not a tree-ish %s", av[1]); - two = parse_tree_indirect(hash2); + two = parse_tree_indirect(hash2.hash); if (!two) die("not a tree-ish %s", av[2]); - shift_tree(one->object.oid.hash, two->object.oid.hash, shifted, -1); - printf("shifted: %s\n", sha1_to_hex(shifted)); + shift_tree(&one->object.oid, &two->object.oid, &shifted, -1); + printf("shifted: %s\n", oid_to_hex(&shifted)); exit(0); } diff --git a/test-mergesort.c b/t/helper/test-mergesort.c index ea3b959..ea3b959 100644 --- a/test-mergesort.c +++ b/t/helper/test-mergesort.c diff --git a/test-mktemp.c b/t/helper/test-mktemp.c index c8c5421..c8c5421 100644 --- a/test-mktemp.c +++ b/t/helper/test-mktemp.c diff --git a/test-parse-options.c b/t/helper/test-parse-options.c index 2c8c8f1..8a1235d 100644 --- a/test-parse-options.c +++ b/t/helper/test-parse-options.c @@ -7,16 +7,25 @@ static int integer = 0; static unsigned long magnitude = 0; static unsigned long timestamp; static int abbrev = 7; -static int verbose = 0, dry_run = 0, quiet = 0; +static int verbose = -1; /* unspecified */ +static int dry_run = 0, quiet = 0; static char *string = NULL; static char *file = NULL; static int ambiguous; static struct string_list list; +static struct { + int called; + const char *arg; + int unset; +} length_cb; + static int length_callback(const struct option *opt, const char *arg, int unset) { - printf("Callback: \"%s\", %d\n", - (arg ? arg : "not set"), unset); + length_cb.called = 1; + length_cb.arg = arg; + length_cb.unset = unset; + if (unset) return 1; /* do not support unset */ @@ -30,6 +39,61 @@ static int number_callback(const struct option *opt, const char *arg, int unset) return 0; } +static int collect_expect(const struct option *opt, const char *arg, int unset) +{ + struct string_list *expect; + struct string_list_item *item; + struct strbuf label = STRBUF_INIT; + const char *colon; + + if (!arg || unset) + die("malformed --expect option"); + + expect = (struct string_list *)opt->value; + colon = strchr(arg, ':'); + if (!colon) + die("malformed --expect option, lacking a colon"); + strbuf_add(&label, arg, colon - arg); + item = string_list_insert(expect, strbuf_detach(&label, NULL)); + if (item->util) + die("malformed --expect option, duplicate %s", label.buf); + item->util = (void *)arg; + return 0; +} + +__attribute__((format (printf,3,4))) +static void show(struct string_list *expect, int *status, const char *fmt, ...) +{ + struct string_list_item *item; + struct strbuf buf = STRBUF_INIT; + va_list args; + + va_start(args, fmt); + strbuf_vaddf(&buf, fmt, args); + va_end(args); + + if (!expect->nr) + printf("%s\n", buf.buf); + else { + char *colon = strchr(buf.buf, ':'); + if (!colon) + die("malformed output format, output lacking colon: %s", fmt); + *colon = '\0'; + item = string_list_lookup(expect, buf.buf); + *colon = ':'; + if (!item) + ; /* not among entries being checked */ + else { + if (strcmp((const char *)item->util, buf.buf)) { + printf("-%s\n", (char *)item->util); + printf("+%s\n", buf.buf); + *status = 1; + } + } + } + strbuf_release(&buf); +} + int main(int argc, char **argv) { const char *prefix = "prefix/"; @@ -37,6 +101,7 @@ int main(int argc, char **argv) "test-parse-options <options>", NULL }; + struct string_list expect = STRING_LIST_INIT_NODUP; struct option options[] = { OPT_BOOL(0, "yes", &boolean, "get a boolean"), OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"), @@ -77,28 +142,38 @@ int main(int argc, char **argv) OPT__VERBOSE(&verbose, "be verbose"), OPT__DRY_RUN(&dry_run, "dry run"), OPT__QUIET(&quiet, "be quiet"), + OPT_CALLBACK(0, "expect", &expect, "string", + "expected output in the variable dump", + collect_expect), OPT_END(), }; int i; + int ret = 0; argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0); - printf("boolean: %d\n", boolean); - printf("integer: %d\n", integer); - printf("magnitude: %lu\n", magnitude); - printf("timestamp: %lu\n", timestamp); - printf("string: %s\n", string ? string : "(not set)"); - printf("abbrev: %d\n", abbrev); - printf("verbose: %d\n", verbose); - printf("quiet: %s\n", quiet ? "yes" : "no"); - printf("dry run: %s\n", dry_run ? "yes" : "no"); - printf("file: %s\n", file ? file : "(not set)"); + if (length_cb.called) { + const char *arg = length_cb.arg; + int unset = length_cb.unset; + show(&expect, &ret, "Callback: \"%s\", %d", + (arg ? arg : "not set"), unset); + } + show(&expect, &ret, "boolean: %d", boolean); + show(&expect, &ret, "integer: %d", integer); + show(&expect, &ret, "magnitude: %lu", magnitude); + show(&expect, &ret, "timestamp: %lu", timestamp); + show(&expect, &ret, "string: %s", string ? string : "(not set)"); + show(&expect, &ret, "abbrev: %d", abbrev); + show(&expect, &ret, "verbose: %d", verbose); + show(&expect, &ret, "quiet: %d", quiet); + show(&expect, &ret, "dry run: %s", dry_run ? "yes" : "no"); + show(&expect, &ret, "file: %s", file ? file : "(not set)"); for (i = 0; i < list.nr; i++) - printf("list: %s\n", list.items[i].string); + show(&expect, &ret, "list: %s", list.items[i].string); for (i = 0; i < argc; i++) - printf("arg %02d: %s\n", i, argv[i]); + show(&expect, &ret, "arg %02d: %s", i, argv[i]); - return 0; + return ret; } diff --git a/test-path-utils.c b/t/helper/test-path-utils.c index ba805b3..ba805b3 100644 --- a/test-path-utils.c +++ b/t/helper/test-path-utils.c diff --git a/test-prio-queue.c b/t/helper/test-prio-queue.c index 7be72f0..7be72f0 100644 --- a/test-prio-queue.c +++ b/t/helper/test-prio-queue.c diff --git a/test-read-cache.c b/t/helper/test-read-cache.c index b25bcf1..b25bcf1 100644 --- a/test-read-cache.c +++ b/t/helper/test-read-cache.c diff --git a/test-regex.c b/t/helper/test-regex.c index 0dc598e..0dc598e 100644 --- a/test-regex.c +++ b/t/helper/test-regex.c diff --git a/test-revision-walking.c b/t/helper/test-revision-walking.c index 3d03133..3d03133 100644 --- a/test-revision-walking.c +++ b/t/helper/test-revision-walking.c diff --git a/test-run-command.c b/t/helper/test-run-command.c index 30a64a9..30a64a9 100644 --- a/test-run-command.c +++ b/t/helper/test-run-command.c diff --git a/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c index 6efee31..6efee31 100644 --- a/test-scrap-cache-tree.c +++ b/t/helper/test-scrap-cache-tree.c diff --git a/test-sha1-array.c b/t/helper/test-sha1-array.c index 60ea1d5..60ea1d5 100644 --- a/test-sha1-array.c +++ b/t/helper/test-sha1-array.c diff --git a/test-sha1.c b/t/helper/test-sha1.c index e57eae1..e57eae1 100644 --- a/test-sha1.c +++ b/t/helper/test-sha1.c diff --git a/test-sha1.sh b/t/helper/test-sha1.sh index cef4bcc..750b95a 100755 --- a/test-sha1.sh +++ b/t/helper/test-sha1.sh @@ -1,7 +1,7 @@ #!/bin/sh dd if=/dev/zero bs=1048576 count=100 2>/dev/null | -/usr/bin/time ./test-sha1 >/dev/null +/usr/bin/time t/helper/test-sha1 >/dev/null while read expect cnt pfx do @@ -11,7 +11,7 @@ do test -z "$pfx" || echo "$pfx" dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null | perl -pe 'y/\000/g/' - } | ./test-sha1 $cnt + } | ./t/helper/test-sha1 $cnt ) if test "$expect" = "$actual" then diff --git a/test-sigchain.c b/t/helper/test-sigchain.c index e499fce..e499fce 100644 --- a/test-sigchain.c +++ b/t/helper/test-sigchain.c diff --git a/test-string-list.c b/t/helper/test-string-list.c index 14bdf9d..14bdf9d 100644 --- a/test-string-list.c +++ b/t/helper/test-string-list.c diff --git a/test-submodule-config.c b/t/helper/test-submodule-config.c index dab8c27..dab8c27 100644 --- a/test-submodule-config.c +++ b/t/helper/test-submodule-config.c diff --git a/test-subprocess.c b/t/helper/test-subprocess.c index 56881a0..56881a0 100644 --- a/test-subprocess.c +++ b/t/helper/test-subprocess.c diff --git a/test-svn-fe.c b/t/helper/test-svn-fe.c index 120ec96..120ec96 100644 --- a/test-svn-fe.c +++ b/t/helper/test-svn-fe.c diff --git a/test-urlmatch-normalization.c b/t/helper/test-urlmatch-normalization.c index 090bf21..090bf21 100644 --- a/test-urlmatch-normalization.c +++ b/t/helper/test-urlmatch-normalization.c diff --git a/test-wildmatch.c b/t/helper/test-wildmatch.c index 578b164..578b164 100644 --- a/test-wildmatch.c +++ b/t/helper/test-wildmatch.c diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 012d40e..54fd5a6 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -33,7 +33,7 @@ fi # Older versions of perforce were available compiled natively for # cygwin. Those do not accept native windows paths, so make sure # not to convert for them. -native_path() { +native_path () { path="$1" && if test_have_prereq CYGWIN && ! p4 -V | grep -q CYGWIN then @@ -49,7 +49,7 @@ native_path() { # Attention: This function is not safe again against time offset updates # at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)' # function could fix that but it is not in Python until 3.3. -time_in_seconds() { +time_in_seconds () { (cd / && "$PYTHON_PATH" -c 'import time; print(int(time.time()))') } @@ -75,7 +75,7 @@ git="$TRASH_DIRECTORY/git" pidfile="$TRASH_DIRECTORY/p4d.pid" # Sometimes "prove" seems to hang on exit because p4d is still running -cleanup() { +cleanup () { if test -f "$pidfile" then kill -9 $(cat "$pidfile") 2>/dev/null && exit 255 @@ -89,7 +89,7 @@ trap cleanup EXIT TMPDIR="$TRASH_DIRECTORY" export TMPDIR -start_p4d() { +start_p4d () { mkdir -p "$db" "$cli" "$git" && rm -f "$pidfile" && ( @@ -151,7 +151,7 @@ start_p4d() { return 0 } -p4_add_user() { +p4_add_user () { name=$1 && p4 user -f -i <<-EOF User: $name @@ -160,7 +160,16 @@ p4_add_user() { EOF } -retry_until_success() { +p4_add_job () { + p4 job -f -i <<-EOF + Job: $1 + Status: open + User: dummy + Description: + EOF +} + +retry_until_success () { timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT)) until "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout do @@ -168,7 +177,7 @@ retry_until_success() { done } -retry_until_fail() { +retry_until_fail () { timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT)) until ! "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout do @@ -176,7 +185,7 @@ retry_until_fail() { done } -kill_p4d() { +kill_p4d () { pid=$(cat "$pidfile") retry_until_fail kill $pid retry_until_fail kill -9 $pid @@ -186,13 +195,13 @@ kill_p4d() { retry_until_fail kill -9 $watchdog_pid } -cleanup_git() { +cleanup_git () { retry_until_success rm -r "$git" test_must_fail test -d "$git" && retry_until_success mkdir "$git" } -marshal_dump() { +marshal_dump () { what=$1 && line=${2:-1} && cat >"$TRASH_DIRECTORY/marshal-dump.py" <<-EOF && @@ -209,7 +218,7 @@ marshal_dump() { # # Construct a client with this list of View lines # -client_view() { +client_view () { ( cat <<-EOF && Client: $P4CLIENT @@ -223,7 +232,7 @@ client_view() { ) | p4 client -i } -is_cli_file_writeable() { +is_cli_file_writeable () { # cygwin version of p4 does not set read-only attr, # will be marked 444 but -w is true file="$1" && diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 6a50b87..fb88232 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -1,8 +1,5 @@ . ./test-lib.sh -remotes_git_svn=remotes/git""-svn -git_svn_id=git""-svn-id - if test -n "$NO_SVN_TESTS" then skip_all='skipping git svn tests, NO_SVN_TESTS defined' diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index db2ef22..ec2aa8f 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -1,9 +1,8 @@ #!/bin/sh gpg_version=$(gpg --version 2>&1) -if test $? = 127; then - say "You do not seem to have gpg installed" -else +if test $? != 127 +then # As said here: http://www.gnupg.org/documentation/faqs.html#q6.19 # the gpg version 1.0.6 didn't parse trust packets correctly, so for # that version, creation of signed tags using the generated key fails. diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 9317ba0..018a83a 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -102,6 +102,10 @@ Alias /auth/dumb/ www/auth/dumb/ SetEnv GIT_HTTP_EXPORT_ALL Header set Set-Cookie name=value </LocationMatch> +<LocationMatch /smart_headers/> + SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} + SetEnv GIT_HTTP_EXPORT_ALL +</LocationMatch> ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1 ScriptAlias /broken_smart/ broken-smart-http.sh/ ScriptAlias /error/ error.sh/ @@ -128,6 +132,18 @@ RewriteRule ^/ftp-redir/(.*)$ ftp://localhost:1000/$1 [R=302] RewriteRule ^/loop-redir/x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-(.*) /$1 [R=302] RewriteRule ^/loop-redir/(.*)$ /loop-redir/x-$1 [R=302] +# Apache 2.2 does not understand <RequireAll>, so we use RewriteCond. +# And as RewriteCond does not allow testing for non-matches, we match +# the desired case first (one has abra, two has cadabra), and let it +# pass by marking the RewriteRule as [L], "last rule, do not process +# any other matching RewriteRules after this"), and then have another +# RewriteRule that matches all other cases and lets them fail via '[F]', +# "fail the request". +RewriteCond %{HTTP:x-magic-one} =abra +RewriteCond %{HTTP:x-magic-two} =cadabra +RewriteRule ^/smart_headers/.* - [L] +RewriteRule ^/smart_headers/.* - [F] + <IfDefine SSL> LoadModule ssl_module modules/mod_ssl.so diff --git a/t/perf/p3404-rebase-interactive.sh b/t/perf/p3404-rebase-interactive.sh new file mode 100755 index 0000000..88f47de --- /dev/null +++ b/t/perf/p3404-rebase-interactive.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +test_description='Tests rebase -i performance' +. ./perf-lib.sh + +test_perf_default_repo + +# This commit merges a sufficiently long topic branch for reasonable +# performance testing +branch_merge=ba5312da19c6fdb6c6747d479f58932aae6e900c^{commit} +export branch_merge + +git rev-parse --verify $branch_merge >/dev/null 2>&1 || { + skip_all='skipping because $branch_merge was not found' + test_done +} + +write_script swap-first-two.sh <<\EOF +case "$1" in +*/COMMIT_EDITMSG) + mv "$1" "$1".bak && + sed -e '1{h;d}' -e 2G <"$1".bak >"$1" + ;; +esac +EOF + +test_expect_success 'setup' ' + git config core.editor "\"$PWD"/swap-first-two.sh\" && + git checkout -f $branch_merge^2 +' + +test_perf 'rebase -i' ' + git rebase -i $branch_merge^ +' + +test_done diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 5cf74ed..773f955 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -80,23 +80,29 @@ test_perf_create_repo_from () { error "bug in the test script: not 2 parameters to test-create-repo" repo="$1" source="$2" - source_git=$source/$(cd "$source" && git rev-parse --git-dir) + source_git="$(git -C "$source" rev-parse --git-dir)" + objects_dir="$(git -C "$source" rev-parse --git-path objects)" mkdir -p "$repo/.git" ( - cd "$repo/.git" && - { cp -Rl "$source_git/objects" . 2>/dev/null || - cp -R "$source_git/objects" .; } && + cd "$source" && + { cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null || + cp -R "$objects_dir" "$repo/.git/"; } && for stuff in "$source_git"/*; do case "$stuff" in - */objects|*/hooks|*/config) + */objects|*/hooks|*/config|*/commondir) ;; *) - cp -R "$stuff" . || exit 1 + cp -R "$stuff" "$repo/.git/" || exit 1 ;; esac - done && - cd .. && - git init -q && + done + ) && + ( + cd "$repo" && + git init -q && { + test_have_prereq SYMLINKS || + git config core.symlinks false + } && mv .git/hooks .git/hooks-disabled 2>/dev/null ) || error "failed to copy repository '$source' to '$repo'" } @@ -121,11 +127,15 @@ test_checkout_worktree () { # Performance tests should never fail. If they do, stop immediately immediate=t +# Perf tests require GNU time +case "$(uname -s)" in Darwin) GTIME="${GTIME:-gtime}";; esac +GTIME="${GTIME:-/usr/bin/time}" + test_run_perf_ () { test_cleanup=: test_export_="test_cleanup" export test_cleanup test_export_ - /usr/bin/time -f "%E %U %S" -o test_time.$i "$SHELL" -c ' + "$GTIME" -f "%E %U %S" -o test_time.$i "$SHELL" -c ' . '"$TEST_DIRECTORY"/test-lib-functions.sh' test_export () { [ $# != 0 ] || return 0 diff --git a/t/t0006-date.sh b/t/t0006-date.sh index fac0986..04ce535 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -6,26 +6,52 @@ test_description='test date parsing and printing' # arbitrary reference time: 2009-08-30 19:20:00 TEST_DATE_NOW=1251660000; export TEST_DATE_NOW -check_show() { +check_relative() { t=$(($TEST_DATE_NOW - $1)) echo "$t -> $2" >expect test_expect_${3:-success} "relative date ($2)" " - test-date show $t >actual && + test-date relative $t >actual && test_i18ncmp expect actual " } -check_show 5 '5 seconds ago' -check_show 300 '5 minutes ago' -check_show 18000 '5 hours ago' -check_show 432000 '5 days ago' -check_show 1728000 '3 weeks ago' -check_show 13000000 '5 months ago' -check_show 37500000 '1 year, 2 months ago' -check_show 55188000 '1 year, 9 months ago' -check_show 630000000 '20 years ago' -check_show 31449600 '12 months ago' -check_show 62985600 '2 years ago' +check_relative 5 '5 seconds ago' +check_relative 300 '5 minutes ago' +check_relative 18000 '5 hours ago' +check_relative 432000 '5 days ago' +check_relative 1728000 '3 weeks ago' +check_relative 13000000 '5 months ago' +check_relative 37500000 '1 year, 2 months ago' +check_relative 55188000 '1 year, 9 months ago' +check_relative 630000000 '20 years ago' +check_relative 31449600 '12 months ago' +check_relative 62985600 '2 years ago' + +check_show () { + format=$1 + time=$2 + expect=$3 + test_expect_${4:-success} "show date ($format:$time)" ' + echo "$time -> $expect" >expect && + test-date show:$format "$time" >actual && + test_cmp expect actual + ' +} + +# arbitrary but sensible time for examples +TIME='1466000000 +0200' +check_show iso8601 "$TIME" '2016-06-15 16:13:20 +0200' +check_show iso8601-strict "$TIME" '2016-06-15T16:13:20+02:00' +check_show rfc2822 "$TIME" 'Wed, 15 Jun 2016 16:13:20 +0200' +check_show short "$TIME" '2016-06-15' +check_show default "$TIME" 'Wed Jun 15 16:13:20 2016 +0200' +check_show raw "$TIME" '1466000000 +0200' +check_show iso-local "$TIME" '2016-06-15 14:13:20 +0000' + +# arbitrary time absurdly far in the future +FUTURE="5758122296 -0400" +check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" +check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" check_parse() { echo "$1 -> $2" >expect diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index 89544dd..b425f3a 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -605,7 +605,7 @@ cat <<-EOF >expected-verbose a/b/.gitignore:8:!on* a/b/one a/b/.gitignore:8:!on* a/b/one one a/b/.gitignore:8:!on* a/b/one two - a/b/.gitignore:8:!on* "a/b/one\"three" + a/b/.gitignore:8:!on* "a/b/one\\"three" a/b/.gitignore:9:!two a/b/two a/.gitignore:1:two* a/b/twooo $global_excludes:2:!globaltwo globaltwo @@ -686,7 +686,7 @@ cat <<-EOF >expected-all a/b/.gitignore:8:!on* b/one a/b/.gitignore:8:!on* b/one one a/b/.gitignore:8:!on* b/one two - a/b/.gitignore:8:!on* "b/one\"three" + a/b/.gitignore:8:!on* "b/one\\"three" a/b/.gitignore:9:!two b/two :: b/not-ignored a/.gitignore:1:two* b/twooo diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index f33962b..9372589 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -12,7 +12,7 @@ fi compare_files () { tr '\015\000' QN <"$1" >"$1".expect && - tr '\015\000' QN <"$2" >"$2".actual && + tr '\015\000' QN <"$2" | tr -d 'Z' >"$2".actual && test_cmp "$1".expect "$2".actual && rm "$1".expect "$2".actual } @@ -52,14 +52,17 @@ create_gitattributes () { create_NNO_files () { for crlf in false true input do - for attr in "" auto text -text lf crlf + for attr in "" auto text -text do - pfx=NNO_${crlf}_attr_${attr} && - cp CRLF_mix_LF ${pfx}_LF.txt && - cp CRLF_mix_LF ${pfx}_CRLF.txt && - cp CRLF_mix_LF ${pfx}_CRLF_mix_LF.txt && - cp CRLF_mix_LF ${pfx}_LF_mix_CR.txt && - cp CRLF_mix_LF ${pfx}_CRLF_nul.txt + for aeol in "" lf crlf + do + pfx=NNO_attr_${attr}_aeol_${aeol}_${crlf} + cp CRLF_mix_LF ${pfx}_LF.txt && + cp CRLF_mix_LF ${pfx}_CRLF.txt && + cp CRLF_mix_LF ${pfx}_CRLF_mix_LF.txt && + cp CRLF_mix_LF ${pfx}_LF_mix_CR.txt && + cp CRLF_mix_LF ${pfx}_CRLF_nul.txt + done done done } @@ -100,20 +103,22 @@ commit_check_warn () { } commit_chk_wrnNNO () { - crlf=$1 - attr=$2 - lfwarn=$3 - crlfwarn=$4 - lfmixcrlf=$5 - lfmixcr=$6 - crlfnul=$7 - pfx=NNO_${crlf}_attr_${attr} + attr=$1 ; shift + aeol=$1 ; shift + crlf=$1 ; shift + lfwarn=$1 ; shift + crlfwarn=$1 ; shift + lfmixcrlf=$1 ; shift + lfmixcr=$1 ; shift + crlfnul=$1 ; shift + pfx=NNO_attr_${attr}_aeol_${aeol}_${crlf} #Commit files on top of existing file - create_gitattributes "$attr" && + create_gitattributes "$attr" $aeol && for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul do fname=${pfx}_$f.txt && cp $f $fname && + printf Z >>"$fname" && git -c core.autocrlf=$crlf add $fname 2>/dev/null && git -c core.autocrlf=$crlf commit -m "commit_$fname" $fname >"${pfx}_$f.err" 2>&1 done @@ -121,19 +126,19 @@ commit_chk_wrnNNO () { test_expect_success "commit NNO files crlf=$crlf attr=$attr LF" ' check_warning "$lfwarn" ${pfx}_LF.err ' - test_expect_success "commit NNO files crlf=$crlf attr=$attr CRLF" ' + test_expect_success "commit NNO files attr=$attr aeol=$aeol crlf=$crlf CRLF" ' check_warning "$crlfwarn" ${pfx}_CRLF.err ' - test_expect_success "commit NNO files crlf=$crlf attr=$attr CRLF_mix_LF" ' + test_expect_success "commit NNO files attr=$attr aeol=$aeol crlf=$crlf CRLF_mix_LF" ' check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err ' - test_expect_success "commit NNO files crlf=$crlf attr=$attr LF_mix_cr" ' + test_expect_success "commit NNO files attr=$attr aeol=$aeol crlf=$crlf LF_mix_cr" ' check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err ' - test_expect_success "commit NNO files crlf=$crlf attr=$attr CRLF_nul" ' + test_expect_success "commit NNO files attr=$attr aeol=$aeol crlf=$crlf CRLF_nul" ' check_warning "$crlfnul" ${pfx}_CRLF_nul.err ' } @@ -162,6 +167,7 @@ stats_ascii () { # contruct the attr/ returned by git ls-files --eol # Take none (=empty), one or two args +# convert.c: eol=XX overrides text=auto attr_ascii () { case $1,$2 in -text,*) echo "-text" ;; @@ -169,8 +175,8 @@ attr_ascii () { text,lf) echo "text eol=lf" ;; text,crlf) echo "text eol=crlf" ;; auto,) echo "text=auto" ;; - auto,lf) echo "text=auto eol=lf" ;; - auto,crlf) echo "text=auto eol=crlf" ;; + auto,lf) echo "text eol=lf" ;; + auto,crlf) echo "text eol=crlf" ;; lf,) echo "text eol=lf" ;; crlf,) echo "text eol=crlf" ;; ,) echo "" ;; @@ -195,28 +201,29 @@ check_files_in_repo () { } check_in_repo_NNO () { - crlf=$1 - attr=$2 - lfname=$3 - crlfname=$4 - lfmixcrlf=$5 - lfmixcr=$6 - crlfnul=$7 - pfx=NNO_${crlf}_attr_${attr}_ - test_expect_success "compare_files $lfname ${pfx}LF.txt" ' - compare_files $lfname ${pfx}LF.txt + attr=$1 ; shift + aeol=$1 ; shift + crlf=$1 ; shift + lfname=$1 ; shift + crlfname=$1 ; shift + lfmixcrlf=$1 ; shift + lfmixcr=$1 ; shift + crlfnul=$1 ; shift + pfx=NNO_attr_${attr}_aeol_${aeol}_${crlf} + test_expect_success "compare_files $lfname ${pfx}_LF.txt" ' + compare_files $lfname ${pfx}_LF.txt ' - test_expect_success "compare_files $crlfname ${pfx}CRLF.txt" ' - compare_files $crlfname ${pfx}CRLF.txt + test_expect_success "compare_files $crlfname ${pfx}_CRLF.txt" ' + compare_files $crlfname ${pfx}_CRLF.txt ' - test_expect_success "compare_files $lfmixcrlf ${pfx}CRLF_mix_LF.txt" ' - compare_files $lfmixcrlf ${pfx}CRLF_mix_LF.txt + test_expect_success "compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt" ' + compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt ' - test_expect_success "compare_files $lfmixcr ${pfx}LF_mix_CR.txt" ' - compare_files $lfmixcr ${pfx}LF_mix_CR.txt + test_expect_success "compare_files $lfmixcr ${pfx}_LF_mix_CR.txt" ' + compare_files $lfmixcr ${pfx}_LF_mix_CR.txt ' - test_expect_success "compare_files $crlfnul ${pfx}CRLF_nul.txt" ' - compare_files $crlfnul ${pfx}CRLF_nul.txt + test_expect_success "compare_files $crlfnul ${pfx}_CRLF_nul.txt" ' + compare_files $crlfnul ${pfx}_CRLF_nul.txt ' } @@ -231,7 +238,7 @@ checkout_files () { lfmixcrlf=$1 ; shift lfmixcr=$1 ; shift crlfnul=$1 ; shift - create_gitattributes "$attr" "$ident" && + create_gitattributes "$attr" $ident $aeol && git config core.autocrlf $crlf && pfx=eol_${ceol}_crlf_${crlf}_attr_${attr}_ && for f in LF CRLF LF_mix_CR CRLF_mix_LF LF_nul @@ -244,7 +251,7 @@ checkout_files () { fi done - test_expect_success "ls-files --eol attr=$attr $ident $aeol core.autocrlf=$crlf core.eol=$ceol" ' + test_expect_success "ls-files --eol attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol" ' test_when_finished "rm expect actual" && sort <<-EOF >expect && i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt @@ -259,19 +266,19 @@ checkout_files () { sort >actual && test_cmp expect actual ' - test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=LF" " + test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=LF" " compare_ws_file $pfx $lfname crlf_false_attr__LF.txt " - test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=CRLF" " + test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=CRLF" " compare_ws_file $pfx $crlfname crlf_false_attr__CRLF.txt " - test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=CRLF_mix_LF" " + test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=CRLF_mix_LF" " compare_ws_file $pfx $lfmixcrlf crlf_false_attr__CRLF_mix_LF.txt " - test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=LF_mix_CR" " + test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=LF_mix_CR" " compare_ws_file $pfx $lfmixcr crlf_false_attr__LF_mix_CR.txt " - test_expect_success "checkout $ident $attr $aeol core.autocrlf=$crlf core.eol=$ceol file=LF_nul" " + test_expect_success "checkout attr=$attr $ident aeol=$aeol core.autocrlf=$crlf core.eol=$ceol file=LF_nul" " compare_ws_file $pfx $crlfnul crlf_false_attr__LF_nul.txt " } @@ -385,31 +392,31 @@ test_expect_success 'commit files attr=crlf' ' commit_check_warn input "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" ' -# attr LF CRLF CRLFmixLF LF_mix_CR CRLFNUL -commit_chk_wrnNNO false "" "" "" "" "" "" -commit_chk_wrnNNO true "" "LF_CRLF" "" "" "" "" -commit_chk_wrnNNO input "" "" "" "" "" "" - +# attr LF CRLF CRLFmixLF LF_mix_CR CRLFNUL +commit_chk_wrnNNO "" "" false "" "" "" "" "" +commit_chk_wrnNNO "" "" true LF_CRLF "" "" "" "" +commit_chk_wrnNNO "" "" input "" "" "" "" "" -commit_chk_wrnNNO false "auto" "$WILC" "$WICL" "$WAMIX" "" "" -commit_chk_wrnNNO true "auto" "LF_CRLF" "" "LF_CRLF" "" "" -commit_chk_wrnNNO input "auto" "" "CRLF_LF" "CRLF_LF" "" "" +commit_chk_wrnNNO "auto" "" false "$WILC" "$WICL" "$WAMIX" "" "" +commit_chk_wrnNNO "auto" "" true LF_CRLF "" LF_CRLF "" "" +commit_chk_wrnNNO "auto" "" input "" CRLF_LF CRLF_LF "" "" -commit_chk_wrnNNO false "text" "$WILC" "$WICL" "$WAMIX" "$WILC" "$WICL" -commit_chk_wrnNNO true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" -commit_chk_wrnNNO input "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" - -commit_chk_wrnNNO false "-text" "" "" "" "" "" -commit_chk_wrnNNO true "-text" "" "" "" "" "" -commit_chk_wrnNNO input "-text" "" "" "" "" "" - -commit_chk_wrnNNO false "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" -commit_chk_wrnNNO true "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" -commit_chk_wrnNNO input "lf" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" +for crlf in true false input +do + commit_chk_wrnNNO -text "" $crlf "" "" "" "" "" + commit_chk_wrnNNO -text lf $crlf "" "" "" "" "" + commit_chk_wrnNNO -text crlf $crlf "" "" "" "" "" + commit_chk_wrnNNO "" lf $crlf "" CRLF_LF CRLF_LF "" CRLF_LF + commit_chk_wrnNNO "" crlf $crlf LF_CRLF "" LF_CRLF LF_CRLF "" + commit_chk_wrnNNO auto lf $crlf "" CRLF_LF CRLF_LF "" CRLF_LF + commit_chk_wrnNNO auto crlf $crlf LF_CRLF "" LF_CRLF LF_CRLF "" + commit_chk_wrnNNO text lf $crlf "" CRLF_LF CRLF_LF "" CRLF_LF + commit_chk_wrnNNO text crlf $crlf LF_CRLF "" LF_CRLF LF_CRLF "" +done -commit_chk_wrnNNO false "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" -commit_chk_wrnNNO true "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" -commit_chk_wrnNNO input "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" +commit_chk_wrnNNO "text" "" false "$WILC" "$WICL" "$WAMIX" "$WILC" "$WICL" +commit_chk_wrnNNO "text" "" true LF_CRLF "" LF_CRLF LF_CRLF "" +commit_chk_wrnNNO "text" "" input "" CRLF_LF CRLF_LF "" CRLF_LF test_expect_success 'create files cleanup' ' rm -f *.txt && @@ -440,24 +447,20 @@ test_expect_success 'commit -text' ' check_files_in_repo input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul ' -# attr LF CRLF CRLF_mix_LF LF_mix_CR CRLFNUL -check_in_repo_NNO false "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_in_repo_NNO true "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_in_repo_NNO input "" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul - -check_in_repo_NNO false "auto" LF LF LF LF_mix_CR CRLF_nul -check_in_repo_NNO true "auto" LF LF LF LF_mix_CR CRLF_nul -check_in_repo_NNO input "auto" LF LF LF LF_mix_CR CRLF_nul - -check_in_repo_NNO false "text" LF LF LF LF_mix_CR LF_nul -check_in_repo_NNO true "text" LF LF LF LF_mix_CR LF_nul -check_in_repo_NNO input "text" LF LF LF LF_mix_CR LF_nul - -check_in_repo_NNO false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_in_repo_NNO true "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul -check_in_repo_NNO input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul - - +for crlf in true false input +do + # attr aeol LF CRLF CRLF_mix_LF LF_mix_CR CRLFNUL + check_in_repo_NNO "" "" $crlf LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul + check_in_repo_NNO -text "" $crlf LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul + check_in_repo_NNO -text lf $crlf LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul + check_in_repo_NNO -text crlf $crlf LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul + check_in_repo_NNO auto "" $crlf LF LF LF LF_mix_CR CRLF_nul + check_in_repo_NNO auto lf $crlf LF LF LF LF_mix_CR LF_nul + check_in_repo_NNO auto crlf $crlf LF LF LF LF_mix_CR LF_nul + check_in_repo_NNO text "" $crlf LF LF LF LF_mix_CR LF_nul + check_in_repo_NNO text lf $crlf LF LF LF LF_mix_CR LF_nul + check_in_repo_NNO text crlf $crlf LF LF LF LF_mix_CR LF_nul +done ################################################################################ # Check how files in the repo are changed when they are checked out # How to read the table below: @@ -489,89 +492,47 @@ LFNUL=LF_nul fi export CRLF_MIX_LF_CR MIX NL -checkout_files "" "" "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" "" "" false crlf 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 "" "" "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" "" "" input "" 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 "" "" "" true "" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" "" "" true crlf CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" "" "" true lf CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" "" "" true native CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" true crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" true lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "" ident "" true native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" "" "" false "" $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul -checkout_files "auto" "" "" false crlf CRLF CRLF CRLF LF_mix_CR LF_nul -checkout_files "auto" "" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" "" "" false native $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul -checkout_files "auto" "" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" "" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" "" "" true "" CRLF CRLF CRLF LF_mix_CR LF_nul -checkout_files "auto" "" "" true crlf CRLF CRLF CRLF LF_mix_CR LF_nul -checkout_files "auto" "" "" true lf CRLF CRLF CRLF LF_mix_CR LF_nul -checkout_files "auto" "" "" true native CRLF CRLF CRLF LF_mix_CR LF_nul -checkout_files "auto" ident "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" true crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" true lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul -checkout_files "auto" ident "" true native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - -for id in "" ident; +# Same handling with and without ident +for id in "" ident do - checkout_files "crlf" "$id" "" false "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" false crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" false lf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" false native CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" input "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" input lf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" true "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" true crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" true lf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "crlf" "$id" "" true native CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "lf" "$id" "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" true crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" true lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "lf" "$id" "" true native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "text" "$id" "" false "" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL - checkout_files "text" "$id" "" false crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "text" "$id" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "text" "$id" "" false native $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL - checkout_files "text" "$id" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "text" "$id" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "text" "$id" "" true "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "text" "$id" "" true crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "text" "$id" "" true lf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "text" "$id" "" true native CRLF CRLF CRLF CRLF_mix_CR CRLF_nul - checkout_files "-text" "$id" "" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" false crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" false native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" input "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" input lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" true crlf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" true lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul - checkout_files "-text" "$id" "" true native LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + for ceol in lf crlf native + do + for crlf in true false input + do + # -text overrides core.autocrlf and core.eol + # text and eol=crlf or eol=lf override core.autocrlf and core.eol + checkout_files -text "$id" "" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + checkout_files -text "$id" "lf" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + checkout_files -text "$id" "crlf" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + # text + checkout_files text "$id" "lf" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + checkout_files text "$id" "crlf" "$crlf" "$ceol" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul + # currently the same as text, eol=XXX + checkout_files auto "$id" "lf" "$crlf" "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + checkout_files auto "$id" "crlf" "$crlf" "$ceol" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul + done + + # core.autocrlf false, different core.eol + checkout_files "" "$id" "" false "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + # core.autocrlf true + checkout_files "" "$id" "" true "$ceol" CRLF CRLF CRLF_mix_LF LF_mix_CR LF_nul + # text: core.autocrlf = true overrides core.eol + checkout_files auto "$id" "" true "$ceol" CRLF CRLF CRLF LF_mix_CR LF_nul + checkout_files text "$id" "" true "$ceol" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul + # text: core.autocrlf = input overrides core.eol + checkout_files text "$id" "" input "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + checkout_files auto "$id" "" input "$ceol" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + # text=auto + eol=XXX + done + # text: core.autocrlf=false uses core.eol + checkout_files text "$id" "" false crlf CRLF CRLF CRLF CRLF_mix_CR CRLF_nul + checkout_files text "$id" "" false lf LF CRLF CRLF_mix_LF LF_mix_CR LF_nul + # text: core.autocrlf=false and core.eol unset(or native) uses native eol + checkout_files text "$id" "" false "" $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL + checkout_files text "$id" "" false native $NL CRLF $MIX_CRLF_LF $MIX_LF_CR $LFNUL + # auto: core.autocrlf=false and core.eol unset(or native) uses native eol + checkout_files auto "$id" "" false "" $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul + checkout_files auto "$id" "" false native $NL CRLF $MIX_CRLF_LF LF_mix_CR LF_nul done # Should be the last test case: remove some files from the worktree diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index 9be6411..db5f60d 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -7,7 +7,7 @@ test_description='our own option parser' . ./test-lib.sh -cat > expect << EOF +cat >expect <<\EOF usage: test-parse-options <options> --yes get a boolean @@ -45,63 +45,24 @@ Standard options -v, --verbose be verbose -n, --dry-run dry run -q, --quiet be quiet + --expect <string> expected output in the variable dump EOF test_expect_success 'test help' ' - test_must_fail test-parse-options -h > output 2> output.err && + test_must_fail test-parse-options -h >output 2>output.err && test_must_be_empty output.err && test_i18ncmp expect output ' mv expect expect.err -cat >expect.template <<EOF -boolean: 0 -integer: 0 -magnitude: 0 -timestamp: 0 -string: (not set) -abbrev: 7 -verbose: 0 -quiet: no -dry run: no -file: (not set) -EOF - -check() { +check () { what="$1" && shift && expect="$1" && shift && - sed "s/^$what .*/$what $expect/" <expect.template >expect && - test-parse-options $* >output 2>output.err && - test_must_be_empty output.err && - test_cmp expect output -} - -check_i18n() { - what="$1" && - shift && - expect="$1" && - shift && - sed "s/^$what .*/$what $expect/" <expect.template >expect && - test-parse-options $* >output 2>output.err && - test_must_be_empty output.err && - test_i18ncmp expect output -} - -check_unknown() { - case "$1" in - --*) - echo error: unknown option \`${1#--}\' >expect ;; - -*) - echo error: unknown switch \`${1#-}\' >expect ;; - esac && - cat expect.err >>expect && - test_must_fail test-parse-options $* >output 2>output.err && - test_must_be_empty output && - test_cmp expect output.err + test-parse-options --expect="$what $expect" "$@" } check_unknown_i18n() { @@ -156,7 +117,7 @@ test_expect_success 'OPT_MAGNITUDE() 3giga' ' check magnitude: 3221225472 -m 3g ' -cat > expect << EOF +cat >expect <<\EOF boolean: 2 integer: 1729 magnitude: 16384 @@ -164,7 +125,7 @@ timestamp: 0 string: 123 abbrev: 7 verbose: 2 -quiet: no +quiet: 0 dry run: yes file: prefix/my.file EOF @@ -176,7 +137,7 @@ test_expect_success 'short options' ' test_must_be_empty output.err ' -cat > expect << EOF +cat >expect <<\EOF boolean: 2 integer: 1729 magnitude: 16384 @@ -184,7 +145,7 @@ timestamp: 0 string: 321 abbrev: 10 verbose: 2 -quiet: no +quiet: 0 dry run: no file: prefix/fi.le EOF @@ -204,15 +165,15 @@ test_expect_success 'missing required value' ' test_expect_code 129 test-parse-options --file ' -cat > expect << EOF +cat >expect <<\EOF boolean: 1 integer: 13 magnitude: 0 timestamp: 0 string: 123 abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) arg 00: a1 @@ -222,32 +183,32 @@ EOF test_expect_success 'intermingled arguments' ' test-parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \ - > output 2> output.err && + >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' -cat > expect << EOF +cat >expect <<\EOF boolean: 0 integer: 2 magnitude: 0 timestamp: 0 string: (not set) abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) EOF test_expect_success 'unambiguously abbreviated option' ' - test-parse-options --int 2 --boolean --no-bo > output 2> output.err && + test-parse-options --int 2 --boolean --no-bo >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' test_expect_success 'unambiguously abbreviated option with "="' ' - test-parse-options --int=2 > output 2> output.err && + test-parse-options --int=2 >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' @@ -256,74 +217,74 @@ test_expect_success 'ambiguously abbreviated option' ' test_expect_code 129 test-parse-options --strin 123 ' -cat > expect << EOF +cat >expect <<\EOF boolean: 0 integer: 0 magnitude: 0 timestamp: 0 string: 123 abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) EOF test_expect_success 'non ambiguous option (after two options it abbreviates)' ' - test-parse-options --st 123 > output 2> output.err && + test-parse-options --st 123 >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' -cat > typo.err << EOF -error: did you mean \`--boolean\` (with two dashes ?) +cat >typo.err <<\EOF +error: did you mean `--boolean` (with two dashes ?) EOF test_expect_success 'detect possible typos' ' - test_must_fail test-parse-options -boolean > output 2> output.err && + test_must_fail test-parse-options -boolean >output 2>output.err && test_must_be_empty output && test_cmp typo.err output.err ' -cat > typo.err << EOF -error: did you mean \`--ambiguous\` (with two dashes ?) +cat >typo.err <<\EOF +error: did you mean `--ambiguous` (with two dashes ?) EOF test_expect_success 'detect possible typos' ' - test_must_fail test-parse-options -ambiguous > output 2> output.err && + test_must_fail test-parse-options -ambiguous >output 2>output.err && test_must_be_empty output && test_cmp typo.err output.err ' -cat > expect <<EOF +cat >expect <<\EOF boolean: 0 integer: 0 magnitude: 0 timestamp: 0 string: (not set) abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) arg 00: --quux EOF test_expect_success 'keep some options as arguments' ' - test-parse-options --quux > output 2> output.err && + test-parse-options --quux >output 2>output.err && test_must_be_empty output.err && - test_cmp expect output + test_cmp expect output ' -cat > expect <<EOF +cat >expect <<\EOF boolean: 0 integer: 0 magnitude: 0 timestamp: 1 string: (not set) abbrev: 7 -verbose: 0 -quiet: yes +verbose: -1 +quiet: 1 dry run: no file: (not set) arg 00: foo @@ -331,12 +292,12 @@ EOF test_expect_success 'OPT_DATE() works' ' test-parse-options -t "1970-01-01 00:00:01 +0000" \ - foo -q > output 2> output.err && + foo -q >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' -cat > expect <<EOF +cat >expect <<\EOF Callback: "four", 0 boolean: 5 integer: 4 @@ -344,112 +305,110 @@ magnitude: 0 timestamp: 0 string: (not set) abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) EOF test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' ' - test-parse-options --length=four -b -4 > output 2> output.err && + test-parse-options --length=four -b -4 >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' -cat > expect <<EOF -Callback: "not set", 1 -EOF +>expect test_expect_success 'OPT_CALLBACK() and callback errors work' ' - test_must_fail test-parse-options --no-length > output 2> output.err && + test_must_fail test-parse-options --no-length >output 2>output.err && test_i18ncmp expect output && test_i18ncmp expect.err output.err ' -cat > expect <<EOF +cat >expect <<\EOF boolean: 1 integer: 23 magnitude: 0 timestamp: 0 string: (not set) abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) EOF test_expect_success 'OPT_BIT() and OPT_SET_INT() work' ' - test-parse-options --set23 -bbbbb --no-or4 > output 2> output.err && + test-parse-options --set23 -bbbbb --no-or4 >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' ' - test-parse-options --set23 -bbbbb --neg-or4 > output 2> output.err && + test-parse-options --set23 -bbbbb --neg-or4 >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' -cat > expect <<EOF +cat >expect <<\EOF boolean: 6 integer: 0 magnitude: 0 timestamp: 0 string: (not set) abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) EOF test_expect_success 'OPT_BIT() works' ' - test-parse-options -bb --or4 > output 2> output.err && + test-parse-options -bb --or4 >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' test_expect_success 'OPT_NEGBIT() works' ' - test-parse-options -bb --no-neg-or4 > output 2> output.err && + test-parse-options -bb --no-neg-or4 >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' ' - test-parse-options + + + + + + > output 2> output.err && + test-parse-options + + + + + + >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' -cat > expect <<EOF +cat >expect <<\EOF boolean: 0 integer: 12345 magnitude: 0 timestamp: 0 string: (not set) abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) EOF test_expect_success 'OPT_NUMBER_CALLBACK() works' ' - test-parse-options -12345 > output 2> output.err && + test-parse-options -12345 >output 2>output.err && test_must_be_empty output.err && test_cmp expect output ' -cat >expect <<EOF +cat >expect <<\EOF boolean: 0 integer: 0 magnitude: 0 timestamp: 0 string: (not set) abbrev: 7 -verbose: 0 -quiet: no +verbose: -1 +quiet: 0 dry run: no file: (not set) EOF @@ -460,7 +419,7 @@ test_expect_success 'negation of OPT_NONEG flags is not ambiguous' ' test_cmp expect output ' -cat >>expect <<'EOF' +cat >>expect <<\EOF list: foo list: bar list: baz @@ -476,4 +435,118 @@ test_expect_success '--no-list resets list' ' test_cmp expect output ' +cat >expect <<\EOF +boolean: 0 +integer: 0 +magnitude: 0 +timestamp: 0 +string: (not set) +abbrev: 7 +verbose: -1 +quiet: 3 +dry run: no +file: (not set) +EOF + +test_expect_success 'multiple quiet levels' ' + test-parse-options -q -q -q >output 2>output.err && + test_must_be_empty output.err && + test_cmp expect output +' + +cat >expect <<\EOF +boolean: 0 +integer: 0 +magnitude: 0 +timestamp: 0 +string: (not set) +abbrev: 7 +verbose: 3 +quiet: 0 +dry run: no +file: (not set) +EOF + +test_expect_success 'multiple verbose levels' ' + test-parse-options -v -v -v >output 2>output.err && + test_must_be_empty output.err && + test_cmp expect output +' + +cat >expect <<\EOF +boolean: 0 +integer: 0 +magnitude: 0 +timestamp: 0 +string: (not set) +abbrev: 7 +verbose: -1 +quiet: 0 +dry run: no +file: (not set) +EOF + +test_expect_success '--no-quiet sets --quiet to 0' ' + test-parse-options --no-quiet >output 2>output.err && + test_must_be_empty output.err && + test_cmp expect output +' + +cat >expect <<\EOF +boolean: 0 +integer: 0 +magnitude: 0 +timestamp: 0 +string: (not set) +abbrev: 7 +verbose: -1 +quiet: 0 +dry run: no +file: (not set) +EOF + +test_expect_success '--no-quiet resets multiple -q to 0' ' + test-parse-options -q -q -q --no-quiet >output 2>output.err && + test_must_be_empty output.err && + test_cmp expect output +' + +cat >expect <<\EOF +boolean: 0 +integer: 0 +magnitude: 0 +timestamp: 0 +string: (not set) +abbrev: 7 +verbose: 0 +quiet: 0 +dry run: no +file: (not set) +EOF + +test_expect_success '--no-verbose sets verbose to 0' ' + test-parse-options --no-verbose >output 2>output.err && + test_must_be_empty output.err && + test_cmp expect output +' + +cat >expect <<\EOF +boolean: 0 +integer: 0 +magnitude: 0 +timestamp: 0 +string: (not set) +abbrev: 7 +verbose: 0 +quiet: 0 +dry run: no +file: (not set) +EOF + +test_expect_success '--no-verbose resets multiple verbose to 0' ' + test-parse-options -v -v -v --no-verbose >output 2>output.err && + test_must_be_empty output.err && + test_cmp expect output +' + test_done diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index 8532a02..bf2deee 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -19,6 +19,13 @@ relative_path() { "test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'" } +test_submodule_relative_url() { + test_expect_success "test_submodule_relative_url: $1 $2 $3 => $4" " + actual=\$(git submodule--helper resolve-relative-url-test '$1' '$2' '$3') && + test \"\$actual\" = '$4' + " +} + test_git_path() { test_expect_success "git-path $1 $2 => $3" " $1 git rev-parse --git-path $2 >actual && @@ -298,4 +305,43 @@ 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 +# In the tests below, the distinction between $PWD and $(pwd) is important: +# on Windows, $PWD is POSIX style (/c/foo), $(pwd) has drive letter (c:/foo). + +test_submodule_relative_url "../" "../foo" "../submodule" "../../submodule" +test_submodule_relative_url "../" "../foo/bar" "../submodule" "../../foo/submodule" +test_submodule_relative_url "../" "../foo/submodule" "../submodule" "../../foo/submodule" +test_submodule_relative_url "../" "./foo" "../submodule" "../submodule" +test_submodule_relative_url "../" "./foo/bar" "../submodule" "../foo/submodule" +test_submodule_relative_url "../../../" "../foo/bar" "../sub/a/b/c" "../../../../foo/sub/a/b/c" +test_submodule_relative_url "../" "$PWD/addtest" "../repo" "$(pwd)/repo" +test_submodule_relative_url "../" "foo/bar" "../submodule" "../foo/submodule" +test_submodule_relative_url "../" "foo" "../submodule" "../submodule" + +test_submodule_relative_url "(null)" "../foo/bar" "../sub/a/b/c" "../foo/sub/a/b/c" +test_submodule_relative_url "(null)" "../foo/bar" "../submodule" "../foo/submodule" +test_submodule_relative_url "(null)" "../foo/submodule" "../submodule" "../foo/submodule" +test_submodule_relative_url "(null)" "../foo" "../submodule" "../submodule" +test_submodule_relative_url "(null)" "./foo/bar" "../submodule" "foo/submodule" +test_submodule_relative_url "(null)" "./foo" "../submodule" "submodule" +test_submodule_relative_url "(null)" "//somewhere else/repo" "../subrepo" "//somewhere else/subrepo" +test_submodule_relative_url "(null)" "$PWD/subsuper_update_r" "../subsubsuper_update_r" "$(pwd)/subsubsuper_update_r" +test_submodule_relative_url "(null)" "$PWD/super_update_r2" "../subsuper_update_r" "$(pwd)/subsuper_update_r" +test_submodule_relative_url "(null)" "$PWD/." "../." "$(pwd)/." +test_submodule_relative_url "(null)" "$PWD" "./." "$(pwd)/." +test_submodule_relative_url "(null)" "$PWD/addtest" "../repo" "$(pwd)/repo" +test_submodule_relative_url "(null)" "$PWD" "./Γ₯ Àâ" "$(pwd)/Γ₯ Àâ" +test_submodule_relative_url "(null)" "$PWD/." "../submodule" "$(pwd)/submodule" +test_submodule_relative_url "(null)" "$PWD/submodule" "../submodule" "$(pwd)/submodule" +test_submodule_relative_url "(null)" "$PWD/home2/../remote" "../bundle1" "$(pwd)/home2/../bundle1" +test_submodule_relative_url "(null)" "$PWD/submodule_update_repo" "./." "$(pwd)/submodule_update_repo/." +test_submodule_relative_url "(null)" "file:///tmp/repo" "../subrepo" "file:///tmp/subrepo" +test_submodule_relative_url "(null)" "foo/bar" "../submodule" "foo/submodule" +test_submodule_relative_url "(null)" "foo" "../submodule" "submodule" +test_submodule_relative_url "(null)" "helper:://hostname/repo" "../subrepo" "helper:://hostname/subrepo" +test_submodule_relative_url "(null)" "ssh://hostname/repo" "../subrepo" "ssh://hostname/subrepo" +test_submodule_relative_url "(null)" "ssh://hostname:22/repo" "../subrepo" "ssh://hostname:22/subrepo" +test_submodule_relative_url "(null)" "user@host:path/to/repo" "../subrepo" "user@host:path/to/subrepo" +test_submodule_relative_url "(null)" "user@host:repo" "../subrepo" "user@host:subrepo" + test_done diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh index d7ef44b..03bd31e 100755 --- a/t/t0300-credentials.sh +++ b/t/t0300-credentials.sh @@ -298,4 +298,15 @@ test_expect_success 'helpers can abort the process' ' test_cmp expect stdout ' +test_expect_success 'empty helper spec resets helper list' ' + test_config credential.helper "verbatim file file" && + check fill "" "verbatim cmdline cmdline" <<-\EOF + -- + username=cmdline + password=cmdline + -- + verbatim: get + EOF +' + test_done diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 3d6f1db..d934a24 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -1087,6 +1087,20 @@ test_expect_success 'git -c complains about empty key and value' ' test_must_fail git -c "" rev-parse ' +test_expect_success 'multiple git -c appends config' ' + test_config alias.x "!git -c x.two=2 config --get-regexp ^x\.*" && + cat >expect <<-\EOF && + x.one 1 + x.two 2 + EOF + git -c x.one=1 x >actual && + test_cmp expect actual +' + +test_expect_success 'git -c is not confused by empty environment' ' + GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list +' + test_expect_success 'git config --edit works' ' git config -f tmp test.value no && echo test.value=yes >expect && diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh new file mode 100755 index 0000000..5e3fb3a --- /dev/null +++ b/t/t1350-config-hooks-path.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +test_description='Test the core.hooksPath configuration variable' + +. ./test-lib.sh + +test_expect_success 'set up a pre-commit hook in core.hooksPath' ' + mkdir -p .git/custom-hooks .git/hooks && + write_script .git/custom-hooks/pre-commit <<-\EOF && + echo CUSTOM >>actual + EOF + write_script .git/hooks/pre-commit <<-\EOF + echo NORMAL >>actual + EOF +' + +test_expect_success 'Check that various forms of specifying core.hooksPath work' ' + test_commit no_custom_hook && + git config core.hooksPath .git/custom-hooks && + test_commit have_custom_hook && + git config core.hooksPath .git/custom-hooks/ && + test_commit have_custom_hook_trailing_slash && + git config core.hooksPath "$PWD/.git/custom-hooks" && + test_commit have_custom_hook_abs_path && + git config core.hooksPath "$PWD/.git/custom-hooks/" && + test_commit have_custom_hook_abs_path_trailing_slash && + cat >expect <<-\EOF && + NORMAL + CUSTOM + CUSTOM + CUSTOM + CUSTOM + EOF + test_cmp expect actual +' + +test_done diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh index 417eecc..ca3fa40 100755 --- a/t/t1401-symbolic-ref.sh +++ b/t/t1401-symbolic-ref.sh @@ -110,7 +110,7 @@ test_expect_success 'symbolic-ref writes reflog entry' ' update create EOF - git log --format=%gs -g >actual && + git log --format=%gs -g -2 >actual && test_cmp expect actual ' diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index c623824..dd2be04 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -338,4 +338,36 @@ test_expect_failure 'reflog with non-commit entries displays all entries' ' test_line_count = 3 actual ' +test_expect_success 'reflog expire operates on symref not referrent' ' + git branch -l the_symref && + git branch -l referrent && + git update-ref referrent HEAD && + git symbolic-ref refs/heads/the_symref refs/heads/referrent && + test_when_finished "rm -f .git/refs/heads/referrent.lock" && + touch .git/refs/heads/referrent.lock && + git reflog expire --expire=all the_symref +' + +test_expect_success 'continue walking past root commits' ' + git init orphanage && + ( + cd orphanage && + cat >expect <<-\EOF && + HEAD@{0} commit (initial): orphan2-1 + HEAD@{1} commit: orphan1-2 + HEAD@{2} commit (initial): orphan1-1 + HEAD@{3} commit (initial): initial + EOF + test_commit initial && + git reflog && + git checkout --orphan orphan1 && + test_commit orphan1-1 && + test_commit orphan1-2 && + git checkout --orphan orphan2 && + test_commit orphan2-1 && + git log -g --format="%gd %gs" >actual && + test_cmp expect actual + ) +' + test_done diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index c465abe..25ddab4 100755 --- a/t/t1430-bad-ref-name.sh +++ b/t/t1430-bad-ref-name.sh @@ -42,7 +42,7 @@ test_expect_success 'git branch shows badly named ref as warning' ' cp .git/refs/heads/master .git/refs/heads/broken...ref && test_when_finished "rm -f .git/refs/heads/broken...ref" && git branch >output 2>error && - grep -e "broken\.\.\.ref" error && + test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && ! grep -e "broken\.\.\.ref" output ' @@ -147,35 +147,145 @@ test_expect_success 'rev-parse skips symref pointing to broken name' ' test_when_finished "rm -f .git/refs/heads/broken...ref" && git branch shadow one && cp .git/refs/heads/master .git/refs/heads/broken...ref && - git symbolic-ref refs/tags/shadow refs/heads/broken...ref && - + printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow && + test_when_finished "rm -f .git/refs/tags/shadow" && git rev-parse --verify one >expect && git rev-parse --verify shadow >actual 2>err && test_cmp expect actual && - test_i18ngrep "ignoring.*refs/tags/shadow" err + test_i18ngrep "ignoring dangling symref refs/tags/shadow" err ' -test_expect_success 'update-ref --no-deref -d can delete reference to broken name' ' - git symbolic-ref refs/heads/badname refs/heads/broken...ref && +test_expect_success 'for-each-ref emits warnings for broken names' ' + cp .git/refs/heads/master .git/refs/heads/broken...ref && + test_when_finished "rm -f .git/refs/heads/broken...ref" && + printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && test_when_finished "rm -f .git/refs/heads/badname" && - test_path_is_file .git/refs/heads/badname && - git update-ref --no-deref -d refs/heads/badname && - test_path_is_missing .git/refs/heads/badname + printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref && + test_when_finished "rm -f .git/refs/heads/broken...symref" && + git for-each-ref >output 2>error && + ! grep -e "broken\.\.\.ref" output && + ! grep -e "badname" output && + ! grep -e "broken\.\.\.symref" output && + test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && + test_i18ngrep "ignoring broken ref refs/heads/badname" error && + test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error ' test_expect_success 'update-ref -d can delete broken name' ' cp .git/refs/heads/master .git/refs/heads/broken...ref && test_when_finished "rm -f .git/refs/heads/broken...ref" && - git update-ref -d refs/heads/broken...ref && + git update-ref -d refs/heads/broken...ref >output 2>error && + test_must_be_empty output && + test_must_be_empty error && + git branch >output 2>error && + ! grep -e "broken\.\.\.ref" error && + ! grep -e "broken\.\.\.ref" output +' + +test_expect_success 'branch -d can delete broken name' ' + cp .git/refs/heads/master .git/refs/heads/broken...ref && + test_when_finished "rm -f .git/refs/heads/broken...ref" && + git branch -d broken...ref >output 2>error && + test_i18ngrep "Deleted branch broken...ref (was broken)" output && + test_must_be_empty error && git branch >output 2>error && ! grep -e "broken\.\.\.ref" error && ! grep -e "broken\.\.\.ref" output ' +test_expect_success 'update-ref --no-deref -d can delete symref to broken name' ' + cp .git/refs/heads/master .git/refs/heads/broken...ref && + test_when_finished "rm -f .git/refs/heads/broken...ref" && + printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && + test_when_finished "rm -f .git/refs/heads/badname" && + git update-ref --no-deref -d refs/heads/badname >output 2>error && + test_path_is_missing .git/refs/heads/badname && + test_must_be_empty output && + test_must_be_empty error +' + +test_expect_success 'branch -d can delete symref to broken name' ' + cp .git/refs/heads/master .git/refs/heads/broken...ref && + test_when_finished "rm -f .git/refs/heads/broken...ref" && + printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && + test_when_finished "rm -f .git/refs/heads/badname" && + git branch -d badname >output 2>error && + test_path_is_missing .git/refs/heads/badname && + test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && + test_must_be_empty error +' + +test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' ' + printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && + test_when_finished "rm -f .git/refs/heads/badname" && + git update-ref --no-deref -d refs/heads/badname >output 2>error && + test_path_is_missing .git/refs/heads/badname && + test_must_be_empty output && + test_must_be_empty error +' + +test_expect_success 'branch -d can delete dangling symref to broken name' ' + printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && + test_when_finished "rm -f .git/refs/heads/badname" && + git branch -d badname >output 2>error && + test_path_is_missing .git/refs/heads/badname && + test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && + test_must_be_empty error +' + +test_expect_success 'update-ref -d can delete broken name through symref' ' + cp .git/refs/heads/master .git/refs/heads/broken...ref && + test_when_finished "rm -f .git/refs/heads/broken...ref" && + printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && + test_when_finished "rm -f .git/refs/heads/badname" && + git update-ref -d refs/heads/badname >output 2>error && + test_path_is_missing .git/refs/heads/broken...ref && + test_must_be_empty output && + test_must_be_empty error +' + +test_expect_success 'update-ref --no-deref -d can delete symref with broken name' ' + printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref && + test_when_finished "rm -f .git/refs/heads/broken...symref" && + git update-ref --no-deref -d refs/heads/broken...symref >output 2>error && + test_path_is_missing .git/refs/heads/broken...symref && + test_must_be_empty output && + test_must_be_empty error +' + +test_expect_success 'branch -d can delete symref with broken name' ' + printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref && + test_when_finished "rm -f .git/refs/heads/broken...symref" && + git branch -d broken...symref >output 2>error && + test_path_is_missing .git/refs/heads/broken...symref && + test_i18ngrep "Deleted branch broken...symref (was refs/heads/master)" output && + test_must_be_empty error +' + +test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' ' + printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref && + test_when_finished "rm -f .git/refs/heads/broken...symref" && + git update-ref --no-deref -d refs/heads/broken...symref >output 2>error && + test_path_is_missing .git/refs/heads/broken...symref && + test_must_be_empty output && + test_must_be_empty error +' + +test_expect_success 'branch -d can delete dangling symref with broken name' ' + printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref && + test_when_finished "rm -f .git/refs/heads/broken...symref" && + git branch -d broken...symref >output 2>error && + test_path_is_missing .git/refs/heads/broken...symref && + test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output && + test_must_be_empty error +' + test_expect_success 'update-ref -d cannot delete non-ref in .git dir' ' echo precious >.git/my-private-file && echo precious >expect && - test_must_fail git update-ref -d my-private-file && + test_must_fail git update-ref -d my-private-file >output 2>error && + test_must_be_empty output && + test_i18ngrep -e "cannot lock .*: unable to resolve reference" error && test_cmp expect .git/my-private-file ' diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index 48ee077..038e24c 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -3,85 +3,88 @@ test_description='test git rev-parse' . ./test-lib.sh -test_rev_parse() { - name=$1 - shift - - test_expect_success "$name: is-bare-repository" \ - "test '$1' = \"\$(git rev-parse --is-bare-repository)\"" - shift - [ $# -eq 0 ] && return - - test_expect_success "$name: is-inside-git-dir" \ - "test '$1' = \"\$(git rev-parse --is-inside-git-dir)\"" - shift - [ $# -eq 0 ] && return +# usage: [options] label is-bare is-inside-git is-inside-work prefix git-dir +test_rev_parse () { + d= + bare= + gitdir= + while : + do + case "$1" in + -C) d="$2"; shift; shift ;; + -b) case "$2" in + [tfu]*) bare="$2"; shift; shift ;; + *) error "test_rev_parse: bogus core.bare value '$2'" ;; + esac ;; + -g) gitdir="$2"; shift; shift ;; + -*) error "test_rev_parse: unrecognized option '$1'" ;; + *) break ;; + esac + done - test_expect_success "$name: is-inside-work-tree" \ - "test '$1' = \"\$(git rev-parse --is-inside-work-tree)\"" - shift - [ $# -eq 0 ] && return - - test_expect_success "$name: prefix" \ - "test '$1' = \"\$(git rev-parse --show-prefix)\"" + name=$1 shift - [ $# -eq 0 ] && return - test_expect_success "$name: git-dir" \ - "test '$1' = \"\$(git rev-parse --git-dir)\"" - shift - [ $# -eq 0 ] && return + for o in --is-bare-repository \ + --is-inside-git-dir \ + --is-inside-work-tree \ + --show-prefix \ + --git-dir + do + test $# -eq 0 && break + expect="$1" + test_expect_success "$name: $o" ' + if test -n "$gitdir" + then + test_when_finished "unset GIT_DIR" && + GIT_DIR="$gitdir" && + export GIT_DIR + fi && + + case "$bare" in + t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;; + f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;; + u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;; + esac && + + echo "$expect" >expect && + git ${d:+-C} ${d:+"$d"} rev-parse $o >actual && + test_cmp expect actual + ' + shift + done } -# label is-bare is-inside-git is-inside-work prefix git-dir - ROOT=$(pwd) +test_expect_success 'setup' ' + mkdir -p sub/dir work && + cp -R .git repo.git +' + test_rev_parse toplevel false false true '' .git -cd .git || exit 1 -test_rev_parse .git/ false true false '' . -cd objects || exit 1 -test_rev_parse .git/objects/ false true false '' "$ROOT/.git" -cd ../.. || exit 1 +test_rev_parse -C .git .git/ false true false '' . +test_rev_parse -C .git/objects .git/objects/ false true false '' "$ROOT/.git" -mkdir -p sub/dir || exit 1 -cd sub/dir || exit 1 -test_rev_parse subdirectory false false true sub/dir/ "$ROOT/.git" -cd ../.. || exit 1 +test_rev_parse -C sub/dir subdirectory false false true sub/dir/ "$ROOT/.git" -git config core.bare true -test_rev_parse 'core.bare = true' true false false +test_rev_parse -b t 'core.bare = true' true false false -git config --unset core.bare -test_rev_parse 'core.bare undefined' false false true +test_rev_parse -b u 'core.bare undefined' false false true -mkdir work || exit 1 -cd work || exit 1 -GIT_DIR=../.git -GIT_CONFIG="$(pwd)"/../.git/config -export GIT_DIR GIT_CONFIG -git config core.bare false -test_rev_parse 'GIT_DIR=../.git, core.bare = false' false false true '' +test_rev_parse -C work -g ../.git -b f 'GIT_DIR=../.git, core.bare = false' false false true '' -git config core.bare true -test_rev_parse 'GIT_DIR=../.git, core.bare = true' true false false '' +test_rev_parse -C work -g ../.git -b t 'GIT_DIR=../.git, core.bare = true' true false false '' -git config --unset core.bare -test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false true '' +test_rev_parse -C work -g ../.git -b u 'GIT_DIR=../.git, core.bare undefined' false false true '' -mv ../.git ../repo.git || exit 1 -GIT_DIR=../repo.git -GIT_CONFIG="$(pwd)"/../repo.git/config -git config core.bare false -test_rev_parse 'GIT_DIR=../repo.git, core.bare = false' false false true '' +test_rev_parse -C work -g ../repo.git -b f 'GIT_DIR=../repo.git, core.bare = false' false false true '' -git config core.bare true -test_rev_parse 'GIT_DIR=../repo.git, core.bare = true' true false false '' +test_rev_parse -C work -g ../repo.git -b t 'GIT_DIR=../repo.git, core.bare = true' true false false '' -git config --unset core.bare -test_rev_parse 'GIT_DIR=../repo.git, core.bare undefined' false false true '' +test_rev_parse -C work -g ../repo.git -b u 'GIT_DIR=../repo.git, core.bare undefined' false false true '' test_done diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index cbfa41e..3a22fc5 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -4,6 +4,8 @@ test_description='test git worktree add' . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-rebase.sh + test_expect_success 'setup' ' test_commit init ' @@ -213,4 +215,73 @@ test_expect_success 'local clone from linked checkout' ' ( cd here-clone && git fsck ) ' +test_expect_success '"add" worktree with --no-checkout' ' + git worktree add --no-checkout -b swamp swamp && + ! test -e swamp/init.t && + git -C swamp reset --hard && + test_cmp init.t swamp/init.t +' + +test_expect_success '"add" worktree with --checkout' ' + git worktree add --checkout -b swmap2 swamp2 && + test_cmp init.t swamp2/init.t +' + +test_expect_success 'put a worktree under rebase' ' + git worktree add under-rebase && + ( + cd under-rebase && + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i HEAD^ && + git worktree list | grep "under-rebase.*detached HEAD" + ) +' + +test_expect_success 'add a worktree, checking out a rebased branch' ' + test_must_fail git worktree add new-rebase under-rebase && + ! test -d new-rebase +' + +test_expect_success 'checking out a rebased branch from another worktree' ' + git worktree add new-place && + test_must_fail git -C new-place checkout under-rebase +' + +test_expect_success 'not allow to delete a branch under rebase' ' + ( + cd under-rebase && + test_must_fail git branch -D under-rebase + ) +' + +test_expect_success 'rename a branch under rebase not allowed' ' + test_must_fail git branch -M under-rebase rebase-with-new-name +' + +test_expect_success 'check out from current worktree branch ok' ' + ( + cd under-rebase && + git checkout under-rebase && + git checkout - && + git rebase --abort + ) +' + +test_expect_success 'checkout a branch under bisect' ' + git worktree add under-bisect && + ( + cd under-bisect && + git bisect start && + git bisect bad && + git bisect good HEAD~2 && + git worktree list | grep "under-bisect.*detached HEAD" && + test_must_fail git worktree add new-bisect under-bisect && + ! test -d new-bisect + ) +' + +test_expect_success 'rename a branch under bisect not allowed' ' + test_must_fail git branch -M under-bisect bisect-with-new-name +' + test_done diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh index 46aadc4..d314599 100755 --- a/t/t3033-merge-toplevel.sh +++ b/t/t3033-merge-toplevel.sh @@ -19,6 +19,8 @@ test_expect_success setup ' test_commit three && git checkout right && test_commit four && + git checkout --orphan newroot && + test_commit five && git checkout master ' @@ -133,4 +135,18 @@ test_expect_success 'merge FETCH_HEAD octopus non-fast-forward' ' test_cmp expect actual ' +# two-project merge +test_expect_success 'refuse two-project merge by default' ' + t3033_reset && + git reset --hard four && + test_must_fail git merge five +' + +test_expect_success 'two-project merge with --allow-unrelated-histories' ' + t3033_reset && + git reset --hard four && + git merge --allow-unrelated-histories five && + git diff --exit-code five +' + test_done diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 8f64505..488945e 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -85,6 +85,15 @@ test_expect_success 'rebase -Xtheirs' ' ! grep 11 original ' +test_expect_success 'rebase -Xtheirs from orphan' ' + git checkout --orphan orphan-conflicting master~2 && + echo "AB $T" >> original && + git commit -morphan-conflicting original && + git rebase -Xtheirs master && + grep AB original && + ! grep 11 original +' + test_expect_success 'merge and rebase should match' ' git diff-tree -r test-rebase test-merge >difference && if test -s difference diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index d6d65a3..66348f1 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -62,7 +62,7 @@ test_expect_success 'setup' ' # "exec" commands are ran with the user shell by default, but this may # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work -# to create a file. Unseting SHELL avoids such non-portable behavior +# to create a file. Unsetting SHELL avoids such non-portable behavior # in tests. It must be exported for it to take effect where needed. SHELL= export SHELL @@ -770,7 +770,6 @@ test_expect_success 'rebase-i history with funny messages' ' test_cmp expect actual ' - test_expect_success 'prepare for rebase -i --exec' ' git checkout master && git checkout -b execute && @@ -779,7 +778,6 @@ test_expect_success 'prepare for rebase -i --exec' ' test_commit three_exec main.txt three_exec ' - test_expect_success 'running "git rebase -i --exec git show HEAD"' ' set_fake_editor && git rebase -i --exec "git show HEAD" HEAD~2 >actual && @@ -792,7 +790,6 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' ' test_cmp expected actual ' - test_expect_success 'running "git rebase --exec git show HEAD -i"' ' git reset --hard execute && set_fake_editor && @@ -806,7 +803,6 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' ' test_cmp expected actual ' - test_expect_success 'running "git rebase -ix git show HEAD"' ' git reset --hard execute && set_fake_editor && @@ -834,7 +830,6 @@ test_expect_success 'rebase -ix with several <CMD>' ' test_cmp expected actual ' - test_expect_success 'rebase -ix with several instances of --exec' ' git reset --hard execute && set_fake_editor && @@ -849,7 +844,6 @@ test_expect_success 'rebase -ix with several instances of --exec' ' test_cmp expected actual ' - test_expect_success 'rebase -ix with --autosquash' ' git reset --hard execute && git checkout -b autosquash && @@ -875,16 +869,15 @@ test_expect_success 'rebase -ix with --autosquash' ' test_cmp expected actual ' - -test_expect_success 'rebase --exec without -i shows error message' ' +test_expect_success 'rebase --exec works without -i ' ' git reset --hard execute && - set_fake_editor && - test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual && - echo "The --exec option must be used with the --interactive option" >expected && - test_i18ncmp expected actual + rm -rf exec_output && + EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output" HEAD~2 2>actual && + test_i18ngrep "Successfully rebased and updated" actual && + test_line_count = 2 exec_output && + test_path_is_missing invoked_editor ' - test_expect_success 'rebase -i --exec without <CMD>' ' git reset --hard execute && set_fake_editor && diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh index 0b52105..73a39f2 100755 --- a/t/t3412-rebase-root.sh +++ b/t/t3412-rebase-root.sh @@ -133,7 +133,7 @@ test_expect_success 'set up second root and merge' ' rm A B C && test_commit 6 D && git checkout other && - git merge third + git merge --allow-unrelated-histories third ' cat > expect-third <<'EOF' diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh index 217dd79..49f548c 100755 --- a/t/t3419-rebase-patch-id.sh +++ b/t/t3419-rebase-patch-id.sh @@ -73,17 +73,17 @@ do_tests () { run git format-patch --stdout --ignore-if-in-upstream master " - test_expect_success $pr 'detect upstream patch' " + test_expect_success $pr 'detect upstream patch' ' git checkout -q master && scramble file && git add file && - git commit -q -m 'change big file again' && + git commit -q -m "change big file again" && git checkout -q other^{} && git rebase master && - test_must_fail test -n \"\$(git rev-list master...HEAD~)\" - " + test_must_fail test -n "$(git rev-list master...HEAD~)" + ' - test_expect_success $pr 'do not drop patch' " + test_expect_success $pr 'do not drop patch' ' git branch -f squashed master && git checkout -q -f squashed && git reset -q --soft HEAD~2 && @@ -91,7 +91,7 @@ do_tests () { git checkout -q other^{} && test_must_fail git rebase squashed && rm -rf .git/rebase-apply - " + ' } do_tests 500 diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh index 9c55cba..68fe200 100755 --- a/t/t3421-rebase-topology-linear.sh +++ b/t/t3421-rebase-topology-linear.sh @@ -253,7 +253,7 @@ test_run_rebase () { " } test_run_rebase success '' -test_run_rebase failure -m +test_run_rebase success -m test_run_rebase success -i test_run_rebase success -p @@ -268,7 +268,7 @@ test_run_rebase () { " } test_run_rebase success '' -test_run_rebase failure -m +test_run_rebase success -m test_run_rebase success -i test_run_rebase failure -p diff --git a/t/t3700-add.sh b/t/t3700-add.sh index f14a665..4865304 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -332,4 +332,34 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out test_i18ncmp expect.err actual.err ' +test_expect_success 'git add --chmod=+x stages a non-executable file with +x' ' + echo foo >foo1 && + git add --chmod=+x foo1 && + case "$(git ls-files --stage foo1)" in + 100755" "*foo1) echo pass;; + *) echo fail; git ls-files --stage foo1; (exit 1);; + esac +' + +test_expect_success 'git add --chmod=-x stages an executable file with -x' ' + echo foo >xfoo1 && + chmod 755 xfoo1 && + git add --chmod=-x xfoo1 && + case "$(git ls-files --stage xfoo1)" in + 100644" "*xfoo1) echo pass;; + *) echo fail; git ls-files --stage xfoo1; (exit 1);; + esac +' + +test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' ' + git config core.filemode 1 && + git config core.symlinks 1 && + echo foo >foo2 && + git add --chmod=+x foo2 && + case "$(git ls-files --stage foo2)" in + 100755" "*foo2) echo pass;; + *) echo fail; git ls-files --stage foo2; (exit 1);; + esac +' + test_done diff --git a/t/t3910-mac-os-precompose.sh b/t/t3910-mac-os-precompose.sh index 8319356..26dd5b7 100755 --- a/t/t3910-mac-os-precompose.sh +++ b/t/t3910-mac-os-precompose.sh @@ -49,12 +49,54 @@ test_expect_success "setup" ' test_expect_success "setup case mac" ' git checkout -b mac_os ' +# This will test nfd2nfc in git diff +test_expect_success "git diff f.Adiar" ' + touch f.$Adiarnfc && + git add f.$Adiarnfc && + echo f.Adiarnfc >f.$Adiarnfc && + git diff f.$Adiarnfd >expect && + git diff f.$Adiarnfc >actual && + test_cmp expect actual && + git reset HEAD f.Adiarnfc && + rm f.$Adiarnfc expect actual +' +# This will test nfd2nfc in git diff-files +test_expect_success "git diff-files f.Adiar" ' + touch f.$Adiarnfc && + git add f.$Adiarnfc && + echo f.Adiarnfc >f.$Adiarnfc && + git diff-files f.$Adiarnfd >expect && + git diff-files f.$Adiarnfc >actual && + test_cmp expect actual && + git reset HEAD f.Adiarnfc && + rm f.$Adiarnfc expect actual +' +# This will test nfd2nfc in git diff-index +test_expect_success "git diff-index f.Adiar" ' + touch f.$Adiarnfc && + git add f.$Adiarnfc && + echo f.Adiarnfc >f.$Adiarnfc && + git diff-index HEAD f.$Adiarnfd >expect && + git diff-index HEAD f.$Adiarnfc >actual && + test_cmp expect actual && + git reset HEAD f.Adiarnfc && + rm f.$Adiarnfc expect actual +' # This will test nfd2nfc in readdir() test_expect_success "add file Adiarnfc" ' echo f.Adiarnfc >f.$Adiarnfc && git add f.$Adiarnfc && git commit -m "add f.$Adiarnfc" ' +# This will test nfd2nfc in git diff-tree +test_expect_success "git diff-tree f.Adiar" ' + echo f.Adiarnfc >>f.$Adiarnfc && + git diff-tree HEAD f.$Adiarnfd >expect && + git diff-tree HEAD f.$Adiarnfc >actual && + test_cmp expect actual && + git checkout f.$Adiarnfc && + rm expect actual +' # This will test nfd2nfc in git stage() test_expect_success "stage file d.Adiarnfd/f.Adiarnfd" ' mkdir d.$Adiarnfd && diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index ed90c6c..0d1fa45 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -9,21 +9,84 @@ test_description='Test rename detection in diff engine. . ./test-lib.sh . "$TEST_DIRECTORY"/diff-lib.sh -echo >path0 'Line 1 -Line 2 -Line 3 -Line 4 -Line 5 -Line 6 -Line 7 -Line 8 -Line 9 -Line 10 -line 11 -Line 12 -Line 13 -Line 14 -Line 15 +test_expect_success 'setup' ' + cat >path0 <<-\EOF && + Line 1 + Line 2 + Line 3 + Line 4 + Line 5 + Line 6 + Line 7 + Line 8 + Line 9 + Line 10 + line 11 + Line 12 + Line 13 + Line 14 + Line 15 + EOF + cat >expected <<-\EOF && + diff --git a/path0 b/path1 + rename from path0 + rename to path1 + --- a/path0 + +++ b/path1 + @@ -8,7 +8,7 @@ Line 7 + Line 8 + Line 9 + Line 10 + -line 11 + +Line 11 + Line 12 + Line 13 + Line 14 + EOF + cat >no-rename <<-\EOF + diff --git a/path0 b/path0 + deleted file mode 100644 + index fdbec44..0000000 + --- a/path0 + +++ /dev/null + @@ -1,15 +0,0 @@ + -Line 1 + -Line 2 + -Line 3 + -Line 4 + -Line 5 + -Line 6 + -Line 7 + -Line 8 + -Line 9 + -Line 10 + -line 11 + -Line 12 + -Line 13 + -Line 14 + -Line 15 + diff --git a/path1 b/path1 + new file mode 100644 + index 0000000..752c50e + --- /dev/null + +++ b/path1 + @@ -0,0 +1,15 @@ + +Line 1 + +Line 2 + +Line 3 + +Line 4 + +Line 5 + +Line 6 + +Line 7 + +Line 8 + +Line 9 + +Line 10 + +Line 11 + +Line 12 + +Line 13 + +Line 14 + +Line 15 + EOF ' test_expect_success \ @@ -43,27 +106,27 @@ test_expect_success \ test_expect_success \ 'git diff-index -p -M after rename and editing.' \ 'git diff-index -p -M $tree >current' -cat >expected <<\EOF -diff --git a/path0 b/path1 -rename from path0 -rename to path1 ---- a/path0 -+++ b/path1 -@@ -8,7 +8,7 @@ Line 7 - Line 8 - Line 9 - Line 10 --line 11 -+Line 11 - Line 12 - Line 13 - Line 14 -EOF + test_expect_success \ 'validate the output.' \ 'compare_diff_patch current expected' +test_expect_success 'test diff.renames=true' ' + git -c diff.renames=true diff --cached $tree >current && + compare_diff_patch current expected +' + +test_expect_success 'test diff.renames=false' ' + git -c diff.renames=false diff --cached $tree >current && + compare_diff_patch current no-rename +' + +test_expect_success 'test diff.renames unset' ' + git diff --cached $tree >current && + compare_diff_patch current expected +' + test_expect_success 'favour same basenames over different ones' ' cp path1 another-path && git add another-path && diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 6ec6072..94ef500 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -90,6 +90,8 @@ test_expect_success setup ' git commit -m "Rearranged lines in dir/sub" && git checkout master && + git config diff.renames false && + git show-branch ' diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 3b99434..805dc90 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -549,7 +549,7 @@ test_expect_success 'cover-letter inherits diff options' ' git mv file foo && git commit -m foo && - git format-patch --cover-letter -1 && + git format-patch --no-renames --cover-letter -1 && check_patch 0000-cover-letter.patch && ! grep "file => foo .* 0 *\$" 0000-cover-letter.patch && git format-patch --cover-letter -1 -M && @@ -703,7 +703,7 @@ test_expect_success 'options no longer allowed for format-patch' ' test_expect_success 'format-patch --numstat should produce a patch' ' git format-patch --numstat --stdout master..side > output && - test 6 = $(grep "^diff --git a/" output | wc -l)' + test 5 = $(grep "^diff --git a/" output | wc -l)' test_expect_success 'format-patch -- <path>' ' git format-patch master..side -- file 2>error && @@ -1072,7 +1072,7 @@ test_expect_success '--from omits redundant in-body header' ' ' test_expect_success 'in-body headers trigger content encoding' ' - GIT_AUTHOR_NAME="Γ©xΓΆtΓ¬c" test_commit exotic && + test_env GIT_AUTHOR_NAME="Γ©xΓΆtΓ¬c" test_commit exotic && test_when_finished "git reset --hard HEAD^" && git format-patch -1 --stdout --from >patch && cat >expect <<-\EOF && @@ -1460,4 +1460,109 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' ' test_path_is_dir patchset ' +test_expect_success 'format-patch --base' ' + git checkout side && + git format-patch --stdout --base=HEAD~3 -1 >patch && + grep "^base-commit:" patch >actual && + grep "^prerequisite-patch-id:" patch >>actual && + echo "base-commit: $(git rev-parse HEAD~3)" >expected && + echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected && + echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected && + test_cmp expected actual +' + +test_expect_success 'format-patch --base errors out when base commit is in revision list' ' + test_must_fail git format-patch --base=HEAD -2 && + test_must_fail git format-patch --base=HEAD~1 -2 && + git format-patch --stdout --base=HEAD~2 -2 >patch && + grep "^base-commit:" patch >actual && + echo "base-commit: $(git rev-parse HEAD~2)" >expected && + test_cmp expected actual +' + +test_expect_success 'format-patch --base errors out when base commit is not ancestor of revision list' ' + # For history as below: + # + # ---Q---P---Z---Y---*---X + # \ / + # ------------W + # + # If "format-patch Z..X" is given, P and Z can not be specified as the base commit + git checkout -b topic1 master && + git rev-parse HEAD >commit-id-base && + test_commit P && + git rev-parse HEAD >commit-id-P && + test_commit Z && + git rev-parse HEAD >commit-id-Z && + test_commit Y && + git checkout -b topic2 master && + test_commit W && + git merge topic1 && + test_commit X && + test_must_fail git format-patch --base=$(cat commit-id-P) -3 && + test_must_fail git format-patch --base=$(cat commit-id-Z) -3 && + git format-patch --stdout --base=$(cat commit-id-base) -3 >patch && + grep "^base-commit:" patch >actual && + echo "base-commit: $(cat commit-id-base)" >expected && + test_cmp expected actual +' + +test_expect_success 'format-patch --base=auto' ' + git checkout -b upstream master && + git checkout -b local upstream && + git branch --set-upstream-to=upstream && + test_commit N1 && + test_commit N2 && + git format-patch --stdout --base=auto -2 >patch && + grep "^base-commit:" patch >actual && + echo "base-commit: $(git rev-parse upstream)" >expected && + test_cmp expected actual +' + +test_expect_success 'format-patch errors out when history involves criss-cross' ' + # setup criss-cross history + # + # B---M1---D + # / \ / + # A X + # \ / \ + # C---M2---E + # + git checkout master && + test_commit A && + git checkout -b xb master && + test_commit B && + git checkout -b xc master && + test_commit C && + git checkout -b xbc xb -- && + git merge xc && + git checkout -b xcb xc -- && + git branch --set-upstream-to=xbc && + git merge xb && + git checkout xbc && + test_commit D && + git checkout xcb && + test_commit E && + test_must_fail git format-patch --base=auto -1 +' + +test_expect_success 'format-patch format.useAutoBaseoption' ' + test_when_finished "git config --unset format.useAutoBase" && + git checkout local && + git config format.useAutoBase true && + git format-patch --stdout -1 >patch && + grep "^base-commit:" patch >actual && + echo "base-commit: $(git rev-parse upstream)" >expected && + test_cmp expected actual +' + +test_expect_success 'format-patch --base overrides format.useAutoBase' ' + test_when_finished "git config --unset format.useAutoBase" && + git config format.useAutoBase true && + git format-patch --stdout --base=HEAD~1 -1 >patch && + grep "^base-commit:" patch >actual && + echo "base-commit: $(git rev-parse HEAD~1)" >expected && + test_cmp expected actual +' + test_done diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh index 3b8b792..447a8ff 100755 --- a/t/t4047-diff-dirstat.sh +++ b/t/t4047-diff-dirstat.sh @@ -248,7 +248,8 @@ EOF git rm -r src/move/unchanged && git rm -r src/move/changed && git rm -r src/move/rearranged && - git commit -m "changes" + git commit -m "changes" && + git config diff.renames false ' cat <<EOF >expect_diff_stat diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh index 001d678..b79b877 100755 --- a/t/t4051-diff-function-context.sh +++ b/t/t4051-diff-function-context.sh @@ -3,90 +3,180 @@ test_description='diff function context' . ./test-lib.sh -. "$TEST_DIRECTORY"/diff-lib.sh +dir="$TEST_DIRECTORY/t4051" -cat <<\EOF >hello.c -#include <stdio.h> - -static int a(void) -{ - /* - * Dummy. - */ +commit_and_tag () { + tag=$1 && + shift && + git add "$@" && + test_tick && + git commit -m "$tag" && + git tag "$tag" } -static int hello_world(void) -{ - /* Classic. */ - printf("Hello world.\n"); - - /* Success! */ - return 0; +first_context_line () { + awk ' + found {print; exit} + /^@@/ {found = 1} + ' } -static int b(void) -{ - /* - * Dummy, too. - */ + +last_context_line () { + sed -ne \$p } -int main(int argc, char **argv) -{ - a(); - b(); - return hello_world(); +check_diff () { + name=$1 + desc=$2 + options="-W $3" + + test_expect_success "$desc" ' + git diff $options "$name^" "$name" >"$name.diff" + ' + + test_expect_success ' diff applies' ' + test_when_finished "git reset --hard" && + git checkout --detach "$name^" && + git apply --index "$name.diff" && + git diff --exit-code "$name" + ' } -EOF test_expect_success 'setup' ' - git add hello.c && - test_tick && - git commit -m initial && - - grep -v Classic <hello.c >hello.c.new && - mv hello.c.new hello.c -' - -cat <<\EOF >expected -diff --git a/hello.c b/hello.c ---- a/hello.c -+++ b/hello.c -@@ -10,8 +10,7 @@ static int a(void) - static int hello_world(void) - { -- /* Classic. */ - printf("Hello world.\n"); - - /* Success! */ - return 0; - } -EOF - -test_expect_success 'diff -U0 -W' ' - git diff -U0 -W >actual && - compare_diff_patch actual expected -' - -cat <<\EOF >expected -diff --git a/hello.c b/hello.c ---- a/hello.c -+++ b/hello.c -@@ -9,9 +9,8 @@ static int a(void) - - static int hello_world(void) - { -- /* Classic. */ - printf("Hello world.\n"); - - /* Success! */ - return 0; - } -EOF - -test_expect_success 'diff -W' ' - git diff -W >actual && - compare_diff_patch actual expected + cat "$dir/includes.c" "$dir/dummy.c" "$dir/dummy.c" "$dir/hello.c" \ + "$dir/dummy.c" "$dir/dummy.c" >file.c && + commit_and_tag initial file.c && + + grep -v "delete me from hello" <file.c >file.c.new && + mv file.c.new file.c && + commit_and_tag changed_hello file.c && + + grep -v "delete me from includes" <file.c >file.c.new && + mv file.c.new file.c && + commit_and_tag changed_includes file.c && + + cat "$dir/appended1.c" >>file.c && + commit_and_tag appended file.c && + + cat "$dir/appended2.c" >>file.c && + commit_and_tag extended file.c && + + grep -v "Begin of second part" <file.c >file.c.new && + mv file.c.new file.c && + commit_and_tag long_common_tail file.c && + + git checkout initial && + grep -v "delete me from hello" <file.c >file.c.new && + mv file.c.new file.c && + cat "$dir/appended1.c" >>file.c && + commit_and_tag changed_hello_appended file.c +' + +check_diff changed_hello 'changed function' + +test_expect_success ' context includes begin' ' + grep "^ .*Begin of hello" changed_hello.diff +' + +test_expect_success ' context includes end' ' + grep "^ .*End of hello" changed_hello.diff +' + +test_expect_success ' context does not include other functions' ' + test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1 +' + +test_expect_success ' context does not include preceding empty lines' ' + test "$(first_context_line <changed_hello.diff)" != " " +' + +test_expect_success ' context does not include trailing empty lines' ' + test "$(last_context_line <changed_hello.diff)" != " " +' + +check_diff changed_includes 'changed includes' + +test_expect_success ' context includes begin' ' + grep "^ .*Begin.h" changed_includes.diff +' + +test_expect_success ' context includes end' ' + grep "^ .*End.h" changed_includes.diff +' + +test_expect_success ' context does not include other functions' ' + test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1 +' + +test_expect_success ' context does not include trailing empty lines' ' + test "$(last_context_line <changed_includes.diff)" != " " +' + +check_diff appended 'appended function' + +test_expect_success ' context includes begin' ' + grep "^[+].*Begin of first part" appended.diff +' + +test_expect_success ' context includes end' ' + grep "^[+].*End of first part" appended.diff +' + +test_expect_success ' context does not include other functions' ' + test $(grep -c "^[ +-].*Begin" appended.diff) -le 1 +' + +check_diff extended 'appended function part' + +test_expect_success ' context includes begin' ' + grep "^ .*Begin of first part" extended.diff +' + +test_expect_success ' context includes end' ' + grep "^[+].*End of second part" extended.diff +' + +test_expect_success ' context does not include other functions' ' + test $(grep -c "^[ +-].*Begin" extended.diff) -le 2 +' + +test_expect_success ' context does not include preceding empty lines' ' + test "$(first_context_line <extended.diff)" != " " +' + +check_diff long_common_tail 'change with long common tail and no context' -U0 + +test_expect_success ' context includes begin' ' + grep "^ .*Begin of first part" long_common_tail.diff +' + +test_expect_success ' context includes end' ' + grep "^ .*End of second part" long_common_tail.diff +' + +test_expect_success ' context does not include other functions' ' + test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2 +' + +test_expect_success ' context does not include preceding empty lines' ' + test "$(first_context_line <long_common_tail.diff.diff)" != " " +' + +check_diff changed_hello_appended 'changed function plus appended function' + +test_expect_success ' context includes begin' ' + grep "^ .*Begin of hello" changed_hello_appended.diff && + grep "^[+].*Begin of first part" changed_hello_appended.diff +' + +test_expect_success ' context includes end' ' + grep "^ .*End of hello" changed_hello_appended.diff && + grep "^[+].*End of first part" changed_hello_appended.diff +' + +test_expect_success ' context does not include other functions' ' + test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2 ' test_done diff --git a/t/t4051/appended1.c b/t/t4051/appended1.c new file mode 100644 index 0000000..a9f56f1 --- /dev/null +++ b/t/t4051/appended1.c @@ -0,0 +1,15 @@ + +int appended(void) // Begin of first part +{ + int i; + char *s = "a string"; + + printf("%s\n", s); + + for (i = 99; + i >= 0; + i--) { + printf("%d bottles of beer on the wall\n", i); + } + + printf("End of first part\n"); diff --git a/t/t4051/appended2.c b/t/t4051/appended2.c new file mode 100644 index 0000000..e651f71 --- /dev/null +++ b/t/t4051/appended2.c @@ -0,0 +1,35 @@ + printf("Begin of second part\n"); + + /* + * Lorem ipsum dolor sit amet, consectetuer sadipscing elitr, + * sed diam nonumy eirmod tempor invidunt ut labore et dolore + * magna aliquyam erat, sed diam voluptua. At vero eos et + * accusam et justo duo dolores et ea rebum. Stet clita kasd + * gubergren, no sea takimata sanctus est Lorem ipsum dolor + * sit amet. + * + * Lorem ipsum dolor sit amet, consectetuer sadipscing elitr, + * sed diam nonumy eirmod tempor invidunt ut labore et dolore + * magna aliquyam erat, sed diam voluptua. At vero eos et + * accusam et justo duo dolores et ea rebum. Stet clita kasd + * gubergren, no sea takimata sanctus est Lorem ipsum dolor + * sit amet. + * + * Lorem ipsum dolor sit amet, consectetuer sadipscing elitr, + * sed diam nonumy eirmod tempor invidunt ut labore et dolore + * magna aliquyam erat, sed diam voluptua. At vero eos et + * accusam et justo duo dolores et ea rebum. Stet clita kasd + * gubergren, no sea takimata sanctus est Lorem ipsum dolor + * sit amet. + * + * Lorem ipsum dolor sit amet, consectetuer sadipscing elitr, + * sed diam nonumy eirmod tempor invidunt ut labore et dolore + * magna aliquyam erat, sed diam voluptua. At vero eos et + * accusam et justo duo dolores et ea rebum. Stet clita kasd + * gubergren, no sea takimata sanctus est Lorem ipsum dolor + * sit amet. + * + */ + + return 0; +} // End of second part diff --git a/t/t4051/dummy.c b/t/t4051/dummy.c new file mode 100644 index 0000000..a43016e --- /dev/null +++ b/t/t4051/dummy.c @@ -0,0 +1,7 @@ + +static int dummy(void) // Begin of dummy +{ + int rc = 0; + + return rc; +} // End of dummy diff --git a/t/t4051/hello.c b/t/t4051/hello.c new file mode 100644 index 0000000..63b1a1e --- /dev/null +++ b/t/t4051/hello.c @@ -0,0 +1,21 @@ + +static void hello(void) // Begin of hello +{ + /* + * Classic. + */ + putchar('H'); + putchar('e'); + putchar('l'); + putchar('l'); + putchar('o'); + putchar(' '); + /* delete me from hello */ + putchar('w'); + putchar('o'); + putchar('r'); + putchar('l'); + putchar('d'); + putchar('.'); + putchar('\n'); +} // End of hello diff --git a/t/t4051/includes.c b/t/t4051/includes.c new file mode 100644 index 0000000..efc68f8 --- /dev/null +++ b/t/t4051/includes.c @@ -0,0 +1,20 @@ +#include <Begin.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <stddef.h> +#include <stdlib.h> +#include <stdarg.h> +/* delete me from includes */ +#include <string.h> +#include <sys/types.h> +#include <dirent.h> +#include <sys/time.h> +#include <time.h> +#include <signal.h> +#include <assert.h> +#include <regex.h> +#include <utime.h> +#include <syslog.h> +#include <End.h> diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index ed9c91e..1a080e7 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -184,12 +184,27 @@ test_expect_success 'rerere updates postimage timestamp' ' ' test_expect_success 'rerere clear' ' - rm $rr/postimage && + mv $rr/postimage .git/post-saved && echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR && git rerere clear && ! test -d $rr ' +test_expect_success 'leftover directory' ' + git reset --hard && + mkdir -p $rr && + test_must_fail git merge first && + test -f $rr/preimage +' + +test_expect_success 'missing preimage' ' + git reset --hard && + mkdir -p $rr && + cp .git/post-saved $rr/postimage && + test_must_fail git merge first && + test -f $rr/preimage +' + test_expect_success 'set up for garbage collection tests' ' mkdir -p $rr && echo Hello >$rr/preimage && @@ -391,4 +406,157 @@ test_expect_success 'rerere -h' ' test_i18ngrep [Uu]sage help ' +concat_insert () { + last=$1 + shift + cat early && printf "%s\n" "$@" && cat late "$last" +} + +count_pre_post () { + find .git/rr-cache/ -type f -name "preimage*" >actual && + test_line_count = "$1" actual && + find .git/rr-cache/ -type f -name "postimage*" >actual && + test_line_count = "$2" actual +} + +test_expect_success 'rerere gc' ' + find .git/rr-cache -type f >original && + xargs test-chmtime -172800 <original && + + git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc && + find .git/rr-cache -type f >actual && + test_cmp original actual && + + git -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc && + find .git/rr-cache -type f >actual && + test_cmp original actual && + + git -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc && + find .git/rr-cache -type f >actual && + >expect && + test_cmp expect actual +' + +merge_conflict_resolve () { + git reset --hard && + test_must_fail git merge six.1 && + # Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both) + concat_insert short 6.1 6.2 >file1 && + concat_insert long 6.1 6.2 >file2 +} + +test_expect_success 'multiple identical conflicts' ' + git reset --hard && + + test_seq 1 6 >early && + >late && + test_seq 11 15 >short && + test_seq 111 120 >long && + concat_insert short >file1 && + concat_insert long >file2 && + git add file1 file2 && + git commit -m base && + git tag base && + git checkout -b six.1 && + concat_insert short 6.1 >file1 && + concat_insert long 6.1 >file2 && + git add file1 file2 && + git commit -m 6.1 && + git checkout -b six.2 HEAD^ && + concat_insert short 6.2 >file1 && + concat_insert long 6.2 >file2 && + git add file1 file2 && + git commit -m 6.2 && + + # At this point, six.1 and six.2 + # - derive from common ancestor that has two files + # 1...6 7 11..15 (file1) and 1...6 7 111..120 (file2) + # - six.1 replaces these 7s with 6.1 + # - six.2 replaces these 7s with 6.2 + + merge_conflict_resolve && + + # Check that rerere knows that file1 and file2 have conflicts + + printf "%s\n" file1 file2 >expect && + git ls-files -u | sed -e "s/^.* //" | sort -u >actual && + test_cmp expect actual && + + git rerere status | sort >actual && + test_cmp expect actual && + + git rerere remaining >actual && + test_cmp expect actual && + + count_pre_post 2 0 && + + # Pretend that the conflicts were made quite some time ago + find .git/rr-cache/ -type f | xargs test-chmtime -172800 && + + # Unresolved entries have not expired yet + git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc && + count_pre_post 2 0 && + + # Unresolved entries have expired + git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc && + count_pre_post 0 0 && + + # Recreate the conflicted state + merge_conflict_resolve && + count_pre_post 2 0 && + + # Clear it + git rerere clear && + count_pre_post 0 0 && + + # Recreate the conflicted state + merge_conflict_resolve && + count_pre_post 2 0 && + + # We resolved file1 and file2 + git rerere && + >expect && + git rerere remaining >actual && + test_cmp expect actual && + + # We must have recorded both of them + count_pre_post 2 2 && + + # Now we should be able to resolve them both + git reset --hard && + test_must_fail git merge six.1 && + git rerere && + + >expect && + git rerere remaining >actual && + test_cmp expect actual && + + concat_insert short 6.1 6.2 >file1.expect && + concat_insert long 6.1 6.2 >file2.expect && + test_cmp file1.expect file1 && + test_cmp file2.expect file2 && + + # Forget resolution for file2 + git rerere forget file2 && + echo file2 >expect && + git rerere status >actual && + test_cmp expect actual && + count_pre_post 2 1 && + + # file2 already has correct resolution, so record it again + git rerere && + + # Pretend that the resolutions are old again + find .git/rr-cache/ -type f | xargs test-chmtime -172800 && + + # Resolved entries have not expired yet + git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc && + + count_pre_post 2 2 && + + # Resolved entries have expired + git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc && + count_pre_post 0 0 +' + test_done diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index f5e6367..a977365 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -115,7 +115,7 @@ EOF ' test_expect_success !MINGW 'shortlog from non-git directory' ' - git log HEAD >log && + git log --no-expand-tabs HEAD >log && GIT_DIR=non-existing git shortlog -w <log >out && test_cmp expect out ' diff --git a/t/t4202-log.sh b/t/t4202-log.sh index cb82eb7..128ba93 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -101,8 +101,8 @@ test_expect_success 'oneline' ' test_expect_success 'diff-filter=A' ' - git log --pretty="format:%s" --diff-filter=A HEAD > actual && - git log --pretty="format:%s" --diff-filter A HEAD > actual-separate && + git log --no-renames --pretty="format:%s" --diff-filter=A HEAD > actual && + git log --no-renames --pretty="format:%s" --diff-filter A HEAD > actual-separate && printf "fifth\nfourth\nthird\ninitial" > expect && test_cmp expect actual && test_cmp expect actual-separate @@ -119,7 +119,7 @@ test_expect_success 'diff-filter=M' ' test_expect_success 'diff-filter=D' ' - actual=$(git log --pretty="format:%s" --diff-filter=D HEAD) && + actual=$(git log --no-renames --pretty="format:%s" --diff-filter=D HEAD) && expect=$(echo sixth ; echo third) && verbose test "$actual" = "$expect" @@ -848,7 +848,7 @@ sanitize_output () { } test_expect_success 'log --graph with diff and stats' ' - git log --graph --pretty=short --stat -p >actual && + git log --no-renames --graph --pretty=short --stat -p >actual && sanitize_output >actual.sanitized <actual && test_i18ncmp expect actual.sanitized ' diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh index baa9d3c..84a8096 100755 --- a/t/t4204-patch-id.sh +++ b/t/t4204-patch-id.sh @@ -30,11 +30,11 @@ test_expect_success 'patch-id output is well-formed' ' #calculate patch id. Make sure output is not empty. calc_patch_id () { - name="$1" + patch_name="$1" shift git patch-id "$@" | - sed "s/ .*//" >patch-id_"$name" && - test_line_count -gt 0 patch-id_"$name" + sed "s/ .*//" >patch-id_"$patch_name" && + test_line_count -gt 0 patch-id_"$patch_name" } get_top_diff () { diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 7398605..d9f6242 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -176,6 +176,17 @@ EOF test_cmp expected actual ' +test_expect_success 'left alignment formatting at the nth column' ' + COLUMNS=50 git log --pretty="tformat:%h %<|(-10)%s" >actual && + qz_to_tab_space <<EOF >expected && +$head1 message two Z +$head2 message one Z +$head3 add bar Z +$head4 $(commit_msg) Z +EOF + test_cmp expected actual +' + test_expect_success 'left alignment formatting at the nth column. i18n.logOutputEncoding' ' git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %<|(40)%s" >actual && qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected && @@ -308,6 +319,17 @@ EOF test_cmp expected actual ' +test_expect_success 'right alignment formatting at the nth column' ' + COLUMNS=50 git log --pretty="tformat:%h %>|(-10)%s" >actual && + qz_to_tab_space <<EOF >expected && +$head1 message two +$head2 message one +$head3 add bar +$head4 $(commit_msg) +EOF + test_cmp expected actual +' + test_expect_success 'right alignment formatting at the nth column. i18n.logOutputEncoding' ' git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %>|(40)%s" >actual && qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected && @@ -319,6 +341,19 @@ EOF test_cmp expected actual ' +# Note: Space between 'message' and 'two' should be in the same column +# as in previous test. +test_expect_success 'right alignment formatting at the nth column with --graph. i18n.logOutputEncoding' ' + git -c i18n.logOutputEncoding=$test_encoding log --graph --pretty="tformat:%h %>|(40)%s" >actual && + iconv -f utf-8 -t $test_encoding >expected <<EOF&& +* $head1 message two +* $head2 message one +* $head3 add bar +* $head4 $(commit_msg) +EOF + test_cmp expected actual +' + test_expect_success 'right alignment formatting with no padding' ' git log --pretty="tformat:%>(1)%s" >actual && cat <<EOF >expected && @@ -330,6 +365,17 @@ EOF test_cmp expected actual ' +test_expect_success 'right alignment formatting with no padding and with --graph' ' + git log --graph --pretty="tformat:%>(1)%s" >actual && + cat <<EOF >expected && +* message two +* message one +* add bar +* $(commit_msg) +EOF + test_cmp expected actual +' + test_expect_success 'right alignment formatting with no padding. i18n.logOutputEncoding' ' git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(1)%s" >actual && cat <<EOF | iconv -f utf-8 -t $test_encoding >expected && @@ -373,6 +419,17 @@ EOF test_cmp expected actual ' +test_expect_success 'center alignment formatting at the nth column' ' + COLUMNS=70 git log --pretty="tformat:%h %><|(-30)%s" >actual && + qz_to_tab_space <<EOF >expected && +$head1 message two Z +$head2 message one Z +$head3 add bar Z +$head4 $(commit_msg) Z +EOF + test_cmp expected actual +' + test_expect_success 'center alignment formatting at the nth column. i18n.logOutputEncoding' ' git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %><|(40)%s" >actual && qz_to_tab_space <<EOF | iconv -f utf-8 -t $test_encoding >expected && diff --git a/t/t4213-log-tabexpand.sh b/t/t4213-log-tabexpand.sh new file mode 100755 index 0000000..e01a8f6 --- /dev/null +++ b/t/t4213-log-tabexpand.sh @@ -0,0 +1,105 @@ +#!/bin/sh + +test_description='log/show --expand-tabs' + +. ./test-lib.sh + +HT=" " +title='tab indent at the beginning of the title line' +body='tab indent on a line in the body' + +# usage: count_expand $indent $numSP $numHT @format_args +count_expand () +{ + expect= + count=$(( $1 + $2 )) ;# expected spaces + while test $count -gt 0 + do + expect="$expect " + count=$(( $count - 1 )) + done + shift 2 + count=$1 ;# expected tabs + while test $count -gt 0 + do + expect="$expect$HT" + count=$(( $count - 1 )) + done + shift + + # The remainder of the command line is "git show -s" options + case " $* " in + *' --pretty=short '*) + line=$title ;; + *) + line=$body ;; + esac + + # Prefix the output with the command line arguments, and + # replace SP with a dot both in the expecte and actual output + # so that test_cmp would show the differene together with the + # breakage in a way easier to consume by the debugging user. + { + echo "git show -s $*" + echo "$expect$line" + } | sed -e 's/ /./g' >expect + + { + echo "git show -s $*" + git show -s "$@" | + sed -n -e "/$line\$/p" + } | sed -e 's/ /./g' >actual + + test_cmp expect actual +} + +test_expand () +{ + fmt=$1 + case "$fmt" in + *=raw | *=short | *=email) + default="0 1" ;; + *) + default="8 0" ;; + esac + case "$fmt" in + *=email) + in=0 ;; + *) + in=4 ;; + esac + test_expect_success "expand/no-expand${fmt:+ for $fmt}" ' + count_expand $in $default $fmt && + count_expand $in 8 0 $fmt --expand-tabs && + count_expand $in 8 0 --expand-tabs $fmt && + count_expand $in 8 0 $fmt --expand-tabs=8 && + count_expand $in 8 0 --expand-tabs=8 $fmt && + count_expand $in 0 1 $fmt --no-expand-tabs && + count_expand $in 0 1 --no-expand-tabs $fmt && + count_expand $in 0 1 $fmt --expand-tabs=0 && + count_expand $in 0 1 --expand-tabs=0 $fmt && + count_expand $in 4 0 $fmt --expand-tabs=4 && + count_expand $in 4 0 --expand-tabs=4 $fmt + ' +} + +test_expect_success 'setup' ' + test_tick && + sed -e "s/Q/$HT/g" <<-EOF >msg && + Q$title + + Q$body + EOF + git commit --allow-empty -F msg +' + +test_expand "" +test_expand --pretty +test_expand --pretty=short +test_expand --pretty=medium +test_expand --pretty=full +test_expand --pretty=fuller +test_expand --pretty=raw +test_expand --pretty=email + +test_done diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index d446706..3893afd 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -47,6 +47,12 @@ rev_list_tests() { test_cmp expect actual ' + test_expect_success "counting commits with limit ($state)" ' + git rev-list --count -n 1 HEAD >expect && + git rev-list --use-bitmap-index --count -n 1 HEAD >actual && + test_cmp expect actual + ' + test_expect_success "counting non-linear history ($state)" ' git rev-list --count other...master >expect && git rev-list --use-bitmap-index --count other...master >actual && diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 9b9bec4..82d913a 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -259,7 +259,8 @@ test_expect_success 'clone shallow object count' ' test_expect_success 'pull in shallow repo with missing merge base' ' ( cd shallow && - test_must_fail git pull --depth 4 .. A + git fetch --depth 4 .. A + test_must_fail git merge --allow-unrelated-histories FETCH_HEAD ) ' @@ -279,9 +280,10 @@ test_expect_success 'clone shallow depth count' ' test_expect_success 'clone shallow object count' ' ( cd shallow && + git prune && git count-objects -v ) > count.shallow && - grep "^count: 55" count.shallow + grep "^count: 54" count.shallow ' test_expect_success 'fetch --no-shallow on full repo' ' @@ -556,7 +558,6 @@ check_prot_path () { } check_prot_host_port_path () { - local diagport case "$2" in *ssh*) pp=ssh diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index c952d5e..739c089 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -9,6 +9,24 @@ modify () { mv "$2.x" "$2" } +test_pull_autostash () { + git reset --hard before-rebase && + echo dirty >new_file && + git add new_file && + git pull "$@" . copy && + test_cmp_rev HEAD^ copy && + test "$(cat new_file)" = dirty && + test "$(cat file)" = "modified again" +} + +test_pull_autostash_fail () { + git reset --hard before-rebase && + echo dirty >new_file && + git add new_file && + test_must_fail git pull "$@" . copy 2>err && + test_i18ngrep "uncommitted changes." err +} + test_expect_success setup ' echo file >file && git add file && @@ -247,15 +265,47 @@ test_expect_success '--rebase fails with multiple branches' ' test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' ' test_config rebase.autostash true && - git reset --hard before-rebase && - echo dirty >new_file && - git add new_file && - git pull --rebase . copy && - test_cmp_rev HEAD^ copy && - test "$(cat new_file)" = dirty && - test "$(cat file)" = "modified again" + test_pull_autostash --rebase ' +test_expect_success 'pull --rebase --autostash & rebase.autostash=true' ' + test_config rebase.autostash true && + test_pull_autostash --rebase --autostash +' + +test_expect_success 'pull --rebase --autostash & rebase.autostash=false' ' + test_config rebase.autostash false && + test_pull_autostash --rebase --autostash +' + +test_expect_success 'pull --rebase --autostash & rebase.autostash unset' ' + test_unconfig rebase.autostash && + test_pull_autostash --rebase --autostash +' + +test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' ' + test_config rebase.autostash true && + test_pull_autostash_fail --rebase --no-autostash +' + +test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' ' + test_config rebase.autostash false && + test_pull_autostash_fail --rebase --no-autostash +' + +test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' ' + test_unconfig rebase.autostash && + test_pull_autostash_fail --rebase --no-autostash +' + +for i in --autostash --no-autostash +do + test_expect_success "pull $i (without --rebase) is illegal" ' + test_must_fail git pull $i . copy 2>err && + test_i18ngrep "only valid with --rebase" err + ' +done + test_expect_success 'pull.rebase' ' git reset --hard before-rebase && test_config pull.rebase true && @@ -264,6 +314,16 @@ test_expect_success 'pull.rebase' ' test new = "$(git show HEAD:file2)" ' +test_expect_success 'pull --autostash & pull.rebase=true' ' + test_config pull.rebase true && + test_pull_autostash --autostash +' + +test_expect_success 'pull --no-autostash & pull.rebase=true' ' + test_config pull.rebase true && + test_pull_autostash_fail --no-autostash +' + test_expect_success 'branch.to-rebase.rebase' ' git reset --hard before-rebase && test_config branch.to-rebase.rebase true && diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh index 18372ca..ded8f98 100755 --- a/t/t5521-pull-options.sh +++ b/t/t5521-pull-options.sh @@ -144,4 +144,25 @@ test_expect_success 'git pull --all --dry-run' ' ) ' +test_expect_success 'git pull --allow-unrelated-histories' ' + test_when_finished "rm -fr src dst" && + git init src && + ( + cd src && + test_commit one && + test_commit two + ) && + git clone src dst && + ( + cd src && + git checkout --orphan side HEAD^ && + test_commit three + ) && + ( + cd dst && + test_must_fail git pull ../src side && + git pull --allow-unrelated-histories ../src side + ) +' + test_done diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 1241146..954d0e4 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -471,4 +471,18 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea test_i18ncmp expect.err actual.err ' +test_expect_success 'fetching submodules respects parallel settings' ' + git config fetch.recurseSubmodules true && + ( + cd downstream && + GIT_TRACE=$(pwd)/trace.out git fetch --jobs 7 && + grep "7 tasks" trace.out && + git config submodule.fetchJobs 8 && + GIT_TRACE=$(pwd)/trace.out git fetch && + grep "8 tasks" trace.out && + GIT_TRACE=$(pwd)/trace.out git fetch --jobs 9 && + grep "9 tasks" trace.out + ) +' + test_done diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh index 6414635..3484b6f 100755 --- a/t/t5550-http-fetch-dumb.sh +++ b/t/t5550-http-fetch-dumb.sh @@ -91,6 +91,55 @@ test_expect_success 'configured username does not override URL' ' expect_askpass pass user@host ' +test_expect_success 'set up repo with http submodules' ' + git init super && + set_askpass user@host pass@host && + ( + cd super && + git submodule add "$HTTPD_URL/auth/dumb/repo.git" sub && + git commit -m "add submodule" + ) +' + +test_expect_success 'cmdline credential config passes to submodule via clone' ' + set_askpass wrong pass@host && + test_must_fail git clone --recursive super super-clone && + rm -rf super-clone && + + set_askpass wrong pass@host && + git -c "credential.$HTTPD_URL.username=user@host" \ + clone --recursive super super-clone && + expect_askpass pass user@host +' + +test_expect_success 'cmdline credential config passes submodule via fetch' ' + set_askpass wrong pass@host && + test_must_fail git -C super-clone fetch --recurse-submodules && + + set_askpass wrong pass@host && + git -C super-clone \ + -c "credential.$HTTPD_URL.username=user@host" \ + fetch --recurse-submodules && + expect_askpass pass user@host +' + +test_expect_success 'cmdline credential config passes submodule update' ' + # advance the submodule HEAD so that a fetch is required + git commit --allow-empty -m foo && + git push "$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/repo.git" HEAD && + sha1=$(git rev-parse HEAD) && + git -C super-clone update-index --cacheinfo 160000,$sha1,sub && + + set_askpass wrong pass@host && + test_must_fail git -C super-clone submodule update && + + set_askpass wrong pass@host && + git -C super-clone \ + -c "credential.$HTTPD_URL.username=user@host" \ + submodule update && + expect_askpass pass user@host +' + test_expect_success 'fetch changes via http' ' echo content >>file && git commit -a -m two && diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index 58207d8..2f375eb 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -282,5 +282,22 @@ test_expect_success EXPENSIVE 'http can handle enormous ref negotiation' ' test_line_count = 100000 tags ' +test_expect_success 'custom http headers' ' + test_must_fail git -c http.extraheader="x-magic-two: cadabra" \ + fetch "$HTTPD_URL/smart_headers/repo.git" && + git -c http.extraheader="x-magic-one: abra" \ + -c http.extraheader="x-magic-two: cadabra" \ + fetch "$HTTPD_URL/smart_headers/repo.git" && + git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub && + git config -f .gitmodules submodule.sub.path sub && + git config -f .gitmodules submodule.sub.url \ + "$HTTPD_URL/smart_headers/repo.git" && + git submodule init sub && + test_must_fail git submodule update sub && + git -c http.extraheader="x-magic-one: abra" \ + -c http.extraheader="x-magic-two: cadabra" \ + submodule update sub +' + stop_httpd test_done diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 1789d0b..a433394 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -308,7 +308,7 @@ test_expect_success 'clone checking out a tag' ' setup_ssh_wrapper () { test_expect_success 'setup ssh wrapper' ' - cp "$GIT_BUILD_DIR/test-fake-ssh$X" \ + cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" \ "$TRASH_DIRECTORY/ssh-wrapper$X" && GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" && export GIT_SSH && diff --git a/t/t5614-clone-submodules.sh b/t/t5614-clone-submodules.sh new file mode 100755 index 0000000..da2a67f --- /dev/null +++ b/t/t5614-clone-submodules.sh @@ -0,0 +1,70 @@ +#!/bin/sh + +test_description='Test shallow cloning of repos with submodules' + +. ./test-lib.sh + +pwd=$(pwd) + +test_expect_success 'setup' ' + git checkout -b master && + test_commit commit1 && + test_commit commit2 && + mkdir sub && + ( + cd sub && + git init && + test_commit subcommit1 && + test_commit subcommit2 && + test_commit subcommit3 + ) && + git submodule add "file://$pwd/sub" sub && + git commit -m "add submodule" +' + +test_expect_success 'nonshallow clone implies nonshallow submodule' ' + test_when_finished "rm -rf super_clone" && + git clone --recurse-submodules "file://$pwd/." super_clone && + git -C super_clone log --oneline >lines && + test_line_count = 3 lines && + git -C super_clone/sub log --oneline >lines && + test_line_count = 3 lines +' + +test_expect_success 'shallow clone with shallow submodule' ' + test_when_finished "rm -rf super_clone" && + git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone && + git -C super_clone log --oneline >lines && + test_line_count = 2 lines && + git -C super_clone/sub log --oneline >lines && + test_line_count = 1 lines +' + +test_expect_success 'shallow clone does not imply shallow submodule' ' + test_when_finished "rm -rf super_clone" && + git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone && + git -C super_clone log --oneline >lines && + test_line_count = 2 lines && + git -C super_clone/sub log --oneline >lines && + test_line_count = 3 lines +' + +test_expect_success 'shallow clone with non shallow submodule' ' + test_when_finished "rm -rf super_clone" && + git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone && + git -C super_clone log --oneline >lines && + test_line_count = 2 lines && + git -C super_clone/sub log --oneline >lines && + test_line_count = 3 lines +' + +test_expect_success 'non shallow clone with shallow submodule' ' + test_when_finished "rm -rf super_clone" && + git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone && + git -C super_clone log --oneline >lines && + test_line_count = 3 lines && + git -C super_clone/sub log --oneline >lines && + test_line_count = 1 lines +' + +test_done diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index b77d4c9..a1dcdb8 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -184,38 +184,38 @@ commit $head1 [1;31;43mfoo[m EOF -test_expect_success '%C(auto) does not enable color by default' ' +test_expect_success '%C(auto,...) does not enable color by default' ' git log --format=$AUTO_COLOR -1 >actual && has_no_color actual ' -test_expect_success '%C(auto) enables colors for color.diff' ' +test_expect_success '%C(auto,...) enables colors for color.diff' ' git -c color.diff=always log --format=$AUTO_COLOR -1 >actual && has_color actual ' -test_expect_success '%C(auto) enables colors for color.ui' ' +test_expect_success '%C(auto,...) enables colors for color.ui' ' git -c color.ui=always log --format=$AUTO_COLOR -1 >actual && has_color actual ' -test_expect_success '%C(auto) respects --color' ' +test_expect_success '%C(auto,...) respects --color' ' git log --format=$AUTO_COLOR -1 --color >actual && has_color actual ' -test_expect_success '%C(auto) respects --no-color' ' +test_expect_success '%C(auto,...) respects --no-color' ' git -c color.ui=always log --format=$AUTO_COLOR -1 --no-color >actual && has_no_color actual ' -test_expect_success TTY '%C(auto) respects --color=auto (stdout is tty)' ' +test_expect_success TTY '%C(auto,...) respects --color=auto (stdout is tty)' ' test_terminal env TERM=vt100 \ git log --format=$AUTO_COLOR -1 --color=auto >actual && has_color actual ' -test_expect_success '%C(auto) respects --color=auto (stdout not tty)' ' +test_expect_success '%C(auto,...) respects --color=auto (stdout not tty)' ' ( TERM=vt100 && export TERM && git log --format=$AUTO_COLOR -1 --color=auto >actual && @@ -223,6 +223,18 @@ test_expect_success '%C(auto) respects --color=auto (stdout not tty)' ' ) ' +test_expect_success '%C(auto) respects --color' ' + git log --color --format="%C(auto)%H" -1 >actual && + printf "\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect && + test_cmp expect actual +' + +test_expect_success '%C(auto) respects --no-color' ' + git log --no-color --format="%C(auto)%H" -1 >actual && + git rev-parse HEAD >expect && + test_cmp expect actual +' + iconv -f utf-8 -t $test_encoding > commit-msg <<EOF Test printing of complex bodies diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh index 66cda17..20e3e25 100755 --- a/t/t6009-rev-list-parent.sh +++ b/t/t6009-rev-list-parent.sh @@ -47,7 +47,9 @@ test_expect_success 'setup roots, merges and octopuses' ' git checkout -b yetanotherbranch four && test_commit eight && git checkout master && - test_merge normalmerge newroot && + test_tick && + git merge --allow-unrelated-histories -m normalmerge newroot && + git tag normalmerge && test_tick && git merge -m tripus sidebranch anotherbranch && git tag tripus && diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index 39b3238..e0c5f44 100755 --- a/t/t6010-merge-base.sh +++ b/t/t6010-merge-base.sh @@ -215,11 +215,13 @@ test_expect_success 'criss-cross merge-base for octopus-step' ' git reset --hard E && test_commit CC2 && test_tick && - git merge -s ours CC1 && + # E is a root commit unrelated to MMR root on which CC1 is based + git merge -s ours --allow-unrelated-histories CC1 && test_commit CC-o && test_commit CCB && git reset --hard CC1 && - git merge -s ours CC2 && + # E is a root commit unrelated to MMR root on which CC1 is based + git merge -s ours --allow-unrelated-histories CC2 && test_commit CCA && git rev-parse CC1 CC2 >expected && diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh index b89cd6b..2a0fbb8 100755 --- a/t/t6012-rev-list-simplify.sh +++ b/t/t6012-rev-list-simplify.sh @@ -71,7 +71,7 @@ test_expect_success setup ' note J && git checkout master && - test_tick && git merge -m "Coolest" unrelated && + test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated && note K && echo "Immaterial" >elif && diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 755d30c..3f59e58 100755 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -76,7 +76,7 @@ test_expect_success "result contains a conflict" "test_cmp expect a1" git ls-files --stage > out cat > expect << EOF -100644 439cc46de773d8a83c77799b7cc9191c128bfcff 1 a1 +100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1 100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 EOF diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 04c0509..ef0cbce 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -176,7 +176,8 @@ test_expect_success 'up-to-date merge without common ancestor' ' test_tick && ( cd repo1 && - git pull ../repo2 master + git fetch ../repo2 master && + git merge --allow-unrelated-histories FETCH_HEAD ) ' diff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh index 73fc240..3e69245 100755 --- a/t/t6029-merge-subtree.sh +++ b/t/t6029-merge-subtree.sh @@ -49,7 +49,7 @@ test_expect_success 'setup' ' test_expect_success 'initial merge' ' git remote add -f gui ../git-gui && - git merge -s ours --no-commit gui/master && + git merge -s ours --no-commit --allow-unrelated-histories gui/master && git read-tree --prefix=git-gui/ -u gui/master && git commit -m "Merge git-gui as our subdirectory" && git checkout -b work && diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 9d6621c..18aa88b 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -212,7 +212,8 @@ test_expect_success 'git detects differently handled merges conflict' ' -L "" \ -L "Temporary merge branch 1" \ merged empty merge-me && - test $(git rev-parse :1:new_a) = $(git hash-object merged) + sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal && + test $(git rev-parse :1:new_a) = $(git hash-object merged-internal) ' # @@ -299,89 +300,6 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev ' # -# criss-cross + modify/modify with very contrived file contents: -# -# B D -# o---o -# / \ / \ -# A o X ? F -# \ / \ / -# o---o -# C E -# -# Commit A: file with contents 'A\n' -# Commit B: file with contents 'B\n' -# Commit C: file with contents 'C\n' -# Commit D: file with contents 'D\n' -# Commit E: file with contents: -# <<<<<<< Temporary merge branch 1 -# C -# ======= -# B -# >>>>>>> Temporary merge branch 2 -# -# Now, when we merge commits D & E, does git detect the conflict? - -test_expect_success 'setup differently handled merges of content conflict' ' - git clean -fdqx && - rm -rf .git && - git init && - - echo A >file && - git add file && - test_tick && - git commit -m A && - - git branch B && - git checkout -b C && - echo C >file && - git add file && - test_tick && - git commit -m C && - - git checkout B && - echo B >file && - git add file && - test_tick && - git commit -m B && - - git checkout B^0 && - test_must_fail git merge C && - echo D >file && - git add file && - test_tick && - git commit -m D && - git tag D && - - git checkout C^0 && - test_must_fail git merge B && - cat <<EOF >file && -<<<<<<< Temporary merge branch 1 -C -======= -B ->>>>>>> Temporary merge branch 2 -EOF - git add file && - test_tick && - git commit -m E && - git tag E -' - -test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' ' - git checkout D^0 && - - test_must_fail git merge -s recursive E^0 && - - test 3 -eq $(git ls-files -s | wc -l) && - test 3 -eq $(git ls-files -u | wc -l) && - test 0 -eq $(git ls-files -o | wc -l) && - - test $(git rev-parse :2:file) = $(git rev-parse D:file) && - test $(git rev-parse :3:file) = $(git rev-parse E:file) -' - -# # criss-cross + d/f conflict via add/add: # Commit A: Neither file 'a' nor directory 'a/' exists. # Commit B: Introduce 'a' diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh new file mode 100755 index 0000000..0102348 --- /dev/null +++ b/t/t6044-merge-unrelated-index-changes.sh @@ -0,0 +1,153 @@ +#!/bin/sh + +test_description="merges with unrelated index changes" + +. ./test-lib.sh + +# Testcase for some simple merges +# A +# o-----o B +# \ +# \---o C +# \ +# \-o D +# \ +# o E +# Commit A: some file a +# Commit B: adds file b, modifies end of a +# Commit C: adds file c +# Commit D: adds file d, modifies beginning of a +# Commit E: renames a->subdir/a, adds subdir/e + +test_expect_success 'setup trivial merges' ' + test_seq 1 10 >a && + git add a && + test_tick && git commit -m A && + + git branch A && + git branch B && + git branch C && + git branch D && + git branch E && + + git checkout B && + echo b >b && + echo 11 >>a && + git add a b && + test_tick && git commit -m B && + + git checkout C && + echo c >c && + git add c && + test_tick && git commit -m C && + + git checkout D && + test_seq 2 10 >a && + echo d >d && + git add a d && + test_tick && git commit -m D && + + git checkout E && + mkdir subdir && + git mv a subdir/a && + echo e >subdir/e && + git add subdir && + test_tick && git commit -m E +' + +test_expect_success 'ff update' ' + git reset --hard && + git checkout A^0 && + + touch random_file && git add random_file && + + git merge E^0 && + + test_must_fail git rev-parse HEAD:random_file && + test "$(git diff --name-only --cached E)" = "random_file" +' + +test_expect_success 'ff update, important file modified' ' + git reset --hard && + git checkout A^0 && + + mkdir subdir && + touch subdir/e && + git add subdir/e && + + test_must_fail git merge E^0 +' + +test_expect_success 'resolve, trivial' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s resolve C^0 +' + +test_expect_success 'resolve, non-trivial' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s resolve D^0 +' + +test_expect_success 'recursive' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s recursive C^0 +' + +test_expect_success 'octopus, unrelated file touched' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge C^0 D^0 +' + +test_expect_success 'octopus, related file removed' ' + git reset --hard && + git checkout B^0 && + + git rm b && + + test_must_fail git merge C^0 D^0 +' + +test_expect_success 'octopus, related file modified' ' + git reset --hard && + git checkout B^0 && + + echo 12 >>a && git add a && + + test_must_fail git merge C^0 D^0 +' + +test_expect_success 'ours' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s ours C^0 +' + +test_expect_success 'subtree' ' + git reset --hard && + git checkout B^0 && + + touch random_file && git add random_file && + + test_must_fail git merge -s subtree E^0 +' + +test_done diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh index 10b1452..1c6952d 100755 --- a/t/t6101-rev-parse-parents.sh +++ b/t/t6101-rev-parse-parents.sh @@ -19,7 +19,7 @@ test_expect_success 'setup' ' git checkout --orphan tmp && test_commit start2 && git checkout master && - git merge -m next start2 && + git merge -m next --allow-unrelated-histories start2 && test_commit final && test_seq 40 | diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh index bcf472b..d0ab09f 100755 --- a/t/t6302-for-each-ref-filter.sh +++ b/t/t6302-for-each-ref-filter.sh @@ -5,20 +5,27 @@ test_description='test for-each-refs usage of ref-filter APIs' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-gpg.sh -if ! test_have_prereq GPG -then - skip_all="skipping for-each-ref tests, GPG not available" - test_done -fi - test_expect_success 'setup some history and refs' ' test_commit one && test_commit two && test_commit three && git checkout -b side && test_commit four && - git tag -s -m "A signed tag message" signed-tag && - git tag -s -m "Annonated doubly" double-tag signed-tag && + git tag -m "An annotated tag" annotated-tag && + git tag -m "Annonated doubly" doubly-annotated-tag annotated-tag && + + # Note that these "signed" tags might not actually be signed. + # Tests which care about the distinction should be marked + # with the GPG prereq. + if test_have_prereq GPG + then + sign=-s + else + sign= + fi && + git tag $sign -m "A signed tag" signed-tag && + git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag && + git checkout master && git update-ref refs/odd/spot master ' @@ -36,6 +43,7 @@ test_expect_success 'filtering with --points-at' ' test_expect_success 'check signed tags with --points-at' ' sed -e "s/Z$//" >expect <<-\EOF && refs/heads/side Z + refs/tags/annotated-tag four refs/tags/four Z refs/tags/signed-tag four EOF @@ -58,7 +66,9 @@ test_expect_success 'filtering with --merged' ' test_expect_success 'filtering with --no-merged' ' cat >expect <<-\EOF && refs/heads/side - refs/tags/double-tag + refs/tags/annotated-tag + refs/tags/doubly-annotated-tag + refs/tags/doubly-signed-tag refs/tags/four refs/tags/signed-tag EOF @@ -71,7 +81,9 @@ test_expect_success 'filtering with --contains' ' refs/heads/master refs/heads/side refs/odd/spot - refs/tags/double-tag + refs/tags/annotated-tag + refs/tags/doubly-annotated-tag + refs/tags/doubly-signed-tag refs/tags/four refs/tags/signed-tag refs/tags/three @@ -90,7 +102,9 @@ test_expect_success 'left alignment is default' ' refname is refs/heads/master |refs/heads/master refname is refs/heads/side |refs/heads/side refname is refs/odd/spot |refs/odd/spot - refname is refs/tags/double-tag|refs/tags/double-tag + refname is refs/tags/annotated-tag|refs/tags/annotated-tag + refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag + refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag refname is refs/tags/four |refs/tags/four refname is refs/tags/one |refs/tags/one refname is refs/tags/signed-tag|refs/tags/signed-tag @@ -106,7 +120,9 @@ test_expect_success 'middle alignment' ' | refname is refs/heads/master |refs/heads/master | refname is refs/heads/side |refs/heads/side | refname is refs/odd/spot |refs/odd/spot - |refname is refs/tags/double-tag|refs/tags/double-tag + |refname is refs/tags/annotated-tag|refs/tags/annotated-tag + |refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag + |refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag | refname is refs/tags/four |refs/tags/four | refname is refs/tags/one |refs/tags/one |refname is refs/tags/signed-tag|refs/tags/signed-tag @@ -122,7 +138,9 @@ test_expect_success 'right alignment' ' | refname is refs/heads/master|refs/heads/master | refname is refs/heads/side|refs/heads/side | refname is refs/odd/spot|refs/odd/spot - |refname is refs/tags/double-tag|refs/tags/double-tag + |refname is refs/tags/annotated-tag|refs/tags/annotated-tag + |refname is refs/tags/doubly-annotated-tag|refs/tags/doubly-annotated-tag + |refname is refs/tags/doubly-signed-tag|refs/tags/doubly-signed-tag | refname is refs/tags/four|refs/tags/four | refname is refs/tags/one|refs/tags/one |refname is refs/tags/signed-tag|refs/tags/signed-tag @@ -137,7 +155,9 @@ cat >expect <<-\EOF | refname is refs/heads/master |refs/heads/master | refname is refs/heads/side |refs/heads/side | refname is refs/odd/spot |refs/odd/spot -| refname is refs/tags/double-tag |refs/tags/double-tag +| refname is refs/tags/annotated-tag |refs/tags/annotated-tag +|refname is refs/tags/doubly-annotated-tag |refs/tags/doubly-annotated-tag +| refname is refs/tags/doubly-signed-tag |refs/tags/doubly-signed-tag | refname is refs/tags/four |refs/tags/four | refname is refs/tags/one |refs/tags/one | refname is refs/tags/signed-tag |refs/tags/signed-tag @@ -182,7 +202,9 @@ test_expect_success 'alignment with format quote' " |' '\''master| A U Thor'\'' '| |' '\''side| A U Thor'\'' '| |' '\''odd/spot| A U Thor'\'' '| - |' '\''double-tag| '\'' '| + |' '\''annotated-tag| '\'' '| + |' '\''doubly-annotated-tag| '\'' '| + |' '\''doubly-signed-tag| '\'' '| |' '\''four| A U Thor'\'' '| |' '\''one| A U Thor'\'' '| |' '\''signed-tag| '\'' '| @@ -198,7 +220,9 @@ test_expect_success 'nested alignment with quote formatting' " |' master '| |' side '| |' odd/spot '| - |' double-tag '| + |' annotated-tag '| + |'doubly-annotated-tag '| + |'doubly-signed-tag '| |' four '| |' one '| |' signed-tag '| @@ -214,10 +238,12 @@ test_expect_success 'check `%(contents:lines=1)`' ' master |three side |four odd/spot |three - double-tag |Annonated doubly + annotated-tag |An annotated tag + doubly-annotated-tag |Annonated doubly + doubly-signed-tag |Signed doubly four |four one |one - signed-tag |A signed tag message + signed-tag |A signed tag three |three two |two EOF @@ -230,7 +256,9 @@ test_expect_success 'check `%(contents:lines=0)`' ' master | side | odd/spot | - double-tag | + annotated-tag | + doubly-annotated-tag | + doubly-signed-tag | four | one | signed-tag | @@ -246,10 +274,12 @@ test_expect_success 'check `%(contents:lines=99999)`' ' master |three side |four odd/spot |three - double-tag |Annonated doubly + annotated-tag |An annotated tag + doubly-annotated-tag |Annonated doubly + doubly-signed-tag |Signed doubly four |four one |one - signed-tag |A signed tag message + signed-tag |A signed tag three |three two |two EOF diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index cf3469b..f9b7d79 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -775,6 +775,47 @@ test_expect_success GPG '-s implies annotated tag' ' test_cmp expect actual ' +get_tag_header forcesignannotated-implied-sign $commit commit $time >expect +echo "A message" >>expect +echo '-----BEGIN PGP SIGNATURE-----' >>expect +test_expect_success GPG \ + 'git tag -s implied if configured with tag.forcesignannotated' \ + 'test_config tag.forcesignannotated true && + git tag -m "A message" forcesignannotated-implied-sign && + get_tag_msg forcesignannotated-implied-sign >actual && + test_cmp expect actual +' + +test_expect_success GPG \ + 'lightweight with no message when configured with tag.forcesignannotated' \ + 'test_config tag.forcesignannotated true && + git tag forcesignannotated-lightweight && + tag_exists forcesignannotated-lightweight && + test_must_fail git tag -v forcesignannotated-no-message +' + +get_tag_header forcesignannotated-annotate $commit commit $time >expect +echo "A message" >>expect +test_expect_success GPG \ + 'git tag -a disable configured tag.forcesignannotated' \ + 'test_config tag.forcesignannotated true && + git tag -a -m "A message" forcesignannotated-annotate && + get_tag_msg forcesignannotated-annotate >actual && + test_cmp expect actual && + test_must_fail git tag -v forcesignannotated-annotate +' + +get_tag_header forcesignannotated-disabled $commit commit $time >expect +echo "A message" >>expect +echo '-----BEGIN PGP SIGNATURE-----' >>expect +test_expect_success GPG \ + 'git tag --sign enable GPG sign' \ + 'test_config tag.forcesignannotated false && + git tag --sign -m "A message" forcesignannotated-disabled && + get_tag_msg forcesignannotated-disabled >actual && + test_cmp expect actual +' + test_expect_success GPG \ 'trying to create a signed tag with non-existing -F file should fail' ' ! test -f nonexistingfile && diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh index 4608e71..07079a4 100755 --- a/t/t7030-verify-tag.sh +++ b/t/t7030-verify-tag.sh @@ -112,4 +112,17 @@ test_expect_success GPG 'verify signatures with --raw' ' ) ' +test_expect_success GPG 'verify multiple tags' ' + tags="fourth-signed sixth-signed seventh-signed" && + for i in $tags + do + git verify-tag -v --raw $i || return 1 + done >expect.stdout 2>expect.stderr.1 && + grep "^.GNUPG:." <expect.stderr.1 >expect.stderr && + git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 && + grep "^.GNUPG:." <actual.stderr.1 >actual.stderr && + test_cmp expect.stdout actual.stdout && + test_cmp expect.stderr actual.stderr +' + test_done diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 75db023..3570f7b 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -22,6 +22,22 @@ test_expect_success 'setup - initial commit' ' git branch initial ' +test_expect_success 'submodule init aborts on missing .gitmodules file' ' + test_when_finished "git update-index --remove sub" && + git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub && + # missing the .gitmodules file here + test_must_fail git submodule init 2>actual && + test_i18ngrep "No url found for submodule path" actual +' + +test_expect_success 'submodule update aborts on missing .gitmodules file' ' + test_when_finished "git update-index --remove sub" && + git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub && + # missing the .gitmodules file here + git submodule update sub 2>actual && + test_i18ngrep "Submodule path .sub. not initialized" actual +' + test_expect_success 'configuration parsing' ' test_when_finished "rm -f .gitmodules" && cat >.gitmodules <<-\EOF && @@ -466,7 +482,7 @@ test_expect_success 'update --init' ' git config --remove-section submodule.example && test_must_fail git config submodule.example.url && - git submodule update init > update.out && + git submodule update init 2> update.out && cat update.out && test_i18ngrep "not initialized" update.out && test_must_fail git rev-parse --resolve-git-dir init/.git && @@ -484,7 +500,7 @@ test_expect_success 'update --init from subdirectory' ' mkdir -p sub && ( cd sub && - git submodule update ../init >update.out && + git submodule update ../init 2>update.out && cat update.out && test_i18ngrep "not initialized" update.out && test_must_fail git rev-parse --resolve-git-dir ../init/.git && @@ -902,7 +918,7 @@ test_expect_success 'submodule deinit works on repository without submodules' ' git init && >file && git add file && - git commit -m "repo should not be empty" + git commit -m "repo should not be empty" && git submodule deinit . && git submodule deinit --all ) diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh index 79bc135..5503ec0 100755 --- a/t/t7403-submodule-sync.sh +++ b/t/t7403-submodule-sync.sh @@ -62,13 +62,13 @@ test_expect_success 'change submodule' ' ' reset_submodule_urls () { - local root - root=$(pwd) && ( + root=$(pwd) && cd super-clone/submodule && git config remote.origin.url "$root/submodule" ) && ( + root=$(pwd) && cd super-clone/submodule/sub-submodule && git config remote.origin.url "$root/submodule" ) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index e5af4b4..5f27879 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -108,24 +108,36 @@ pwd=$(pwd) cat <<EOF >expect Submodule path '../super': checked out '$supersha1' -Submodule 'merging' ($pwd/merging) registered for path '../super/merging' -Submodule 'none' ($pwd/none) registered for path '../super/none' -Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing' -Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule' Submodule path '../super/merging': checked out '$mergingsha1' Submodule path '../super/none': checked out '$nonesha1' Submodule path '../super/rebasing': checked out '$rebasingsha1' Submodule path '../super/submodule': checked out '$submodulesha1' EOF +cat <<EOF >expect2 +Submodule 'merging' ($pwd/merging) registered for path '../super/merging' +Submodule 'none' ($pwd/none) registered for path '../super/none' +Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing' +Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule' +Cloning into '$pwd/recursivesuper/super/merging'... +done. +Cloning into '$pwd/recursivesuper/super/none'... +done. +Cloning into '$pwd/recursivesuper/super/rebasing'... +done. +Cloning into '$pwd/recursivesuper/super/submodule'... +done. +EOF + test_expect_success 'submodule update --init --recursive from subdirectory' ' git -C recursivesuper/super reset --hard HEAD^ && (cd recursivesuper && mkdir tmp && cd tmp && - git submodule update --init --recursive ../super >../../actual + git submodule update --init --recursive ../super >../../actual 2>../../actual2 ) && - test_cmp expect actual + test_cmp expect actual && + test_cmp expect2 actual2 ' apos="'"; @@ -850,4 +862,31 @@ test_expect_success 'submodule update --recursive drops module name before recur test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual ) ' + +test_expect_success 'submodule update can be run in parallel' ' + (cd super2 && + GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 && + grep "7 tasks" trace.out && + git config submodule.fetchJobs 8 && + GIT_TRACE=$(pwd)/trace.out git submodule update && + grep "8 tasks" trace.out && + GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 && + grep "9 tasks" trace.out + ) +' + +test_expect_success 'git clone passes the parallel jobs config on to submodules' ' + test_when_finished "rm -rf super4" && + GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 && + grep "7 tasks" trace.out && + rm -rf super4 && + git config --global submodule.fetchJobs 8 && + GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 && + grep "8 tasks" trace.out && + rm -rf super4 && + GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 && + grep "9 tasks" trace.out && + rm -rf super4 +' + test_done diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 900f7de..d84897a 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -607,4 +607,24 @@ test_expect_success '--only works on to-be-born branch' ' test_cmp expected actual ' +test_expect_success '--dry-run with conflicts fixed from a merge' ' + # setup two branches with conflicting information + # in the same file, resolve the conflict, + # call commit with --dry-run + echo "Initial contents, unimportant" >test-file && + git add test-file && + git commit -m "Initial commit" && + echo "commit-1-state" >test-file && + git commit -m "commit 1" -i test-file && + git tag commit-1 && + git checkout -b branch-2 HEAD^1 && + echo "commit-2-state" >test-file && + git commit -m "commit 2" -i test-file && + ! $(git merge --no-commit commit-1) && + echo "commit-2-state" >test-file && + git add test-file && + git commit --dry-run && + git commit -m "conflicts fixed from merge." +' + test_done diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh index 2ddf28c..ed2653d 100755 --- a/t/t7507-commit-verbose.sh +++ b/t/t7507-commit-verbose.sh @@ -3,11 +3,10 @@ test_description='verbose commit template' . ./test-lib.sh -cat >check-for-diff <<EOF -#!$SHELL_PATH -exec grep '^diff --git' "\$1" +write_script "check-for-diff" <<\EOF && +grep '^diff --git' "$1" >out +exit 0 EOF -chmod +x check-for-diff test_set_editor "$PWD/check-for-diff" cat >message <<'EOF' @@ -23,7 +22,8 @@ test_expect_success 'setup' ' ' test_expect_success 'initial commit shows verbose diff' ' - git commit --amend -v + git commit --amend -v && + test_line_count = 1 out ' test_expect_success 'second commit' ' @@ -39,13 +39,15 @@ check_message() { test_expect_success 'verbose diff is stripped out' ' git commit --amend -v && - check_message message + check_message message && + test_line_count = 1 out ' test_expect_success 'verbose diff is stripped out (mnemonicprefix)' ' git config diff.mnemonicprefix true && git commit --amend -v && - check_message message + check_message message && + test_line_count = 1 out ' cat >diff <<'EOF' @@ -96,4 +98,60 @@ test_expect_success 'verbose diff is stripped out with set core.commentChar' ' test_i18ngrep "Aborting commit due to empty commit message." err ' +test_expect_success 'status does not verbose without --verbose' ' + git status >actual && + ! grep "^diff --git" actual +' + +test_expect_success 'setup -v -v' ' + echo dirty >file +' + +for i in true 1 +do + test_expect_success "commit.verbose=$i and --verbose omitted" " + git -c commit.verbose=$i commit --amend && + test_line_count = 1 out + " +done + +for i in false -2 -1 0 +do + test_expect_success "commit.verbose=$i and --verbose omitted" " + git -c commit.verbose=$i commit --amend && + test_line_count = 0 out + " +done + +for i in 2 3 +do + test_expect_success "commit.verbose=$i and --verbose omitted" " + git -c commit.verbose=$i commit --amend && + test_line_count = 2 out + " +done + +for i in true false -2 -1 0 1 2 3 +do + test_expect_success "commit.verbose=$i and --verbose" " + git -c commit.verbose=$i commit --amend --verbose && + test_line_count = 1 out + " + + test_expect_success "commit.verbose=$i and --no-verbose" " + git -c commit.verbose=$i commit --amend --no-verbose && + test_line_count = 0 out + " + + test_expect_success "commit.verbose=$i and -v -v" " + git -c commit.verbose=$i commit --amend -v -v && + test_line_count = 2 out + " +done + +test_expect_success "status ignores commit.verbose=true" ' + git -c commit.verbose=true status >actual && + ! grep "^diff --git actual" +' + test_done diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 18e5cf0..4177a86 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -45,12 +45,18 @@ test_expect_success GPG 'create signed commits' ' git tag seventh-signed && echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 && - git tag eighth-signed-alt + git tag eighth-signed-alt && + + # commit.gpgsign is still on but this must not be signed + git tag ninth-unsigned $(echo 9 | git commit-tree HEAD^{tree}) && + # explicit -S of course must sign. + git tag tenth-signed $(echo 9 | git commit-tree -S HEAD^{tree}) ' test_expect_success GPG 'verify and show signatures' ' ( - for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed + for commit in initial second merge fourth-signed \ + fifth-signed sixth-signed seventh-signed tenth-signed do git verify-commit $commit && git show --pretty=short --show-signature $commit >actual && @@ -60,7 +66,8 @@ test_expect_success GPG 'verify and show signatures' ' done ) && ( - for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned + for commit in merge^2 fourth-unsigned sixth-unsigned \ + seventh-unsigned ninth-unsigned do test_must_fail git verify-commit $commit && git show --pretty=short --show-signature $commit >actual && diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh index 0cb9d11..5d56c38 100755 --- a/t/t7605-merge-resolve.sh +++ b/t/t7605-merge-resolve.sh @@ -27,7 +27,7 @@ test_expect_success 'setup' ' git tag c3 ' -test_expect_success 'merge c1 to c2' ' +merge_c1_to_c2_cmds=' git reset --hard c1 && git merge -s resolve c2 && test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" && @@ -41,6 +41,10 @@ test_expect_success 'merge c1 to c2' ' test 3 = $(git ls-files | wc -l) ' +test_expect_success 'merge c1 to c2' "$merge_c1_to_c2_cmds" + +test_expect_success 'merge c1 to c2, again' "$merge_c1_to_c2_cmds" + test_expect_success 'merge c2 to c3 (fails)' ' git reset --hard c2 && test_must_fail git merge -s resolve c3 diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index ff7a9e9..42a2929 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -419,11 +419,34 @@ run_dir_diff_test 'difftool --dir-diff when worktree file is missing' ' grep file2 output ' +run_dir_diff_test 'difftool --dir-diff with unmerged files' ' + test_when_finished git reset --hard && + test_config difftool.echo.cmd "echo ok" && + git checkout -B conflict-a && + git checkout -B conflict-b && + git checkout conflict-a && + echo a >>file && + git add file && + git commit -m conflict-a && + git checkout conflict-b && + echo b >>file && + git add file && + git commit -m conflict-b && + git checkout master && + git merge conflict-a && + test_must_fail git merge conflict-b && + cat >expect <<-EOF && + ok + EOF + git difftool --dir-diff $symlinks -t echo >actual && + test_cmp expect actual +' + write_script .git/CHECK_SYMLINKS <<\EOF for f in file file2 sub/sub do echo "$f" - readlink "$2/$f" + ls -ld "$2/$f" | sed -e 's/.* -> //' done >actual EOF diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 1e72971..bd8ea11 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -9,7 +9,9 @@ test_description='git grep various. . ./test-lib.sh cat >hello.c <<EOF +#include <assert.h> #include <stdio.h> + int main(int argc, const char **argv) { printf("Hello world.\n"); @@ -353,7 +355,7 @@ test_expect_success 'grep -l -C' ' cat >expected <<EOF file:5 EOF -test_expect_success 'grep -l -C' ' +test_expect_success 'grep -c -C' ' git grep -c -C1 foo >actual && test_cmp expected actual ' @@ -715,6 +717,7 @@ test_expect_success 'grep -p' ' cat >expected <<EOF hello.c-#include <stdio.h> +hello.c- hello.c=int main(int argc, const char **argv) hello.c-{ hello.c- printf("Hello world.\n"); @@ -741,6 +744,16 @@ test_expect_success 'grep -W' ' ' cat >expected <<EOF +hello.c-#include <assert.h> +hello.c:#include <stdio.h> +EOF + +test_expect_success 'grep -W shows no trailing empty lines' ' + git grep -W stdio >actual && + test_cmp expected actual +' + +cat >expected <<EOF hello.c= printf("Hello world.\n"); hello.c: return 0; hello.c- /* char ?? */ @@ -1232,8 +1245,8 @@ test_expect_success 'grep --heading' ' cat >expected <<EOF <BOLD;GREEN>hello.c<RESET> -2:int main(int argc, const <BLACK;BYELLOW>char<RESET> **argv) -6: /* <BLACK;BYELLOW>char<RESET> ?? */ +4:int main(int argc, const <BLACK;BYELLOW>char<RESET> **argv) +8: /* <BLACK;BYELLOW>char<RESET> ?? */ <BOLD;GREEN>hello_world<RESET> 3:Hel<BLACK;BYELLOW>lo_w<RESET>orld @@ -1340,7 +1353,7 @@ test_expect_success 'grep --color -e A --and --not -e B with context' ' ' cat >expected <<EOF -hello.c-#include <stdio.h> +hello.c- hello.c=int main(int argc, const char **argv) hello.c-{ hello.c: pr<RED>int<RESET>f("<RED>Hello<RESET> world.\n"); diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 22d8367..28082b1 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -45,13 +45,13 @@ test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"' name='try a deep --rmdir with a commit' test_expect_success "$name" ' - git checkout -f -b mybranch ${remotes_git_svn} && + git checkout -f -b mybranch remotes/git-svn && mv dir/a/b/c/d/e/file dir/file && cp dir/file file && git update-index --add --remove dir/a/b/c/d/e/file dir/file file && git commit -m "$name" && git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch && + remotes/git-svn..mybranch && svn_cmd up "$SVN_TREE" && test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a' @@ -65,14 +65,14 @@ test_expect_success "$name" " git update-index --add dir/file/file && git commit -m '$name' && test_must_fail git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch + remotes/git-svn..mybranch " name='detect node change from directory to file #1' test_expect_success "$name" ' rm -rf dir "$GIT_DIR"/index && - git checkout -f -b mybranch2 ${remotes_git_svn} && + git checkout -f -b mybranch2 remotes/git-svn && mv bar/zzz zzz && rm -rf bar && mv zzz bar && @@ -80,14 +80,14 @@ test_expect_success "$name" ' git update-index --add -- bar && git commit -m "$name" && test_must_fail git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch2 + remotes/git-svn..mybranch2 ' name='detect node change from file to directory #2' test_expect_success "$name" ' rm -f "$GIT_DIR"/index && - git checkout -f -b mybranch3 ${remotes_git_svn} && + git checkout -f -b mybranch3 remotes/git-svn && rm bar/zzz && git update-index --remove bar/zzz && mkdir bar/zzz && @@ -95,7 +95,7 @@ test_expect_success "$name" ' git update-index --add bar/zzz/yyy && git commit -m "$name" && git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch3 && + remotes/git-svn..mybranch3 && svn_cmd up "$SVN_TREE" && test -d "$SVN_TREE"/bar/zzz && test -e "$SVN_TREE"/bar/zzz/yyy @@ -104,7 +104,7 @@ test_expect_success "$name" ' name='detect node change from directory to file #2' test_expect_success "$name" ' rm -f "$GIT_DIR"/index && - git checkout -f -b mybranch4 ${remotes_git_svn} && + git checkout -f -b mybranch4 remotes/git-svn && rm -rf dir && git update-index --remove -- dir/file && touch dir && @@ -112,19 +112,19 @@ test_expect_success "$name" ' git update-index --add -- dir && git commit -m "$name" && test_must_fail git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch4 + remotes/git-svn..mybranch4 ' name='remove executable bit from a file' test_expect_success POSIXPERM "$name" ' rm -f "$GIT_DIR"/index && - git checkout -f -b mybranch5 ${remotes_git_svn} && + git checkout -f -b mybranch5 remotes/git-svn && chmod -x exec.sh && git update-index exec.sh && git commit -m "$name" && git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch5 && + remotes/git-svn..mybranch5 && svn_cmd up "$SVN_TREE" && test ! -x "$SVN_TREE"/exec.sh' @@ -135,7 +135,7 @@ test_expect_success POSIXPERM "$name" ' git update-index exec.sh && git commit -m "$name" && git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch5 && + remotes/git-svn..mybranch5 && svn_cmd up "$SVN_TREE" && test -x "$SVN_TREE"/exec.sh' @@ -147,7 +147,7 @@ test_expect_success SYMLINKS "$name" ' git update-index exec.sh && git commit -m "$name" && git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch5 && + remotes/git-svn..mybranch5 && svn_cmd up "$SVN_TREE" && test -h "$SVN_TREE"/exec.sh' @@ -159,7 +159,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" ' git update-index --add file exec-2.sh && git commit -m "$name" && git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch5 && + remotes/git-svn..mybranch5 && svn_cmd up "$SVN_TREE" && test -x "$SVN_TREE"/file && test -h "$SVN_TREE"/exec-2.sh' @@ -172,7 +172,7 @@ test_expect_success POSIXPERM,SYMLINKS "$name" ' git update-index exec-2.sh && git commit -m "$name" && git svn set-tree --find-copies-harder --rmdir \ - ${remotes_git_svn}..mybranch5 && + remotes/git-svn..mybranch5 && svn_cmd up "$SVN_TREE" && test -f "$SVN_TREE"/exec-2.sh && test ! -h "$SVN_TREE"/exec-2.sh && @@ -194,7 +194,7 @@ GIT_SVN_ID=alt export GIT_SVN_ID test_expect_success "$name" \ 'git svn init "$svnrepo" && git svn fetch && - git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a && + git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a && git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b && test_cmp a b' @@ -217,17 +217,17 @@ EOF test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected" -test_expect_success 'exit if remote refs are ambigious' " +test_expect_success 'exit if remote refs are ambigious' ' git config --add svn-remote.svn.fetch \ - bar:refs/${remotes_git_svn} && + bar:refs/remotes/git-svn && test_must_fail git svn migrate -" +' test_expect_success 'exit if init-ing a would clobber a URL' ' svnadmin create "${PWD}/svnrepo2" && svn mkdir -m "mkdir bar" "${svnrepo}2/bar" && git config --unset svn-remote.svn.fetch \ - "^bar:refs/${remotes_git_svn}$" && + "^bar:refs/remotes/git-svn$" && test_must_fail git svn init "${svnrepo}2/bar" ' @@ -237,7 +237,7 @@ test_expect_success \ git config --get svn-remote.svn.fetch \ "^bar:refs/remotes/bar$" && git config --get svn-remote.svn.fetch \ - "^:refs/${remotes_git_svn}$" + "^:refs/remotes/git-svn$" ' test_expect_success 'dcommit $rev does not clobber current branch' ' @@ -259,26 +259,26 @@ test_expect_success 'dcommit $rev does not clobber current branch' ' git branch -D my-bar ' -test_expect_success 'able to dcommit to a subdirectory' " +test_expect_success 'able to dcommit to a subdirectory' ' git svn fetch -i bar && git checkout -b my-bar refs/remotes/bar && echo abc > d && git update-index --add d && - git commit -m '/bar/d should be in the log' && + git commit -m "/bar/d should be in the log" && git svn dcommit -i bar && - test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" && + test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" && mkdir newdir && echo new > newdir/dir && git update-index --add newdir/dir && - git commit -m 'add a new directory' && + git commit -m "add a new directory" && git svn dcommit -i bar && - test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" && + test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" && echo foo >> newdir/dir && git update-index newdir/dir && - git commit -m 'modify a file in new directory' && + git commit -m "modify a file in new directory" && git svn dcommit -i bar && - test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" - " + test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" +' test_expect_success 'dcommit should not fail with a touched file' ' test_commit "commit-new-file-foo2" foo2 && @@ -291,13 +291,13 @@ test_expect_success 'rebase should not fail with a touched file' ' git svn rebase ' -test_expect_success 'able to set-tree to a subdirectory' " +test_expect_success 'able to set-tree to a subdirectory' ' echo cba > d && git update-index d && - git commit -m 'update /bar/d' && + git commit -m "update /bar/d" && git svn set-tree -i bar HEAD && - test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" - " + test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" +' test_expect_success 'git-svn works in a bare repository' ' mkdir bare-repo && diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh index e8173d5..07bfb63 100755 --- a/t/t9101-git-svn-props.sh +++ b/t/t9101-git-svn-props.sh @@ -73,11 +73,11 @@ test_expect_success 'fetch revisions from svn' 'git svn fetch' name='test svn:keywords ignoring' test_expect_success "$name" \ - 'git checkout -b mybranch ${remotes_git_svn} && + 'git checkout -b mybranch remotes/git-svn && echo Hi again >> kw.c && git commit -a -m "test keywords ignoring" && - git svn set-tree ${remotes_git_svn}..mybranch && - git pull . ${remotes_git_svn}' + git svn set-tree remotes/git-svn..mybranch && + git pull . remotes/git-svn' expect='/* $Id$ */' got="$(sed -ne 2p kw.c)" @@ -95,7 +95,7 @@ test_expect_success "propset CR on crlf files" ' test_expect_success 'fetch and pull latest from svn and checkout a new wc' \ 'git svn fetch && - git pull . ${remotes_git_svn} && + git pull . remotes/git-svn && svn_cmd co "$svnrepo" new_wc' for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf @@ -117,7 +117,7 @@ cd test_wc svn_cmd commit -m "propset CRLF on cr files"' cd .. test_expect_success 'fetch and pull latest from svn' \ - 'git svn fetch && git pull . ${remotes_git_svn}' + 'git svn fetch && git pull . remotes/git-svn' b_cr="$(git hash-object cr)" b_ne_cr="$(git hash-object ne_cr)" @@ -168,7 +168,7 @@ cat >create-ignore-index.expect <<\EOF EOF test_expect_success 'test create-ignore' " - git svn fetch && git pull . ${remotes_git_svn} && + git svn fetch && git pull . remotes/git-svn && git svn create-ignore && cmp ./.gitignore create-ignore.expect && cmp ./deeply/.gitignore create-ignore.expect && diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh index eb70f48..66cd511 100755 --- a/t/t9102-git-svn-deep-rmdir.sh +++ b/t/t9102-git-svn-deep-rmdir.sh @@ -17,7 +17,7 @@ test_expect_success 'initialize repo' ' test_expect_success 'mirror via git svn' ' git svn init "$svnrepo" && git svn fetch && - git checkout -f -b test-rmdir ${remotes_git_svn} + git checkout -f -b test-rmdir remotes/git-svn ' test_expect_success 'Try a commit on rmdir' ' diff --git a/t/t9103-git-svn-tracked-directory-removed.sh b/t/t9103-git-svn-tracked-directory-removed.sh index 3413164..b282713 100755 --- a/t/t9103-git-svn-tracked-directory-removed.sh +++ b/t/t9103-git-svn-tracked-directory-removed.sh @@ -23,17 +23,19 @@ test_expect_success 'make history for tracking' ' test_expect_success 'clone repo with git' ' git svn clone -s "$svnrepo" x && - test -f x/FOLLOWME && - test ! -f x/README + test_path_is_file x/FOLLOWME && + test_path_is_missing x/README ' -test_expect_success 'make sure r2 still has old file' " - cd x && - test -n \"\$(git svn find-rev r1)\" && - git reset --hard \$(git svn find-rev r1) && - test -f README && - test ! -f FOLLOWME && - test x\$(git svn find-rev r2) = x -" +test_expect_success 'make sure r2 still has old file' ' + ( + cd x && + test -n "$(git svn find-rev r1)" && + git reset --hard "$(git svn find-rev r1)" && + test_path_is_file README && + test_path_is_missing FOLLOWME && + test -z "$(git svn find-rev r2)" + ) +' test_done diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index f6d7ac7..dbe8dea 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -44,7 +44,7 @@ test_expect_success 'commit complementing change from git' ' test_expect_success 'dcommit fails to commit because of conflict' ' git svn init "$svnrepo" && git svn fetch && - git reset --hard refs/${remotes_git_svn} && + git reset --hard refs/remotes/git-svn && svn_cmd co "$svnrepo" t.svn && ( cd t.svn && @@ -59,7 +59,7 @@ test_expect_success 'dcommit fails to commit because of conflict' ' ' test_expect_success 'dcommit does the svn equivalent of an index merge' " - git reset --hard refs/${remotes_git_svn} && + git reset --hard refs/remotes/git-svn && echo 'index merge' > file2 && git update-index --add file2 && git commit -a -m 'index merge' && @@ -81,7 +81,7 @@ test_expect_success 'commit another change from svn side' ' ' test_expect_success 'multiple dcommit from git svn will not clobber svn' " - git reset --hard refs/${remotes_git_svn} && + git reset --hard refs/remotes/git-svn && echo new file >> new-file && git update-index --add new-file && git commit -a -m 'new file' && diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh index 9060198..9f3ef8f 100755 --- a/t/t9107-git-svn-migrate.sh +++ b/t/t9107-git-svn-migrate.sh @@ -19,13 +19,14 @@ test_expect_success 'setup old-looking metadata' ' git svn init "$svnrepo" && git svn fetch && rm -rf "$GIT_DIR"/svn && - git update-ref refs/heads/git-svn-HEAD refs/${remotes_git_svn} && - git update-ref refs/heads/svn-HEAD refs/${remotes_git_svn} && - git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn} + git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn && + git update-ref refs/heads/svn-HEAD refs/remotes/git-svn && + git update-ref -d refs/remotes/git-svn refs/remotes/git-svn ' -head=$(git rev-parse --verify refs/heads/git-svn-HEAD^0) -test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'" +test_expect_success 'git-svn-HEAD is a real HEAD' ' + git rev-parse --verify refs/heads/git-svn-HEAD^0 +' svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/') @@ -35,11 +36,11 @@ test_expect_success 'initialize old-style (v0) git svn layout' ' echo "$svnrepo" > "$GIT_DIR"/svn/info/url && git svn migrate && ! test -d "$GIT_DIR"/git-svn && - git rev-parse --verify refs/${remotes_git_svn}^0 && + git rev-parse --verify refs/remotes/git-svn^0 && git rev-parse --verify refs/remotes/svn^0 && test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" && test $(git config --get svn-remote.svn.fetch) = \ - ":refs/${remotes_git_svn}" + ":refs/remotes/git-svn" ' test_expect_success 'initialize a multi-repository repo' ' @@ -56,9 +57,11 @@ test_expect_success 'initialize a multi-repository repo' ' "^tags/\*:refs/remotes/origin/tags/\*$" && git config --add svn-remote.svn.fetch "branches/a:refs/remotes/origin/a" && git config --add svn-remote.svn.fetch "branches/b:refs/remotes/origin/b" && - for i in tags/0.1 tags/0.2 tags/0.3; do + for i in tags/0.1 tags/0.2 tags/0.3 + do git config --add svn-remote.svn.fetch \ - $i:refs/remotes/origin/$i || exit 1; done && + $i:refs/remotes/origin/$i || return 1 + done && git config --get-all svn-remote.svn.fetch > fetch.out && grep "^trunk:refs/remotes/origin/trunk$" fetch.out && grep "^branches/a:refs/remotes/origin/a$" fetch.out && @@ -66,34 +69,42 @@ test_expect_success 'initialize a multi-repository repo' ' grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out && grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out && grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out && - grep "^:refs/${remotes_git_svn}" fetch.out + grep "^:refs/remotes/git-svn" fetch.out ' # refs should all be different, but the trees should all be the same: -test_expect_success 'multi-fetch works on partial urls + paths' " +test_expect_success 'multi-fetch works on partial urls + paths' ' + refs="trunk a b tags/0.1 tags/0.2 tags/0.3" && git svn multi-fetch && - for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do - git rev-parse --verify refs/remotes/origin/\$i^0 >> refs.out || exit 1; - done && - test -z \"\$(sort < refs.out | uniq -d)\" && - for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do - for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do - if test \$j != \$i; then continue; fi - test -z \"\$(git diff refs/remotes/origin/\$i \ - refs/remotes/origin/\$j)\" ||exit 1; done; done - " + for i in $refs + do + git rev-parse --verify refs/remotes/origin/$i^0 || return 1; + done >refs.out && + test -z "$(sort <refs.out | uniq -d)" && + for i in $refs + do + for j in $refs + do + git diff --exit-code refs/remotes/origin/$i \ + refs/remotes/origin/$j || + return 1 + done + done +' test_expect_success 'migrate --minimize on old inited layout' ' git config --unset-all svn-remote.svn.fetch && git config --unset-all svn-remote.svn.url && rm -rf "$GIT_DIR"/svn && - for i in $(cat fetch.out); do + for i in $(cat fetch.out) + do path=$(expr $i : "\([^:]*\):.*$") ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$") if test -z "$ref"; then continue; fi if test -n "$path"; then path="/$path"; fi - ( mkdir -p "$GIT_DIR"/svn/$ref/info/ && - echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1; + mkdir -p "$GIT_DIR"/svn/$ref/info/ && + echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url || + return 1 done && git svn migrate --minimize && test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" && @@ -104,7 +115,7 @@ test_expect_success 'migrate --minimize on old inited layout' ' grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out && grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out && grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out && - grep "^:refs/${remotes_git_svn}" fetch.out + grep "^:refs/remotes/git-svn" fetch.out ' test_expect_success ".rev_db auto-converted to .rev_map.UUID" ' diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh index 29fbdfd..dde0a3c 100755 --- a/t/t9110-git-svn-use-svm-props.sh +++ b/t/t9110-git-svn-use-svm-props.sh @@ -22,31 +22,31 @@ uuid=161ce429-a9dd-4828-af4a-52023f968c89 bar_url=http://mayonaise/svnrepo/bar test_expect_success 'verify metadata for /bar' " git cat-file commit refs/remotes/bar | \ - grep '^${git_svn_id}: $bar_url@12 $uuid$' && + grep '^git-svn-id: $bar_url@12 $uuid$' && git cat-file commit refs/remotes/bar~1 | \ - grep '^${git_svn_id}: $bar_url@11 $uuid$' && + grep '^git-svn-id: $bar_url@11 $uuid$' && git cat-file commit refs/remotes/bar~2 | \ - grep '^${git_svn_id}: $bar_url@10 $uuid$' && + grep '^git-svn-id: $bar_url@10 $uuid$' && git cat-file commit refs/remotes/bar~3 | \ - grep '^${git_svn_id}: $bar_url@9 $uuid$' && + grep '^git-svn-id: $bar_url@9 $uuid$' && git cat-file commit refs/remotes/bar~4 | \ - grep '^${git_svn_id}: $bar_url@6 $uuid$' && + grep '^git-svn-id: $bar_url@6 $uuid$' && git cat-file commit refs/remotes/bar~5 | \ - grep '^${git_svn_id}: $bar_url@1 $uuid$' + grep '^git-svn-id: $bar_url@1 $uuid$' " e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e test_expect_success 'verify metadata for /dir/a/b/c/d/e' " git cat-file commit refs/remotes/e | \ - grep '^${git_svn_id}: $e_url@1 $uuid$' + grep '^git-svn-id: $e_url@1 $uuid$' " dir_url=http://mayonaise/svnrepo/dir test_expect_success 'verify metadata for /dir' " git cat-file commit refs/remotes/dir | \ - grep '^${git_svn_id}: $dir_url@2 $uuid$' && + grep '^git-svn-id: $dir_url@2 $uuid$' && git cat-file commit refs/remotes/dir~1 | \ - grep '^${git_svn_id}: $dir_url@1 $uuid$' + grep '^git-svn-id: $dir_url@1 $uuid$' " test_expect_success 'find commit based on SVN revision number' " diff --git a/t/t9111-git-svn-use-svnsync-props.sh b/t/t9111-git-svn-use-svnsync-props.sh index bd081c2..22b6e5e 100755 --- a/t/t9111-git-svn-use-svnsync-props.sh +++ b/t/t9111-git-svn-use-svnsync-props.sh @@ -21,31 +21,31 @@ uuid=161ce429-a9dd-4828-af4a-52023f968c89 bar_url=http://mayonaise/svnrepo/bar test_expect_success 'verify metadata for /bar' " git cat-file commit refs/remotes/bar | \ - grep '^${git_svn_id}: $bar_url@12 $uuid$' && + grep '^git-svn-id: $bar_url@12 $uuid$' && git cat-file commit refs/remotes/bar~1 | \ - grep '^${git_svn_id}: $bar_url@11 $uuid$' && + grep '^git-svn-id: $bar_url@11 $uuid$' && git cat-file commit refs/remotes/bar~2 | \ - grep '^${git_svn_id}: $bar_url@10 $uuid$' && + grep '^git-svn-id: $bar_url@10 $uuid$' && git cat-file commit refs/remotes/bar~3 | \ - grep '^${git_svn_id}: $bar_url@9 $uuid$' && + grep '^git-svn-id: $bar_url@9 $uuid$' && git cat-file commit refs/remotes/bar~4 | \ - grep '^${git_svn_id}: $bar_url@6 $uuid$' && + grep '^git-svn-id: $bar_url@6 $uuid$' && git cat-file commit refs/remotes/bar~5 | \ - grep '^${git_svn_id}: $bar_url@1 $uuid$' + grep '^git-svn-id: $bar_url@1 $uuid$' " e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e test_expect_success 'verify metadata for /dir/a/b/c/d/e' " git cat-file commit refs/remotes/e | \ - grep '^${git_svn_id}: $e_url@1 $uuid$' + grep '^git-svn-id: $e_url@1 $uuid$' " dir_url=http://mayonaise/svnrepo/dir test_expect_success 'verify metadata for /dir' " git cat-file commit refs/remotes/dir | \ - grep '^${git_svn_id}: $dir_url@2 $uuid$' && + grep '^git-svn-id: $dir_url@2 $uuid$' && git cat-file commit refs/remotes/dir~1 | \ - grep '^${git_svn_id}: $dir_url@1 $uuid$' + grep '^git-svn-id: $dir_url@1 $uuid$' " test_done diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh index 1c84ce1..59465b1 100755 --- a/t/t9120-git-svn-clone-with-percent-escapes.sh +++ b/t/t9120-git-svn-clone-with-percent-escapes.sh @@ -22,7 +22,7 @@ test_expect_success 'test clone with percent escapes' ' git svn clone "$svnrepo/pr%20ject" clone && ( cd clone && - git rev-parse refs/${remotes_git_svn} + git rev-parse refs/remotes/git-svn ) ' @@ -42,7 +42,7 @@ test_expect_success 'test clone trunk with percent escapes and minimize-url' ' git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize && ( cd minimize && - git rev-parse refs/${remotes_git_svn} + git rev-parse refs/remotes/git-svn ) ' @@ -50,7 +50,7 @@ test_expect_success 'test clone trunk with percent escapes' ' git svn clone "$svnrepo/pr%20ject/trunk" trunk && ( cd trunk && - git rev-parse refs/${remotes_git_svn} + git rev-parse refs/remotes/git-svn ) ' diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh index fd81847..ead4045 100755 --- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh +++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh @@ -17,7 +17,7 @@ rm -rf import test_expect_success 'init, fetch and checkout repository' ' git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" && git svn fetch && - git checkout -b mybranch ${remotes_git_svn} + git checkout -b mybranch remotes/git-svn ' test_expect_success 'remove rev_map' ' diff --git a/t/t9153-git-svn-rewrite-uuid.sh b/t/t9153-git-svn-rewrite-uuid.sh index 88a2cfa..372ef15 100755 --- a/t/t9153-git-svn-rewrite-uuid.sh +++ b/t/t9153-git-svn-rewrite-uuid.sh @@ -17,9 +17,9 @@ test_expect_success 'load svn repo' " test_expect_success 'verify uuid' " git cat-file commit refs/remotes/git-svn~0 | \ - grep '^${git_svn_id}: .*@2 $uuid$' && + grep '^git-svn-id: .*@2 $uuid$' && git cat-file commit refs/remotes/git-svn~1 | \ - grep '^${git_svn_id}: .*@1 $uuid$' + grep '^git-svn-id: .*@1 $uuid$' " test_done diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 25bb60b..4bca35c 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2650,6 +2650,21 @@ test_expect_success 'R: ignore non-git options' ' git fast-import <input ' +test_expect_success 'R: corrupt lines do not mess marks file' ' + rm -f io.marks && + blob=$(echo hi | git hash-object --stdin) && + cat >expect <<-EOF && + :3 0000000000000000000000000000000000000000 + :1 $blob + :2 $blob + EOF + cp expect io.marks && + test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF && + + EOF + test_cmp expect io.marks +' + ## ## R: very large blobs ## diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index d708cbf..432c61d 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -45,7 +45,8 @@ test_expect_success 'setup' ' touch secondrootfile && git add secondrootfile && git commit -m "second root") && - git pull secondroot master && + git fetch secondroot master && + git merge --allow-unrelated-histories FETCH_HEAD && git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 && GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true && GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" && diff --git a/t/t9826-git-p4-keep-empty-commits.sh b/t/t9826-git-p4-keep-empty-commits.sh index be12960..fa8b9da 100755 --- a/t/t9826-git-p4-keep-empty-commits.sh +++ b/t/t9826-git-p4-keep-empty-commits.sh @@ -47,23 +47,23 @@ test_expect_success 'Clone repo root path with all history' ' git init . && git p4 clone --use-client-spec --destination="$git" //depot@all && cat >expect <<-\EOF && -Remove file 4 -[git-p4: depot-paths = "//depot/": change = 6] + Remove file 4 + [git-p4: depot-paths = "//depot/": change = 6] -Remove file 3 -[git-p4: depot-paths = "//depot/": change = 5] + Remove file 3 + [git-p4: depot-paths = "//depot/": change = 5] -Add file 4 -[git-p4: depot-paths = "//depot/": change = 4] + Add file 4 + [git-p4: depot-paths = "//depot/": change = 4] -Add file 3 -[git-p4: depot-paths = "//depot/": change = 3] + Add file 3 + [git-p4: depot-paths = "//depot/": change = 3] -Add file 2 -[git-p4: depot-paths = "//depot/": change = 2] + Add file 2 + [git-p4: depot-paths = "//depot/": change = 2] -Add file 1 -[git-p4: depot-paths = "//depot/": change = 1] + Add file 1 + [git-p4: depot-paths = "//depot/": change = 1] EOF git log --format=%B >actual && @@ -80,23 +80,23 @@ test_expect_success 'Clone repo subdir with all history but keep empty commits' git config git-p4.keepEmptyCommits true && git p4 clone --use-client-spec --destination="$git" //depot@all && cat >expect <<-\EOF && -Remove file 4 -[git-p4: depot-paths = "//depot/": change = 6] + Remove file 4 + [git-p4: depot-paths = "//depot/": change = 6] -Remove file 3 -[git-p4: depot-paths = "//depot/": change = 5] + Remove file 3 + [git-p4: depot-paths = "//depot/": change = 5] -Add file 4 -[git-p4: depot-paths = "//depot/": change = 4] + Add file 4 + [git-p4: depot-paths = "//depot/": change = 4] -Add file 3 -[git-p4: depot-paths = "//depot/": change = 3] + Add file 3 + [git-p4: depot-paths = "//depot/": change = 3] -Add file 2 -[git-p4: depot-paths = "//depot/": change = 2] + Add file 2 + [git-p4: depot-paths = "//depot/": change = 2] -Add file 1 -[git-p4: depot-paths = "//depot/": change = 1] + Add file 1 + [git-p4: depot-paths = "//depot/": change = 1] EOF git log --format=%B >actual && @@ -112,14 +112,14 @@ test_expect_success 'Clone repo subdir with all history' ' git init . && git p4 clone --use-client-spec --destination="$git" --verbose //depot@all && cat >expect <<-\EOF && -Remove file 3 -[git-p4: depot-paths = "//depot/": change = 5] + Remove file 3 + [git-p4: depot-paths = "//depot/": change = 5] -Add file 3 -[git-p4: depot-paths = "//depot/": change = 3] + Add file 3 + [git-p4: depot-paths = "//depot/": change = 3] -Add file 1 -[git-p4: depot-paths = "//depot/": change = 1] + Add file 1 + [git-p4: depot-paths = "//depot/": change = 1] EOF git log --format=%B >actual && diff --git a/t/t9828-git-p4-map-user.sh b/t/t9828-git-p4-map-user.sh new file mode 100755 index 0000000..e20395c --- /dev/null +++ b/t/t9828-git-p4-map-user.sh @@ -0,0 +1,61 @@ +#!/bin/sh + +test_description='Clone repositories and map users' + +. ./lib-git-p4.sh + +test_expect_success 'start p4d' ' + start_p4d +' + +test_expect_success 'Create a repo with different users' ' + client_view "//depot/... //client/..." && + ( + cd "$cli" && + + >author.txt && + p4 add author.txt && + p4 submit -d "Add file author\\n" && + + P4USER=mmax && + >max.txt && + p4 add max.txt && + p4 submit -d "Add file max" && + + P4USER=eri && + >moritz.txt && + p4 add moritz.txt && + p4 submit -d "Add file moritz" && + + P4USER=no && + >nobody.txt && + p4 add nobody.txt && + p4 submit -d "Add file nobody" + ) +' + +test_expect_success 'Clone repo root path with all history' ' + client_view "//depot/... //client/..." && + test_when_finished cleanup_git && + ( + cd "$git" && + git init . && + git config --add git-p4.mapUser "mmax = Max Musterman <max@example.com> " && + git config --add git-p4.mapUser " eri=Erika Musterman <erika@example.com>" && + git p4 clone --use-client-spec --destination="$git" //depot@all && + cat >expect <<-\EOF && + no <no@client> + Erika Musterman <erika@example.com> + Max Musterman <max@example.com> + Dr. author <author@example.com> + EOF + git log --format="%an <%ae>" >actual && + test_cmp expect actual + ) +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done diff --git a/t/t9829-git-p4-jobs.sh b/t/t9829-git-p4-jobs.sh new file mode 100755 index 0000000..971aeee --- /dev/null +++ b/t/t9829-git-p4-jobs.sh @@ -0,0 +1,99 @@ +#!/bin/sh + +test_description='git p4 retrieve job info' + +. ./lib-git-p4.sh + +test_expect_success 'start p4d' ' + start_p4d +' + +test_expect_success 'add p4 jobs' ' + ( + p4_add_job TESTJOB-A && + p4_add_job TESTJOB-B + ) +' + +test_expect_success 'add p4 files' ' + client_view "//depot/... //client/..." && + ( + cd "$cli" && + >file1 && + p4 add file1 && + p4 submit -d "Add file 1" + ) +' + +test_expect_success 'check log message of changelist with no jobs' ' + client_view "//depot/... //client/..." && + test_when_finished cleanup_git && + ( + cd "$git" && + git init . && + git p4 clone --use-client-spec --destination="$git" //depot@all && + cat >expect <<-\EOF && + Add file 1 + [git-p4: depot-paths = "//depot/": change = 1] + + EOF + git log --format=%B >actual && + test_cmp expect actual + ) +' + +test_expect_success 'add TESTJOB-A to change 1' ' + ( + cd "$cli" && + p4 fix -c 1 TESTJOB-A + ) +' + +test_expect_success 'check log message of changelist with one job' ' + client_view "//depot/... //client/..." && + test_when_finished cleanup_git && + ( + cd "$git" && + git init . && + git p4 clone --use-client-spec --destination="$git" //depot@all && + cat >expect <<-\EOF && + Add file 1 + Jobs: TESTJOB-A + [git-p4: depot-paths = "//depot/": change = 1] + + EOF + git log --format=%B >actual && + test_cmp expect actual + ) +' + +test_expect_success 'add TESTJOB-B to change 1' ' + ( + cd "$cli" && + p4 fix -c 1 TESTJOB-B + ) +' + +test_expect_success 'check log message of changelist with more jobs' ' + client_view "//depot/... //client/..." && + test_when_finished cleanup_git && + ( + cd "$git" && + git init . && + git p4 clone --use-client-spec --destination="$git" //depot@all && + cat >expect <<-\EOF && + Add file 1 + Jobs: TESTJOB-A TESTJOB-B + [git-p4: depot-paths = "//depot/": change = 1] + + EOF + git log --format=%B >actual && + test_cmp expect actual + ) +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 3978fc0..48884d5 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -939,3 +939,25 @@ mingw_read_file_strip_cr_ () { eval "$1=\$$1\$line" done } + +# Like "env FOO=BAR some-program", but run inside a subshell, which means +# it also works for shell functions (though those functions cannot impact +# the environment outside of the test_env invocation). +test_env () { + ( + while test $# -gt 0 + do + case "$1" in + *=*) + eval "${1%%=*}=\${1#*=}" + eval "export ${1%%=*}" + shift + ;; + *) + "$@" + exit + ;; + esac + done + ) +} diff --git a/t/test-lib.sh b/t/test-lib.sh index 39c70f0..0055ebb 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -867,10 +867,10 @@ test -d "$GIT_BUILD_DIR"/templates/blt || { error "You haven't built things yet, have you?" } -if ! test -x "$GIT_BUILD_DIR"/test-chmtime +if ! test -x "$GIT_BUILD_DIR"/t/helper/test-chmtime then echo >&2 'You need to build test-chmtime:' - echo >&2 'Run "make test-chmtime" in the source (toplevel) directory' + echo >&2 'Run "make t/helper/test-chmtime" in the source (toplevel) directory' exit 1 fi @@ -6,6 +6,59 @@ const char *tag_type = "tag"; +static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags) +{ + struct signature_check sigc; + size_t payload_size; + int ret; + + memset(&sigc, 0, sizeof(sigc)); + + payload_size = parse_signature(buf, size); + + if (size == payload_size) { + if (flags & GPG_VERIFY_VERBOSE) + write_in_full(1, buf, payload_size); + return error("no signature found"); + } + + ret = check_signature(buf, payload_size, buf + payload_size, + size - payload_size, &sigc); + print_signature_buffer(&sigc, flags); + + signature_check_clear(&sigc); + return ret; +} + +int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report, + unsigned flags) +{ + enum object_type type; + char *buf; + unsigned long size; + int ret; + + type = sha1_object_info(sha1, NULL); + if (type != OBJ_TAG) + return error("%s: cannot verify a non-tag object of type %s.", + name_to_report ? + name_to_report : + find_unique_abbrev(sha1, DEFAULT_ABBREV), + typename(type)); + + buf = read_sha1_file(sha1, &type, &size); + if (!buf) + return error("%s: unable to read file.", + name_to_report ? + name_to_report : + find_unique_abbrev(sha1, DEFAULT_ABBREV)); + + ret = run_gpg_verify(buf, size, flags); + + free(buf); + return ret; +} + struct object *deref_tag(struct object *o, const char *warn, int warnlen) { while (o && o->type == OBJ_TAG) @@ -17,5 +17,7 @@ extern int parse_tag_buffer(struct tag *item, const void *data, unsigned long si extern int parse_tag(struct tag *item); extern struct object *deref_tag(struct object *, const char *, int); extern struct object *deref_tag_noverify(struct object *); +extern int gpg_verify_tag(const unsigned char *sha1, + const char *name_to_report, unsigned flags); #endif /* TAG_H */ diff --git a/transport-helper.c b/transport-helper.c index 13b7a57..bd666b2 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1166,7 +1166,7 @@ static int udt_do_read(struct unidirectional_transfer *t) bytes = read(t->src, t->buf + t->bufuse, BUFFERSIZE - t->bufuse); if (bytes < 0 && errno != EWOULDBLOCK && errno != EAGAIN && errno != EINTR) { - error("read(%s) failed: %s", t->src_name, strerror(errno)); + error_errno("read(%s) failed", t->src_name); return -1; } else if (bytes == 0) { transfer_debug("%s EOF (with %i bytes in buffer)", @@ -1193,7 +1193,7 @@ static int udt_do_write(struct unidirectional_transfer *t) transfer_debug("%s is writable", t->dest_name); bytes = xwrite(t->dest, t->buf, t->bufuse); if (bytes < 0 && errno != EWOULDBLOCK) { - error("write(%s) failed: %s", t->dest_name, strerror(errno)); + error_errno("write(%s) failed", t->dest_name); return -1; } else if (bytes > 0) { t->bufuse -= bytes; @@ -1306,7 +1306,7 @@ static int tloop_join(pid_t pid, const char *name) { int tret; if (waitpid(pid, &tret, 0) < 0) { - error("%s process failed to wait: %s", name, strerror(errno)); + error_errno("%s process failed to wait", name); return 1; } if (!WIFEXITED(tret) || WEXITSTATUS(tret)) { diff --git a/tree-diff.c b/tree-diff.c index 4dda9a1..ebf40f4 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -14,6 +14,16 @@ */ #define S_IFXMIN_NEQ S_DIFFTREE_IFXMIN_NEQ +#define FAST_ARRAY_ALLOC(x, nr) do { \ + if ((nr) <= 2) \ + (x) = xalloca((nr) * sizeof(*(x))); \ + else \ + ALLOC_ARRAY((x), nr); \ +} while(0) +#define FAST_ARRAY_FREE(x, nr) do { \ + if ((nr) > 2) \ + free((x)); \ +} while(0) static struct combine_diff_path *ll_diff_tree_paths( struct combine_diff_path *p, const unsigned char *sha1, @@ -183,7 +193,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p, if (t) { /* path present in resulting tree */ - sha1 = tree_entry_extract(t, &path, &mode); + sha1 = tree_entry_extract(t, &path, &mode)->hash; pathlen = tree_entry_len(&t->entry); isdir = S_ISDIR(mode); } else { @@ -229,7 +239,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p, DIFF_STATUS_ADDED; if (tpi_valid) { - sha1_i = tp[i].entry.sha1; + sha1_i = tp[i].entry.oid->hash; mode_i = tp[i].entry.mode; } else { @@ -265,19 +275,19 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p, if (recurse) { const unsigned char **parents_sha1; - parents_sha1 = xalloca(nparent * sizeof(parents_sha1[0])); + FAST_ARRAY_ALLOC(parents_sha1, nparent); for (i = 0; i < nparent; ++i) { /* same rule as in emitthis */ int tpi_valid = tp && !(tp[i].entry.mode & S_IFXMIN_NEQ); - parents_sha1[i] = tpi_valid ? tp[i].entry.sha1 + parents_sha1[i] = tpi_valid ? tp[i].entry.oid->hash : NULL; } strbuf_add(base, path, pathlen); strbuf_addch(base, '/'); p = ll_diff_tree_paths(p, sha1, parents_sha1, nparent, base, opt); - xalloca_free(parents_sha1); + FAST_ARRAY_FREE(parents_sha1, nparent); } strbuf_setlen(base, old_baselen); @@ -402,8 +412,8 @@ static struct combine_diff_path *ll_diff_tree_paths( void *ttree, **tptree; int i; - tp = xalloca(nparent * sizeof(tp[0])); - tptree = xalloca(nparent * sizeof(tptree[0])); + FAST_ARRAY_ALLOC(tp, nparent); + FAST_ARRAY_ALLOC(tptree, nparent); /* * load parents first, as they are probably already cached. @@ -482,7 +492,7 @@ static struct combine_diff_path *ll_diff_tree_paths( continue; /* diff(t,pi) != ΓΈ */ - if (hashcmp(t.entry.sha1, tp[i].entry.sha1) || + if (oidcmp(t.entry.oid, tp[i].entry.oid) || (t.entry.mode != tp[i].entry.mode)) continue; @@ -531,8 +541,8 @@ static struct combine_diff_path *ll_diff_tree_paths( free(ttree); for (i = nparent-1; i >= 0; i--) free(tptree[i]); - xalloca_free(tptree); - xalloca_free(tp); + FAST_ARRAY_FREE(tptree, nparent); + FAST_ARRAY_FREE(tp, nparent); return p; } diff --git a/tree-walk.c b/tree-walk.c index cd4bb2c..ce27842 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -38,7 +38,7 @@ static void decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned /* Initialize the descriptor entry */ desc->entry.path = path; desc->entry.mode = canon_mode(mode); - desc->entry.sha1 = (const unsigned char *)(path + len); + desc->entry.oid = (const struct object_id *)(path + len); } void init_tree_desc(struct tree_desc *desc, const void *buffer, unsigned long size) @@ -76,7 +76,7 @@ static void entry_extract(struct tree_desc *t, struct name_entry *a) void update_tree_entry(struct tree_desc *desc) { const void *buf = desc->buffer; - const unsigned char *end = desc->entry.sha1 + 20; + const unsigned char *end = desc->entry.oid->hash + 20; unsigned long size = desc->size; unsigned long len = end - (const unsigned char *)buf; @@ -110,7 +110,7 @@ void setup_traverse_info(struct traverse_info *info, const char *base) pathlen--; info->pathlen = pathlen ? pathlen + 1 : 0; info->name.path = base; - info->name.sha1 = (void *)(base + pathlen + 1); + info->name.oid = (void *)(base + pathlen + 1); if (pathlen) info->prev = &dummy; } @@ -433,10 +433,10 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char int namelen = strlen(name); while (t->size) { const char *entry; - const unsigned char *sha1; + const struct object_id *oid; int entrylen, cmp; - sha1 = tree_entry_extract(t, &entry, mode); + oid = tree_entry_extract(t, &entry, mode); entrylen = tree_entry_len(&t->entry); update_tree_entry(t); if (entrylen > namelen) @@ -447,7 +447,7 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char if (cmp < 0) break; if (entrylen == namelen) { - hashcpy(result, sha1); + hashcpy(result, oid->hash); return 0; } if (name[entrylen] != '/') @@ -455,10 +455,10 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char if (!S_ISDIR(*mode)) break; if (++entrylen == namelen) { - hashcpy(result, sha1); + hashcpy(result, oid->hash); return 0; } - return get_tree_entry(sha1, name + entrylen, result, mode); + return get_tree_entry(oid->hash, name + entrylen, result, mode); } return -1; } diff --git a/tree-walk.h b/tree-walk.h index 174eb61..97a7d69 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -2,7 +2,7 @@ #define TREE_WALK_H struct name_entry { - const unsigned char *sha1; + const struct object_id *oid; const char *path; unsigned int mode; }; @@ -13,16 +13,16 @@ struct tree_desc { unsigned int size; }; -static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep) +static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep) { *pathp = desc->entry.path; *modep = desc->entry.mode; - return desc->entry.sha1; + return desc->entry.oid; } static inline int tree_entry_len(const struct name_entry *ne) { - return (const char *)ne->sha1 - ne->path - 1; + return (const char *)ne->oid - ne->path - 1; } void update_tree_entry(struct tree_desc *); @@ -76,7 +76,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, continue; } - switch (fn(entry.sha1, base, + switch (fn(entry.oid->hash, base, entry.path, entry.mode, stage, context)) { case 0: continue; @@ -87,19 +87,19 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, } if (S_ISDIR(entry.mode)) - hashcpy(sha1, entry.sha1); + hashcpy(sha1, entry.oid->hash); else if (S_ISGITLINK(entry.mode)) { struct commit *commit; - commit = lookup_commit(entry.sha1); + commit = lookup_commit(entry.oid->hash); if (!commit) die("Commit %s in submodule path %s%s not found", - sha1_to_hex(entry.sha1), + oid_to_hex(entry.oid), base->buf, entry.path); if (parse_commit(commit)) die("Invalid commit %s in submodule path %s%s", - sha1_to_hex(entry.sha1), + oid_to_hex(entry.oid), base->buf, entry.path); hashcpy(sha1, commit->tree->object.oid.hash); diff --git a/unpack-trees.c b/unpack-trees.c index aea9aa7..6bc9512 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -509,7 +509,7 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, for (i = 0; i < n; i++, dirmask >>= 1) { const unsigned char *sha1 = NULL; if (dirmask & 1) - sha1 = names[i].sha1; + sha1 = names[i].oid->hash; buf[i] = fill_tree_descriptor(t+i, sha1); } @@ -625,7 +625,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, con ce->ce_mode = create_ce_mode(n->mode); ce->ce_flags = create_ce_flags(stage); ce->ce_namelen = len; - hashcpy(ce->sha1, n->sha1); + hashcpy(ce->sha1, n->oid->hash); make_traverse_path(ce->name, info, n); return ce; @@ -1533,8 +1533,7 @@ static int verify_absent_1(const struct cache_entry *ce, path = xmemdupz(ce->name, len); if (lstat(path, &st)) - ret = error("cannot stat '%s': %s", path, - strerror(errno)); + ret = error_errno("cannot stat '%s'", path); else ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL, &st, error_type, o); @@ -1542,8 +1541,7 @@ static int verify_absent_1(const struct cache_entry *ce, return ret; } else if (lstat(ce->name, &st)) { if (errno != ENOENT) - return error("cannot stat '%s': %s", ce->name, - strerror(errno)); + return error_errno("cannot stat '%s'", ce->name); return 0; } else { return check_ok_to_remove(ce->name, ce_namelen(ce), diff --git a/upload-pack.c b/upload-pack.c index dc802a0..f19444d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -174,8 +174,7 @@ static void create_pack_file(void) if (ret < 0) { if (errno != EINTR) { - error("poll failed, resuming: %s", - strerror(errno)); + error_errno("poll failed, resuming"); sleep(1); } continue; @@ -109,19 +109,11 @@ void NORETURN die(const char *err, ...) va_end(params); } -void NORETURN die_errno(const char *fmt, ...) +static const char *fmt_with_err(char *buf, int n, const char *fmt) { - va_list params; - char fmt_with_err[1024]; char str_error[256], *err; int i, j; - if (die_is_recursing()) { - fputs("fatal: recursion detected in die_errno handler\n", - stderr); - exit(128); - } - err = strerror(errno); for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) { if ((str_error[j++] = err[i++]) != '%') @@ -136,13 +128,37 @@ void NORETURN die_errno(const char *fmt, ...) } } str_error[j] = 0; - snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, str_error); + snprintf(buf, n, "%s: %s", fmt, str_error); + return buf; +} + +void NORETURN die_errno(const char *fmt, ...) +{ + char buf[1024]; + va_list params; + + if (die_is_recursing()) { + fputs("fatal: recursion detected in die_errno handler\n", + stderr); + exit(128); + } va_start(params, fmt); - die_routine(fmt_with_err, params); + die_routine(fmt_with_err(buf, sizeof(buf), fmt), params); va_end(params); } +int error_errno(const char *fmt, ...) +{ + char buf[1024]; + va_list params; + + va_start(params, fmt); + error_routine(fmt_with_err(buf, sizeof(buf), fmt), params); + va_end(params); + return -1; +} + #undef error int error(const char *err, ...) { @@ -154,6 +170,16 @@ int error(const char *err, ...) return -1; } +void warning_errno(const char *warn, ...) +{ + char buf[1024]; + va_list params; + + va_start(params, warn); + warn_routine(fmt_with_err(buf, sizeof(buf), warn), params); + va_end(params); +} + void warning(const char *warn, ...) { va_list params; diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c index 57cc1ce..e416caf 100644 --- a/vcs-svn/line_buffer.c +++ b/vcs-svn/line_buffer.c @@ -53,9 +53,9 @@ long buffer_tmpfile_prepare_to_read(struct line_buffer *buf) { long pos = ftell(buf->infile); if (pos < 0) - return error("ftell error: %s", strerror(errno)); + return error_errno("ftell error"); if (fseek(buf->infile, 0, SEEK_SET)) - return error("seek error: %s", strerror(errno)); + return error_errno("seek error"); return pos; } diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c index f11d490..06d273c 100644 --- a/vcs-svn/sliding_window.c +++ b/vcs-svn/sliding_window.c @@ -12,7 +12,7 @@ static int input_error(struct line_buffer *file) { if (!buffer_ferror(file)) return error("delta preimage ends early"); - return error("cannot read delta preimage: %s", strerror(errno)); + return error_errno("cannot read delta preimage"); } static int skip_or_whine(struct line_buffer *file, off_t gap) diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c index 74c97c4..75c7531 100644 --- a/vcs-svn/svndiff.c +++ b/vcs-svn/svndiff.c @@ -64,13 +64,13 @@ static int write_strbuf(struct strbuf *sb, FILE *out) { if (fwrite(sb->buf, 1, sb->len, out) == sb->len) /* Success. */ return 0; - return error("cannot write delta postimage: %s", strerror(errno)); + return error_errno("cannot write delta postimage"); } static int error_short_read(struct line_buffer *input) { if (buffer_ferror(input)) - return error("error reading delta: %s", strerror(errno)); + return error_errno("error reading delta"); return error("invalid delta: unexpected end of file"); } diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index 31d1d83..e4b3959 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -501,7 +501,7 @@ static void init(int report_fd) int svndump_init(const char *filename) { if (buffer_init(&input, filename)) - return error("cannot open %s: %s", filename ? filename : "NULL", strerror(errno)); + return error_errno("cannot open %s", filename ? filename : "NULL"); init(REPORT_FILENO); return 0; } @@ -509,7 +509,7 @@ int svndump_init(const char *filename) int svndump_init_fd(int in_fd, int back_fd) { if(buffer_fdinit(&input, xdup(in_fd))) - return error("cannot open fd %d: %s", in_fd, strerror(errno)); + return error_errno("cannot open fd %d", in_fd); init(xdup(back_fd)); return 0; } @@ -43,12 +43,12 @@ static int process_tree(struct walker *walker, struct tree *tree) if (S_ISGITLINK(entry.mode)) continue; if (S_ISDIR(entry.mode)) { - struct tree *tree = lookup_tree(entry.sha1); + struct tree *tree = lookup_tree(entry.oid->hash); if (tree) obj = &tree->object; } else { - struct blob *blob = lookup_blob(entry.sha1); + struct blob *blob = lookup_blob(entry.oid->hash); if (blob) obj = &blob->object; } @@ -2,6 +2,8 @@ #include "refs.h" #include "strbuf.h" #include "worktree.h" +#include "dir.h" +#include "wt-status.h" void free_worktrees(struct worktree **worktrees) { @@ -9,7 +11,7 @@ void free_worktrees(struct worktree **worktrees) for (i = 0; worktrees[i]; i++) { free(worktrees[i]->path); - free(worktrees[i]->git_dir); + free(worktrees[i]->id); free(worktrees[i]->head_ref); free(worktrees[i]); } @@ -74,13 +76,11 @@ static struct worktree *get_main_worktree(void) struct worktree *worktree = NULL; struct strbuf path = STRBUF_INIT; struct strbuf worktree_path = STRBUF_INIT; - struct strbuf gitdir = STRBUF_INIT; struct strbuf head_ref = STRBUF_INIT; int is_bare = 0; int is_detached = 0; - strbuf_addf(&gitdir, "%s", absolute_path(get_git_common_dir())); - strbuf_addbuf(&worktree_path, &gitdir); + strbuf_addstr(&worktree_path, absolute_path(get_git_common_dir())); is_bare = !strbuf_strip_suffix(&worktree_path, "/.git"); if (is_bare) strbuf_strip_suffix(&worktree_path, "/."); @@ -92,15 +92,15 @@ static struct worktree *get_main_worktree(void) worktree = xmalloc(sizeof(struct worktree)); worktree->path = strbuf_detach(&worktree_path, NULL); - worktree->git_dir = strbuf_detach(&gitdir, NULL); + worktree->id = NULL; worktree->is_bare = is_bare; worktree->head_ref = NULL; worktree->is_detached = is_detached; + worktree->is_current = 0; add_head_info(&head_ref, worktree); done: strbuf_release(&path); - strbuf_release(&gitdir); strbuf_release(&worktree_path); strbuf_release(&head_ref); return worktree; @@ -111,16 +111,13 @@ static struct worktree *get_linked_worktree(const char *id) struct worktree *worktree = NULL; struct strbuf path = STRBUF_INIT; struct strbuf worktree_path = STRBUF_INIT; - struct strbuf gitdir = STRBUF_INIT; struct strbuf head_ref = STRBUF_INIT; int is_detached = 0; if (!id) die("Missing linked worktree name"); - strbuf_addf(&gitdir, "%s/worktrees/%s", - absolute_path(get_git_common_dir()), id); - strbuf_addf(&path, "%s/gitdir", gitdir.buf); + strbuf_git_common_path(&path, "worktrees/%s/gitdir", id); if (strbuf_read_file(&worktree_path, path.buf, 0) <= 0) /* invalid gitdir file */ goto done; @@ -140,20 +137,39 @@ static struct worktree *get_linked_worktree(const char *id) worktree = xmalloc(sizeof(struct worktree)); worktree->path = strbuf_detach(&worktree_path, NULL); - worktree->git_dir = strbuf_detach(&gitdir, NULL); + worktree->id = xstrdup(id); worktree->is_bare = 0; worktree->head_ref = NULL; worktree->is_detached = is_detached; + worktree->is_current = 0; add_head_info(&head_ref, worktree); done: strbuf_release(&path); - strbuf_release(&gitdir); strbuf_release(&worktree_path); strbuf_release(&head_ref); return worktree; } +static void mark_current_worktree(struct worktree **worktrees) +{ + struct strbuf git_dir = STRBUF_INIT; + struct strbuf path = STRBUF_INIT; + int i; + + strbuf_addstr(&git_dir, absolute_path(get_git_dir())); + for (i = 0; worktrees[i]; i++) { + struct worktree *wt = worktrees[i]; + strbuf_addstr(&path, absolute_path(get_worktree_git_dir(wt))); + wt->is_current = !fspathcmp(git_dir.buf, path.buf); + strbuf_reset(&path); + if (wt->is_current) + break; + } + strbuf_release(&git_dir); + strbuf_release(&path); +} + struct worktree **get_worktrees(void) { struct worktree **list = NULL; @@ -185,35 +201,105 @@ struct worktree **get_worktrees(void) } ALLOC_GROW(list, counter + 1, alloc); list[counter] = NULL; + + mark_current_worktree(list); return list; } -char *find_shared_symref(const char *symref, const char *target) +const char *get_worktree_git_dir(const struct worktree *wt) +{ + if (!wt) + return get_git_dir(); + else if (!wt->id) + return get_git_common_dir(); + else + return git_common_path("worktrees/%s", wt->id); +} + +int is_worktree_being_rebased(const struct worktree *wt, + const char *target) +{ + struct wt_status_state state; + int found_rebase; + + memset(&state, 0, sizeof(state)); + found_rebase = wt_status_check_rebase(wt, &state) && + ((state.rebase_in_progress || + state.rebase_interactive_in_progress) && + state.branch && + starts_with(target, "refs/heads/") && + !strcmp(state.branch, target + strlen("refs/heads/"))); + free(state.branch); + free(state.onto); + return found_rebase; +} + +int is_worktree_being_bisected(const struct worktree *wt, + const char *target) { - char *existing = NULL; + struct wt_status_state state; + int found_rebase; + + memset(&state, 0, sizeof(state)); + found_rebase = wt_status_check_bisect(wt, &state) && + state.branch && + starts_with(target, "refs/heads/") && + !strcmp(state.branch, target + strlen("refs/heads/")); + free(state.branch); + return found_rebase; +} + +/* + * note: this function should be able to detect shared symref even if + * HEAD is temporarily detached (e.g. in the middle of rebase or + * bisect). New commands that do similar things should update this + * function as well. + */ +const struct worktree *find_shared_symref(const char *symref, + const char *target) +{ + const struct worktree *existing = NULL; struct strbuf path = STRBUF_INIT; struct strbuf sb = STRBUF_INIT; - struct worktree **worktrees = get_worktrees(); + static struct worktree **worktrees; int i = 0; + if (worktrees) + free_worktrees(worktrees); + worktrees = get_worktrees(); + for (i = 0; worktrees[i]; i++) { + struct worktree *wt = worktrees[i]; + + if (wt->is_detached && !strcmp(symref, "HEAD")) { + if (is_worktree_being_rebased(wt, target)) { + existing = wt; + break; + } + if (is_worktree_being_bisected(wt, target)) { + existing = wt; + break; + } + } + strbuf_reset(&path); strbuf_reset(&sb); - strbuf_addf(&path, "%s/%s", worktrees[i]->git_dir, symref); + strbuf_addf(&path, "%s/%s", + get_worktree_git_dir(wt), + symref); if (parse_ref(path.buf, &sb, NULL)) { continue; } if (!strcmp(sb.buf, target)) { - existing = xstrdup(worktrees[i]->path); + existing = wt; break; } } strbuf_release(&path); strbuf_release(&sb); - free_worktrees(worktrees); return existing; } @@ -3,11 +3,12 @@ struct worktree { char *path; - char *git_dir; + char *id; char *head_ref; unsigned char head_sha1[20]; int is_detached; int is_bare; + int is_current; }; /* Functions for acting on the information about worktrees. */ @@ -23,16 +24,33 @@ struct worktree { extern struct worktree **get_worktrees(void); /* + * Return git dir of the worktree. Note that the path may be relative. + * If wt is NULL, git dir of current worktree is returned. + */ +extern const char *get_worktree_git_dir(const struct worktree *wt); + +/* * Free up the memory for worktree(s) */ extern void free_worktrees(struct worktree **); /* * Check if a per-worktree symref points to a ref in the main worktree - * or any linked worktree, and return the path to the exising worktree - * if it is. Returns NULL if there is no existing ref. The caller is - * responsible for freeing the returned path. + * or any linked worktree, and return the worktree that holds the ref, + * or NULL otherwise. The result may be destroyed by the next call. + */ +extern const struct worktree *find_shared_symref(const char *symref, + const char *target); + +int is_worktree_being_rebased(const struct worktree *wt, const char *target); +int is_worktree_being_bisected(const struct worktree *wt, const char *target); + +/* + * Similar to git_path() but can produce paths for a specified + * worktree instead of current one */ -extern char *find_shared_symref(const char *symref, const char *target); +extern const char *worktree_git_path(const struct worktree *wt, + const char *fmt, ...) + __attribute__((format (printf, 2, 3))); #endif diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh index db0ec6a..22b6e49 100644 --- a/wrap-for-bin.sh +++ b/wrap-for-bin.sh @@ -17,6 +17,7 @@ fi GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'"${GITPERLLIB:+:$GITPERLLIB}" GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale' PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH" + export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR if test -n "$GIT_TEST_GDB" @@ -555,7 +555,7 @@ static int warn_if_unremovable(const char *op, const char *file, int rc) if (!rc || errno == ENOENT) return 0; err = errno; - warning("unable to %s %s: %s", op, file, strerror(errno)); + warning_errno("unable to %s %s", op, file); errno = err; return rc; } @@ -591,7 +591,7 @@ int remove_or_warn(unsigned int mode, const char *file) void warn_on_inaccessible(const char *path) { - warning(_("unable to access '%s': %s"), path, strerror(errno)); + warning_errno(_("unable to access '%s'"), path); } static int access_error_is_ok(int err, unsigned flag) diff --git a/wt-status.c b/wt-status.c index 1ea2ebe..4ce4e35 100644 --- a/wt-status.c +++ b/wt-status.c @@ -15,6 +15,7 @@ #include "column.h" #include "strbuf.h" #include "utf8.h" +#include "worktree.h" static const char cut_line[] = "------------------------ >8 ------------------------\n"; @@ -950,6 +951,7 @@ static void show_merge_in_progress(struct wt_status *s, status_printf_ln(s, color, _(" (fix conflicts and run \"git commit\")")); } else { + s-> commitable = 1; status_printf_ln(s, color, _("All conflicts fixed but you are still merging.")); if (s->hints) @@ -1262,13 +1264,13 @@ static void show_bisect_in_progress(struct wt_status *s, /* * Extract branch information from rebase/bisect */ -static char *read_and_strip_branch(const char *path) +static char *get_branch(const struct worktree *wt, const char *path) { struct strbuf sb = STRBUF_INIT; unsigned char sha1[20]; const char *branch_name; - if (strbuf_read_file(&sb, git_path("%s", path), 0) <= 0) + if (strbuf_read_file(&sb, worktree_git_path(wt, "%s", path), 0) <= 0) goto got_nothing; while (sb.len && sb.buf[sb.len - 1] == '\n') @@ -1360,40 +1362,62 @@ static void wt_status_get_detached_from(struct wt_status_state *state) strbuf_release(&cb.buf); } -void wt_status_get_state(struct wt_status_state *state, - int get_detached_from) +int wt_status_check_rebase(const struct worktree *wt, + struct wt_status_state *state) { struct stat st; - unsigned char sha1[20]; - if (!stat(git_path_merge_head(), &st)) { - state->merge_in_progress = 1; - } else if (!stat(git_path("rebase-apply"), &st)) { - if (!stat(git_path("rebase-apply/applying"), &st)) { + if (!stat(worktree_git_path(wt, "rebase-apply"), &st)) { + if (!stat(worktree_git_path(wt, "rebase-apply/applying"), &st)) { state->am_in_progress = 1; - if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size) + if (!stat(worktree_git_path(wt, "rebase-apply/patch"), &st) && !st.st_size) state->am_empty_patch = 1; } else { state->rebase_in_progress = 1; - state->branch = read_and_strip_branch("rebase-apply/head-name"); - state->onto = read_and_strip_branch("rebase-apply/onto"); + state->branch = get_branch(wt, "rebase-apply/head-name"); + state->onto = get_branch(wt, "rebase-apply/onto"); } - } else if (!stat(git_path("rebase-merge"), &st)) { - if (!stat(git_path("rebase-merge/interactive"), &st)) + } else if (!stat(worktree_git_path(wt, "rebase-merge"), &st)) { + if (!stat(worktree_git_path(wt, "rebase-merge/interactive"), &st)) state->rebase_interactive_in_progress = 1; else state->rebase_in_progress = 1; - state->branch = read_and_strip_branch("rebase-merge/head-name"); - state->onto = read_and_strip_branch("rebase-merge/onto"); + state->branch = get_branch(wt, "rebase-merge/head-name"); + state->onto = get_branch(wt, "rebase-merge/onto"); + } else + return 0; + return 1; +} + +int wt_status_check_bisect(const struct worktree *wt, + struct wt_status_state *state) +{ + struct stat st; + + if (!stat(worktree_git_path(wt, "BISECT_LOG"), &st)) { + state->bisect_in_progress = 1; + state->branch = get_branch(wt, "BISECT_START"); + return 1; + } + return 0; +} + +void wt_status_get_state(struct wt_status_state *state, + int get_detached_from) +{ + struct stat st; + unsigned char sha1[20]; + + if (!stat(git_path_merge_head(), &st)) { + state->merge_in_progress = 1; + } else if (wt_status_check_rebase(NULL, state)) { + ; /* all set */ } else if (!stat(git_path_cherry_pick_head(), &st) && !get_sha1("CHERRY_PICK_HEAD", sha1)) { state->cherry_pick_in_progress = 1; hashcpy(state->cherry_pick_head_sha1, sha1); } - if (!stat(git_path("BISECT_LOG"), &st)) { - state->bisect_in_progress = 1; - state->branch = read_and_strip_branch("BISECT_START"); - } + wt_status_check_bisect(NULL, state); if (!stat(git_path_revert_head(), &st) && !get_sha1("REVERT_HEAD", sha1)) { state->revert_in_progress = 1; @@ -1530,7 +1554,7 @@ void wt_status_print(struct wt_status *s) else printf(_("nothing to commit\n")); } else - printf(_("nothing to commit, working directory clean\n")); + printf(_("nothing to commit, working tree clean\n")); } } diff --git a/wt-status.h b/wt-status.h index c9b3b74..2ca93f6 100644 --- a/wt-status.h +++ b/wt-status.h @@ -6,6 +6,8 @@ #include "color.h" #include "pathspec.h" +struct worktree; + enum color_wt_status { WT_STATUS_HEADER = 0, WT_STATUS_UPDATED, @@ -100,6 +102,10 @@ void wt_status_prepare(struct wt_status *s); void wt_status_print(struct wt_status *s); void wt_status_collect(struct wt_status *s); void wt_status_get_state(struct wt_status_state *state, int get_detached_from); +int wt_status_check_rebase(const struct worktree *wt, + struct wt_status_state *state); +int wt_status_check_bisect(const struct worktree *wt, + struct wt_status_state *state); void wt_shortstatus_print(struct wt_status *s); void wt_porcelain_print(struct wt_status *s); diff --git a/xdiff-interface.c b/xdiff-interface.c index 54236f2..f34ea76 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -100,9 +100,9 @@ static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf) /* * Trim down common substring at the end of the buffers, - * but leave at least ctx lines at the end. + * but end on a complete line. */ -static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx) +static void trim_common_tail(mmfile_t *a, mmfile_t *b) { const int blk = 1024; long trimmed = 0, recovered = 0; @@ -110,9 +110,6 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx) char *bp = b->ptr + b->size; long smaller = (a->size < b->size) ? a->size : b->size; - if (ctx) - return; - while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) { trimmed += blk; ap -= blk; @@ -134,7 +131,8 @@ int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co if (mf1->size > MAX_XDIFF_SIZE || mf2->size > MAX_XDIFF_SIZE) return -1; - trim_common_tail(&a, &b, xecfg->ctxlen); + if (!xecfg->ctxlen && !(xecfg->flags & XDL_EMIT_FUNCCONTEXT)) + trim_common_tail(&a, &b); return xdl_diff(&a, &b, xpp, xecfg, xecb); } diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 4fb7e79..7423f77 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -41,6 +41,8 @@ extern "C" { #define XDF_IGNORE_BLANK_LINES (1 << 7) +#define XDF_COMPACTION_HEURISTIC (1 << 8) + #define XDL_EMIT_FUNCNAMES (1 << 0) #define XDL_EMIT_FUNCCONTEXT (1 << 2) diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 2358a2d..b3c6848 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -400,9 +400,23 @@ static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1, } +static int is_blank_line(xrecord_t **recs, long ix, long flags) +{ + return xdl_blankline(recs[ix]->ptr, recs[ix]->size, flags); +} + +static int recs_match(xrecord_t **recs, long ixs, long ix, long flags) +{ + return (recs[ixs]->ha == recs[ix]->ha && + xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size, + recs[ix]->ptr, recs[ix]->size, + flags)); +} + int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { long ix, ixo, ixs, ixref, grpsiz, nrec = xdf->nrec; char *rchg = xdf->rchg, *rchgo = xdfo->rchg; + unsigned int blank_lines; xrecord_t **recs = xdf->recs; /* @@ -436,14 +450,14 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { do { grpsiz = ix - ixs; + blank_lines = 0; /* * If the line before the current change group, is equal to * the last line of the current change group, shift backward * the group. */ - while (ixs > 0 && recs[ixs - 1]->ha == recs[ix - 1]->ha && - xdl_recmatch(recs[ixs - 1]->ptr, recs[ixs - 1]->size, recs[ix - 1]->ptr, recs[ix - 1]->size, flags)) { + while (ixs > 0 && recs_match(recs, ixs - 1, ix - 1, flags)) { rchg[--ixs] = 1; rchg[--ix] = 0; @@ -470,8 +484,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { * the line next of the current change group, shift forward * the group. */ - while (ix < nrec && recs[ixs]->ha == recs[ix]->ha && - xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size, recs[ix]->ptr, recs[ix]->size, flags)) { + while (ix < nrec && recs_match(recs, ixs, ix, flags)) { + blank_lines += is_blank_line(recs, ix, flags); + rchg[ixs++] = 0; rchg[ix++] = 1; @@ -498,6 +513,23 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { rchg[--ix] = 0; while (rchgo[--ixo]); } + + /* + * If a group can be moved back and forth, see if there is a + * blank line in the moving space. If there is a blank line, + * make sure the last blank line is the end of the group. + * + * As we already shifted the group forward as far as possible + * in the earlier loop, we need to shift it back only if at all. + */ + if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) { + while (ixs > 0 && + !is_blank_line(recs, ix - 1, flags) && + recs_match(recs, ixs - 1, ix - 1, flags)) { + rchg[--ixs] = 1; + rchg[--ix] = 0; + } + } } return 0; diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 993724b..49aa16f 100644 --- a/xdiff/xemit.c +++ b/xdiff/xemit.c @@ -120,6 +120,16 @@ static long def_ff(const char *rec, long len, char *buf, long sz, void *priv) return -1; } +static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri, + char *buf, long sz) +{ + const char *rec; + long len = xdl_get_rec(xdf, ri, &rec); + if (!xecfg->find_func) + return def_ff(rec, len, buf, sz, xecfg->find_func_priv); + return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv); +} + struct func_line { long len; char buf[80]; @@ -128,7 +138,6 @@ struct func_line { static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg, struct func_line *func_line, long start, long limit) { - find_func_t ff = xecfg->find_func ? xecfg->find_func : def_ff; long l, size, step = (start > limit) ? -1 : 1; char *buf, dummy[1]; @@ -136,9 +145,7 @@ static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg, size = func_line ? sizeof(func_line->buf) : sizeof(dummy); for (l = start; l != limit && 0 <= l && l < xe->xdf1.nrec; l += step) { - const char *rec; - long reclen = xdl_get_rec(&xe->xdf1, l, &rec); - long len = ff(rec, reclen, buf, size, xecfg->find_func_priv); + long len = match_func_rec(&xe->xdf1, xecfg, l, buf, size); if (len >= 0) { if (func_line) func_line->len = len; @@ -148,6 +155,18 @@ static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg, return -1; } +static int is_empty_rec(xdfile_t *xdf, long ri) +{ + const char *rec; + long len = xdl_get_rec(xdf, ri, &rec); + + while (len > 0 && XDL_ISSPACE(*rec)) { + rec++; + len--; + } + return !len; +} + int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, xdemitconf_t const *xecfg) { long s1, s2, e1, e2, lctx; @@ -164,7 +183,34 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0); if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) { - long fs1 = get_func_line(xe, xecfg, NULL, xch->i1, -1); + long fs1, i1 = xch->i1; + + /* Appended chunk? */ + if (i1 >= xe->xdf1.nrec) { + char dummy[1]; + long i2 = xch->i2; + + /* + * We don't need additional context if + * a whole function was added, possibly + * starting with empty lines. + */ + while (i2 < xe->xdf2.nrec && + is_empty_rec(&xe->xdf2, i2)) + i2++; + if (i2 < xe->xdf2.nrec && + match_func_rec(&xe->xdf2, xecfg, i2, + dummy, sizeof(dummy)) >= 0) + goto post_context_calculation; + + /* + * Otherwise get more context from the + * pre-image. + */ + i1 = xe->xdf1.nrec - 1; + } + + fs1 = get_func_line(xe, xecfg, NULL, i1, -1); if (fs1 < 0) fs1 = 0; if (fs1 < s1) { @@ -173,7 +219,7 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, } } - again: + post_context_calculation: lctx = xecfg->ctxlen; lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1)); lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2)); @@ -185,6 +231,8 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, long fe1 = get_func_line(xe, xecfg, NULL, xche->i1 + xche->chg1, xe->xdf1.nrec); + while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1)) + fe1--; if (fe1 < 0) fe1 = xe->xdf1.nrec; if (fe1 > e1) { @@ -198,11 +246,12 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, * its new end. */ if (xche->next) { - long l = xche->next->i1; + long l = XDL_MIN(xche->next->i1, + xe->xdf1.nrec - 1); if (l <= e1 || get_func_line(xe, xecfg, NULL, l, e1) < 0) { xche = xche->next; - goto again; + goto post_context_calculation; } } } |