diff options
108 files changed, 27636 insertions, 4303 deletions
diff --git a/Documentation/RelNotes/2.41.0.txt b/Documentation/RelNotes/2.41.0.txt index fa2834bd72..8a9e17016e 100644 --- a/Documentation/RelNotes/2.41.0.txt +++ b/Documentation/RelNotes/2.41.0.txt @@ -3,7 +3,7 @@ Git v2.41 Release Notes UI, Workflows & Features - * Allow information carried on the WWW-AUthenticate header to be + * Allow information carried on the WWW-Authenticate header to be passed to the credential helpers. * A new "fetch.hideRefs" option can be used to exclude specified refs @@ -48,7 +48,7 @@ UI, Workflows & Features * "git clone" from an empty repository learned to propagate the choice of the hash algorithm from the source repository to the - newly created repository. + newly created repository over any one of the v0/v1/v2 protocol. * "git mergetool" and "git difftool" learns a new configuration guiDefault to optionally favor configured guitool over non-gui-tool @@ -65,9 +65,9 @@ UI, Workflows & Features has symbolic links inside its $GIT_DIR; an error message when that happens has been updated. - * "git branch --format=..." and "git format-patch --format=..." - learns "--omit-empty" to hide refs that whose formatting result - becomes an empty string from the output. + * The "--format=..." option of "git for-each-ref", "git branch", and + "git tag" commands learn "--omit-empty" to hide refs whose + formatting results in an empty string from the output. * The sendemail-validate validate hook learned to pass the total number of input files and where in the sequence each invocation is @@ -91,6 +91,32 @@ UI, Workflows & Features * The titles of manual pages used to be chomped at an unreasonably short limit, which has been removed. + * Error messages given when working on an unborn branch that is + checked out in another worktree have been improved. + + * The documentation was misleading about the interaction between + GIT_DEFAULT_HASH and "git clone", which has been clarified to + stress that the variable is to be ignored by the command. + + * "git send-email" learned "--header-cmd=<cmd>" that can inject + arbitrary e-mail header lines to the outgoing messages. + + * "git fsck" learned to detect bit-flip breakages in the reachability + bitmap files. + + * The "--stdin" option of "git name-rev" has been replaced with + the "--annotate-stdin" option more than a year ago. We stop + advertising it in the "git name-rev -h" output. + + * "git push --all" gained an alias "git push --branches". + + * "git fetch" learned the "--porcelain" option that emits what it did + in a machine-parseable format. + + * "git --attr-source=<tree> cmd $args" is a new way to have any + command to read attributes not from the working tree but from the + given tree object. + Performance, Internal Implementation, Development Support etc. @@ -160,6 +186,14 @@ Performance, Internal Implementation, Development Support etc. formatting toolchain, as the upstream default ones give better output these days. + * The tracing mechanism learned to notice and report when + auto-discovered bare repositories are being used, as allowing so + without explicitly stating the user intends to do so (with setting + GIT_DIR for example) can be used with social engineering as an + attack vector. + + * "git diff-files" learned not to expand sparse-index unless needed. + Fixes since v2.40 ----------------- @@ -325,6 +359,20 @@ Fixes since v2.40 specify the end-of-line conversion. (merge 6696077ace ah/doc-attributes-text later to maint). + * Gitk updates from GfW project. + (merge 99e70f3077 js/gitk-fixes-from-gfw later to maint). + + * "git diff --dirstat" leaked memory, which has been plugged. + (merge 83973981eb jc/dirstat-plug-leaks later to maint). + + * "git merge-tree" reads the basic configuration, which can be used + by git forges to disable replace-refs feature. + (merge b6551feadf ds/merge-tree-use-config later to maint). + + * A few bugs in the sequencer machinery that results in miscounting + the steps have been corrected. + (merge 170eea9750 js/rebase-count-fixes later to maint). + * Other code cleanup, docfix, build fix, etc. (merge f7111175df as/doc-markup-fix later to maint). (merge 90ff7c9898 fc/test-aggregation-clean-up later to maint). @@ -346,3 +394,6 @@ Fixes since v2.40 (merge ad353d7e77 ma/gittutorial-fixes later to maint). (merge a5855fd8d4 ar/test-cleanup-unused-file-creation-part2 later to maint). (merge 0c5308af30 sd/doc-gitignore-and-rm-cached later to maint). + (merge cbb83daeaf kh/doc-interpret-trailers-updates later to maint). + (merge 3d77fbb664 ar/config-count-tests-updates later to maint). + (merge b7cf25c8f4 jc/t9800-fix-use-of-show-s-raw later to maint). diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt index afeeccfbfa..51a70781e5 100644 --- a/Documentation/config/http.txt +++ b/Documentation/config/http.txt @@ -246,8 +246,9 @@ significantly since the entire buffer is allocated even for small pushes. http.lowSpeedLimit, http.lowSpeedTime:: - If the HTTP transfer speed is less than 'http.lowSpeedLimit' - for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. + If the HTTP transfer speed, in bytes per second, 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. diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt index 51da7088a8..92a9ebe98c 100644 --- a/Documentation/config/sendemail.txt +++ b/Documentation/config/sendemail.txt @@ -61,6 +61,7 @@ sendemail.ccCmd:: sendemail.chainReplyTo:: sendemail.envelopeSender:: sendemail.from:: +sendemail.headerCmd:: sendemail.signedoffbycc:: sendemail.smtpPass:: sendemail.suppresscc:: diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 08ab86189a..9f33f88771 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -35,8 +35,11 @@ endif::git-diff[] -s:: --no-patch:: - Suppress diff output. Useful for commands like `git show` that - show the patch by default, or to cancel the effect of `--patch`. + Suppress all output from the diff machinery. Useful for + commands like `git show` that show the patch by default to + squelch their output, or to cancel the effect of options like + `--patch`, `--stat` earlier on the command line in an alias. + endif::git-format-patch[] ifdef::git-log[] diff --git a/Documentation/doc-diff b/Documentation/doc-diff index 1694300e50..fb09e0ac0e 100755 --- a/Documentation/doc-diff +++ b/Documentation/doc-diff @@ -153,7 +153,7 @@ render_tree () { make -j$parallel -C "$tmp/worktree" \ $makemanflags \ GIT_VERSION=omitted \ - SOURCE_DATE_EPOCH=0 \ + GIT_DATE=1970-01-01 \ DESTDIR="$tmp/installed/$dname+" \ install-man && mv "$tmp/installed/$dname+" "$tmp/installed/$dname" diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 622bd84768..41fc7ca3c6 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -78,6 +78,13 @@ linkgit:git-config[1]. --dry-run:: Show what would be done, without making any changes. +--porcelain:: + Print the output to standard output in an easy-to-parse format for + scripts. See section OUTPUT in linkgit:git-fetch[1] for details. ++ +This is incompatible with `--recurse-submodules=[yes|on-demand]` and takes +precedence over the `fetch.output` config option. + ifndef::git-pull[] --[no-]write-fetch-head:: Write the list of remote refs fetched in the `FETCH_HEAD` diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index fba66f1460..f123139c58 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -204,6 +204,15 @@ representing the status of a single ref. Each line is of the form: <flag> <summary> <from> -> <to> [<reason>] ------------------------------- +When using `--porcelain`, the output format is intended to be +machine-parseable. In contrast to the human-readable output formats it +thus prints to standard output instead of standard error. Each line is +of the form: + +------------------------------- +<flag> <old-object-id> <new-object-id> <local-reference> +------------------------------- + The status of up-to-date refs is shown only if the --verbose option is used. diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 22ff3a603e..4b97f812be 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -280,7 +280,7 @@ $ cat msg.txt subject message -$ cat msg.txt | git interpret-trailers --trailer 'sign: Alice <alice@example.com>' --trailer 'sign: Bob <bob@example.com>' +$ git interpret-trailers --trailer 'sign: Alice <alice@example.com>' --trailer 'sign: Bob <bob@example.com>' <msg.txt subject message @@ -322,17 +322,30 @@ $ git interpret-trailers --trailer 'Cc: Alice <alice@example.com>' --trailer 'Re 'Signed-off-by: ' already, and show how it works: + ------------ +$ cat msg1.txt +subject + +message $ git config trailer.sign.key "Signed-off-by: " $ git config trailer.sign.ifmissing add $ git config trailer.sign.ifexists doNothing -$ git config trailer.sign.command 'echo "$(git config user.name) <$(git config user.email)>"' -$ git interpret-trailers <<EOF -> EOF +$ git config trailer.sign.cmd 'echo "$(git config user.name) <$(git config user.email)>"' +$ git interpret-trailers --trailer sign <msg1.txt +subject + +message Signed-off-by: Bob <bob@example.com> -$ git interpret-trailers <<EOF -> Signed-off-by: Alice <alice@example.com> -> EOF +$ cat msg2.txt +subject + +message + +Signed-off-by: Alice <alice@example.com> +$ git interpret-trailers --trailer sign <msg2.txt +subject + +message Signed-off-by: Alice <alice@example.com> ------------ @@ -357,15 +370,14 @@ Fix #42 $ cat ~/bin/glog-find-author #!/bin/sh test -n "$1" && git log --author="$1" --pretty="%an <%ae>" -1 || true +$ cat msg.txt +subject + +message $ git config trailer.help.key "Helped-by: " $ git config trailer.help.ifExists "addIfDifferentNeighbor" $ git config trailer.help.cmd "~/bin/glog-find-author" -$ git interpret-trailers --trailer="help:Junio" --trailer="help:Couder" <<EOF -> subject -> -> message -> -> EOF +$ git interpret-trailers --trailer="help:Junio" --trailer="help:Couder" <msg.txt subject message @@ -382,15 +394,14 @@ Helped-by: Christian Couder <christian.couder@gmail.com> $ cat ~/bin/glog-grep #!/bin/sh test -n "$1" && git log --grep "$1" --pretty=reference -1 || true +$ cat msg.txt +subject + +message $ git config trailer.ref.key "Reference-to: " $ git config trailer.ref.ifExists "replace" $ git config trailer.ref.cmd "~/bin/glog-grep" -$ git interpret-trailers --trailer="ref:Add copyright notices." <<EOF -> subject -> -> message -> -> EOF +$ git interpret-trailers --trailer="ref:Add copyright notices." <msg.txt subject message @@ -402,17 +413,20 @@ Reference-to: 8bc9a0c769 (Add copyright notices., 2005-04-07) commit that is related, and show how it works: + ------------ +$ cat msg.txt +subject + +message + +see: HEAD~2 +$ cat ~/bin/glog-ref +#!/bin/sh +git log -1 --oneline --format="%h (%s)" --abbrev-commit --abbrev=14 $ git config trailer.see.key "See-also: " $ git config trailer.see.ifExists "replace" $ git config trailer.see.ifMissing "doNothing" -$ git config trailer.see.command "git log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14 \$ARG" -$ git interpret-trailers <<EOF -> subject -> -> message -> -> see: HEAD~2 -> EOF +$ git config trailer.see.cmd "glog-ref" +$ git interpret-trailers --trailer=see <msg.txt subject message @@ -427,22 +441,21 @@ See-also: fe3187489d69c4 (subject of related commit) to add a 'git-version' trailer: + ------------ -$ sed -e 's/ Z$/ /' >commit_template.txt <<EOF -> ***subject*** -> -> ***message*** -> -> Fixes: Z -> Cc: Z -> Reviewed-by: Z -> Signed-off-by: Z -> EOF +$ cat temp.txt +***subject*** + +***message*** + +Fixes: Z +Cc: Z +Reviewed-by: Z +Signed-off-by: Z +$ sed -e 's/ Z$/ /' temp.txt > commit_template.txt $ git config commit.template commit_template.txt -$ cat >.git/hooks/commit-msg <<EOF -> #!/bin/sh -> git interpret-trailers --trim-empty --trailer "git-version: \$(git describe)" "\$1" > "\$1.new" -> mv "\$1.new" "\$1" -> EOF +$ cat .git/hooks/commit-msg +#!/bin/sh +git interpret-trailers --trim-empty --trailer "git-version: \$(git describe)" "\$1" > "\$1.new" +mv "\$1.new" "\$1" $ chmod +x .git/hooks/commit-msg ------------ diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt index ec8a27ce8b..5c56c87025 100644 --- a/Documentation/git-name-rev.txt +++ b/Documentation/git-name-rev.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git name-rev' [--tags] [--refs=<pattern>] - ( --all | --stdin | <commit-ish>... ) + ( --all | --annotate-stdin | <commit-ish>... ) DESCRIPTION ----------- @@ -46,7 +46,8 @@ OPTIONS Transform stdin by substituting all the 40-character SHA-1 hexes (say $hex) with "$hex ($rev_name)". When used with --name-only, substitute with "$rev_name", omitting $hex - altogether. + altogether. This option was called `--stdin` in older versions + of Git. + For example: + @@ -70,10 +71,6 @@ The full name after substitution is master, while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad ----------- ---stdin:: - This option is deprecated in favor of 'git name-rev --annotate-stdin'. - They are functionally equivalent. - --name-only:: Instead of printing both the SHA-1 and the name, print only the name. If given with --tags the usual tag prefix of @@ -107,7 +104,7 @@ Now you are wiser, because you know that it happened 940 revisions before v0.99. Another nice thing you can do is: ------------ -% git log | git name-rev --stdin +% git log | git name-rev --annotate-stdin ------------ GIT diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 5bb1d5aae2..297927d866 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects SYNOPSIS -------- [verse] -'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>] +'git push' [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose] [-u | --set-upstream] [-o <string> | --push-option=<string>] [--[no-]signed|--signed=(true|false|if-asked)] @@ -147,6 +147,7 @@ already exists on the remote side. `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. --all:: +--branches:: Push all branches (i.e. refs under `refs/heads/`); cannot be used with other <refspec>. diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 6e988a83c5..492a82323d 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -320,6 +320,17 @@ Automating Output of this command must be single email address per line. Default is the value of `sendemail.ccCmd` configuration value. +--header-cmd=<command>:: + Specify a command that is executed once per outgoing message + and output RFC 2822 style header lines to be inserted into + them. When the `sendemail.headerCmd` configuration variable is + set, its value is always used. When --header-cmd is provided + at the command line, its value takes precedence over the + `sendemail.headerCmd` configuration variable. + +--no-header-cmd:: + Disable any header command in use. + --[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 diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 7f61c1edb3..d42efb3112 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -381,6 +381,16 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 include::date-formats.txt[] +FILES +----- + +`$GIT_DIR/TAG_EDITMSG`:: + This file contains the message of an in-progress annotated + tag. If `git tag` exits due to an error before creating an + annotated tag then the tag message that has been provided by the + user in an editor session will be available in this file, but + may be overwritten by the next invocation of `git tag`. + NOTES ----- diff --git a/Documentation/git.txt b/Documentation/git.txt index 74973d3cc4..f0cafa2290 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -212,6 +212,11 @@ If you just want to run git as if it was started in `<path>` then use nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands) +--attr-source=<tree-ish>:: + Read gitattributes from <tree-ish> instead of the worktree. See + linkgit:gitattributes[5]. This is equivalent to setting the + `GIT_ATTR_SOURCE` environment variable. + GIT COMMANDS ------------ @@ -546,9 +551,9 @@ double-quotes and respecting backslash escapes. E.g., the value `GIT_DEFAULT_HASH`:: If this variable is set, the default hash algorithm for new - repositories will be set to this value. This value is currently - ignored when cloning; the setting of the remote repository - is used instead. The default is "sha1". THIS VARIABLE IS + repositories will be set to this value. This value is + ignored when cloning and the setting of the remote repository + is always used. The default is "sha1". THIS VARIABLE IS EXPERIMENTAL! See `--object-format` in linkgit:git-init[1]. Git Commits @@ -686,6 +691,9 @@ for further details. tells Git not to verify the SSL certificate when fetching or pushing over HTTPS. +`GIT_ATTR_SOURCE`:: + Sets the treeish that gitattributes will be read from. + `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) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 9a1111af9b..b37f72a552 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.40.GIT +DEF_VER=v2.41.0 LF=' ' @@ -130,7 +130,7 @@ static const struct attr_check *get_archive_attrs(struct index_state *istate, static struct attr_check *check; if (!check) check = attr_check_initl("export-ignore", "export-subst", NULL); - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); return check; } @@ -21,6 +21,7 @@ #include "setup.h" #include "thread-utils.h" #include "tree-walk.h" +#include "object-name.h" const char git_attr__true[] = "(builtin)true"; const char git_attr__false[] = "\0(builtin)false"; @@ -1170,11 +1171,42 @@ static void collect_some_attrs(struct index_state *istate, fill(path, pathlen, basename_offset, check->stack, check->all_attrs, rem); } +static const char *default_attr_source_tree_object_name; + +void set_git_attr_source(const char *tree_object_name) +{ + default_attr_source_tree_object_name = xstrdup(tree_object_name); +} + +static void compute_default_attr_source(struct object_id *attr_source) +{ + if (!default_attr_source_tree_object_name) + default_attr_source_tree_object_name = getenv(GIT_ATTR_SOURCE_ENVIRONMENT); + + if (!default_attr_source_tree_object_name || !is_null_oid(attr_source)) + return; + + if (repo_get_oid_treeish(the_repository, default_attr_source_tree_object_name, attr_source)) + die(_("bad --attr-source or GIT_ATTR_SOURCE")); +} + +static struct object_id *default_attr_source(void) +{ + static struct object_id attr_source; + + if (is_null_oid(&attr_source)) + compute_default_attr_source(&attr_source); + if (is_null_oid(&attr_source)) + return NULL; + return &attr_source; +} + void git_check_attr(struct index_state *istate, - const struct object_id *tree_oid, const char *path, + const char *path, struct attr_check *check) { int i; + const struct object_id *tree_oid = default_attr_source(); collect_some_attrs(istate, tree_oid, path, check); @@ -1187,10 +1219,11 @@ void git_check_attr(struct index_state *istate, } } -void git_all_attrs(struct index_state *istate, const struct object_id *tree_oid, +void git_all_attrs(struct index_state *istate, const char *path, struct attr_check *check) { int i; + const struct object_id *tree_oid = default_attr_source(); attr_check_reset(check); collect_some_attrs(istate, tree_oid, path, check); @@ -45,7 +45,7 @@ * const char *path; * * setup_check(); - * git_check_attr(&the_index, tree_oid, path, check); + * git_check_attr(&the_index, path, check); * ------------ * * - Act on `.value` member of the result, left in `check->items[]`: @@ -120,7 +120,6 @@ #define ATTR_MAX_FILE_SIZE (100 * 1024 * 1024) struct index_state; -struct object_id; /** * An attribute is an opaque object that is identified by its name. Pass the @@ -136,6 +135,12 @@ struct all_attrs_item; struct attr_stack; /* + * The textual object name for the tree-ish used by git_check_attr() + * to read attributes from (instead of from the working tree). + */ +void set_git_attr_source(const char *); + +/* * Given a string, return the gitattribute object that * corresponds to it. */ @@ -203,14 +208,14 @@ void attr_check_free(struct attr_check *check); const char *git_attr_name(const struct git_attr *); void git_check_attr(struct index_state *istate, - const struct object_id *tree_oid, const char *path, + const char *path, struct attr_check *check); /* * Retrieve all attributes that apply to the specified path. * check holds the attributes and their values. */ -void git_all_attrs(struct index_state *istate, const struct object_id *tree_oid, +void git_all_attrs(struct index_state *istate, const char *path, struct attr_check *check); enum git_attr_direction { @@ -840,30 +840,3 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree) free_worktrees(worktrees); } - -int replace_each_worktree_head_symref(const char *oldref, const char *newref, - const char *logmsg) -{ - int ret = 0; - struct worktree **worktrees = get_worktrees(); - int i; - - for (i = 0; worktrees[i]; i++) { - struct ref_store *refs; - - if (worktrees[i]->is_detached) - continue; - if (!worktrees[i]->head_ref) - continue; - if (strcmp(oldref, worktrees[i]->head_ref)) - continue; - - refs = get_worktree_ref_store(worktrees[i]); - if (refs_create_symref(refs, "HEAD", newref, logmsg)) - ret = error(_("HEAD of working tree %s is not updated"), - worktrees[i]->path); - } - - free_worktrees(worktrees); - return ret; -} @@ -155,12 +155,4 @@ int read_branch_desc(struct strbuf *, const char *branch_name); */ 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. - * This will be used when renaming a branch. Returns 0 if successful, non-zero - * otherwise. - */ -int replace_each_worktree_head_symref(const char *oldref, const char *newref, - const char *logmsg); - #endif diff --git a/builtin/branch.c b/builtin/branch.c index 501c47657c..e6c2655af6 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -512,9 +512,9 @@ static void print_current_branch_name(void) die(_("HEAD (%s) points outside of refs/heads/"), refname); } -static void reject_rebase_or_bisect_branch(const char *target) +static void reject_rebase_or_bisect_branch(struct worktree **worktrees, + const char *target) { - struct worktree **worktrees = get_worktrees(); int i; for (i = 0; worktrees[i]; i++) { @@ -531,17 +531,50 @@ static void reject_rebase_or_bisect_branch(const char *target) die(_("Branch %s is being bisected at %s"), target, wt->path); } +} - free_worktrees(worktrees); +/* + * Update all per-worktree HEADs pointing at the old ref to point the new ref. + * This will be used when renaming a branch. Returns 0 if successful, non-zero + * otherwise. + */ +static int replace_each_worktree_head_symref(struct worktree **worktrees, + const char *oldref, const char *newref, + const char *logmsg) +{ + int ret = 0; + int i; + + for (i = 0; worktrees[i]; i++) { + struct ref_store *refs; + + if (worktrees[i]->is_detached) + continue; + if (!worktrees[i]->head_ref) + continue; + if (strcmp(oldref, worktrees[i]->head_ref)) + continue; + + refs = get_worktree_ref_store(worktrees[i]); + if (refs_create_symref(refs, "HEAD", newref, logmsg)) + ret = error(_("HEAD of working tree %s is not updated"), + worktrees[i]->path); + } + + return ret; } +#define IS_HEAD 1 +#define IS_ORPHAN 2 + static void copy_or_rename_branch(const char *oldname, const char *newname, int copy, int force) { struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; const char *interpreted_oldname = NULL; const char *interpreted_newname = NULL; - int recovery = 0; + int recovery = 0, oldref_usage = 0; + struct worktree **worktrees = get_worktrees(); if (strbuf_check_branch_ref(&oldref, oldname)) { /* @@ -554,8 +587,19 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int die(_("Invalid branch name: '%s'"), oldname); } - if ((copy || strcmp(head, oldname)) && !ref_exists(oldref.buf)) { - if (copy && !strcmp(head, oldname)) + for (int i = 0; worktrees[i]; i++) { + struct worktree *wt = worktrees[i]; + + if (wt->head_ref && !strcmp(oldref.buf, wt->head_ref)) { + oldref_usage |= IS_HEAD; + if (is_null_oid(&wt->head_oid)) + oldref_usage |= IS_ORPHAN; + break; + } + } + + if ((copy || !(oldref_usage & IS_HEAD)) && !ref_exists(oldref.buf)) { + if (oldref_usage & IS_HEAD) die(_("No commit on branch '%s' yet."), oldname); else die(_("No branch named '%s'."), oldname); @@ -570,7 +614,7 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int else validate_new_branchname(newname, &newref, force); - reject_rebase_or_bisect_branch(oldref.buf); + reject_rebase_or_bisect_branch(worktrees, oldref.buf); if (!skip_prefix(oldref.buf, "refs/heads/", &interpreted_oldname) || !skip_prefix(newref.buf, "refs/heads/", &interpreted_newname)) { @@ -584,8 +628,7 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int strbuf_addf(&logmsg, "Branch: renamed %s to %s", oldref.buf, newref.buf); - if (!copy && - (!head || strcmp(oldname, head) || !is_null_oid(&head_oid)) && + if (!copy && !(oldref_usage & IS_ORPHAN) && rename_ref(oldref.buf, newref.buf, logmsg.buf)) die(_("Branch rename failed")); if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf)) @@ -600,8 +643,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int interpreted_oldname); } - if (!copy && - replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf)) + if (!copy && (oldref_usage & IS_HEAD) && + replace_each_worktree_head_symref(worktrees, oldref.buf, newref.buf, + logmsg.buf)) die(_("Branch renamed to %s, but HEAD is not updated!"), newname); strbuf_release(&logmsg); @@ -616,6 +660,7 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int strbuf_release(&newref); strbuf_release(&oldsection); strbuf_release(&newsection); + free_worktrees(worktrees); } static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION") @@ -834,7 +879,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); if (!ref_exists(branch_ref.buf)) - error((!argc || !strcmp(head, branch_name)) + error((!argc || branch_checked_out(branch_ref.buf)) ? _("No commit on branch '%s' yet.") : _("No branch named '%s'."), branch_name); @@ -879,7 +924,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) } if (!ref_exists(branch->refname)) { - if (!argc || !strcmp(head, branch->name)) + if (!argc || branch_checked_out(branch->refname)) die(_("No commit on branch '%s' yet."), branch->name); die(_("branch '%s' does not exist"), branch->name); } diff --git a/builtin/check-attr.c b/builtin/check-attr.c index b2b678847f..e27b86d150 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -64,7 +64,7 @@ static void output_attr(struct attr_check *check, const char *file) } static void check_attr(const char *prefix, struct attr_check *check, - const struct object_id *tree_oid, int collect_all, + int collect_all, const char *file) { @@ -72,9 +72,9 @@ static void check_attr(const char *prefix, struct attr_check *check, prefix_path(prefix, prefix ? strlen(prefix) : 0, file); if (collect_all) { - git_all_attrs(&the_index, tree_oid, full_path, check); + git_all_attrs(&the_index, full_path, check); } else { - git_check_attr(&the_index, tree_oid, full_path, check); + git_check_attr(&the_index, full_path, check); } output_attr(check, file); @@ -82,7 +82,7 @@ static void check_attr(const char *prefix, struct attr_check *check, } static void check_attr_stdin_paths(const char *prefix, struct attr_check *check, - const struct object_id *tree_oid, int collect_all) + int collect_all) { struct strbuf buf = STRBUF_INIT; struct strbuf unquoted = STRBUF_INIT; @@ -96,7 +96,7 @@ static void check_attr_stdin_paths(const char *prefix, struct attr_check *check, die("line is badly quoted"); strbuf_swap(&buf, &unquoted); } - check_attr(prefix, check, tree_oid, collect_all, buf.buf); + check_attr(prefix, check, collect_all, buf.buf); maybe_flush_or_die(stdout, "attribute to stdout"); } strbuf_release(&buf); @@ -112,7 +112,6 @@ static NORETURN void error_with_usage(const char *msg) int cmd_check_attr(int argc, const char **argv, const char *prefix) { struct attr_check *check; - struct object_id *tree_oid = NULL; struct object_id initialized_oid; int cnt, i, doubledash, filei; @@ -188,14 +187,14 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix) if (source) { if (repo_get_oid_tree(the_repository, source, &initialized_oid)) die("%s: not a valid tree-ish source", source); - tree_oid = &initialized_oid; + set_git_attr_source(source); } if (stdin_paths) - check_attr_stdin_paths(prefix, check, tree_oid, all_attrs); + check_attr_stdin_paths(prefix, check, all_attrs); else { for (i = filei; i < argc; i++) - check_attr(prefix, check, tree_oid, all_attrs, argv[i]); + check_attr(prefix, check, all_attrs, argv[i]); maybe_flush_or_die(stdout, "attribute to stdout"); } diff --git a/builtin/diff-files.c b/builtin/diff-files.c index dc991f753b..360464e6ef 100644 --- a/builtin/diff-files.c +++ b/builtin/diff-files.c @@ -27,6 +27,10 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) usage(diff_files_usage); git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ + + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + repo_init_revisions(the_repository, &rev, prefix); rev.abbrev = 0; diff --git a/builtin/fetch.c b/builtin/fetch.c index 4d7c289752..849a9be421 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -57,11 +57,18 @@ enum { TAGS_SET = 2 }; +enum display_format { + DISPLAY_FORMAT_UNKNOWN = 0, + DISPLAY_FORMAT_FULL, + DISPLAY_FORMAT_COMPACT, + DISPLAY_FORMAT_PORCELAIN, +}; + struct display_state { struct strbuf buf; int refcol_width; - int compact_format; + enum display_format format; char *url; int url_len, shown_url; @@ -78,13 +85,12 @@ static int fetch_prune_tags_config = -1; /* unspecified */ static int prune_tags = -1; /* unspecified */ #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */ -static int all, append, dry_run, force, keep, multiple, update_head_ok; +static int append, dry_run, force, keep, update_head_ok; static int write_fetch_head = 1; static int verbosity, deepen_relative, set_upstream, refetch; static int progress = -1; -static int enable_auto_gc = 1; -static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen; -static int max_jobs = -1, submodule_fetch_jobs_config = -1; +static int tags = TAGS_DEFAULT, update_shallow, deepen; +static int submodule_fetch_jobs_config = -1; static int fetch_parallel_config = 1; static int atomic_fetch; static enum transport_family family; @@ -95,20 +101,20 @@ static struct string_list deepen_not = STRING_LIST_INIT_NODUP; static struct strbuf default_rla = STRBUF_INIT; static struct transport *gtransport; static struct transport *gsecondary; -static const char *submodule_prefix = ""; static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; -static int recurse_submodules_cli = RECURSE_SUBMODULES_DEFAULT; -static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND; static struct refspec refmap = REFSPEC_INIT_FETCH; static struct list_objects_filter_options filter_options = LIST_OBJECTS_FILTER_INIT; static struct string_list server_options = STRING_LIST_INIT_DUP; static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP; -static int fetch_write_commit_graph = -1; -static int stdin_refspecs = 0; -static int negotiate_only; + +struct fetch_config { + enum display_format display_format; +}; static int git_fetch_config(const char *k, const char *v, void *cb) { + struct fetch_config *fetch_config = cb; + if (!strcmp(k, "fetch.prune")) { fetch_prune_config = git_config_bool(k, v); return 0; @@ -147,6 +153,18 @@ static int git_fetch_config(const char *k, const char *v, void *cb) return 0; } + if (!strcmp(k, "fetch.output")) { + if (!v) + return config_error_nonbool(k); + else if (!strcasecmp(v, "full")) + fetch_config->display_format = DISPLAY_FORMAT_FULL; + else if (!strcasecmp(v, "compact")) + fetch_config->display_format = DISPLAY_FORMAT_COMPACT; + else + die(_("invalid value for '%s': '%s'"), + "fetch.output", v); + } + return git_default_config(k, v, cb); } @@ -163,92 +181,6 @@ static int parse_refmap_arg(const struct option *opt, const char *arg, int unset return 0; } -static struct option builtin_fetch_options[] = { - OPT__VERBOSITY(&verbosity), - OPT_BOOL(0, "all", &all, - N_("fetch from all remotes")), - OPT_BOOL(0, "set-upstream", &set_upstream, - N_("set upstream for git pull/fetch")), - OPT_BOOL('a', "append", &append, - N_("append to .git/FETCH_HEAD instead of overwriting")), - OPT_BOOL(0, "atomic", &atomic_fetch, - N_("use atomic transaction to update references")), - OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), - N_("path to upload pack on remote end")), - OPT__FORCE(&force, N_("force overwrite of local reference"), 0), - OPT_BOOL('m', "multiple", &multiple, - N_("fetch from multiple remotes")), - OPT_SET_INT('t', "tags", &tags, - N_("fetch all tags and associated objects"), TAGS_SET), - OPT_SET_INT('n', NULL, &tags, - N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), - OPT_INTEGER('j', "jobs", &max_jobs, - N_("number of submodules fetched in parallel")), - OPT_BOOL(0, "prefetch", &prefetch, - N_("modify the refspec to place all refs within refs/prefetch/")), - OPT_BOOL('p', "prune", &prune, - N_("prune remote-tracking branches no longer on remote")), - OPT_BOOL('P', "prune-tags", &prune_tags, - N_("prune local tags no longer on remote and clobber changed tags")), - OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules_cli, N_("on-demand"), - N_("control recursive fetching of submodules"), - PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), - OPT_BOOL(0, "dry-run", &dry_run, - N_("dry run")), - OPT_BOOL(0, "write-fetch-head", &write_fetch_head, - N_("write fetched references to the FETCH_HEAD file")), - OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), - OPT_BOOL('u', "update-head-ok", &update_head_ok, - N_("allow updating of HEAD ref")), - OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), - OPT_STRING(0, "depth", &depth, N_("depth"), - N_("deepen history of shallow clone")), - OPT_STRING(0, "shallow-since", &deepen_since, N_("time"), - N_("deepen history of shallow repository based on time")), - OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"), - N_("deepen history of shallow clone, excluding rev")), - OPT_INTEGER(0, "deepen", &deepen_relative, - N_("deepen history of shallow clone")), - OPT_SET_INT_F(0, "unshallow", &unshallow, - N_("convert to a complete repository"), - 1, PARSE_OPT_NONEG), - OPT_SET_INT_F(0, "refetch", &refetch, - N_("re-fetch without negotiating common commits"), - 1, PARSE_OPT_NONEG), - { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), - N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, - OPT_CALLBACK_F(0, "recurse-submodules-default", - &recurse_submodules_default, N_("on-demand"), - N_("default for recursive fetching of submodules " - "(lower priority than config files)"), - PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules), - OPT_BOOL(0, "update-shallow", &update_shallow, - N_("accept refs that update .git/shallow")), - OPT_CALLBACK_F(0, "refmap", NULL, N_("refmap"), - N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg), - OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")), - OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"), - TRANSPORT_FAMILY_IPV4), - OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"), - TRANSPORT_FAMILY_IPV6), - OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"), - N_("report that we have only objects reachable from this object")), - OPT_BOOL(0, "negotiate-only", &negotiate_only, - N_("do not fetch a packfile; instead, print ancestors of negotiation tips")), - OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), - OPT_BOOL(0, "auto-maintenance", &enable_auto_gc, - N_("run 'maintenance --auto' after fetching")), - OPT_BOOL(0, "auto-gc", &enable_auto_gc, - N_("run 'maintenance --auto' after fetching")), - OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates, - N_("check for forced-updates on all updated branches")), - OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph, - N_("write the commit-graph after fetching")), - OPT_BOOL(0, "stdin", &stdin_refspecs, - N_("accept refspecs from stdin")), - OPT_END() -}; - static void unlock_pack(unsigned int flags) { if (gtransport) @@ -760,46 +692,56 @@ out: return ret; } -static int refcol_width(const struct ref *ref, int compact_format) +static int refcol_width(const struct ref *ref_map, int compact_format) { - int max, rlen, llen, len; + const struct ref *ref; + int max, width = 10; - /* uptodate lines are only shown on high verbosity level */ - if (verbosity <= 0 && oideq(&ref->peer_ref->old_oid, &ref->old_oid)) - return 0; + max = term_columns(); + if (compact_format) + max = max * 2 / 3; - max = term_columns(); - rlen = utf8_strwidth(prettify_refname(ref->name)); + for (ref = ref_map; ref; ref = ref->next) { + int rlen, llen = 0, len; - llen = utf8_strwidth(prettify_refname(ref->peer_ref->name)); + if (ref->status == REF_STATUS_REJECT_SHALLOW || + !ref->peer_ref || + !strcmp(ref->name, "HEAD")) + continue; - /* - * rough estimation to see if the output line is too long and - * should not be counted (we can't do precise calculation - * anyway because we don't know if the error explanation part - * will be printed in update_local_ref) - */ - if (compact_format) { - llen = 0; - max = max * 2 / 3; + /* uptodate lines are only shown on high verbosity level */ + if (verbosity <= 0 && oideq(&ref->peer_ref->old_oid, &ref->old_oid)) + continue; + + rlen = utf8_strwidth(prettify_refname(ref->name)); + if (!compact_format) + llen = utf8_strwidth(prettify_refname(ref->peer_ref->name)); + + /* + * rough estimation to see if the output line is too long and + * should not be counted (we can't do precise calculation + * anyway because we don't know if the error explanation part + * will be printed in update_local_ref) + */ + len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen; + if (len >= max) + continue; + + if (width < rlen) + width = rlen; } - len = 21 /* flag and summary */ + rlen + 4 /* -> */ + llen; - if (len >= max) - return 0; - return rlen; + return width; } static void display_state_init(struct display_state *display_state, struct ref *ref_map, - const char *raw_url) + const char *raw_url, enum display_format format) { - struct ref *rm; - const char *format = "full"; int i; memset(display_state, 0, sizeof(*display_state)); - strbuf_init(&display_state->buf, 0); + display_state->format = format; if (raw_url) display_state->url = transport_anonymize_url(raw_url); @@ -816,33 +758,17 @@ static void display_state_init(struct display_state *display_state, struct ref * if (verbosity < 0) return; - git_config_get_string_tmp("fetch.output", &format); - if (!strcasecmp(format, "full")) - display_state->compact_format = 0; - else if (!strcasecmp(format, "compact")) - display_state->compact_format = 1; - else - die(_("invalid value for '%s': '%s'"), - "fetch.output", format); - - display_state->refcol_width = 10; - for (rm = ref_map; rm; rm = rm->next) { - int width; - - if (rm->status == REF_STATUS_REJECT_SHALLOW || - !rm->peer_ref || - !strcmp(rm->name, "HEAD")) - continue; - - width = refcol_width(rm, display_state->compact_format); - - /* - * Not precise calculation for compact mode because '*' can - * appear on the left hand side of '->' and shrink the column - * back. - */ - if (display_state->refcol_width < width) - display_state->refcol_width = width; + switch (display_state->format) { + case DISPLAY_FORMAT_FULL: + case DISPLAY_FORMAT_COMPACT: + display_state->refcol_width = refcol_width(ref_map, + display_state->format == DISPLAY_FORMAT_COMPACT); + break; + case DISPLAY_FORMAT_PORCELAIN: + /* We don't need to precompute anything here. */ + break; + default: + BUG("unexpected display format %d", display_state->format); } } @@ -911,39 +837,61 @@ static void print_compact(struct display_state *display_state, static void display_ref_update(struct display_state *display_state, char code, const char *summary, const char *error, const char *remote, const char *local, + const struct object_id *old_oid, + const struct object_id *new_oid, int summary_width) { - int width; + FILE *f = stderr; if (verbosity < 0) return; strbuf_reset(&display_state->buf); - if (!display_state->shown_url) { - strbuf_addf(&display_state->buf, _("From %.*s\n"), - display_state->url_len, display_state->url); - display_state->shown_url = 1; - } + switch (display_state->format) { + case DISPLAY_FORMAT_FULL: + case DISPLAY_FORMAT_COMPACT: { + int width; - width = (summary_width + strlen(summary) - gettext_width(summary)); + if (!display_state->shown_url) { + strbuf_addf(&display_state->buf, _("From %.*s\n"), + display_state->url_len, display_state->url); + display_state->shown_url = 1; + } - strbuf_addf(&display_state->buf, " %c %-*s ", code, width, summary); - if (!display_state->compact_format) - print_remote_to_local(display_state, remote, prettify_refname(local)); - else - print_compact(display_state, remote, prettify_refname(local)); - if (error) - strbuf_addf(&display_state->buf, " (%s)", error); + width = (summary_width + strlen(summary) - gettext_width(summary)); + remote = prettify_refname(remote); + local = prettify_refname(local); + + strbuf_addf(&display_state->buf, " %c %-*s ", code, width, summary); + + if (display_state->format != DISPLAY_FORMAT_COMPACT) + print_remote_to_local(display_state, remote, local); + else + print_compact(display_state, remote, local); + + if (error) + strbuf_addf(&display_state->buf, " (%s)", error); + + break; + } + case DISPLAY_FORMAT_PORCELAIN: + strbuf_addf(&display_state->buf, "%c %s %s %s", code, + oid_to_hex(old_oid), oid_to_hex(new_oid), local); + f = stdout; + break; + default: + BUG("unexpected display format %d", display_state->format); + }; strbuf_addch(&display_state->buf, '\n'); - fputs(display_state->buf.buf, stderr); + fputs(display_state->buf.buf, f); } static int update_local_ref(struct ref *ref, struct ref_transaction *transaction, struct display_state *display_state, - const char *remote, const struct ref *remote_ref, + const struct ref *remote_ref, int summary_width) { struct commit *current = NULL, *updated; @@ -955,7 +903,8 @@ static int update_local_ref(struct ref *ref, if (oideq(&ref->old_oid, &ref->new_oid)) { if (verbosity > 0) display_ref_update(display_state, '=', _("[up to date]"), NULL, - remote, ref->name, summary_width); + remote_ref->name, ref->name, + &ref->old_oid, &ref->new_oid, summary_width); return 0; } @@ -968,7 +917,8 @@ static int update_local_ref(struct ref *ref, */ display_ref_update(display_state, '!', _("[rejected]"), _("can't fetch into checked-out branch"), - remote, ref->name, summary_width); + remote_ref->name, ref->name, + &ref->old_oid, &ref->new_oid, summary_width); return 1; } @@ -979,12 +929,14 @@ static int update_local_ref(struct ref *ref, r = s_update_ref("updating tag", ref, transaction, 0); display_ref_update(display_state, r ? '!' : 't', _("[tag update]"), r ? _("unable to update local ref") : NULL, - remote, ref->name, summary_width); + remote_ref->name, ref->name, + &ref->old_oid, &ref->new_oid, summary_width); return r; } else { display_ref_update(display_state, '!', _("[rejected]"), _("would clobber existing tag"), - remote, ref->name, summary_width); + remote_ref->name, ref->name, + &ref->old_oid, &ref->new_oid, summary_width); return 1; } } @@ -1017,7 +969,8 @@ static int update_local_ref(struct ref *ref, r = s_update_ref(msg, ref, transaction, 0); display_ref_update(display_state, r ? '!' : '*', what, r ? _("unable to update local ref") : NULL, - remote, ref->name, summary_width); + remote_ref->name, ref->name, + &ref->old_oid, &ref->new_oid, summary_width); return r; } @@ -1040,7 +993,8 @@ static int update_local_ref(struct ref *ref, r = s_update_ref("fast-forward", ref, transaction, 1); display_ref_update(display_state, r ? '!' : ' ', quickref.buf, r ? _("unable to update local ref") : NULL, - remote, ref->name, summary_width); + remote_ref->name, ref->name, + &ref->old_oid, &ref->new_oid, summary_width); strbuf_release(&quickref); return r; } else if (force || ref->force) { @@ -1052,12 +1006,14 @@ static int update_local_ref(struct ref *ref, r = s_update_ref("forced-update", ref, transaction, 1); display_ref_update(display_state, r ? '!' : '+', quickref.buf, r ? _("unable to update local ref") : _("forced update"), - remote, ref->name, summary_width); + remote_ref->name, ref->name, + &ref->old_oid, &ref->new_oid, summary_width); strbuf_release(&quickref); return r; } else { display_ref_update(display_state, '!', _("[rejected]"), _("non-fast-forward"), - remote, ref->name, summary_width); + remote_ref->name, ref->name, + &ref->old_oid, &ref->new_oid, summary_width); return 1; } } @@ -1262,14 +1218,13 @@ static int store_updated_refs(struct display_state *display_state, if (!strcmp(rm->name, "HEAD")) { kind = ""; what = ""; - } - else if (skip_prefix(rm->name, "refs/heads/", &what)) + } else if (skip_prefix(rm->name, "refs/heads/", &what)) { kind = "branch"; - else if (skip_prefix(rm->name, "refs/tags/", &what)) + } else if (skip_prefix(rm->name, "refs/tags/", &what)) { kind = "tag"; - else if (skip_prefix(rm->name, "refs/remotes/", &what)) + } else if (skip_prefix(rm->name, "refs/remotes/", &what)) { kind = "remote-tracking branch"; - else { + } else { kind = ""; what = rm->name; } @@ -1287,7 +1242,7 @@ static int store_updated_refs(struct display_state *display_state, display_state->url_len); if (ref) { - rc |= update_local_ref(ref, transaction, display_state, what, + rc |= update_local_ref(ref, transaction, display_state, rm, summary_width); free(ref); } else if (write_fetch_head || dry_run) { @@ -1298,8 +1253,10 @@ static int store_updated_refs(struct display_state *display_state, */ display_ref_update(display_state, '*', *kind ? kind : "branch", NULL, - *what ? what : "HEAD", - "FETCH_HEAD", summary_width); + rm->name, + "FETCH_HEAD", + &rm->new_oid, &rm->old_oid, + summary_width); } } } @@ -1439,6 +1396,7 @@ static int prune_refs(struct display_state *display_state, for (ref = stale_refs; ref; ref = ref->next) { display_ref_update(display_state, '-', _("[deleted]"), NULL, _("(none)"), ref->name, + &ref->new_oid, &ref->old_oid, summary_width); warn_dangling_symref(stderr, dangling_msg, ref->name); } @@ -1596,7 +1554,8 @@ static int backfill_tags(struct display_state *display_state, } static int do_fetch(struct transport *transport, - struct refspec *rs) + struct refspec *rs, + enum display_format display_format) { struct ref_transaction *transaction = NULL; struct ref *ref_map = NULL; @@ -1682,7 +1641,7 @@ static int do_fetch(struct transport *transport, if (retcode) goto cleanup; - display_state_init(&display_state, ref_map, transport->url); + display_state_init(&display_state, ref_map, transport->url, display_format); if (atomic_fetch) { transaction = ref_transaction_begin(&err); @@ -1870,7 +1829,8 @@ static int add_remote_or_group(const char *name, struct string_list *list) return 1; } -static void add_options_to_argv(struct strvec *argv) +static void add_options_to_argv(struct strvec *argv, + enum display_format format) { if (dry_run) strvec_push(argv, "--dry-run"); @@ -1886,6 +1846,8 @@ static void add_options_to_argv(struct strvec *argv) strvec_push(argv, "--keep"); if (recurse_submodules == RECURSE_SUBMODULES_ON) strvec_push(argv, "--recurse-submodules"); + else if (recurse_submodules == RECURSE_SUBMODULES_OFF) + strvec_push(argv, "--no-recurse-submodules"); else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) strvec_push(argv, "--recurse-submodules=on-demand"); if (tags == TAGS_SET) @@ -1904,6 +1866,8 @@ static void add_options_to_argv(struct strvec *argv) strvec_push(argv, "--ipv6"); if (!write_fetch_head) strvec_push(argv, "--no-write-fetch-head"); + if (format == DISPLAY_FORMAT_PORCELAIN) + strvec_pushf(argv, "--porcelain"); } /* Fetch multiple remotes in parallel */ @@ -1912,6 +1876,7 @@ struct parallel_fetch_state { const char **argv; struct string_list *remotes; int next, result; + enum display_format format; }; static int fetch_next_remote(struct child_process *cp, @@ -1931,7 +1896,7 @@ static int fetch_next_remote(struct child_process *cp, strvec_push(&cp->args, remote); cp->git_cmd = 1; - if (verbosity >= 0) + if (verbosity >= 0 && state->format != DISPLAY_FORMAT_PORCELAIN) printf(_("Fetching %s\n"), remote); return 1; @@ -1963,7 +1928,8 @@ static int fetch_finished(int result, struct strbuf *out, return 0; } -static int fetch_multiple(struct string_list *list, int max_children) +static int fetch_multiple(struct string_list *list, int max_children, + enum display_format format) { int i, result = 0; struct strvec argv = STRVEC_INIT; @@ -1981,10 +1947,10 @@ static int fetch_multiple(struct string_list *list, int max_children) strvec_pushl(&argv, "-c", "fetch.bundleURI=", "fetch", "--append", "--no-auto-gc", "--no-write-commit-graph", NULL); - add_options_to_argv(&argv); + add_options_to_argv(&argv, format); if (max_children != 1 && list->nr != 1) { - struct parallel_fetch_state state = { argv.v, list, 0, 0 }; + struct parallel_fetch_state state = { argv.v, list, 0, 0, format }; const struct run_process_parallel_opts opts = { .tr2_category = "fetch", .tr2_label = "parallel/fetch", @@ -2008,7 +1974,7 @@ static int fetch_multiple(struct string_list *list, int max_children) strvec_pushv(&cmd.args, argv.v); strvec_push(&cmd.args, name); - if (verbosity >= 0) + if (verbosity >= 0 && format != DISPLAY_FORMAT_PORCELAIN) printf(_("Fetching %s\n"), name); cmd.git_cmd = 1; if (run_command(&cmd)) { @@ -2063,7 +2029,8 @@ static inline void fetch_one_setup_partial(struct remote *remote) } static int fetch_one(struct remote *remote, int argc, const char **argv, - int prune_tags_ok, int use_stdin_refspecs) + int prune_tags_ok, int use_stdin_refspecs, + enum display_format display_format) { struct refspec rs = REFSPEC_INIT_FETCH; int i; @@ -2130,7 +2097,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv, sigchain_push_common(unlock_pack_on_signal); atexit(unlock_pack_atexit); sigchain_push(SIGPIPE, SIG_IGN); - exit_code = do_fetch(gtransport, &rs); + exit_code = do_fetch(gtransport, &rs, display_format); sigchain_pop(SIGPIPE); refspec_clear(&rs); transport_disconnect(gtransport); @@ -2140,12 +2107,113 @@ 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 fetch_config config = { + .display_format = DISPLAY_FORMAT_FULL, + }; + const char *submodule_prefix = ""; const char *bundle_uri; struct string_list list = STRING_LIST_INIT_DUP; struct remote *remote = NULL; + int all = 0, multiple = 0; int result = 0; int prune_tags_ok = 1; + int enable_auto_gc = 1; + int unshallow = 0; + int max_jobs = -1; + int recurse_submodules_cli = RECURSE_SUBMODULES_DEFAULT; + int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND; + int fetch_write_commit_graph = -1; + int stdin_refspecs = 0; + int negotiate_only = 0; + int porcelain = 0; + int i; + + struct option builtin_fetch_options[] = { + OPT__VERBOSITY(&verbosity), + OPT_BOOL(0, "all", &all, + N_("fetch from all remotes")), + OPT_BOOL(0, "set-upstream", &set_upstream, + N_("set upstream for git pull/fetch")), + OPT_BOOL('a', "append", &append, + N_("append to .git/FETCH_HEAD instead of overwriting")), + OPT_BOOL(0, "atomic", &atomic_fetch, + N_("use atomic transaction to update references")), + OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), + N_("path to upload pack on remote end")), + OPT__FORCE(&force, N_("force overwrite of local reference"), 0), + OPT_BOOL('m', "multiple", &multiple, + N_("fetch from multiple remotes")), + OPT_SET_INT('t', "tags", &tags, + N_("fetch all tags and associated objects"), TAGS_SET), + OPT_SET_INT('n', NULL, &tags, + N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), + OPT_INTEGER('j', "jobs", &max_jobs, + N_("number of submodules fetched in parallel")), + OPT_BOOL(0, "prefetch", &prefetch, + N_("modify the refspec to place all refs within refs/prefetch/")), + OPT_BOOL('p', "prune", &prune, + N_("prune remote-tracking branches no longer on remote")), + OPT_BOOL('P', "prune-tags", &prune_tags, + N_("prune local tags no longer on remote and clobber changed tags")), + OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules_cli, N_("on-demand"), + N_("control recursive fetching of submodules"), + PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), + OPT_BOOL(0, "dry-run", &dry_run, + N_("dry run")), + OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")), + OPT_BOOL(0, "write-fetch-head", &write_fetch_head, + N_("write fetched references to the FETCH_HEAD file")), + OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), + OPT_BOOL('u', "update-head-ok", &update_head_ok, + N_("allow updating of HEAD ref")), + OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), + OPT_STRING(0, "depth", &depth, N_("depth"), + N_("deepen history of shallow clone")), + OPT_STRING(0, "shallow-since", &deepen_since, N_("time"), + N_("deepen history of shallow repository based on time")), + OPT_STRING_LIST(0, "shallow-exclude", &deepen_not, N_("revision"), + N_("deepen history of shallow clone, excluding rev")), + OPT_INTEGER(0, "deepen", &deepen_relative, + N_("deepen history of shallow clone")), + OPT_SET_INT_F(0, "unshallow", &unshallow, + N_("convert to a complete repository"), + 1, PARSE_OPT_NONEG), + OPT_SET_INT_F(0, "refetch", &refetch, + N_("re-fetch without negotiating common commits"), + 1, PARSE_OPT_NONEG), + { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), + N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, + OPT_CALLBACK_F(0, "recurse-submodules-default", + &recurse_submodules_default, N_("on-demand"), + N_("default for recursive fetching of submodules " + "(lower priority than config files)"), + PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules), + OPT_BOOL(0, "update-shallow", &update_shallow, + N_("accept refs that update .git/shallow")), + OPT_CALLBACK_F(0, "refmap", NULL, N_("refmap"), + N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg), + OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")), + OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"), + TRANSPORT_FAMILY_IPV4), + OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"), + TRANSPORT_FAMILY_IPV6), + OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"), + N_("report that we have only objects reachable from this object")), + OPT_BOOL(0, "negotiate-only", &negotiate_only, + N_("do not fetch a packfile; instead, print ancestors of negotiation tips")), + OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), + OPT_BOOL(0, "auto-maintenance", &enable_auto_gc, + N_("run 'maintenance --auto' after fetching")), + OPT_BOOL(0, "auto-gc", &enable_auto_gc, + N_("run 'maintenance --auto' after fetching")), + OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates, + N_("check for forced-updates on all updated branches")), + OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph, + N_("write the commit-graph after fetching")), + OPT_BOOL(0, "stdin", &stdin_refspecs, + N_("accept refspecs from stdin")), + OPT_END() + }; packet_trace_identity("fetch"); @@ -2159,7 +2227,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) free(anon); } - git_config(git_fetch_config, NULL); + git_config(git_fetch_config, &config); if (the_repository->gitdir) { prepare_repo_settings(the_repository); the_repository->settings.command_requires_full_index = 0; @@ -2198,6 +2266,26 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) fetch_config_from_gitmodules(sfjc, rs); } + + if (porcelain) { + switch (recurse_submodules_cli) { + case RECURSE_SUBMODULES_OFF: + case RECURSE_SUBMODULES_DEFAULT: + /* + * Reference updates in submodules would be ambiguous + * in porcelain mode, so we reject this combination. + */ + recurse_submodules = RECURSE_SUBMODULES_OFF; + break; + + default: + die(_("options '%s' and '%s' cannot be used together"), + "--porcelain", "--recurse-submodules"); + } + + config.display_format = DISPLAY_FORMAT_PORCELAIN; + } + if (negotiate_only && !negotiation_tip.nr) die(_("--negotiate-only needs one or more --negotiation-tip=*")); @@ -2296,7 +2384,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) } else if (remote) { if (filter_options.choice || repo_has_promisor_remote(the_repository)) fetch_one_setup_partial(remote); - result = fetch_one(remote, argc, argv, prune_tags_ok, stdin_refspecs); + result = fetch_one(remote, argc, argv, prune_tags_ok, stdin_refspecs, + config.display_format); } else { int max_children = max_jobs; @@ -2316,10 +2405,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) max_children = fetch_parallel_config; /* TODO should this also die if we have a previous partial-clone? */ - result = fetch_multiple(&list, max_children); + result = fetch_multiple(&list, max_children, config.display_format); } - /* * This is only needed after fetch_one(), which does not fetch * submodules by itself. @@ -2338,7 +2426,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) if (max_children < 0) max_children = fetch_parallel_config; - add_options_to_argv(&options); + add_options_to_argv(&options, config.display_format); result = fetch_submodules(the_repository, &options, submodule_prefix, diff --git a/builtin/fsck.c b/builtin/fsck.c index 2cd461b84c..dcc165bf0c 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -27,6 +27,7 @@ #include "run-command.h" #include "worktree.h" #include "pack-revindex.h" +#include "pack-bitmap.h" #define REACHABLE 0x0001 #define SEEN 0x0002 @@ -57,6 +58,7 @@ static int name_objects; #define ERROR_COMMIT_GRAPH 020 #define ERROR_MULTI_PACK_INDEX 040 #define ERROR_PACK_REV_INDEX 0100 +#define ERROR_BITMAP 0200 static const char *describe_object(const struct object_id *oid) { @@ -867,20 +869,20 @@ static int check_pack_rev_indexes(struct repository *r, int show_progress) int res = 0; if (show_progress) { - for (struct packed_git *p = get_all_packs(the_repository); p; p = p->next) + for (struct packed_git *p = get_all_packs(r); p; p = p->next) pack_count++; progress = start_delayed_progress("Verifying reverse pack-indexes", pack_count); pack_count = 0; } - for (struct packed_git *p = get_all_packs(the_repository); p; p = p->next) { + for (struct packed_git *p = get_all_packs(r); p; p = p->next) { int load_error = load_pack_revindex_from_disk(p); if (load_error < 0) { error(_("unable to load rev-index for pack '%s'"), p->pack_name); res = ERROR_PACK_REV_INDEX; } else if (!load_error && - !load_pack_revindex(the_repository, p) && + !load_pack_revindex(r, p) && verify_pack_revindex(p)) { error(_("invalid rev-index for pack '%s'"), p->pack_name); res = ERROR_PACK_REV_INDEX; @@ -1056,6 +1058,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } errors_found |= check_pack_rev_indexes(the_repository, show_progress); + if (verify_bitmap_files(the_repository)) + errors_found |= ERROR_BITMAP; check_connectivity(); diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index aa8040c2a6..b8f8a8b5d9 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -17,6 +17,7 @@ #include "merge-blobs.h" #include "quote.h" #include "tree.h" +#include "config.h" static int line_termination = '\n'; @@ -628,6 +629,8 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) if (argc != expected_remaining_argc) usage_with_options(merge_tree_usage, mt_options); + git_config(git_default_config, NULL); + /* Do the relevant type of merge */ if (o.mode == MODE_REAL) return real_merge(&o, merge_base, argv[0], argv[1], prefix); diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 593f0506a1..4d15a23fc4 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -573,7 +573,11 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix) N_("ignore refs matching <pattern>")), OPT_GROUP(""), OPT_BOOL(0, "all", &all, N_("list all commits reachable from all refs")), - OPT_BOOL(0, "stdin", &transform_stdin, N_("deprecated: use --annotate-stdin instead")), + OPT_BOOL_F(0, + "stdin", + &transform_stdin, + N_("deprecated: use --annotate-stdin instead"), + PARSE_OPT_HIDDEN), OPT_BOOL(0, "annotate-stdin", &annotate_stdin, N_("annotate text from stdin")), OPT_BOOL(0, "undefined", &allow_undefined, N_("allow to print `undefined` names (default)")), OPT_BOOL(0, "always", &always, diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index a5b466839b..9cfc8801f9 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1331,7 +1331,7 @@ static int no_try_delta(const char *path) if (!check) check = attr_check_initl("delta", NULL); - git_check_attr(the_repository->index, NULL, path, check); + git_check_attr(the_repository->index, path, check); if (ATTR_FALSE(check->items[0].value)) return 1; return 0; diff --git a/builtin/push.c b/builtin/push.c index 4e5780dd50..dbdf609daf 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -595,11 +595,12 @@ int cmd_push(int argc, const char **argv, const char *prefix) struct option options[] = { OPT__VERBOSITY(&verbosity), OPT_STRING( 0 , "repo", &repo, N_("repository"), N_("repository")), - OPT_BIT( 0 , "all", &flags, N_("push all refs"), TRANSPORT_PUSH_ALL), + OPT_BIT( 0 , "all", &flags, N_("push all branches"), TRANSPORT_PUSH_ALL), + OPT_ALIAS( 0 , "branches", "all"), OPT_BIT( 0 , "mirror", &flags, N_("mirror all refs"), (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)), OPT_BOOL('d', "delete", &deleterefs, N_("delete refs")), - OPT_BOOL( 0 , "tags", &tags, N_("push tags (can't be used with --all or --mirror)")), + OPT_BOOL( 0 , "tags", &tags, N_("push tags (can't be used with --all or --branches or --mirror)")), OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN), OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN), OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE), @@ -642,7 +643,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) set_push_cert_flags(&flags, push_cert); if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR)))) - die(_("options '%s' and '%s' cannot be used together"), "--delete", "--all/--mirror/--tags"); + die(_("options '%s' and '%s' cannot be used together"), "--delete", "--all/--branches/--mirror/--tags"); if (deleterefs && argc < 2) die(_("--delete doesn't make sense without any refs")); diff --git a/builtin/tag.c b/builtin/tag.c index 1850a6a6fd..49b64c7a28 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -271,11 +271,10 @@ static const char message_advice_nested_tag[] = static void create_tag(const struct object_id *object, const char *object_ref, const char *tag, struct strbuf *buf, struct create_tag_options *opt, - struct object_id *prev, struct object_id *result) + struct object_id *prev, struct object_id *result, char *path) { enum object_type type; struct strbuf header = STRBUF_INIT; - char *path = NULL; type = oid_object_info(the_repository, object, NULL); if (type <= OBJ_NONE) @@ -299,7 +298,6 @@ static void create_tag(const struct object_id *object, const char *object_ref, int fd; /* write the template message before editing: */ - path = git_pathdup("TAG_EDITMSG"); fd = xopen(path, O_CREAT | O_TRUNC | O_WRONLY, 0600); if (opt->message_given) { @@ -341,10 +339,6 @@ static void create_tag(const struct object_id *object, const char *object_ref, path); exit(128); } - if (path) { - unlink_or_warn(path); - free(path); - } } static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb) @@ -495,6 +489,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) }; int ret = 0; const char *only_in_list = NULL; + char *path = NULL; setup_ref_filter_porcelain_msg(); @@ -629,7 +624,9 @@ int cmd_tag(int argc, const char **argv, const char *prefix) if (create_tag_object) { if (force_sign_annotate && !annotate) opt.sign = 1; - create_tag(&object, object_ref, tag, &buf, &opt, &prev, &object); + path = git_pathdup("TAG_EDITMSG"); + create_tag(&object, object_ref, tag, &buf, &opt, &prev, &object, + path); } transaction = ref_transaction_begin(&err); @@ -637,8 +634,17 @@ int cmd_tag(int argc, const char **argv, const char *prefix) ref_transaction_update(transaction, ref.buf, &object, &prev, create_reflog ? REF_FORCE_CREATE_REFLOG : 0, reflog_msg.buf, &err) || - ref_transaction_commit(transaction, &err)) + ref_transaction_commit(transaction, &err)) { + if (path) + fprintf(stderr, + _("The tag message has been left in %s\n"), + path); die("%s", err.buf); + } + if (path) { + unlink_or_warn(path); + free(path); + } ref_transaction_free(transaction); if (force && !is_null_oid(&prev) && !oideq(&prev, &object)) printf(_("Updated tag '%s' (was %s)\n"), tag, diff --git a/contrib/coccinelle/README b/contrib/coccinelle/README index d1daa1f626..055ad0e06a 100644 --- a/contrib/coccinelle/README +++ b/contrib/coccinelle/README @@ -1,7 +1,9 @@ -This directory provides examples of Coccinelle (http://coccinelle.lip6.fr/) -semantic patches that might be useful to developers. += coccinelle -There are two types of semantic patches: +This directory provides Coccinelle (http://coccinelle.lip6.fr/) semantic patches +that might be useful to developers. + +== Types of semantic patches * Using the semantic transformation to check for bad patterns in the code; The target 'make coccicheck' is designed to check for these patterns and @@ -42,7 +44,7 @@ There are two types of semantic patches: This allows to expose plans of pending large scale refactorings without impacting the bad pattern checks. -Git-specific tips & things to know about how we run "spatch": +== Git-specific tips & things to know about how we run "spatch": * The "make coccicheck" will piggy-back on "COMPUTE_HEADER_DEPENDENCIES". If you've built a given object file @@ -90,3 +92,33 @@ Git-specific tips & things to know about how we run "spatch": The absolute times will differ for you, but the relative speedup from caching should be on that order. + +== Authoring and reviewing coccinelle changes + +* When a .cocci is made, both the Git changes and .cocci file should be + reviewed. When reviewing such a change, do your best to understand the .cocci + changes (e.g. by asking the author to explain the change) and be explicit + about your understanding of the changes. This helps us decide whether input + from coccinelle experts is needed or not. If you aren't sure of the cocci + changes, indicate what changes you actively endorse and leave an Acked-by + (instead of Reviewed-by). + +* Authors should consider that reviewers may not be coccinelle experts, thus the + the .cocci changes may not be self-evident. A plain text description of the + changes is strongly encouraged, especially when using more esoteric features + of the language. + +* .cocci rules should target only the problem it is trying to solve; "collateral + damage" is not allowed. Reviewers should look out and flag overly-broad rules. + +* Consider the cost-benefit ratio of .cocci changes. In particular, consider the + effect on the runtime of "make coccicheck", and how often your .cocci check + will catch something valuable. As a rule of thumb, rules that can bail early + if a file doesn't have a particular token will have a small impact on runtime, + and vice-versa. + +* .cocci files used for refactoring should be temporarily kept in-tree to aid + the refactoring of out-of-tree code (e.g. in-flight topics). Periodically + evaluate the cost-benefit ratio to determine when the file should be removed. + For example, consider how many out-of-tree users are left and how much this + slows down "make coccicheck". diff --git a/contrib/coccinelle/tests/unused.c b/contrib/coccinelle/tests/unused.c deleted file mode 100644 index 8294d734ba..0000000000 --- a/contrib/coccinelle/tests/unused.c +++ /dev/null @@ -1,82 +0,0 @@ -void test_strbuf(void) -{ - struct strbuf sb1 = STRBUF_INIT; - struct strbuf sb2 = STRBUF_INIT; - struct strbuf sb3 = STRBUF_INIT; - struct strbuf sb4 = STRBUF_INIT; - struct strbuf sb5; - struct strbuf sb6 = { 0 }; - struct strbuf sb7 = STRBUF_INIT; - struct strbuf sb8 = STRBUF_INIT; - struct strbuf *sp1; - struct strbuf *sp2; - struct strbuf *sp3; - struct strbuf *sp4 = xmalloc(sizeof(struct strbuf)); - struct strbuf *sp5 = xmalloc(sizeof(struct strbuf)); - struct strbuf *sp6 = xmalloc(sizeof(struct strbuf)); - struct strbuf *sp7; - - strbuf_init(&sb5, 0); - strbuf_init(sp1, 0); - strbuf_init(sp2, 0); - strbuf_init(sp3, 0); - strbuf_init(sp4, 0); - strbuf_init(sp5, 0); - strbuf_init(sp6, 0); - strbuf_init(sp7, 0); - sp7 = xmalloc(sizeof(struct strbuf)); - - use_before(&sb3); - use_as_str("%s", sb7.buf); - use_as_str("%s", sp1->buf); - use_as_str("%s", sp6->buf); - pass_pp(&sp3); - - strbuf_release(&sb1); - strbuf_reset(&sb2); - strbuf_release(&sb3); - strbuf_release(&sb4); - strbuf_release(&sb5); - strbuf_release(&sb6); - strbuf_release(&sb7); - strbuf_release(sp1); - strbuf_release(sp2); - strbuf_release(sp3); - strbuf_release(sp4); - strbuf_release(sp5); - strbuf_release(sp6); - strbuf_release(sp7); - - use_after(&sb4); - - if (when_strict()) - return; - strbuf_release(&sb8); -} - -void test_other(void) -{ - struct string_list l = STRING_LIST_INIT_DUP; - struct strbuf sb = STRBUF_INIT; - - string_list_clear(&l, 0); - string_list_clear(&sb, 0); -} - -void test_worktrees(void) -{ - struct worktree **w1 = get_worktrees(); - struct worktree **w2 = get_worktrees(); - struct worktree **w3; - struct worktree **w4; - - w3 = get_worktrees(); - w4 = get_worktrees(); - - use_it(w4); - - free_worktrees(w1); - free_worktrees(w2); - free_worktrees(w3); - free_worktrees(w4); -} diff --git a/contrib/coccinelle/tests/unused.res b/contrib/coccinelle/tests/unused.res deleted file mode 100644 index 6d3e745683..0000000000 --- a/contrib/coccinelle/tests/unused.res +++ /dev/null @@ -1,45 +0,0 @@ -void test_strbuf(void) -{ - struct strbuf sb3 = STRBUF_INIT; - struct strbuf sb4 = STRBUF_INIT; - struct strbuf sb7 = STRBUF_INIT; - struct strbuf *sp1; - struct strbuf *sp3; - struct strbuf *sp6 = xmalloc(sizeof(struct strbuf)); - strbuf_init(sp1, 0); - strbuf_init(sp3, 0); - strbuf_init(sp6, 0); - - use_before(&sb3); - use_as_str("%s", sb7.buf); - use_as_str("%s", sp1->buf); - use_as_str("%s", sp6->buf); - pass_pp(&sp3); - - strbuf_release(&sb3); - strbuf_release(&sb4); - strbuf_release(&sb7); - strbuf_release(sp1); - strbuf_release(sp3); - strbuf_release(sp6); - - use_after(&sb4); - - if (when_strict()) - return; -} - -void test_other(void) -{ -} - -void test_worktrees(void) -{ - struct worktree **w4; - - w4 = get_worktrees(); - - use_it(w4); - - free_worktrees(w4); -} diff --git a/contrib/coccinelle/unused.cocci b/contrib/coccinelle/unused.cocci deleted file mode 100644 index d84046f82e..0000000000 --- a/contrib/coccinelle/unused.cocci +++ /dev/null @@ -1,43 +0,0 @@ -// This rule finds sequences of "unused" declerations and uses of a -// variable, where "unused" is defined to include only calling the -// equivalent of alloc, init & free functions on the variable. -@@ -type T; -identifier I; -// STRBUF_INIT, but also e.g. STRING_LIST_INIT_DUP (so no anchoring) -constant INIT_MACRO =~ "_INIT"; -identifier MALLOC1 =~ "^x?[mc]alloc$"; -identifier INIT_ASSIGN1 =~ "^get_worktrees$"; -identifier INIT_CALL1 =~ "^[a-z_]*_init$"; -identifier REL1 =~ "^[a-z_]*_(release|reset|clear|free)$"; -identifier REL2 =~ "^(release|clear|free)_[a-z_]*$"; -@@ - -( -- T I; -| -- T I = { 0 }; -| -- T I = INIT_MACRO; -| -- T I = MALLOC1(...); -| -- T I = INIT_ASSIGN1(...); -) - -<... when != \( I \| &I \) -( -- \( INIT_CALL1 \)( \( I \| &I \), ...); -| -- I = \( INIT_ASSIGN1 \)(...); -| -- I = MALLOC1(...); -) -...> - -( -- \( REL1 \| REL2 \)( \( I \| &I \), ...); -| -- \( REL1 \| REL2 \)( \( &I \| I \) ); -) - ... when != \( I \| &I \) diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 10c9c87839..7db4c45676 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -34,8 +34,8 @@ git subtree pull --prefix=<prefix> <repository> <ref> git subtree push --prefix=<prefix> <repository> <refspec> -- h,help show the help -q quiet -d show debug messages +q,quiet quiet +d,debug show debug messages P,prefix= the name of the subdir to split out options for 'split' (also: 'push') annotate= add a prefix to commit message of new commits @@ -1315,7 +1315,7 @@ void convert_attrs(struct index_state *istate, git_config(read_convert_config, NULL); } - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); ccheck = check->items; ca->crlf_action = git_path_check_crlf(ccheck + 4); if (ca->crlf_action == CRLF_UNDEFINED) @@ -3007,6 +3007,24 @@ static int dirstat_compare(const void *_a, const void *_b) return strcmp(a->name, b->name); } +static void conclude_dirstat(struct diff_options *options, + struct dirstat_dir *dir, + unsigned long changed) +{ + struct dirstat_file *to_free = dir->files; + + if (!changed) { + /* This can happen even with many files, if everything was renames */ + ; + } else { + /* Show all directories with more than x% of the changes */ + QSORT(dir->files, dir->nr, dirstat_compare); + gather_dirstat(options, dir, changed, "", 0); + } + + free(to_free); +} + static void show_dirstat(struct diff_options *options) { int i; @@ -3096,13 +3114,7 @@ found_damage: dir.nr++; } - /* This can happen even with many files, if everything was renames */ - if (!changed) - return; - - /* Show all directories with more than x% of the changes */ - QSORT(dir.files, dir.nr, dirstat_compare); - gather_dirstat(options, &dir, changed, "", 0); + conclude_dirstat(options, &dir, changed); } static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *options) @@ -3140,13 +3152,7 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o dir.nr++; } - /* This can happen even with many files, if everything was renames */ - if (!changed) - return; - - /* Show all directories with more than x% of the changes */ - QSORT(dir.files, dir.nr, dirstat_compare); - gather_dirstat(options, &dir, changed, "", 0); + conclude_dirstat(options, &dir, changed); } static void free_diffstat_file(struct diffstat_file *f) @@ -4930,6 +4936,7 @@ static int diff_opt_stat(const struct option *opt, const char *value, int unset) } else BUG("%s should not get here", opt->long_name); + options->output_format &= ~DIFF_FORMAT_NO_OUTPUT; options->output_format |= DIFF_FORMAT_DIFFSTAT; options->stat_name_width = name_width; options->stat_graph_width = graph_width; @@ -4949,6 +4956,7 @@ static int parse_dirstat_opt(struct diff_options *options, const char *params) * The caller knows a dirstat-related option is given from the command * line; allow it to say "return this_function();" */ + options->output_format &= ~DIFF_FORMAT_NO_OUTPUT; options->output_format |= DIFF_FORMAT_DIRSTAT; return 1; } @@ -5148,6 +5156,7 @@ static int diff_opt_compact_summary(const struct option *opt, options->flags.stat_with_summary = 0; } else { options->flags.stat_with_summary = 1; + options->output_format &= ~DIFF_FORMAT_NO_OUTPUT; options->output_format |= DIFF_FORMAT_DIFFSTAT; } return 0; @@ -5493,9 +5502,8 @@ struct option *add_diff_options(const struct option *opts, OPT_BITOP('p', "patch", &options->output_format, N_("generate patch"), DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT), - OPT_BIT_F('s', "no-patch", &options->output_format, - N_("suppress diff output"), - DIFF_FORMAT_NO_OUTPUT, PARSE_OPT_NONEG), + OPT_SET_INT('s', "no-patch", &options->output_format, + N_("suppress diff output"), DIFF_FORMAT_NO_OUTPUT), OPT_BITOP('u', NULL, &options->output_format, N_("generate patch"), DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT), @@ -5504,9 +5512,9 @@ struct option *add_diff_options(const struct option *opts, PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_unified), OPT_BOOL('W', "function-context", &options->flags.funccontext, N_("generate diffs with <n> lines context")), - OPT_BIT_F(0, "raw", &options->output_format, + OPT_BITOP(0, "raw", &options->output_format, N_("generate the diff in raw format"), - DIFF_FORMAT_RAW, PARSE_OPT_NONEG), + DIFF_FORMAT_RAW, DIFF_FORMAT_NO_OUTPUT), OPT_BITOP(0, "patch-with-raw", &options->output_format, N_("synonym for '-p --raw'"), DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW, @@ -5515,12 +5523,12 @@ struct option *add_diff_options(const struct option *opts, N_("synonym for '-p --stat'"), DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT, DIFF_FORMAT_NO_OUTPUT), - OPT_BIT_F(0, "numstat", &options->output_format, + OPT_BITOP(0, "numstat", &options->output_format, N_("machine friendly --stat"), - DIFF_FORMAT_NUMSTAT, PARSE_OPT_NONEG), - OPT_BIT_F(0, "shortstat", &options->output_format, + DIFF_FORMAT_NUMSTAT, DIFF_FORMAT_NO_OUTPUT), + OPT_BITOP(0, "shortstat", &options->output_format, N_("output only the last line of --stat"), - DIFF_FORMAT_SHORTSTAT, PARSE_OPT_NONEG), + DIFF_FORMAT_SHORTSTAT, DIFF_FORMAT_NO_OUTPUT), OPT_CALLBACK_F('X', "dirstat", options, N_("<param1,param2>..."), N_("output the distribution of relative amount of changes for each sub-directory"), PARSE_OPT_NONEG | PARSE_OPT_OPTARG, @@ -5536,9 +5544,9 @@ struct option *add_diff_options(const struct option *opts, OPT_BIT_F(0, "check", &options->output_format, N_("warn if changes introduce conflict markers or whitespace errors"), DIFF_FORMAT_CHECKDIFF, PARSE_OPT_NONEG), - OPT_BIT_F(0, "summary", &options->output_format, + OPT_BITOP(0, "summary", &options->output_format, N_("condensed summary such as creations, renames and mode changes"), - DIFF_FORMAT_SUMMARY, PARSE_OPT_NONEG), + DIFF_FORMAT_SUMMARY, DIFF_FORMAT_NO_OUTPUT), OPT_BIT_F(0, "name-only", &options->output_format, N_("show only names of changed files"), DIFF_FORMAT_NAME, PARSE_OPT_NONEG), diff --git a/environment.h b/environment.h index a63f0c6a24..30cb7e0fa3 100644 --- a/environment.h +++ b/environment.h @@ -55,6 +55,7 @@ const char *getenv_safe(struct strvec *argv, const char *name); #define GIT_QUARANTINE_ENVIRONMENT "GIT_QUARANTINE_PATH" #define GIT_OPTIONAL_LOCKS_ENVIRONMENT "GIT_OPTIONAL_LOCKS" #define GIT_TEXT_DOMAIN_DIR_ENVIRONMENT "GIT_TEXTDOMAINDIR" +#define GIT_ATTR_SOURCE_ENVIRONMENT "GIT_ATTR_SOURCE" /* * Environment variable used in handshaking the wire protocol. diff --git a/git-send-email.perl b/git-send-email.perl index 26e18eebd9..affbb88509 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -87,8 +87,10 @@ git send-email --dump-aliases Automating: --identity <str> * Use the sendemail.<id> options. - --to-cmd <str> * Email To: via `<str> \$patch_path` - --cc-cmd <str> * Email Cc: via `<str> \$patch_path` + --to-cmd <str> * Email To: via `<str> \$patch_path`. + --cc-cmd <str> * Email Cc: via `<str> \$patch_path`. + --header-cmd <str> * Add headers via `<str> \$patch_path`. + --no-header-cmd * Disable any header command in use. --suppress-cc <str> * author, self, sob, cc, cccmd, body, bodycc, misc-by, all. --[no-]cc-cover * Email Cc: addresses in the cover letter. --[no-]to-cover * Email To: addresses in the cover letter. @@ -202,7 +204,7 @@ my (@to,@cc,@xh,$envelope_sender, $author,$sender,$smtp_authpass,$annotate,$compose,$time); # Things we either get from config, *or* are overridden on the # command-line. -my ($no_cc, $no_to, $no_bcc, $no_identity); +my ($no_cc, $no_to, $no_bcc, $no_identity, $no_header_cmd); my (@config_to, @getopt_to); my (@config_cc, @getopt_cc); my (@config_bcc, @getopt_bcc); @@ -269,7 +271,7 @@ sub do_edit { # Variables with corresponding config settings my ($suppress_from, $signed_off_by_cc); my ($cover_cc, $cover_to); -my ($to_cmd, $cc_cmd); +my ($to_cmd, $cc_cmd, $header_cmd); my ($smtp_server, $smtp_server_port, @smtp_server_options); my ($smtp_authuser, $smtp_encryption, $smtp_ssl_cert_path); my ($batch_size, $relogin_delay); @@ -318,6 +320,7 @@ my %config_settings = ( "tocmd" => \$to_cmd, "cc" => \@config_cc, "cccmd" => \$cc_cmd, + "headercmd" => \$header_cmd, "aliasfiletype" => \$aliasfiletype, "bcc" => \@config_bcc, "suppresscc" => \@suppress_cc, @@ -519,6 +522,8 @@ my %options = ( "compose" => \$compose, "quiet" => \$quiet, "cc-cmd=s" => \$cc_cmd, + "header-cmd=s" => \$header_cmd, + "no-header-cmd" => \$no_header_cmd, "suppress-from!" => \$suppress_from, "no-suppress-from" => sub {$suppress_from = 0}, "suppress-cc=s" => \@suppress_cc, @@ -1783,16 +1788,17 @@ sub pre_process_file { $subject = $initial_subject; $message = ""; $message_num++; - # First unfold multiline header fields + undef $message_id; + # Retrieve and unfold header fields. + my @header_lines = (); while(<$fh>) { last if /^\s*$/; - if (/^\s+\S/ and @header) { - chomp($header[$#header]); - s/^\s+/ /; - $header[$#header] .= $_; - } else { - push(@header, $_); - } + push(@header_lines, $_); + } + @header = unfold_headers(@header_lines); + # Add computed headers, if applicable. + unless ($no_header_cmd || ! $header_cmd) { + push @header, invoke_header_cmd($header_cmd, $t); } # Now parse the header foreach(@header) { @@ -2033,15 +2039,64 @@ foreach my $t (@files) { } } +# Execute a command and return its output lines as an array. Blank +# lines which do not appear at the end of the output are reported as +# errors. +sub execute_cmd { + my ($prefix, $cmd, $file) = @_; + my @lines = (); + my $seen_blank_line = 0; + open my $fh, "-|", "$cmd \Q$file\E" + or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd); + while (my $line = <$fh>) { + die sprintf(__("(%s) Malformed output from '%s'"), $prefix, $cmd) + if $seen_blank_line; + if ($line =~ /^$/) { + $seen_blank_line = $line =~ /^$/; + next; + } + push @lines, $line; + } + close $fh + or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd); + return @lines; +} + +# Process headers lines, unfolding multiline headers as defined by RFC +# 2822. +sub unfold_headers { + my @headers; + foreach(@_) { + last if /^\s*$/; + if (/^\s+\S/ and @headers) { + chomp($headers[$#headers]); + s/^\s+/ /; + $headers[$#headers] .= $_; + } else { + push(@headers, $_); + } + } + return @headers; +} + +# Invoke the provided CMD with FILE as an argument, which should +# output RFC 2822 email headers. Fold multiline headers and return the +# headers as an array. +sub invoke_header_cmd { + my ($cmd, $file) = @_; + my @lines = execute_cmd("header-cmd", $header_cmd, $file); + return unfold_headers(@lines); +} + # Execute a command (e.g. $to_cmd) to get a list of email addresses # and return a results array sub recipients_cmd { my ($prefix, $what, $cmd, $file, $quiet) = @_; - + my @lines = (); my @addresses = (); - open my $fh, "-|", "$cmd \Q$file\E" - or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd); - while (my $address = <$fh>) { + + @lines = execute_cmd($prefix, $cmd, $file); + for my $address (@lines) { $address =~ s/^\s*//g; $address =~ s/\s*$//g; $address = sanitize_address($address); @@ -2050,8 +2105,6 @@ sub recipients_cmd { printf(__("(%s) Adding %s: %s from: '%s'\n"), $prefix, $what, $address, $cmd) unless $quiet; } - close $fh - or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd); return @addresses; } @@ -9,6 +9,7 @@ #include "alias.h" #include "replace-object.h" #include "setup.h" +#include "attr.h" #include "shallow.h" #include "trace.h" #include "trace2.h" @@ -314,6 +315,21 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) } else { exit(list_cmds(cmd)); } + } else if (!strcmp(cmd, "--attr-source")) { + if (*argc < 2) { + fprintf(stderr, _("no attribute source given for --attr-source\n" )); + usage(git_usage_string); + } + setenv(GIT_ATTR_SOURCE_ENVIRONMENT, (*argv)[1], 1); + if (envchanged) + *envchanged = 1; + (*argv)++; + (*argc)--; + } else if (skip_prefix(cmd, "--attr-source=", &cmd)) { + set_git_attr_source(cmd); + setenv(GIT_ATTR_SOURCE_ENVIRONMENT, cmd, 1); + if (envchanged) + *envchanged = 1; } else { fprintf(stderr, _("unknown option: %s\n"), cmd); usage(git_usage_string); diff --git a/gitk-git/gitk b/gitk-git/gitk index 0ae7d68590..df3ba2ea99 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -353,6 +353,16 @@ proc parseviewrevs {view revs} { return $ret } +# Escapes a list of filter paths to be passed to git log via stdin. Note that +# paths must not be quoted. +proc escape_filter_paths {paths} { + set escaped [list] + foreach path $paths { + lappend escaped [string map {\\ \\\\ "\ " "\\\ "} $path] + } + return $escaped +} + # Start off a git log process and arrange to read its output proc start_rev_list {view} { global startmsecs commitidx viewcomplete curview @@ -405,14 +415,17 @@ proc start_rev_list {view} { if {$revs eq {}} { return 0 } - set args [concat $vflags($view) $revs] + set args $vflags($view) } else { + set revs {} set args $vorigargs($view) } if {[catch { set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ - --parents --boundary $args "--" $files] r] + --parents --boundary $args --stdin \ + "<<[join [concat $revs "--" \ + [escape_filter_paths $files]] "\\n"]"] r] } err]} { error_popup "[mc "Error executing git log:"] $err" return 0 @@ -554,13 +567,20 @@ proc updatecommits {} { set revs $newrevs set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]] } - set args [concat $vflags($view) $revs --not $oldpos] + set args $vflags($view) + foreach r $oldpos { + lappend revs "^$r" + } } else { + set revs {} set args $vorigargs($view) } if {[catch { set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ - --parents --boundary $args "--" $vfilelimit($view)] r] + --parents --boundary $args --stdin \ + "<<[join [concat $revs "--" \ + [escape_filter_paths \ + $vfilelimit($view)]] "\\n"]"] r] } err]} { error_popup "[mc "Error executing git log:"] $err" return @@ -10231,10 +10251,16 @@ proc getallcommits {} { foreach id $seeds { lappend ids "^$id" } + lappend ids "--" } } if {$ids ne {}} { - set fd [open [concat $cmd $ids] r] + if {$ids eq "--all"} { + set cmd [concat $cmd "--all"] + } else { + set cmd [concat $cmd --stdin "<<[join $ids "\\n"]"] + } + set fd [open $cmd r] fconfigure $fd -blocking 0 incr allcommits nowbusy allcommits diff --git a/imap-send.c b/imap-send.c index a62424e90a..7f5426177a 100644 --- a/imap-send.c +++ b/imap-send.c @@ -29,6 +29,7 @@ #include "run-command.h" #include "parse-options.h" #include "setup.h" +#include "strbuf.h" #include "wrapper.h" #if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG) typedef void *SSL; diff --git a/ll-merge.c b/ll-merge.c index 1993530688..07ec16e8e5 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -394,7 +394,7 @@ enum ll_merge_result ll_merge(mmbuffer_t *result_buf, normalize_file(theirs, path, istate); } - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); ll_driver_name = check->items[0].value; if (check->items[1].value) { marker_size = atoi(check->items[1].value); @@ -422,7 +422,7 @@ int ll_merge_marker_size(struct index_state *istate, const char *path) if (!check) check = attr_check_initl("conflict-marker-size", NULL); - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); if (check->items[0].value) { marker_size = atoi(check->items[0].value); if (marker_size <= 0) diff --git a/pack-bitmap.c b/pack-bitmap.c index e0fad723bf..999f962602 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -2346,3 +2346,48 @@ int bitmap_is_preferred_refname(struct repository *r, const char *refname) return 0; } + +static int verify_bitmap_file(const char *name) +{ + struct stat st; + unsigned char *data; + int fd = git_open(name); + int res = 0; + + /* It is OK to not have the file. */ + if (fd < 0 || fstat(fd, &st)) { + if (fd >= 0) + close(fd); + return 0; + } + + data = xmmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); + close(fd); + if (!hashfile_checksum_valid(data, st.st_size)) + res = error(_("bitmap file '%s' has invalid checksum"), + name); + + munmap(data, st.st_size); + return res; +} + +int verify_bitmap_files(struct repository *r) +{ + int res = 0; + + for (struct multi_pack_index *m = get_multi_pack_index(r); + m; m = m->next) { + char *midx_bitmap_name = midx_bitmap_filename(m); + res |= verify_bitmap_file(midx_bitmap_name); + free(midx_bitmap_name); + } + + for (struct packed_git *p = get_all_packs(r); + p; p = p->next) { + char *pack_bitmap_name = pack_bitmap_filename(p); + res |= verify_bitmap_file(pack_bitmap_name); + free(pack_bitmap_name); + } + + return res; +} diff --git a/pack-bitmap.h b/pack-bitmap.h index f0180b5276..84591f041b 100644 --- a/pack-bitmap.h +++ b/pack-bitmap.h @@ -111,4 +111,6 @@ int bitmap_is_midx(struct bitmap_index *bitmap_git); const struct string_list *bitmap_preferred_tips(struct repository *r); int bitmap_is_preferred_refname(struct repository *r, const char *refname); +int verify_bitmap_files(struct repository *r); + #endif diff --git a/pathspec.c b/pathspec.c index 1e57b6c667..6966b265d3 100644 --- a/pathspec.c +++ b/pathspec.c @@ -736,7 +736,7 @@ int match_pathspec_attrs(struct index_state *istate, if (name[namelen]) name = to_free = xmemdupz(name, namelen); - git_check_attr(istate, NULL, name, item->attr_check); + git_check_attr(istate, name, item->attr_check); free(to_free); @@ -51,7 +51,7 @@ Repository: https://github.com/Arusekk/git-po Leader: Arusekk <arek_koz@o2.pl> Language: pt_PT (Portuguese - Portugal) -Repository: https://codeberg.org/git-pt/Git-PO-pt_PT/ +Repository: https://gitlab.com/alexandre1985/git-pt/ Leader: Daniel Santos <dacs.git@brilhante.top> Language: ru (Russian) @@ -67,16 +67,22 @@ Language: tr (Turkish) Repository: https://github.com/bitigchi/git-po/ Leader: Emir SARI <bitigchi@me.com> +Language: uk (Ukrainian) +Repository: https://github.com/arkid15r/git-ukrainian-l10n/ +Leader: Arkadii Yakovets <ark@cho.red> +Members: Kateryna Golovanova <kate@kgthreads.com> + Language: vi (Vietnamese) Repository: https://github.com/vnwildman/git/ Leader: Trần Ngá»c Quân <vnwildman AT gmail.com> Members: Nguyá»…n Thái Ngá»c Duy <pclouds AT gmail.com> Language: zh_CN (Simplified Chinese) -Repository: https://github.com/fangyi-zhou/git-po/ -Leader: Fangyi Zhou <me AT fangyi.io> +Repository: https://github.com/dyrone/git/ +Leader: Teng Long <dyroneteng AT gmail.com> Members: Ray Chen <oldsharp AT gmail.com> ä¾äº‘ <lilydjwg AT gmail.com> + Fangyi Zhou <me AT fangyi.io> Jiang Xin <worldhello.net AT gmail.com> Language: zh_TW (Traditional Chinese) @@ -199,7 +199,8 @@ # gitattributes file файл Ñ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸ на git # advertised обÑвен за наличен # superproject Ñвръхпроект -# +# rev-index обратен Ð¸Ð½Ð´ÐµÐºÑ (reverse index) +# dererging branches раздалечили Ñе клони # ------------------------ # „$var“ - може да не Ñработва за shell има gettext и eval_gettext - проверка - намират Ñе леÑно по „$ # ------------------------ @@ -216,10 +217,10 @@ # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n msgid "" msgstr "" -"Project-Id-Version: git 2.40\n" +"Project-Id-Version: git 2.41\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-01 01:20+0000\n" -"PO-Revision-Date: 2023-03-02 08:54+0200\n" +"POT-Creation-Date: 2023-05-19 19:48+0200\n" +"PO-Revision-Date: 2023-05-19 20:57+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -890,6 +891,23 @@ msgstr "Промѐните Ñ‚Ñ€Ñбва да Ñе подадат преди Ñ msgid "Exiting because of unfinished merge." msgstr "Изход от програмата заради незавършено Ñливане." +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"Раздалечили Ñе клони не може да Ñе превъртÑÑ‚. Ползвайте:\n" +"\n" +" git merge --no-ff\n" +"\n" +"или:\n" +"\n" +" git rebase\n" + msgid "Not possible to fast-forward, aborting." msgstr "Ðе може да Ñе извърши превъртане, преуÑтановÑване на дейÑтвието." @@ -1354,6 +1372,10 @@ msgid "cannot open %s" msgstr "„%s“ не може да бъде отворен" #, c-format +msgid "cannot unlink '%s'" +msgstr "„%s“ не може да Ñе изтрие" + +#, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе уÑпешно приложено." @@ -1547,6 +1569,10 @@ msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" #, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "пътÑÑ‚ „%s“ Ñъвпада Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ извън текущата директориÑ" + +#, c-format msgid "pathspec '%s' did not match any files" msgstr "пътÑÑ‚ „%s“ не Ñъвпада Ñ Ð½Ð¸ÐºÐ¾Ð¹ файл" @@ -1562,9 +1588,6 @@ msgstr "неправилно име на обект: „%s“" msgid "not a tree object: %s" msgstr "не е обект-дърво: %s" -msgid "current working directory is untracked" -msgstr "текущата работна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ е Ñледена" - #, c-format msgid "File not found: %s" msgstr "Файлът „%s“ липÑва" @@ -1691,6 +1714,11 @@ msgstr "преÑкачане на прекалено Ð³Ð¾Ð»ÐµÐ¼Ð¸Ñ Ñ„Ð°Ð¹Ð» зРmsgid "ignoring overly large gitattributes blob '%s'" msgstr "преÑкачане на прекалено Ð³Ð¾Ð»ÐµÐ¼Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-BLOB за атрибути на git: „%s“" +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "" +"неправилна ÑтойноÑÑ‚ за опциÑта „--attr-source“ или променливата " +"„GIT_ATTR_SOURCE“" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ðеправилно цитирано Ñъдържание във файла „%s“: %s" @@ -1796,9 +1824,6 @@ msgstr[1] "Двоично Ñ‚ÑŠÑ€Ñене: оÑтават %d верÑии ÑлеРmsgid "--contents and --reverse do not blend well." msgstr "опциите „--contents“ и „--reverse“ Ñа неÑъвмеÑтими" -msgid "cannot use --contents with final commit object name" -msgstr "опциÑта „--contents“ е неÑъвмеÑтима Ñ Ð¸Ð¼Ðµ на обект от крайно подаване" - msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изиÑква " @@ -1985,10 +2010,6 @@ msgstr "подмодул „%s“: клонът „%s“ не може да Ñе msgid "'%s' is already checked out at '%s'" msgstr "„%s“ вече е изтеглен в „%s“" -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "УказателÑÑ‚ „HEAD“ на работното дърво „%s“ не е обновен" - msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" @@ -3081,6 +3102,14 @@ msgid "remote-tracking branch '%s' not found." msgstr "ÑледÑщиÑÑ‚ клон „%s“ не може да бъде открит." #, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"клонът „%s“ не може да бъде открит.\n" +"Пробвахте ли опциÑта „--remote“?" + +#, c-format msgid "branch '%s' not found." msgstr "клонът „%s“ не може да бъде открит." @@ -3111,6 +3140,10 @@ msgid "Branch %s is being bisected at %s" msgstr "ТърÑи Ñе двоично в клона „%s“ при „%s“" #, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "УказателÑÑ‚ „HEAD“ на работното дърво „%s“ не е обновен" + +#, c-format msgid "Invalid branch name: '%s'" msgstr "Ðеправилно име на клон: „%s“" @@ -3213,6 +3246,9 @@ msgstr "" msgid "move/rename a branch, even if target exists" msgstr "премеÑтване/преименуване на клон, дори ако има вече клон Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име" +msgid "do not output a newline after empty formatted refs" +msgstr "без извеждане на нов ред Ñлед празен форматиран указател" + msgid "copy a branch and its reflog" msgstr "копиране на клон и Ð¿Ñ€Ð¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñ‰Ð¸Ñ Ð¼Ñƒ журнал на указателите" @@ -3436,12 +3472,10 @@ msgid "Created new report at '%s'.\n" msgstr "ÐовиÑÑ‚ доклад е Ñъздаден в „%s“.\n" msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress ]\n" " [--version=ВЕРСИЯ] ФÐЙЛ ОПЦИЯ_ЗÐ_git-rev-list…" msgid "git bundle verify [-q | --quiet] <file>" @@ -3462,12 +3496,11 @@ msgstr "без извеждане на напредъка" msgid "show progress meter" msgstr "извеждане на напредъка" -msgid "show progress meter during object writing phase" -msgstr "извеждане на напредъка във фазата на запазване на обектите" +msgid "historical; same as --progress" +msgstr "изоÑтавена опциÑ, Ñъщото като „--progress“" -msgid "similar to --all-progress when progress meter is shown" -msgstr "" -"Ñъщото дейÑтвие като опциÑта „--all-progress“ при извеждането на напредъка" +msgid "historical; does nothing" +msgstr "изоÑтавена опциÑ, нищо не прави" msgid "specify bundle format version" msgstr "верÑÐ¸Ñ Ð½Ð° пратката" @@ -4499,6 +4532,10 @@ msgid "%s exists and is not a directory" msgstr "„%s“ ÑъщеÑтвува и не е директориÑ" #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "„%s“ е Ñимволна връзка, не може да Ñе клонира Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--local“" + +#, c-format msgid "failed to start iterator over '%s'" msgstr "неуÑпешно итериране по „%s“" @@ -6071,119 +6108,14 @@ msgstr "git fetch --all [ОПЦИЯ…]" msgid "fetch.parallel cannot be negative" msgstr "опциÑта „fetch.parallel“ Ñ‚Ñ€Ñбва да е неотрицателна" -msgid "fetch from all remotes" -msgstr "доÑтавÑне от вÑички отдалечени хранилища" - -msgid "set upstream for git pull/fetch" -msgstr "задаване на клон за Ñледене за издърпване/доÑтавÑне" - -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "добавÑне към „.git/FETCH_HEAD“ вмеÑто замÑна" - -msgid "use atomic transaction to update references" -msgstr "изиÑкване на атомарни операции за обновÑване на указателите" - -msgid "path to upload pack on remote end" -msgstr "отдалечен път, където да Ñе качи пакетът" - -msgid "force overwrite of local reference" -msgstr "принудително презапиÑване на локален указател" - -msgid "fetch from multiple remotes" -msgstr "доÑтавÑне от множеÑтво отдалечени хранилища" - -msgid "fetch all tags and associated objects" -msgstr "доÑтавÑне на вÑички етикети и принадлежащи обекти" - -msgid "do not fetch all tags (--no-tags)" -msgstr "без доÑтавÑнето на вÑички етикети „--no-tags“" - -msgid "number of submodules fetched in parallel" -msgstr "брой подмодули доÑтавени паралелно" - -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "" -"промÑна на указателÑ, така че и той, както оÑтаналите, да бъде в „refs/" -"prefetch/“" - -msgid "prune remote-tracking branches no longer on remote" -msgstr "окаÑÑ‚Ñ€Ñне на клоните ÑледÑщи вече неÑъщеÑтвуващи отдалечени клони" - -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "" -"окаÑÑ‚Ñ€Ñне на локалните етикети, които вече не ÑъщеÑтвуват в отдалеченото " -"хранилище и презапиÑване на променените" - -msgid "on-demand" -msgstr "ПРИ ÐУЖДÐ" - -msgid "control recursive fetching of submodules" -msgstr "управление на рекурÑивното доÑтавÑне на подмодулите" - -msgid "write fetched references to the FETCH_HEAD file" -msgstr "запазване на доÑтавените указатели във файла „FETCH_HEAD“" - -msgid "keep downloaded pack" -msgstr "запазване на изтеглените пакети Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸" - -msgid "allow updating of HEAD ref" -msgstr "позволÑване на обновÑването на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“" - -msgid "deepen history of shallow clone" -msgstr "задълбочаване на иÑториÑта на плитко хранилище" - -msgid "deepen history of shallow repository based on time" -msgstr "задълбочаване на иÑториÑта на плитко хранилище до определено време" - -msgid "convert to a complete repository" -msgstr "превръщане в пълно хранилище" - -msgid "re-fetch without negotiating common commits" -msgstr "повторно доÑтавÑне без договарÑне на общите подаваниÑ" - -msgid "prepend this to submodule path output" -msgstr "добавÑне на това пред Ð¿ÑŠÑ‚Ñ Ð½Ð° подмодула" - -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "" -"Ñтандартно рекурÑивно изтеглÑне на подмодулите (файловете Ñ Ð½Ð°Ñтройки Ñа Ñ " -"приоритет)" - -msgid "accept refs that update .git/shallow" -msgstr "приемане на указатели, които обновÑват „.git/shallow“" - -msgid "refmap" -msgstr "КÐРТÐ_С_УКÐЗÐТЕЛИ" - -msgid "specify fetch refmap" -msgstr "указване на КÐРТÐта_С_УКÐЗÐТЕЛИ за доÑтавÑне" - -msgid "report that we have only objects reachable from this object" -msgstr "докладване, че вÑички обекти може Ñа доÑтижими при започване от този" - -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "" -"без доÑтавÑне на пакетни файлове, вмеÑто това да Ñе извеждат предшеÑтвеници " -"на договорните върхове" - -msgid "run 'maintenance --auto' after fetching" -msgstr "изпълнÑване на „maintenance --auto“ Ñлед доÑтавÑне" - -msgid "check for forced-updates on all updated branches" -msgstr "проверка за принудителни обновÑÐ²Ð°Ð½Ð¸Ñ Ð½Ð° вÑички клони" - -msgid "write the commit-graph after fetching" -msgstr "запазване на гра̀фа Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта Ñлед доÑтавÑне" - -msgid "accept refspecs from stdin" -msgstr "четене на указателите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" - msgid "couldn't find remote ref HEAD" msgstr "указателÑÑ‚ „HEAD“ в отдалеченото хранилище не може да бъде открит" #, c-format +msgid "From %.*s\n" +msgstr "От %.*s\n" + +#, c-format msgid "object %s not found" msgstr "обектът „%s“ липÑва" @@ -6259,10 +6191,6 @@ msgstr "" "отхвърлÑне на „%s“, защото плитките върхове не може да бъдат обновÑвани" #, c-format -msgid "From %.*s\n" -msgstr "От %.*s\n" - -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -6355,6 +6283,115 @@ msgstr "" msgid "you need to specify a tag name" msgstr "Ñ‚Ñ€Ñбва да укажете име на етикет" +msgid "fetch from all remotes" +msgstr "доÑтавÑне от вÑички отдалечени хранилища" + +msgid "set upstream for git pull/fetch" +msgstr "задаване на клон за Ñледене за издърпване/доÑтавÑне" + +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "добавÑне към „.git/FETCH_HEAD“ вмеÑто замÑна" + +msgid "use atomic transaction to update references" +msgstr "изиÑкване на атомарни операции за обновÑване на указателите" + +msgid "path to upload pack on remote end" +msgstr "отдалечен път, където да Ñе качи пакетът" + +msgid "force overwrite of local reference" +msgstr "принудително презапиÑване на локален указател" + +msgid "fetch from multiple remotes" +msgstr "доÑтавÑне от множеÑтво отдалечени хранилища" + +msgid "fetch all tags and associated objects" +msgstr "доÑтавÑне на вÑички етикети и принадлежащи обекти" + +msgid "do not fetch all tags (--no-tags)" +msgstr "без доÑтавÑнето на вÑички етикети „--no-tags“" + +msgid "number of submodules fetched in parallel" +msgstr "брой подмодули доÑтавени паралелно" + +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"промÑна на указателÑ, така че и той, както оÑтаналите, да бъде в „refs/" +"prefetch/“" + +msgid "prune remote-tracking branches no longer on remote" +msgstr "окаÑÑ‚Ñ€Ñне на клоните ÑледÑщи вече неÑъщеÑтвуващи отдалечени клони" + +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" +"окаÑÑ‚Ñ€Ñне на локалните етикети, които вече не ÑъщеÑтвуват в отдалеченото " +"хранилище и презапиÑване на променените" + +msgid "on-demand" +msgstr "ПРИ ÐУЖДÐ" + +msgid "control recursive fetching of submodules" +msgstr "управление на рекурÑивното доÑтавÑне на подмодулите" + +msgid "write fetched references to the FETCH_HEAD file" +msgstr "запазване на доÑтавените указатели във файла „FETCH_HEAD“" + +msgid "keep downloaded pack" +msgstr "запазване на изтеглените пакети Ñ Ð¾Ð±ÐµÐºÑ‚Ð¸" + +msgid "allow updating of HEAD ref" +msgstr "позволÑване на обновÑването на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“" + +msgid "deepen history of shallow clone" +msgstr "задълбочаване на иÑториÑта на плитко хранилище" + +msgid "deepen history of shallow repository based on time" +msgstr "задълбочаване на иÑториÑта на плитко хранилище до определено време" + +msgid "convert to a complete repository" +msgstr "превръщане в пълно хранилище" + +msgid "re-fetch without negotiating common commits" +msgstr "повторно доÑтавÑне без договарÑне на общите подаваниÑ" + +msgid "prepend this to submodule path output" +msgstr "добавÑне на това пред Ð¿ÑŠÑ‚Ñ Ð½Ð° подмодула" + +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"Ñтандартно рекурÑивно изтеглÑне на подмодулите (файловете Ñ Ð½Ð°Ñтройки Ñа Ñ " +"приоритет)" + +msgid "accept refs that update .git/shallow" +msgstr "приемане на указатели, които обновÑват „.git/shallow“" + +msgid "refmap" +msgstr "КÐРТÐ_С_УКÐЗÐТЕЛИ" + +msgid "specify fetch refmap" +msgstr "указване на КÐРТÐта_С_УКÐЗÐТЕЛИ за доÑтавÑне" + +msgid "report that we have only objects reachable from this object" +msgstr "докладване, че вÑички обекти може Ñа доÑтижими при започване от този" + +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" +"без доÑтавÑне на пакетни файлове, вмеÑто това да Ñе извеждат предшеÑтвеници " +"на договорните върхове" + +msgid "run 'maintenance --auto' after fetching" +msgstr "изпълнÑване на „maintenance --auto“ Ñлед доÑтавÑне" + +msgid "check for forced-updates on all updated branches" +msgstr "проверка за принудителни обновÑÐ²Ð°Ð½Ð¸Ñ Ð½Ð° вÑички клони" + +msgid "write the commit-graph after fetching" +msgstr "запазване на гра̀фа Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта Ñлед доÑтавÑне" + +msgid "accept refspecs from stdin" +msgstr "четене на указателите от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" + msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "" "ОпциÑта „--negotiate-only“ изиÑква една или повече опции „--negotiation-" @@ -6473,6 +6510,12 @@ msgstr "извеждане Ñамо на указателите, които ÑÑŠ msgid "print only refs which don't contain the commit" msgstr "извеждане Ñамо на указателите, които не Ñъдържат това ПОДÐÐ’ÐÐЕ" +msgid "read reference patterns from stdin" +msgstr "изчитане на шаблоните за указатели от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" + +msgid "unknown arguments supplied with --stdin" +msgstr "непознат аргумент към опциÑта „--stdin“" + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=ÐÐСТРОЙКР[--] ÐРГУМЕÐТ…" @@ -6485,6 +6528,10 @@ msgstr "наÑтройка, коÑто Ñъдържа ÑпиÑък Ñ Ð¿ÑŠÑ‚Ð¸Ñ‰ msgid "missing --config=<config>" msgstr "липÑва --config=ÐÐСТРОЙКÐ" +#, c-format +msgid "got bad config --config=%s" +msgstr "получена е неправилена наÑтройка „--config=%s“" + msgid "unknown" msgstr "непознат" @@ -6631,19 +6678,28 @@ msgstr "%s: неÑвързаниÑÑ‚ връх „HEAD“ не Ñочи към н msgid "notice: %s points to an unborn branch (%s)" msgstr "предупреждение: „%s“ Ñочи към вÑе още неÑъщеÑтвуващ клон (%s)" -msgid "Checking cache tree" -msgstr "Проверка на кеша на обектите-дървета" +#, c-format +msgid "Checking cache tree of %s" +msgstr "Проверка на кеша на обектите-дървета на „%s“" #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "„%s“: неправилен указател за SHA1 в кеша на обектите-дървета" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "„%s“: неправилен указател за SHA1 в кеша на обектите-дървета на „%s“" msgid "non-tree in cache-tree" msgstr "в кеша на обектите-дървета има нещо, което не е дърво" #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "„%s“: неправилен указател за отмÑна на разрешените подаваниÑ" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "„%s“: неправилен указател за отмÑна на разрешените Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð½Ð° „%s“" + +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "обратниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° пакета „%s“ не може да бъде зареден" + +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "неправилен обратен Ð¸Ð½Ð´ÐµÐºÑ Ð·Ð° пакета „%s“" msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" @@ -9584,6 +9640,13 @@ msgstr "неподдържана верÑÐ¸Ñ Ð½Ð° индекÑа „%s“" msgid "bad index version '%s'" msgstr "неправилна верÑÐ¸Ñ Ð½Ð° индекÑа „%s“" +msgid "show progress meter during object writing phase" +msgstr "извеждане на напредъка във фазата на запазване на обектите" + +msgid "similar to --all-progress when progress meter is shown" +msgstr "" +"Ñъщото дейÑтвие като опциÑта „--all-progress“ при извеждането на напредъка" + msgid "<version>[,<offset>]" msgstr "ВЕРСИЯ[,ОТМЕСТВÐÐЕ]" @@ -9788,6 +9851,9 @@ msgstr "" "ни извеÑтите Ñ Ðµ-пиÑмо до пощенÑÐºÐ¸Ñ ÑпиÑък:\n" "<git@vger.kernel.org>.\n" +msgid "refusing to run without --i-still-use-this" +msgstr "Ñ‚Ñ€Ñбва да добавите и опциÑта „--i-still-use-this“" + msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -9962,8 +10028,8 @@ msgstr "ОбновÑване на вÑе още неÑъздаден клон Ñ msgid "pull with rebase" msgstr "издърпване Ñ Ð¿Ñ€ÐµÐ±Ð°Ð·Ð¸Ñ€Ð°Ð½Ðµ" -msgid "please commit or stash them." -msgstr "Ñ‚Ñ€Ñбва да подадете или Ñкатаете промѐните." +msgid "Please commit or stash them." +msgstr "Промѐните Ñ‚Ñ€Ñбва или да Ñе подадат, или да Ñе ÑкатаÑÑ‚." #, c-format msgid "" @@ -10001,7 +10067,7 @@ msgstr "Ðе може да превъртите към повече от едиРmsgid "Need to specify how to reconcile divergent branches." msgstr "" -"ТрÑбва да укажете как да Ñе решават разликите при разминаване на клоните." +"ТрÑбва да укажете как да Ñе решават разликите при раздалечаване на клоните." msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -10210,8 +10276,8 @@ msgstr "Ðеправилна ÑтойноÑÑ‚ за „%s“" msgid "repository" msgstr "хранилище" -msgid "push all refs" -msgstr "изтлаÑкване на вÑички указатели" +msgid "push all branches" +msgstr "изтлаÑкване на вÑички клони" msgid "mirror all refs" msgstr "огледално копие на вÑички указатели" @@ -10219,8 +10285,10 @@ msgstr "огледално копие на вÑички указатели" msgid "delete refs" msgstr "изтриване на указателите" -msgid "push tags (can't be used with --all or --mirror)" -msgstr "изтлаÑкване на етикетите (неÑъвмеÑтимо Ñ Ð¾Ð¿Ñ†Ð¸Ð¸Ñ‚Ðµ „--all“ и „--mirror“)" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "" +"изтлаÑкване на етикетите (неÑъвмеÑтимо Ñ Ð¾Ð¿Ñ†Ð¸Ð¸Ñ‚Ðµ „--all“, „--branches“ и „--" +"mirror“)" msgid "force updates" msgstr "принудително обновÑване" @@ -10485,6 +10553,10 @@ msgstr "" "Ð’ резултат те не може да Ñе пребазират." #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "Ðеправилен режим за „--rebase-merges“: %s" + +#, c-format msgid "could not switch to %s" msgstr "не може да Ñе премине към „%s“" @@ -10499,6 +10571,15 @@ msgstr "" "неправилна ÑтойноÑÑ‚ „%s“: вариантите Ñа „drop“ (преÑкачане), " "„keep“ (запазване) и „ask“ (питане)" +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"ползването на „--rebase-merges“ Ñ Ð¿Ñ€Ð°Ð·ÐµÐ½ низ за аргумент е оÑтарÑло и в " +"бъдеще ще Ñпре да работи. Ползвайте опциÑта „--rebase-merges“ без аргумент, " +"за да поÑтигнете ÑÑŠÑ‰Ð¸Ñ Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚." + #, c-format msgid "" "%s\n" @@ -10728,22 +10809,25 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "опциÑта „C“ очаква чиÑло за аргумент" -#, c-format -msgid "Unknown mode: %s" -msgstr "ÐеизвеÑтна ÑтратегиÑ: „%s“" - msgid "--strategy requires --merge or --interactive" msgstr "" "опциÑта „--strategy“ изиÑква нÑÐºÐ¾Ñ Ð¾Ñ‚ опциите „--merge“ или „--interactive“" msgid "" -"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" "autosquash" msgstr "" -"опциите за прилагане Ñа неÑъвмеÑтими Ñ â€žrebase.autosquash“. Пробвайте да " +"опциите за прилагане Ñа неÑъвмеÑтими Ñ â€žrebase.autoSquash“. Пробвайте да " "добавите опциÑта „--no-autosquash“" msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "" +"опциите за прилагане Ñа неÑъвмеÑтими Ñ â€žrebase.rebaseMerges“. Пробвайте да " +"добавите опциÑта „--no-rebase-merges“" + +msgid "" "apply options are incompatible with rebase.updateRefs. Consider adding --no-" "update-refs" msgstr "" @@ -10789,9 +10873,6 @@ msgstr "„%s“: изиÑква Ñе точно една база за преб msgid "Does not point to a valid commit '%s'" msgstr "УказателÑÑ‚ „%s“ не Ñочи към подаване" -msgid "Please commit or stash them." -msgstr "Промѐните Ñ‚Ñ€Ñбва или да Ñе подадат, или да Ñе ÑкатаÑÑ‚." - msgid "HEAD is up to date." msgstr "УказателÑÑ‚ „HEAD“ е напълно актуален." @@ -11476,9 +11557,9 @@ msgstr "" msgid "approxidate" msgstr "евриÑтична дата" -msgid "with -C, expire objects older than this" +msgid "with --cruft, expire objects older than this" msgstr "" -"Ñ Ð¾Ð¿Ñ†Ð¸Ñта „-C“: обÑвÑване на обектите по-Ñтари от това ВРЕМЕ за оÑтарели" +"Ñ Ð¾Ð¿Ñ†Ð¸Ñта „--cruft“: обÑвÑване на обектите по-Ñтари от това ВРЕМЕ за оÑтарели" msgid "remove redundant packs, and run git-prune-packed" msgstr "" @@ -12158,6 +12239,9 @@ msgstr "" msgid "remote name" msgstr "име на отдалечено хранилище" +msgid "push all refs" +msgstr "изтлаÑкване на вÑички указатели" + msgid "use stateless RPC protocol" msgstr "използване на протокол без запазване на ÑÑŠÑтоÑнието за RPC" @@ -12364,9 +12448,11 @@ msgstr "" "локалното хранилище" msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) ОПЦИЯ…" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) ОПЦИЯ…" msgid "this worktree is not sparse" msgstr "това работно дърво не е чаÑтично" @@ -12492,6 +12578,24 @@ msgstr "" msgid "error while refreshing working directory" msgstr "грешка при обновÑване на работната директориÑ" +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks] [--[no-]cone] [--rules-" +"file ФÐЙЛ]" + +msgid "terminate input and output files by a NUL character" +msgstr "разделÑне на входните и изходните файлове Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“" + +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "" +"когато е придружено Ñ â€ž--rules-file“ шаблоните Ñе третират като шаблони в " +"пътеводен режим" + +msgid "use patterns in <file> instead of the current ones." +msgstr "ползване на шаблоните във ФÐЙЛа вмеÑто текущите." + msgid "git stash list [<log-options>]" msgstr "git stash list [ОПЦИЯ_ЗÐ_ЖУРÐÐЛ…]" @@ -15421,8 +15525,8 @@ msgstr "дължината на Ñъкращаване е извън диапаРmsgid "bad zlib compression level %d" msgstr "неправилно ниво на компреÑиране: %d" -msgid "core.commentChar should only be one character" -msgstr "наÑтройката „core.commentChar“ Ñ‚Ñ€Ñбва да е Ñамо един знак" +msgid "core.commentChar should only be one ASCII character" +msgstr "наÑтройката „core.commentChar“ Ñ‚Ñ€Ñбва да е Ñамо един знак от ASCII" #, c-format msgid "ignoring unknown core.fsyncMethod value '%s'" @@ -15540,6 +15644,10 @@ msgid "invalid section name: %s" msgstr "неправилно име на раздел: %s" #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "ред %2$<PRIuMAX> в „%1$s“ е прекалено дълъг" + +#, c-format msgid "missing value for '%s'" msgstr "липÑва ÑтойноÑÑ‚ за „%s“" @@ -16235,6 +16343,9 @@ msgstr "добавÑне на допълнителен Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ Ð·Ð° вÑÐ msgid "do not show any source or destination prefix" msgstr "без Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ Ð·Ð° източника и целта" +msgid "use default prefixes a/ and b/" +msgstr "ползване на Ñтандартните префикÑи „a/“ и „b/“" + msgid "show context between diff hunks up to the specified number of lines" msgstr "" "извеждане на контекÑÑ‚ между поÑледователните парчета Ñ Ñ€Ð°Ð·Ð»Ð¸ÐºÐ¸ от ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ " @@ -16541,6 +16652,14 @@ msgstr "директориÑта на git не може да Ñе мигрира msgid "hint: Waiting for your editor to close the file...%c" msgstr "ПодÑказка: чака Ñе редакторът ви да затвори файла …%c" +#, c-format +msgid "could not write to '%s'" +msgstr "в „%s“ не може да Ñе пише" + +#, c-format +msgid "could not edit '%s'" +msgstr "„%s“ не може да Ñе редактира" + msgid "Filtering content" msgstr "Филтриране на Ñъдържанието" @@ -16846,6 +16965,10 @@ msgid "no config key given for --config-env\n" msgstr "опциÑта „--config-env“ изиÑква ключ\n" #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "опциÑта „--attr-source“ изиÑква източник на атрибути\n" + +#, c-format msgid "unknown option: %s\n" msgstr "непозната опциÑ: „%s“\n" @@ -18588,6 +18711,10 @@ msgid "unable to get disk usage of '%s'" msgstr "използваното мÑÑто за Ñъхранение на „%s“ не може да бъде получено" #, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "неправилна Ñума за проверка за файла Ñ Ð±Ð¸Ñ‚Ð¾Ð²Ð¸ маÑки „%s“" + +#, c-format msgid "mtimes file %s is too small" msgstr "файлът Ñ Ð²Ñ€ÐµÐ¼ÐµÑ‚Ð¾ на промÑна (mtime) „%s“ е твърде малък" @@ -18633,6 +18760,14 @@ msgstr "" "идентификатор на контролна Ñума %2$<PRIu32> на файла Ñ Ð¾Ð±Ñ€Ð°Ñ‚ÐµÐ½ Ð¸Ð½Ð´ÐµÐºÑ â€ž%1$s“ " "не Ñе поддържа" +msgid "invalid checksum" +msgstr "неправилна Ñума за проверка" + +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "" +"неправилна Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ Ð² Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑ Ð¿Ñ€Ð¸ %<PRIu64>: %<PRIu32> != %<PRIu32>" + msgid "cannot both write and verify reverse index" msgstr "обратниÑÑ‚ Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ може едновременно да Ñе запиÑва и да Ñе проверÑва" @@ -19379,6 +19514,10 @@ msgid "positive width expected with the %%(align) atom" msgstr "очаква Ñе положителна широчина Ñ Ð»ÐµÐºÑемата „%%(align)“" #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "очакван формат: %%(ahead-behind:ПОДÐÐ’ÐÐЕ)" + +#, c-format msgid "malformed field name: %.*s" msgstr "неправилно име на обект: „%.*s“" @@ -19929,10 +20068,10 @@ msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" -"ТекущиÑÑ‚ клон Ñе е отделил от „%s“,\n" +"ТекущиÑÑ‚ клон Ñе е раздалечил от „%s“,\n" "двата имат Ñъответно по %d и %d неÑъвпадащи подаваниÑ.\n" msgstr[1] "" -"ТекущиÑÑ‚ клон Ñе е отделил от „%s“,\n" +"ТекущиÑÑ‚ клон Ñе е раздалечил от „%s“,\n" "двата имат Ñъответно по %d и %d неÑъвпадащи подаваниÑ.\n" msgid " (use \"git pull\" to merge the remote branch into yours)\n" @@ -20012,10 +20151,6 @@ msgid "no remembered resolution for '%s'" msgstr "липÑва запазена ÐºÐ¾Ñ€ÐµÐºÑ†Ð¸Ñ Ð½Ð° конфликт при „%s“" #, c-format -msgid "cannot unlink '%s'" -msgstr "„%s“ не може да Ñе изтрие" - -#, c-format msgid "Updated preimage for '%s'" msgstr "ПредварителниÑÑ‚ вариант на „%s“ е обновен" @@ -20384,10 +20519,6 @@ msgid "could not lock '%s'" msgstr "„%s“ не може да Ñе заключи" #, c-format -msgid "could not write to '%s'" -msgstr "в „%s“ не може да Ñе пише" - -#, c-format msgid "could not write eol to '%s'" msgstr "краÑÑ‚ на ред не може да Ñе запише в „%s“" @@ -20757,9 +20888,6 @@ msgstr "" "директориÑта за определÑнето на поÑледователноÑтта „%s“ не може да бъде " "Ñъздадена" -msgid "could not lock HEAD" -msgstr "указателÑÑ‚ „HEAD“ не може да Ñе заключи" - msgid "no cherry-pick or revert in progress" msgstr "" "в момента не Ñе извършва отбиране на Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ пребазиране на клона" @@ -20862,13 +20990,13 @@ msgstr "" " git rebase --continue\n" "\n" -msgid "and made changes to the index and/or the working tree\n" -msgstr "и Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ð¸Ð½Ð´ÐµÐºÑа и/или работното дърво\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "и Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ Ð¸Ð½Ð´ÐµÐºÑа и/или работното дърво.\n" #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" @@ -21325,10 +21453,6 @@ msgstr[0] "%u байт/Ñек." msgstr[1] "%u байта/Ñек." #, c-format -msgid "could not edit '%s'" -msgstr "„%s“ не може да Ñе редактира" - -#, c-format msgid "ignoring suspicious submodule name: %s" msgstr "игнориране на подозрително име на подмодул: „%s“" @@ -23085,13 +23209,17 @@ msgid "(%s) Could not execute '%s'" msgstr "(%s) Ðе може да бъде Ñе изпълни „%s“" #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) ДобавÑне на „%s: %s“ от: „%s“\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) Ðеправилен изход от: „%s“." #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) програмниÑÑ‚ канал не може да Ñе затвори за изпълнението на „%s“" +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) ДобавÑне на „%s: %s“ от: „%s“\n" + msgid "cannot send message as 7bit" msgstr "Ñъобщението не може да Ñе изпрати чрез 7 битови знаци" @@ -68,8 +68,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-01 01:20+0000\n" -"PO-Revision-Date: 2023-03-01 19:00-0600\n" +"POT-Creation-Date: 2023-05-20 14:03+0200\n" +"PO-Revision-Date: 2023-05-26 19:00-0600\n" "Last-Translator: Jordi Mas i Hernà ndez <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -584,7 +584,6 @@ msgstr "«git apply --cached» ha fallat" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -723,6 +722,23 @@ msgstr "Cometeu els vostres canvis abans de fusionar." msgid "Exiting because of unfinished merge." msgstr "S'està sortint a causa d'una fusió no terminada." +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"Les branques divergents no es poden avançar rà pidament, cal que feu:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"o:\n" +"\n" +"\tgit rebase\n" + msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar rà pidament, s'està avortant." @@ -1174,6 +1190,10 @@ msgid "cannot open %s" msgstr "no es pot obrir %s" #, c-format +msgid "cannot unlink '%s'" +msgstr "no es pot fer «unlink» de «%s»" + +#, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." @@ -1365,6 +1385,11 @@ msgid "cannot read '%s'" msgstr "no es pot llegir «%s»" #, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "" +"l'especÃficació de camà «%s» coincideix amb fitxers fora del directori actual" + +#, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camà «%s» no ha coincidit amb cap fitxer" @@ -1380,9 +1405,6 @@ msgstr "no és un nom d'objecte và lid: %s" msgid "not a tree object: %s" msgstr "no és un objecte d'arbre: %s" -msgid "current working directory is untracked" -msgstr "no se segueix el directori de treball actual" - #, c-format msgid "File not found: %s" msgstr "Fitxer no trobat: %s" @@ -1503,11 +1525,14 @@ msgstr "no es pot fer fstat gitattributes al fitxer «%s»" #, c-format msgid "ignoring overly large gitattributes file '%s'" -msgstr "s'ignorarà el fitxer «%s» gitattributes per massa gran" +msgstr "s'ignorarà el fitxer «%s» gitattributes per ser massa gran" #, c-format msgid "ignoring overly large gitattributes blob '%s'" -msgstr "s'ignorarà la blob «%s» gitattributes per massa gran" +msgstr "s'ignorarà el blob «%s» gitattributes per ser massa gran" + +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "--attr-source incorrecte o GIT_ATTR_SOURCE" #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1605,7 +1630,6 @@ msgstr[1] "(aproximadament %d passos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. -#. #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1615,9 +1639,6 @@ msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n" msgid "--contents and --reverse do not blend well." msgstr "--contents i --reverse no funcionen bé juntes." -msgid "cannot use --contents with final commit object name" -msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" - msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse i --first-parent junts requereixen una última comissió especificada" @@ -1694,20 +1715,17 @@ msgstr "no s'està seguint: informació ambigua per a la referència «%s»" #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. -#. #. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space #. around. -#. #, c-format msgid " %s\n" msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. -#. #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -1802,10 +1820,6 @@ msgstr "submòdul «%s»: no es pot crear la branca: «%s»" msgid "'%s' is already checked out at '%s'" msgstr "«%s» ja s'ha agafat a «%s»" -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "HEAD de l'arbre de treball %s no està actualitzat" - msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opcions>] [--] <especificació-de-camÃ>..." @@ -2125,7 +2139,6 @@ msgstr "El cos de la comissió és:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#. #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" @@ -2474,7 +2487,6 @@ msgstr "bisecant amb només una comissió %s" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " @@ -2552,7 +2564,6 @@ msgstr "Cal començar per «git bisect start»\n" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. msgid "Do you want me to do it for you [Y/n]? " msgstr "Voleu que ho faci per vostè [Y/n]? " @@ -2709,7 +2720,7 @@ msgid "show raw timestamp (Default: off)" msgstr "mostra la marca de temps en cru (per defecte: desactivat)" msgid "show long commit SHA1 (Default: off)" -msgstr "mostra l'SHA1 de comissió llarg (per defecte: desactivat)" +msgstr "mostra l'SHA1 de la comissió en format llarg (per defecte: desactivat)" msgid "suppress author name and timestamp (Default: off)" msgstr "omet el nom d'autor i la marca de temps (per defecte: desactivat)" @@ -2773,7 +2784,6 @@ msgstr "" #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. -#. msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" @@ -2859,6 +2869,14 @@ msgid "remote-tracking branch '%s' not found." msgstr "no s'ha trobat la branca amb seguiment remot «%s»." #, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"no s'ha trobat la branca «%s».\n" +"Us heu oblidat de --remote?" + +#, c-format msgid "branch '%s' not found." msgstr "no s'ha trobat la branca «%s»." @@ -2889,6 +2907,10 @@ msgid "Branch %s is being bisected at %s" msgstr "La branca %s s'està bisecant a %s" #, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD de l'arbre de treball %s no està actualitzat" + +#, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no và lid: «%s»" @@ -2992,6 +3014,9 @@ msgstr "mou/canvia de nom una branca i el seu registre de referència" msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destà existeixi" +msgid "do not output a newline after empty formatted refs" +msgstr "no emetis cap lÃnia nova després de refs amb format buit" + msgid "copy a branch and its reflog" msgstr "copia una branca i el seu registre de referència" @@ -3210,12 +3235,10 @@ msgid "Created new report at '%s'.\n" msgstr "S'ha creat un nou informe a «%s».\n" msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<versió>] <fitxer> <git-rev-list-args>" msgid "git bundle verify [-q | --quiet] <file>" @@ -3236,11 +3259,11 @@ msgstr "no mostris l'indicador de progrés" msgid "show progress meter" msgstr "mostra l'indicador de progrés" -msgid "show progress meter during object writing phase" -msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" +msgid "historical; same as --progress" +msgstr "històric; el mateix que --progress" -msgid "similar to --all-progress when progress meter is shown" -msgstr "similar a --all-progress quan l'indicador de progrés es mostra" +msgid "historical; does nothing" +msgstr "històric; no fa res" msgid "specify bundle format version" msgstr "especifica la versió del format del farcell" @@ -4250,12 +4273,16 @@ msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "«%s» és un enllaç simbòlic, es rebutja clonar amb --local" + +#, c-format msgid "failed to start iterator over '%s'" msgstr "no s'ha pogut iniciar l'iterador sobre «%s»" #, c-format msgid "symlink '%s' exists, refusing to clone with --local" -msgstr "l'enllaç simbòlic «%s» existeix, es nega a clonar amb --local" +msgstr "l'enllaç simbòlic «%s» existeix, es rebutja a clonar amb --local" #, c-format msgid "failed to unlink '%s'" @@ -4979,7 +5006,6 @@ msgstr "reusa el missatge de la comissió especificada" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. -#. msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" @@ -5263,7 +5289,7 @@ msgid "writing to stdin is not supported" msgstr "no s'admet escriure a stdin" msgid "writing config blobs is not supported" -msgstr "no s'ha admet l'escriptura de blobs de configuració" +msgstr "no s'admet l'escriptura de blobs de configuració" #, c-format msgid "" @@ -5778,120 +5804,14 @@ msgstr "git fetch --all [<opcions>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel no pot ser negatiu" -msgid "fetch from all remotes" -msgstr "obtén de tots els remots" - -msgid "set upstream for git pull/fetch" -msgstr "estableix la font per a git pull/fetch" - -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure'l" - -msgid "use atomic transaction to update references" -msgstr "usa una transacció atòmica per a actualitzar les referències" - -msgid "path to upload pack on remote end" -msgstr "camà al qual pujar el paquet al costat remot" - -msgid "force overwrite of local reference" -msgstr "força la sobreescriptura de la referència local" - -msgid "fetch from multiple remotes" -msgstr "obtén de múltiples remots" - -msgid "fetch all tags and associated objects" -msgstr "obtén totes les etiquetes i tots els objectes associats" - -msgid "do not fetch all tags (--no-tags)" -msgstr "no obtinguis les etiquetes (--no-tags)" - -msgid "number of submodules fetched in parallel" -msgstr "nombre de submòduls obtinguts en paral·lel" - -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "" -"modifica l'especificació de referència per a col·locar totes les referències " -"dins de refs/prefetch/" - -msgid "prune remote-tracking branches no longer on remote" -msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" - -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "" -"poda les etiquetes locals que ja no existeixen al remot i adjunta les " -"etiquetes que han canviat" - -msgid "on-demand" -msgstr "sota demanda" - -msgid "control recursive fetching of submodules" -msgstr "controla l'obtenció recursiva de submòduls" - -msgid "write fetched references to the FETCH_HEAD file" -msgstr "escriu les referències obtingudes al fitxer FETCH_HEAD" - -msgid "keep downloaded pack" -msgstr "retén el paquet baixat" - -msgid "allow updating of HEAD ref" -msgstr "permet l'actualització de la referència HEAD" - -msgid "deepen history of shallow clone" -msgstr "aprofundeix la història d'un clon superficial" - -msgid "deepen history of shallow repository based on time" -msgstr "aprofundeix la història d'un clon superficial basat en una data" - -msgid "convert to a complete repository" -msgstr "converteix en un repositori complet" - -msgid "re-fetch without negotiating common commits" -msgstr "tornar a obtenir sense negociar comissions comunes" - -msgid "prepend this to submodule path output" -msgstr "anteposa això a la sortida de camà del submòdul" - -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "" -"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que " -"els fitxers de configuració)" - -msgid "accept refs that update .git/shallow" -msgstr "accepta les referències que actualitzin .git/shallow" - -msgid "refmap" -msgstr "mapa de referències" - -msgid "specify fetch refmap" -msgstr "especÃfica l'obtenció del mapa de referències" - -msgid "report that we have only objects reachable from this object" -msgstr "informa que només hi ha objectes abastables des d'aquest objecte" - -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "" -"no obtinguis un fitxer de paquet; en canvi, mostra els avantpassats dels " -"consells de negociació" - -msgid "run 'maintenance --auto' after fetching" -msgstr "executa «maintenance --auto» després d'obtenir" - -msgid "check for forced-updates on all updated branches" -msgstr "" -"comprova si hi ha actualitzacions forçades a totes les branques actualitzades" - -msgid "write the commit-graph after fetching" -msgstr "escriu el graf de comissions després de recollir" - -msgid "accept refspecs from stdin" -msgstr "llegeix les especificacions de referència des de stdin" - msgid "couldn't find remote ref HEAD" msgstr "no s'ha pogut trobar la referència HEAD remota" #, c-format +msgid "From %.*s\n" +msgstr "De %.*s\n" + +#, c-format msgid "object %s not found" msgstr "objecte %s no trobat" @@ -5964,10 +5884,6 @@ msgstr "" "s'ha rebutjat %s perquè no es permeten actualitzar les arrels superficials" #, c-format -msgid "From %.*s\n" -msgstr "De %.*s\n" - -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -6060,6 +5976,116 @@ msgstr "" msgid "you need to specify a tag name" msgstr "necessiteu especificar un nom d'etiqueta" +msgid "fetch from all remotes" +msgstr "obtén de tots els remots" + +msgid "set upstream for git pull/fetch" +msgstr "estableix la font per a git pull/fetch" + +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure'l" + +msgid "use atomic transaction to update references" +msgstr "usa una transacció atòmica per a actualitzar les referències" + +msgid "path to upload pack on remote end" +msgstr "camà al qual pujar el paquet al costat remot" + +msgid "force overwrite of local reference" +msgstr "força la sobreescriptura de la referència local" + +msgid "fetch from multiple remotes" +msgstr "obtén de múltiples remots" + +msgid "fetch all tags and associated objects" +msgstr "obtén totes les etiquetes i tots els objectes associats" + +msgid "do not fetch all tags (--no-tags)" +msgstr "no obtinguis les etiquetes (--no-tags)" + +msgid "number of submodules fetched in parallel" +msgstr "nombre de submòduls obtinguts en paral·lel" + +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"modifica l'especificació de referència per a col·locar totes les referències " +"dins de refs/prefetch/" + +msgid "prune remote-tracking branches no longer on remote" +msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" + +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" +"poda les etiquetes locals que ja no existeixen al remot i adjunta les " +"etiquetes que han canviat" + +msgid "on-demand" +msgstr "sota demanda" + +msgid "control recursive fetching of submodules" +msgstr "controla l'obtenció recursiva de submòduls" + +msgid "write fetched references to the FETCH_HEAD file" +msgstr "escriu les referències obtingudes al fitxer FETCH_HEAD" + +msgid "keep downloaded pack" +msgstr "retén el paquet baixat" + +msgid "allow updating of HEAD ref" +msgstr "permet l'actualització de la referència HEAD" + +msgid "deepen history of shallow clone" +msgstr "aprofundeix la història d'un clon superficial" + +msgid "deepen history of shallow repository based on time" +msgstr "aprofundeix la història d'un clon superficial basat en una data" + +msgid "convert to a complete repository" +msgstr "converteix en un repositori complet" + +msgid "re-fetch without negotiating common commits" +msgstr "tornar a obtenir sense negociar comissions comunes" + +msgid "prepend this to submodule path output" +msgstr "anteposa això a la sortida de camà del submòdul" + +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que " +"els fitxers de configuració)" + +msgid "accept refs that update .git/shallow" +msgstr "accepta les referències que actualitzin .git/shallow" + +msgid "refmap" +msgstr "mapa de referències" + +msgid "specify fetch refmap" +msgstr "especÃfica l'obtenció del mapa de referències" + +msgid "report that we have only objects reachable from this object" +msgstr "informa que només hi ha objectes abastables des d'aquest objecte" + +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" +"no obtinguis un fitxer de paquet; en canvi, mostra els avantpassats dels " +"consells de negociació" + +msgid "run 'maintenance --auto' after fetching" +msgstr "executa «maintenance --auto» després d'obtenir" + +msgid "check for forced-updates on all updated branches" +msgstr "" +"comprova si hi ha actualitzacions forçades a totes les branques actualitzades" + +msgid "write the commit-graph after fetching" +msgstr "escriu el graf de comissions després de recollir" + +msgid "accept refspecs from stdin" +msgstr "llegeix les especificacions de referència des de stdin" + msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only necessita un o més --negotiation-tip=*" @@ -6176,6 +6202,12 @@ msgstr "imprimeix només les referències que continguin la comissió" msgid "print only refs which don't contain the commit" msgstr "imprimeix només les referències que no continguin la comissió" +msgid "read reference patterns from stdin" +msgstr "llegeix els patrons de referència de l'entrada està ndard" + +msgid "unknown arguments supplied with --stdin" +msgstr "s'han proporcionat arguments desconeguts amb --stdin" + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<config> [--] <arguments>" @@ -6188,6 +6220,10 @@ msgstr "clau de configuració emmagatzemant una llista de camins de repositori" msgid "missing --config=<config>" msgstr "falta --config=<config>" +#, c-format +msgid "got bad config --config=%s" +msgstr "s'ha obtingut una configuració incorrecta --config=%s" + msgid "unknown" msgstr "desconegut" @@ -6334,19 +6370,28 @@ msgstr "%s: la HEAD separada no apunta a res" msgid "notice: %s points to an unborn branch (%s)" msgstr "avÃs: %s apunta a una branca no nascuda (%s)" -msgid "Checking cache tree" -msgstr "S'està comprovant l'arbre de la memòria cau" +#, c-format +msgid "Checking cache tree of %s" +msgstr "S'està comprovant l'arbre de la memòria cau %s" #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s: apuntador sha1 no và lid a l'arbre de la memòria cau" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s: punter sha1 no và lid a l'arbre de la memòria cau %s" msgid "non-tree in cache-tree" msgstr "un no arbre en l'arbre de la memòria cau" #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s: el punter sha1 no és và lid a «resolve-undo»" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s: punter sha1 no và lid a «resolve-undo» de %s" + +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "no s'ha pogut carregar l'Ãndex de reversió per al paquet «%s»" + +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "rev-index no và lid per al paquet «%s»" msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" @@ -6768,7 +6813,6 @@ msgstr "s'ha especificat un nombre de fils no và lid (%d) per a %s" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads -#. #, c-format msgid "no threads support, ignoring %s" msgstr "no s'admeten fils, s'ignorarà %s" @@ -8851,7 +8895,6 @@ msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. -#. #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)" @@ -9236,6 +9279,12 @@ msgstr "versió d'Ãndex no compatible %s" msgid "bad index version '%s'" msgstr "versió d'Ãndex incorrecta «%s»" +msgid "show progress meter during object writing phase" +msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" + +msgid "similar to --all-progress when progress meter is shown" +msgstr "similar a --all-progress quan l'indicador de progrés es mostra" + msgid "<version>[,<offset>]" msgstr "<versió>[,<desplaçament>]" @@ -9435,6 +9484,9 @@ msgstr "" "i feu-nos saber que encara l'useu enviant un correu electrònic\n" "a <git@vger.kernel.org>. Grà cies.\n" +msgid "refusing to run without --i-still-use-this" +msgstr "es rebutja a executar sense --i-still-use-this" + msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -9609,8 +9661,8 @@ msgstr "" msgid "pull with rebase" msgstr "baixar fent «rebase»" -msgid "please commit or stash them." -msgstr "cometeu-los o emmagatzemeu-los." +msgid "Please commit or stash them." +msgstr "Cometeu-los o emmagatzemeu-los." #, c-format msgid "" @@ -9854,7 +9906,7 @@ msgstr "valor no và lid per a «%s»" msgid "repository" msgstr "repositori" -msgid "push all refs" +msgid "push all branches" msgstr "puja totes les referències" msgid "mirror all refs" @@ -9863,8 +9915,8 @@ msgstr "reflecteix totes les referències" msgid "delete refs" msgstr "suprimeix les referències" -msgid "push tags (can't be used with --all or --mirror)" -msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "puja les etiquetes (no es pot usar amb --all, --branches o --mirror)" msgid "force updates" msgstr "força les actualitzacions" @@ -10130,6 +10182,10 @@ msgstr "" "Com a resultat, git no pot fer un «rebase» d'elles." #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "Mode de fusió de rebase desconegut: %s" + +#, c-format msgid "could not switch to %s" msgstr "no s'ha pogut commutar a %s" @@ -10143,6 +10199,15 @@ msgid "" msgstr "" "tipus buit no reconegut «%s»; els valors và lids són «drop», «keep» i «ask»." +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"--rebase-merges amb un argument de cadena buit està obsolet i deixarà de " +"funcionar en una versió futura del Git. Utilitzeu --rebase-merges sense un " +"argument, que fa el mateix." + #, c-format msgid "" "%s\n" @@ -10357,21 +10422,24 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "«switch» «c» espera un valor numèric" -#, c-format -msgid "Unknown mode: %s" -msgstr "Mode desconegut: %s" - msgid "--strategy requires --merge or --interactive" msgstr "--strategy requereix --merge o --interactive" msgid "" -"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" "autosquash" msgstr "" -"les opcions «apply» són incompatibles amb rebase.autosquash. Considereu " +"les opcions «apply» són incompatibles amb rebase.autoSquash. Considereu " "afegir-hi --no-autosquash" msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "" +"les opcions «apply» són incompatibles amb rebase.rebaseMerges. Considereu " +"afegir-hi --no-rebase-merges" + +msgid "" "apply options are incompatible with rebase.updateRefs. Consider adding --no-" "update-refs" msgstr "" @@ -10415,9 +10483,6 @@ msgstr "«%s»: necessita exactament una base de fusió" msgid "Does not point to a valid commit '%s'" msgstr "No apunta a una comissió và lida «%s»" -msgid "Please commit or stash them." -msgstr "Cometeu-los o emmagatzemeu-los." - msgid "HEAD is up to date." msgstr "HEAD està al dia." @@ -10884,7 +10949,6 @@ msgstr "(sense URL)" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. -#. #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" @@ -11091,8 +11155,8 @@ msgstr "" msgid "approxidate" msgstr "data aproximada" -msgid "with -C, expire objects older than this" -msgstr "amb -C, venç els objectes més antics que aquest" +msgid "with --cruft, expire objects older than this" +msgstr "amb --cruft, vencen els objectes més antics que aquest" msgid "remove redundant packs, and run git-prune-packed" msgstr "elimina els paquets redundants, i executeu git-prune-packed" @@ -11764,6 +11828,9 @@ msgstr "" msgid "remote name" msgstr "nom del remot" +msgid "push all refs" +msgstr "puja totes les referències" + msgid "use stateless RPC protocol" msgstr "usa el protocol RPC sense estat" @@ -11968,9 +12035,11 @@ msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències de stdin que no siguin en el repositori local" msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<opcions>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<opcions>]" msgid "this worktree is not sparse" msgstr "aquest arbre de treball no és dispers" @@ -12094,6 +12163,24 @@ msgstr "" msgid "error while refreshing working directory" msgstr "s'ha produït un error en actualitzar el directori de treball" +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <fitxer>]" + +msgid "terminate input and output files by a NUL character" +msgstr "acaba els fitxers d'entrada i de sortida amb un carà cter NUL" + +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "" +"quan s'utilitza amb --rules-file, interpreta els patrons com a patrons del " +"mode con" + +msgid "use patterns in <file> instead of the current ones." +msgstr "utilitza patrons en <file> en lloc dels actuals." + msgid "git stash list [<log-options>]" msgstr "git stash list [<log-options>]" @@ -14994,8 +15081,8 @@ msgstr "la longitud d'«abbrev» està fora de rang: %d" msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib incorrecte %d" -msgid "core.commentChar should only be one character" -msgstr "core.commentChar només hauria de ser un carà cter" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar només hauria de ser un carà cter ASCII" #, c-format msgid "ignoring unknown core.fsyncMethod value '%s'" @@ -15108,6 +15195,11 @@ msgid "invalid section name: %s" msgstr "nom de secció no và lida: %s" #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "" +"es rebutja treballar amb una lÃnia massa llarga a «%s» a la lÃnia %<PRIuMAX>" + +#, c-format msgid "missing value for '%s'" msgstr "falta el valor per «%s»" @@ -15790,6 +15882,9 @@ msgstr "afegir un prefix addicional per a cada lÃnia de sortida" msgid "do not show any source or destination prefix" msgstr "no mostris cap prefix d'origen o destÃ" +msgid "use default prefixes a/ and b/" +msgstr "utilitza els prefixos per defecte a/ i b/" + msgid "show context between diff hunks up to the specified number of lines" msgstr "" "mostra el context entre trossos de diferència fins al nombre especificat de " @@ -16101,6 +16196,14 @@ msgstr "no s'ha pogut migrar el directori de «%s» a «%s»" msgid "hint: Waiting for your editor to close the file...%c" msgstr "consell: s'està esperant que el vostre editor tanqui el fitxer...%c" +#, c-format +msgid "could not write to '%s'" +msgstr "no s'ha pogut escriure a «%s»" + +#, c-format +msgid "could not edit '%s'" +msgstr "no s'ha pogut editar «%s»" + msgid "Filtering content" msgstr "S'està filtrant el contingut" @@ -16268,14 +16371,12 @@ msgstr "s'ha produït un error en processar els acks: %d" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. -#. #, c-format msgid "expected packfile to be sent after '%s'" msgstr "s'esperava que el fitxer de paquet s'enviés després de «%s»" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. -#. #, c-format msgid "expected no other sections to be sent after no '%s'" msgstr "no s'esperava que cap altra secció s'enviés després de «%s»" @@ -16399,6 +16500,10 @@ msgid "no config key given for --config-env\n" msgstr "no s'ha indicat cap clau de configuració per a --config-env\n" #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "no s'ha donat d'atribut font per a --attr-source\n" + +#, c-format msgid "unknown option: %s\n" msgstr "opció desconeguda: %s\n" @@ -17089,7 +17194,6 @@ msgstr "" #. name, and the second argument is the abbreviated id of the #. commit that needs to be merged. For example: #. - go to submodule (mysubmodule), and either merge commit abc1234" -#. #, c-format msgid "" " - go to submodule (%s), and either merge commit %s\n" @@ -17124,7 +17228,6 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. -#. #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" @@ -17598,7 +17701,6 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" #. TRANSLATORS: The first %s is the name of #. the environment variable, the second %s is #. its value. -#. #, c-format msgid "Bad %s value: '%s'" msgstr "Valor erroni de %s: «%s»" @@ -17768,7 +17870,7 @@ msgid "object fails fsck: %s" msgstr "l'objecte ha fallat fsck: %s" msgid "refusing to create malformed object" -msgstr "es nega a crear un objecte mal format" +msgstr "es rebutja crear un objecte mal format" #, c-format msgid "read error while indexing %s" @@ -17817,7 +17919,6 @@ msgstr "no s'han pogut desempaquetar els continguts de %s" #. TRANSLATORS: This is a line of ambiguous object #. output shown when we cannot look up or parse the #. object in question. E.g. "deadbeef [bad object]". -#. #, c-format msgid "%s [bad object]" msgstr "%s [objecte incorrecte]" @@ -17826,7 +17927,6 @@ msgstr "%s [objecte incorrecte]" #. object output. E.g.: #. * #. "deadbeef commit 2021-01-01 - Some Commit Message" -#. #, c-format msgid "%s commit %s - %s" msgstr "%s comissió %s - %s" @@ -17841,7 +17941,6 @@ msgstr "%s comissió %s - %s" #. * #. The third argument is the "tag" string #. from object.c. -#. #, c-format msgid "%s tag %s - %s" msgstr "%s etiqueta %s - %s" @@ -17851,21 +17950,18 @@ msgstr "%s etiqueta %s - %s" #. the tag itself. E.g.: #. * #. "deadbeef [bad tag, could not parse it]" -#. #, c-format msgid "%s [bad tag, could not parse it]" msgstr "%s [etiqueta malmesa, no s'ha pogut analitzar]" #. TRANSLATORS: This is a line of ambiguous <type> #. object output. E.g. "deadbeef tree". -#. #, c-format msgid "%s tree" msgstr "arbre %s" #. TRANSLATORS: This is a line of ambiguous <type> #. object output. E.g. "deadbeef blob". -#. #, c-format msgid "%s blob" msgstr "blob %s" @@ -17877,7 +17973,6 @@ msgstr "l'id d'objecte curt %s és ambigu" #. TRANSLATORS: The argument is the list of ambiguous #. objects composed in show_ambiguous_object(). See #. its "TRANSLATORS" comments for details. -#. #, c-format msgid "" "The candidates are:\n" @@ -18110,6 +18205,10 @@ msgid "unable to get disk usage of '%s'" msgstr "no s'ha pogut obtenir l'ús del disc de «%s»" #, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "el fitxer de mapa de bits «%s» té una suma de verificació no và lida" + +#, c-format msgid "mtimes file %s is too small" msgstr "el fitxer mtimes %s és massa petit" @@ -18149,6 +18248,14 @@ msgstr "el fitxer d'Ãndex invers %s té la versió %<PRIu32> no admesa" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "el fitxer d'Ãndex invers %s té un ID de resum %<PRIu32> no admès" +msgid "invalid checksum" +msgstr "suma de verificació no và lida" + +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "" +"posició no và lida de l'Ãndex de reversió a %<PRIu64>: %<PRIu32> != %<PRIu32>" + msgid "cannot both write and verify reverse index" msgstr "no es pot escriure i verificar l'Ãndex invers" @@ -18257,7 +18364,6 @@ msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. -#. #, c-format msgid " or: %s" msgstr " o: %s" @@ -18280,7 +18386,6 @@ msgstr " o: %s" #. function. The "%s" is a line in the (hopefully already #. translated) N_() usage string, which contained embedded #. newlines before we split it up. -#. #, c-format msgid "%*s%s" msgstr "%*s%s" @@ -18879,6 +18984,10 @@ msgid "positive width expected with the %%(align) atom" msgstr "amplada positiva esperada amb l'à tom %%(align)" #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "format esperat: %%(ahead-behind:<committish>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "nom de camp mal format: %.*s" @@ -19262,7 +19371,6 @@ msgstr "" #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. -#. #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -19513,10 +19621,6 @@ msgid "no remembered resolution for '%s'" msgstr "no hi ha cap resolució recordada per a «%s»" #, c-format -msgid "cannot unlink '%s'" -msgstr "no es pot fer «unlink» de «%s»" - -#, c-format msgid "Updated preimage for '%s'" msgstr "Imatge prèvia actualitzada per a «%s»" @@ -19855,10 +19959,6 @@ msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar «%s»" #, c-format -msgid "could not write to '%s'" -msgstr "no s'ha pogut escriure a «%s»" - -#, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de lÃnia a «%s»" @@ -19875,7 +19975,6 @@ msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". -#. #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'Ãndex nou" @@ -20221,9 +20320,6 @@ msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»" msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador «%s»" -msgid "could not lock HEAD" -msgstr "no s'ha pogut bloquejar HEAD" - msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" @@ -20318,13 +20414,13 @@ msgstr "" " git rebase --continue\n" "\n" -msgid "and made changes to the index and/or the working tree\n" -msgstr "i ha fet canvis a l'Ãndex i/o l'arbre de treball\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "i ha fet canvis a l'Ãndex i/o a l'arbre de treball.\n" #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" @@ -20334,7 +20430,8 @@ msgstr "" "però ha deixat canvis a l'Ãndex i/o l'arbre de treball\n" "Cometeu o feu «stash» dels vostres canvis, i llavors executeu\n" "\n" -" git rebase --continue\n" +" git rebase --continue\n" +"\n" #, c-format msgid "illegal label name: '%.*s'" @@ -20772,10 +20869,6 @@ msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" #, c-format -msgid "could not edit '%s'" -msgstr "no s'ha pogut editar «%s»" - -#, c-format msgid "ignoring suspicious submodule name: %s" msgstr "s'està ignorant el nom de submòdul sospitós %s" @@ -22512,13 +22605,17 @@ msgid "(%s) Could not execute '%s'" msgstr "(%s) no s'ha pogut executar «%s»" #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) S'està afegint %s: %s des de: «%s»\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) Sortida mal formada de «%s»" #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) s'ha produït un error en tancar el conducte «%s»" +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) S'està afegint %s: %s des de: «%s»\n" + msgid "cannot send message as 7bit" msgstr "no es pot enviar el missatge en 7 bits" @@ -22555,367 +22652,3 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " - -#~ msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -#~ msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" - -#~ msgid "won't bisect on cg-seek'ed tree" -#~ msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek" - -#~ msgid "--bisect-terms requires 0 or 1 argument" -#~ msgstr "--bisect-terms requereix 0 o 1 argument" - -#~ msgid "--bisect-next requires 0 arguments" -#~ msgstr "--bisect-next no requereix cap argument" - -#~ msgid "--bisect-log requires 0 arguments" -#~ msgstr "--bisect-log no requereix cap argument" - -#~ msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -#~ msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>" - -#~ msgid "default for git_env_*(...) to fall back on" -#~ msgstr "valor per defecte per a git_env_*(...) en cas d'absència" - -#~ msgid "be quiet only use git_env_*() value as exit code" -#~ msgstr "silenciós només utilitza el valor git_env_*() com a codi de sortida" - -#, c-format -#~ msgid "" -#~ "option `--default' expects a boolean value with `--type=bool`, not `%s`" -#~ msgstr "" -#~ "l'opció «--default» espera un valor booleà amb «--type=bool», no «%s»" - -#, c-format -#~ msgid "" -#~ "option `--default' expects an unsigned long value with `--type=ulong`, " -#~ "not `%s`" -#~ msgstr "" -#~ "l'opció «--default» espera un valor llarg sense signe amb «--type=ulong», " -#~ "no «%s»" - -#, c-format -#~ msgid "%s doesn't support --super-prefix" -#~ msgstr "%s no admet --super-prefix" - -#, c-format -#~ msgid "no prefix given for --super-prefix\n" -#~ msgstr "no s'ha especificat cap prefix per a --super-prefix\n" - -#, c-format -#~ msgid "failed to read object %s" -#~ msgstr "s'ha produït un error en llegir l'objecte %s" - -#~ msgid "file write error" -#~ msgstr "s'ha produït un error en escriure al fitxer" - -#~ msgid "corrupt commit" -#~ msgstr "comissió corrupta" - -#~ msgid "corrupt tag" -#~ msgstr "etiqueta corrupta" - -#, c-format -#~ msgid "%%(objecttype) does not take arguments" -#~ msgstr "%%(objecttype) no accepta arguments" - -#, c-format -#~ msgid "%%(deltabase) does not take arguments" -#~ msgstr "%%(deltabase) no accepta arguments" - -#, c-format -#~ msgid "%%(body) does not take arguments" -#~ msgstr "%%(body) no accepta arguments" - -#, c-format -#~ msgid "unrecognized email option: %s" -#~ msgstr "opció del correu electrònic no reconeguda: «%s»" - -#, c-format -#~ msgid "" -#~ "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -#~ "may speed it up, but you have to be careful not to forget to add\n" -#~ "new files yourself (see 'git help status')." -#~ msgstr "" -#~ "S'ha trigat %.2f segons enumerar els fitxers no seguits.\n" -#~ "«status -uno» pot accelerar-ho, però heu d'anar amb compte de no\n" -#~ "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" -#~ "«git help status»)." - -#, perl-format -#~ msgid "%12s %12s %s" -#~ msgstr "%12s %12s %s" - -#, perl-format -#~ msgid "touched %d path\n" -#~ msgid_plural "touched %d paths\n" -#~ msgstr[0] "modificat %d camÃ\n" -#~ msgstr[1] "modificat %d camins\n" - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for staging." -#~ msgstr "" -#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " -#~ "immediatament\n" -#~ "per «staging»." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for stashing." -#~ msgstr "" -#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " -#~ "immediatament\n" -#~ "per «stashing»." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for unstaging." -#~ msgstr "" -#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " -#~ "immediatament\n" -#~ "per «unstaging»." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for applying." -#~ msgstr "" -#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " -#~ "immediatament\n" -#~ "per a aplicar-se." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for discarding." -#~ msgstr "" -#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " -#~ "immediatament\n" -#~ "per a descartar-se." - -#, perl-format -#~ msgid "failed to open hunk edit file for writing: %s" -#~ msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s" - -#, perl-format -#~ msgid "" -#~ "---\n" -#~ "To remove '%s' lines, make them ' ' lines (context).\n" -#~ "To remove '%s' lines, delete them.\n" -#~ "Lines starting with %s will be removed.\n" -#~ msgstr "" -#~ "---\n" -#~ "Per a eliminar les lÃnies «%s», convertiu-les en lÃnies ' ' (context).\n" -#~ "Per a eliminar les lÃnies «%s», suprimiu-les.\n" -#~ "Les lÃnies que comencin per %s s'eliminaran.\n" - -#, perl-format -#~ msgid "failed to open hunk edit file for reading: %s" -#~ msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" - -#~ msgid "" -#~ "y - stage this hunk\n" -#~ "n - do not stage this hunk\n" -#~ "q - quit; do not stage this hunk or any of the remaining ones\n" -#~ "a - stage this hunk and all later hunks in the file\n" -#~ "d - do not stage this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - fes «stage» d'aquest tros\n" -#~ "n - no facis «stage» d'aquest tros\n" -#~ "q - surt; no facis «stage» d'aquest tros o de cap altre restant\n" -#~ "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n" -#~ "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer" - -#~ msgid "" -#~ "y - stash this hunk\n" -#~ "n - do not stash this hunk\n" -#~ "q - quit; do not stash this hunk or any of the remaining ones\n" -#~ "a - stash this hunk and all later hunks in the file\n" -#~ "d - do not stash this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - fes «stash» d'aquest tros\n" -#~ "n - no facis «stash» d'aquest tros\n" -#~ "q - surt; no facis «stash» d'aquest tros o de cap altre restant\n" -#~ "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n" -#~ "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer" - -#~ msgid "" -#~ "y - unstage this hunk\n" -#~ "n - do not unstage this hunk\n" -#~ "q - quit; do not unstage this hunk or any of the remaining ones\n" -#~ "a - unstage this hunk and all later hunks in the file\n" -#~ "d - do not unstage this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - fes «unstage» d'aquest tros\n" -#~ "n - no facis «unstage» d'aquest tros\n" -#~ "q - surt; no facis «unstage» d'aquest tros o de cap altre restant\n" -#~ "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n" -#~ "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer" - -#~ msgid "" -#~ "y - apply this hunk to index\n" -#~ "n - do not apply this hunk to index\n" -#~ "q - quit; do not apply this hunk or any of the remaining ones\n" -#~ "a - apply this hunk and all later hunks in the file\n" -#~ "d - do not apply this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - aplica aquest tros a l'Ãndex\n" -#~ "n - no apliquis aquest tros a l'Ãndex\n" -#~ "q - surt; no apliquis aquest tros ni cap dels pendents\n" -#~ "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" -#~ "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" - -#~ msgid "" -#~ "y - discard this hunk from worktree\n" -#~ "n - do not discard this hunk from worktree\n" -#~ "q - quit; do not discard this hunk or any of the remaining ones\n" -#~ "a - discard this hunk and all later hunks in the file\n" -#~ "d - do not discard this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - descarta aquest tros de l'arbre de treball\n" -#~ "n - no descartis aquest tros des de l'arbre de treball\n" -#~ "q - surt; no descartis aquest tros ni cap dels pendents\n" -#~ "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" -#~ "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" - -#~ msgid "" -#~ "y - discard this hunk from index and worktree\n" -#~ "n - do not discard this hunk from index and worktree\n" -#~ "q - quit; do not discard this hunk or any of the remaining ones\n" -#~ "a - discard this hunk and all later hunks in the file\n" -#~ "d - do not discard this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - descarta aquest tros de l'Ãndex i de l'arbre de treball\n" -#~ "n - no descartis aquest tros des de l'Ãndex i de l'arbre de treball\n" -#~ "q - surt; no descartis aquest tros ni cap dels pendents\n" -#~ "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" -#~ "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" - -#~ msgid "" -#~ "y - apply this hunk to index and worktree\n" -#~ "n - do not apply this hunk to index and worktree\n" -#~ "q - quit; do not apply this hunk or any of the remaining ones\n" -#~ "a - apply this hunk and all later hunks in the file\n" -#~ "d - do not apply this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - aplica aquest tros a l'Ãndex i l'arbre de treball\n" -#~ "n - no apliquis aquest tros des de l'Ãndex i de l'arbre de treball\n" -#~ "q - surt; no apliquis aquest tros ni cap dels pendents\n" -#~ "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" -#~ "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" - -#~ msgid "" -#~ "y - apply this hunk to worktree\n" -#~ "n - do not apply this hunk to worktree\n" -#~ "q - quit; do not apply this hunk or any of the remaining ones\n" -#~ "a - apply this hunk and all later hunks in the file\n" -#~ "d - do not apply this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - aplica aquest tros a l'arbre de treball\n" -#~ "n - no apliquis aquest tros a l'arbre de treball\n" -#~ "q - surt; no apliquis aquest tros ni cap dels pendents\n" -#~ "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" -#~ "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" - -#~ msgid "" -#~ "g - select a hunk to go to\n" -#~ "/ - search for a hunk matching the given regex\n" -#~ "j - leave this hunk undecided, see next undecided hunk\n" -#~ "J - leave this hunk undecided, see next hunk\n" -#~ "k - leave this hunk undecided, see previous undecided hunk\n" -#~ "K - leave this hunk undecided, see previous hunk\n" -#~ "s - split the current hunk into smaller hunks\n" -#~ "e - manually edit the current hunk\n" -#~ "? - print help\n" -#~ msgstr "" -#~ "g - selecciona el tros on voleu anar\n" -#~ "/ - cerca un tros que coincideixi amb l'expressió regular donada\n" -#~ "j - deixa aquest tros sense decidir, veure el tros sense decidir següent\n" -#~ "J - deixa aquest tros sense decidir, veure el tros següent\n" -#~ "k - deixa aquest tros sense decidir, veure el tros sense decidir " -#~ "anterior\n" -#~ "K - deixa aquest tros sense decidir, veure el tros anterior\n" -#~ "s - divideix el tros actual en trossos més petits\n" -#~ "e - edita manualment el tros actual\n" -#~ "? - mostra l'ajuda\n" - -#~ msgid "The selected hunks do not apply to the index!\n" -#~ msgstr "Els trossos seleccionats no apliquen a l'Ãndex\n" - -#, perl-format -#~ msgid "ignoring unmerged: %s\n" -#~ msgstr "s'està ignorant %s no fusionat\n" - -#~ msgid "No other hunks to goto\n" -#~ msgstr "No hi ha altres trossos on anar-hi\n" - -#, perl-format -#~ msgid "Invalid number: '%s'\n" -#~ msgstr "Número no và lid: «%s»\n" - -#, perl-format -#~ msgid "Sorry, only %d hunk available.\n" -#~ msgid_plural "Sorry, only %d hunks available.\n" -#~ msgstr[0] "Només %d tros disponible.\n" -#~ msgstr[1] "Només %d trossos disponibles.\n" - -#~ msgid "No other hunks to search\n" -#~ msgstr "No hi ha cap altre tros a cercar\n" - -#, perl-format -#~ msgid "Malformed search regexp %s: %s\n" -#~ msgstr "Expressió regular de cerca mal formada %s: %s\n" - -#~ msgid "No hunk matches the given pattern\n" -#~ msgstr "No hi ha trossos que coincideixin amb el patró donat\n" - -#~ msgid "No previous hunk\n" -#~ msgstr "Sense tros previ\n" - -#~ msgid "No next hunk\n" -#~ msgstr "No hi ha tros següent\n" - -#~ msgid "Sorry, cannot split this hunk\n" -#~ msgstr "No es pot dividir aquest tros\n" - -#, perl-format -#~ msgid "Split into %d hunk.\n" -#~ msgid_plural "Split into %d hunks.\n" -#~ msgstr[0] "Divideix en %d tros.\n" -#~ msgstr[1] "Divideix en %d trossos.\n" - -#~ msgid "Sorry, cannot edit this hunk\n" -#~ msgstr "No es pot editar aquest tros\n" - -#~ msgid "" -#~ "status - show paths with changes\n" -#~ "update - add working tree state to the staged set of changes\n" -#~ "revert - revert staged set of changes back to the HEAD version\n" -#~ "patch - pick hunks and update selectively\n" -#~ "diff - view diff between HEAD and index\n" -#~ "add untracked - add contents of untracked files to the staged set of " -#~ "changes\n" -#~ msgstr "" -#~ "status - mostra els camins amb canvis\n" -#~ "update - afegeix l'estat de l'arbre de treball al conjunt de " -#~ "canvis «staged»\n" -#~ "revert - reverteix el conjunt de canvis de «staged» a la versió " -#~ "HEAD\n" -#~ "patch - selecciona trossos i actualitza'ls selectivament\n" -#~ "diff - mostra la diferència entre HEAD i l'Ãndex\n" -#~ "add untracked - afegeix el contingut dels fitxers no seguits al conjunt " -#~ "de canvis «staged»\n" - -#~ msgid "missing --" -#~ msgstr "manca --" - -#, perl-format -#~ msgid "unknown --patch mode: %s" -#~ msgstr "desconegut --patch mode: %s" - -#, perl-format -#~ msgid "invalid argument %s, expecting --" -#~ msgstr "argument %s no và lid, s'esperava --" - -#, c-format -#~ msgid "unable to normalize object directory: %s" -#~ msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-03 17:13+0100\n" -"PO-Revision-Date: 2023-03-03 13:46+0100\n" +"POT-Creation-Date: 2023-05-22 17:14+0200\n" +"PO-Revision-Date: 2023-05-22 17:16+0200\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German\n" "Language: de\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 3.2.2\n" +"X-Generator: Poedit 3.3.1\n" #, c-format msgid "Huh (%s)?" @@ -688,6 +688,24 @@ msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen." msgid "Exiting because of unfinished merge." msgstr "Beende wegen nicht abgeschlossenem Merge." +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"Abweichende Branches können nicht vorgespult werden, benutzen Sie " +"stattdessen:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"oder:\n" +"\n" +"\tgit rebase\n" + msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." @@ -1144,6 +1162,10 @@ msgid "cannot open %s" msgstr "kann '%s' nicht öffnen" #, c-format +msgid "cannot unlink '%s'" +msgstr "Kann '%s' nicht löschen." + +#, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." @@ -1341,6 +1363,11 @@ msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" #, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "" +"Pfadspezifikation '%s' findet Dateien außerhalb des aktuellen Verzeichnisses" + +#, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" @@ -1356,9 +1383,6 @@ msgstr "Kein gültiger Objektname: %s" msgid "not a tree object: %s" msgstr "Kein Tree-Objekt: %s" -msgid "current working directory is untracked" -msgstr "aktuelles Arbeitsverzeichnis ist unversioniert" - #, c-format msgid "File not found: %s" msgstr "Datei nicht gefunden: %s" @@ -1485,6 +1509,9 @@ msgstr "ignoriere übermäßig große gitattributes-Datei '%s'" msgid "ignoring overly large gitattributes blob '%s'" msgstr "ignoriere übermäßig großen gitattribute-Blob '%s'" +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "ungültiges --attr-source oder GIT_ATTR_SOURCE" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s" @@ -1591,10 +1618,6 @@ msgstr[1] "Binäre Suche: danach noch %d Commits zum Testen übrig %s\n" msgid "--contents and --reverse do not blend well." msgstr "--contents und --reverse funktionieren gemeinsam nicht." -msgid "cannot use --contents with final commit object name" -msgstr "" -"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen" - msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse und --first-parent zusammen erfordern die Angabe eines " @@ -1782,10 +1805,6 @@ msgstr "Submodul '%s': kann Branch nicht erzeugen: '%s'" msgid "'%s' is already checked out at '%s'" msgstr "'%s' ist bereits in '%s' ausgecheckt" -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert" - msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." @@ -2849,6 +2868,14 @@ msgid "remote-tracking branch '%s' not found." msgstr "Remote-Tracking-Branch '%s' nicht gefunden" #, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"Branch '%s' nicht gefunden.\n" +"Haben Sie --remote vergessen?" + +#, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." @@ -2879,6 +2906,10 @@ msgid "Branch %s is being bisected at %s" msgstr "Binäre Suche von Branch %s zu %s im Gange" #, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert" + +#, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" @@ -2983,6 +3014,9 @@ msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" +msgid "do not output a newline after empty formatted refs" +msgstr "keinen Zeilenumbruch nach leer formatierten Referenzen ausgeben" + msgid "copy a branch and its reflog" msgstr "einen Branch und dessen Reflog kopieren" @@ -3212,12 +3246,10 @@ msgid "Created new report at '%s'.\n" msgstr "Neuer Bericht unter '%s' erstellt.\n" msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<Version>] <Datei> <git-rev-list-Argumente>" msgid "git bundle verify [-q | --quiet] <file>" @@ -3238,11 +3270,11 @@ msgstr "keine Fortschrittsanzeige anzeigen" msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -msgid "show progress meter during object writing phase" -msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" +msgid "historical; same as --progress" +msgstr "historisch; dasselbe wie --progress" -msgid "similar to --all-progress when progress meter is shown" -msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" +msgid "historical; does nothing" +msgstr "historisch; kein Effekt" msgid "specify bundle format version" msgstr "Version des Paket-Formats angeben" @@ -4275,6 +4307,11 @@ msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "" +"'%s' ist eine symbolische Verknüpfung, verweigere das Klonen mit --local" + +#, c-format msgid "failed to start iterator over '%s'" msgstr "Fehler beim Starten der Iteration über '%s'" @@ -5828,127 +5865,14 @@ msgstr "git fetch --all [<Optionen>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kann nicht negativ sein" -msgid "fetch from all remotes" -msgstr "fordert von allen Remote-Repositories an" - -msgid "set upstream for git pull/fetch" -msgstr "Upstream für \"git pull/fetch\" setzen" - -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben" - -msgid "use atomic transaction to update references" -msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren" - -msgid "path to upload pack on remote end" -msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" - -msgid "force overwrite of local reference" -msgstr "das Ãœberschreiben einer lokalen Referenz erzwingen" - -msgid "fetch from multiple remotes" -msgstr "von mehreren Remote-Repositories anfordern" - -msgid "fetch all tags and associated objects" -msgstr "alle Tags und verbundene Objekte anfordern" - -msgid "do not fetch all tags (--no-tags)" -msgstr "nicht alle Tags anfordern (--no-tags)" - -msgid "number of submodules fetched in parallel" -msgstr "Anzahl der parallel anzufordernden Submodule" - -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "" -"Refspec verändern, damit alle Referenzen unter refs/prefetch/ platziert " -"werden" - -msgid "prune remote-tracking branches no longer on remote" -msgstr "" -"Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " -"befinden" - -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "" -"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, " -"und geänderte Tags aktualisieren" - -msgid "on-demand" -msgstr "bei-Bedarf" - -msgid "control recursive fetching of submodules" -msgstr "rekursive Anforderungen von Submodulen kontrollieren" - -msgid "write fetched references to the FETCH_HEAD file" -msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei" - -msgid "keep downloaded pack" -msgstr "heruntergeladenes Paket behalten" - -msgid "allow updating of HEAD ref" -msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" - -msgid "deepen history of shallow clone" -msgstr "" -"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" - -msgid "deepen history of shallow repository based on time" -msgstr "" -"die Historie eines Klons mit unvollständiger Historie (shallow) auf " -"Zeitbasis\n" -"vertiefen" - -msgid "convert to a complete repository" -msgstr "zu einem vollständigen Repository konvertieren" - -msgid "re-fetch without negotiating common commits" -msgstr "erneutes Abrufen ohne Aushandeln gemeinsamer Commits" - -msgid "prepend this to submodule path output" -msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" - -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "" -"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n" -"als Konfigurationsdateien)" - -msgid "accept refs that update .git/shallow" -msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" - -msgid "refmap" -msgstr "Refmap" - -msgid "specify fetch refmap" -msgstr "Refmap für 'fetch' angeben" - -msgid "report that we have only objects reachable from this object" -msgstr "" -"ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar " -"sind" - -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "" -"keine Packdatei anfordern; stattdessen die Vorgänger der Verhandlungstipps " -"anzeigen" - -msgid "run 'maintenance --auto' after fetching" -msgstr "führe 'maintenance --auto' nach \"fetch\" aus" - -msgid "check for forced-updates on all updated branches" -msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches" - -msgid "write the commit-graph after fetching" -msgstr "Schreibe den Commit-Graph nach \"fetch\"" - -msgid "accept refspecs from stdin" -msgstr "akzeptiere Refspecs von der Standard-Eingabe" - msgid "couldn't find remote ref HEAD" msgstr "konnte Remote-Referenz von HEAD nicht finden" #, c-format +msgid "From %.*s\n" +msgstr "Von %.*s\n" + +#, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" @@ -6022,10 +5946,6 @@ msgstr "" "Historie (shallow) nicht aktualisiert werden dürfen." #, c-format -msgid "From %.*s\n" -msgstr "Von %.*s\n" - -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -6117,6 +6037,123 @@ msgstr "" msgid "you need to specify a tag name" msgstr "Sie müssen den Namen des Tags angeben" +msgid "fetch from all remotes" +msgstr "fordert von allen Remote-Repositories an" + +msgid "set upstream for git pull/fetch" +msgstr "Upstream für \"git pull/fetch\" setzen" + +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben" + +msgid "use atomic transaction to update references" +msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren" + +msgid "path to upload pack on remote end" +msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" + +msgid "force overwrite of local reference" +msgstr "das Ãœberschreiben einer lokalen Referenz erzwingen" + +msgid "fetch from multiple remotes" +msgstr "von mehreren Remote-Repositories anfordern" + +msgid "fetch all tags and associated objects" +msgstr "alle Tags und verbundene Objekte anfordern" + +msgid "do not fetch all tags (--no-tags)" +msgstr "nicht alle Tags anfordern (--no-tags)" + +msgid "number of submodules fetched in parallel" +msgstr "Anzahl der parallel anzufordernden Submodule" + +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"Refspec verändern, damit alle Referenzen unter refs/prefetch/ platziert " +"werden" + +msgid "prune remote-tracking branches no longer on remote" +msgstr "" +"Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " +"befinden" + +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" +"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, " +"und geänderte Tags aktualisieren" + +msgid "on-demand" +msgstr "bei-Bedarf" + +msgid "control recursive fetching of submodules" +msgstr "rekursive Anforderungen von Submodulen kontrollieren" + +msgid "write fetched references to the FETCH_HEAD file" +msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei" + +msgid "keep downloaded pack" +msgstr "heruntergeladenes Paket behalten" + +msgid "allow updating of HEAD ref" +msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" + +msgid "deepen history of shallow clone" +msgstr "" +"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" + +msgid "deepen history of shallow repository based on time" +msgstr "" +"die Historie eines Klons mit unvollständiger Historie (shallow) auf " +"Zeitbasis\n" +"vertiefen" + +msgid "convert to a complete repository" +msgstr "zu einem vollständigen Repository konvertieren" + +msgid "re-fetch without negotiating common commits" +msgstr "erneutes Abrufen ohne Aushandeln gemeinsamer Commits" + +msgid "prepend this to submodule path output" +msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" + +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n" +"als Konfigurationsdateien)" + +msgid "accept refs that update .git/shallow" +msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" + +msgid "refmap" +msgstr "Refmap" + +msgid "specify fetch refmap" +msgstr "Refmap für 'fetch' angeben" + +msgid "report that we have only objects reachable from this object" +msgstr "" +"ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar " +"sind" + +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" +"keine Packdatei anfordern; stattdessen die Vorgänger der Verhandlungstipps " +"anzeigen" + +msgid "run 'maintenance --auto' after fetching" +msgstr "führe 'maintenance --auto' nach \"fetch\" aus" + +msgid "check for forced-updates on all updated branches" +msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches" + +msgid "write the commit-graph after fetching" +msgstr "Schreibe den Commit-Graph nach \"fetch\"" + +msgid "accept refspecs from stdin" +msgstr "akzeptiere Refspecs von der Standard-Eingabe" + msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only benötigt einen oder mehrere --negotiation-tip=*" @@ -6239,6 +6276,12 @@ msgstr "nur Referenzen ausgeben, die diesen Commit enthalten" msgid "print only refs which don't contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" +msgid "read reference patterns from stdin" +msgstr "Referenzmuster von Standard-Eingabe lesen" + +msgid "unknown arguments supplied with --stdin" +msgstr "unbekannte Argumente mit --stdin geliefert" + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<Konfiguration> [--] <Argumente>" @@ -6251,6 +6294,10 @@ msgstr "Konfigurationsschlüssel für eine Liste von Repository-Pfaden" msgid "missing --config=<config>" msgstr "Option --config=<Konfiguration> fehlt" +#, c-format +msgid "got bad config --config=%s" +msgstr "ungültige Konfiguration --config=%s" + msgid "unknown" msgstr "unbekannt" @@ -6397,19 +6444,28 @@ msgstr "%s: losgelöster HEAD zeigt auf nichts" msgid "notice: %s points to an unborn branch (%s)" msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)" -msgid "Checking cache tree" -msgstr "Prüfe Cache-Verzeichnis" +#, c-format +msgid "Checking cache tree of %s" +msgstr "Prüfe Cache-Verzeichnis von %s" #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s: ungültiger SHA1-Zeiger im Cache-Verzeichnis von %s" msgid "non-tree in cache-tree" msgstr "non-tree in Cache-Verzeichnis" #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s: Ungültiger sha1-Zeiger in resolve-undo" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s: ungültiger SHA1-Zeiger in resolve-undo von %s" + +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "rev-Index für Pack-Datei '%s' kann nicht geladen werden" + +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "ungültiger Rev-Index für Pack-Datei '%s'" msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" @@ -9326,6 +9382,12 @@ msgstr "nicht unterstützte Index-Version %s" msgid "bad index version '%s'" msgstr "ungültige Index-Version '%s'" +msgid "show progress meter during object writing phase" +msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" + +msgid "similar to --all-progress when progress meter is shown" +msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" + msgid "<version>[,<offset>]" msgstr "<Version>[,<Offset>]" @@ -9530,6 +9592,9 @@ msgstr "" "Sie es immer noch verwenden, indem Sie eine E-Mail an\n" "<git@vger.kernel.org> senden. Danke.\n" +msgid "refusing to run without --i-still-use-this" +msgstr "Ausführung ohne --i-still-use-this verweigert" + msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -9712,7 +9777,7 @@ msgstr "" msgid "pull with rebase" msgstr "Pull mit Rebase" -msgid "please commit or stash them." +msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." #, c-format @@ -9962,8 +10027,8 @@ msgstr "ungültiger Wert für '%s'" msgid "repository" msgstr "Repository" -msgid "push all refs" -msgstr "alle Referenzen versenden" +msgid "push all branches" +msgstr "alle Branches versenden" msgid "mirror all refs" msgstr "alle Referenzen spiegeln" @@ -9971,8 +10036,10 @@ msgstr "alle Referenzen spiegeln" msgid "delete refs" msgstr "Referenzen löschen" -msgid "push tags (can't be used with --all or --mirror)" -msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "" +"Tags versenden (kann nicht mit --all, --branches oder --mirror verwendet " +"werden)" msgid "force updates" msgstr "Aktualisierung erzwingen" @@ -10242,6 +10309,10 @@ msgstr "" "ausführen." #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "Unbekannter rebase-merges Modus: %s" + +#, c-format msgid "could not switch to %s" msgstr "Konnte nicht zu %s wechseln." @@ -10258,6 +10329,15 @@ msgstr "" "nicht erkannter leerer Typ '%s'; gültige Werte sind \"drop\", \"keep\", und " "\"ask\"." +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"--rebase-merges mit einem leeren String-Argument ist veraltet und wird in " +"einer zukünftigen Version von Git nicht mehr funktionieren. Verwenden Sie " +"stattdessen --rebase-merges ohne ein Argument, was dasselbe bewirkt." + #, c-format msgid "" "%s\n" @@ -10483,21 +10563,24 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "Schalter `C' erwartet einen numerischen Wert." -#, c-format -msgid "Unknown mode: %s" -msgstr "Unbekannter Modus: %s" - msgid "--strategy requires --merge or --interactive" msgstr "--strategy erfordert --merge oder --interactive" msgid "" -"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" "autosquash" msgstr "" -"apply-Optionen sind mit rebase.autosquash nicht kompatibel. Erwägen Sie das " +"apply-Optionen sind mit rebase.autoSquash nicht kompatibel. Erwägen Sie das " "Hinzufügen von --no-autosquash" msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "" +"apply-Optionen sind nicht kompatibel mit rebase.rebaseMerges. Erwägen Sie " +"das Hinzufügen von --no-rebase-merges" + +msgid "" "apply options are incompatible with rebase.updateRefs. Consider adding --no-" "update-refs" msgstr "" @@ -10541,9 +10624,6 @@ msgstr "'%s': benötige genau eine Merge-Basis" msgid "Does not point to a valid commit '%s'" msgstr "'%s' zeigt auf keinen gültigen Commit." -msgid "Please commit or stash them." -msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." - msgid "HEAD is up to date." msgstr "HEAD ist aktuell." @@ -11221,8 +11301,8 @@ msgstr "genau wie -a, unerreichbare überflüssige Objekte separat packen" msgid "approxidate" msgstr "Datumsangabe" -msgid "with -C, expire objects older than this" -msgstr "mit -C, Objekte älter als angegeben verfallen lassen" +msgid "with --cruft, expire objects older than this" +msgstr "mit --cruft, Objekte verfallen lassen, die älter sind als das" msgid "remove redundant packs, and run git-prune-packed" msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen" @@ -11902,6 +11982,9 @@ msgstr "" msgid "remote name" msgstr "Name des Remote-Repositories" +msgid "push all refs" +msgstr "alle Referenzen versenden" + msgid "use stateless RPC protocol" msgstr "zustandsloses RPC-Protokoll verwenden" @@ -12107,10 +12190,11 @@ msgstr "" "Repository befinden" msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) " -"[<Optionen>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<Optionen>]" msgid "this worktree is not sparse" msgstr "dieses Arbeitsverzeichnis ist nicht partiell" @@ -12241,6 +12325,24 @@ msgstr "" msgid "error while refreshing working directory" msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses." +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <Datei>]" + +msgid "terminate input and output files by a NUL character" +msgstr "Eingabe- und Ausgabedateien durch ein NUL-Zeichen abschließen" + +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "" +"bei Verwendung mit --rules-file werden die Muster als Cone-Modus Muster " +"interpretiert" + +msgid "use patterns in <file> instead of the current ones." +msgstr "Muster aus <Datei> anstelle der aktuellen Muster verwenden" + msgid "git stash list [<log-options>]" msgstr "git stash list [<log-Optionen>]" @@ -15181,8 +15283,8 @@ msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d" msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -msgid "core.commentChar should only be one character" -msgstr "core.commentChar sollte nur ein Zeichen sein" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar sollte nur ein ASCII-Zeichen sein" #, c-format msgid "ignoring unknown core.fsyncMethod value '%s'" @@ -15300,6 +15402,11 @@ msgid "invalid section name: %s" msgstr "Ungültiger Sektionsname: %s" #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "" +"Ausführung mit übermäßig langer Zeile in '%s' bei Zeile %<PRIuMAX> verweigert" + +#, c-format msgid "missing value for '%s'" msgstr "Fehlender Wert für '%s'" @@ -15980,6 +16087,9 @@ msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen" msgid "do not show any source or destination prefix" msgstr "keine Quell- oder Ziel-Präfixe anzeigen" +msgid "use default prefixes a/ and b/" +msgstr "Standardpräfixe a/ und b/ verwenden" + msgid "show context between diff hunks up to the specified number of lines" msgstr "" "Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von Zeilen " @@ -16294,6 +16404,14 @@ msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren" msgid "hint: Waiting for your editor to close the file...%c" msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c" +#, c-format +msgid "could not write to '%s'" +msgstr "Konnte nicht nach '%s' schreiben." + +#, c-format +msgid "could not edit '%s'" +msgstr "Konnte '%s' nicht editieren." + msgid "Filtering content" msgstr "Filtere Inhalt" @@ -16591,6 +16709,10 @@ msgid "no config key given for --config-env\n" msgstr "kein Konfigurationsschlüssel für --config-env angegeben\n" #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "keine Attributquelle für --attr-source angegeben\n" + +#, c-format msgid "unknown option: %s\n" msgstr "Unbekannte Option: %s\n" @@ -18304,6 +18426,10 @@ msgid "unable to get disk usage of '%s'" msgstr "Festplattennutzung von '%s' kann nicht abgerufen werden" #, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "Bitmap-Datei '%s' hat eine ungültige Prüfsumme" + +#, c-format msgid "mtimes file %s is too small" msgstr "mtimes-Datei %s ist zu klein" @@ -18343,6 +18469,13 @@ msgstr "Reverse-Index-Datei %s hat nicht unterstützte Version %<PRIu32>" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "Reverse-Index-Datei %s hat nicht unterstützte Hash-ID %<PRIu32>" +msgid "invalid checksum" +msgstr "ungültige Prüfsumme" + +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "ungültige rev-index Position bei %<PRIu64>: %<PRIu32> != %<PRIu32>" + msgid "cannot both write and verify reverse index" msgstr "" "Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden" @@ -19072,6 +19205,10 @@ msgid "positive width expected with the %%(align) atom" msgstr "Positive Breitenangabe für %%(align) erwartet" #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "erwartetes Format: %%(ahead-behind:<Commit>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" @@ -19711,10 +19848,6 @@ msgid "no remembered resolution for '%s'" msgstr "Keine aufgezeichnete Konfliktauflösung für '%s'." #, c-format -msgid "cannot unlink '%s'" -msgstr "Kann '%s' nicht löschen." - -#, c-format msgid "Updated preimage for '%s'" msgstr "Preimage für '%s' aktualisiert." @@ -20053,10 +20186,6 @@ msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" #, c-format -msgid "could not write to '%s'" -msgstr "Konnte nicht nach '%s' schreiben." - -#, c-format msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." @@ -20424,9 +20553,6 @@ msgstr "versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\"" msgid "could not create sequencer directory '%s'" msgstr "konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen" -msgid "could not lock HEAD" -msgstr "konnte HEAD nicht sperren" - msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gange" @@ -20523,20 +20649,20 @@ msgstr "" "\n" "ausführen.\n" -msgid "and made changes to the index and/or the working tree\n" -msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "und Änderungen am Index und/oder am Arbeitsverzeichnis vorgenommen.\n" #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "Ausführung erfolgreich: %s\n" -"Aber Änderungen in Index oder Arbeitsverzeichnis verblieben.\n" +"Aber es sind Änderungen im Index oder Arbeitsverzeichnis verblieben.\n" "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\".\n" "Führen Sie dann aus:\n" "\n" @@ -20982,10 +21108,6 @@ msgstr[0] "%u Byte/s" msgstr[1] "%u Bytes/s" #, c-format -msgid "could not edit '%s'" -msgstr "Konnte '%s' nicht editieren." - -#, c-format msgid "ignoring suspicious submodule name: %s" msgstr "Ignoriere verdächtigen Submodulnamen: %s" @@ -22794,13 +22916,17 @@ msgid "(%s) Could not execute '%s'" msgstr "(%s) Konnte '%s' nicht ausführen" #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) Füge %s: %s hinzu von: '%s'\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) Fehlerhafte Ausgabe von '%s'" #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'" +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Füge %s: %s hinzu von: '%s'\n" + msgid "cannot send message as 7bit" msgstr "kann Nachricht nicht als 7bit versenden" @@ -22837,377 +22963,3 @@ msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " - -#~ msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -#~ msgstr "git bisect--helper --bisect-state (bad|new) [<Commit>]" - -#~ msgid "won't bisect on cg-seek'ed tree" -#~ msgstr "" -#~ "binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht " -#~ "möglich" - -#~ msgid "--bisect-terms requires 0 or 1 argument" -#~ msgstr "--bisect-terms benötigt 0 oder 1 Argument" - -#~ msgid "--bisect-next requires 0 arguments" -#~ msgstr "--bisect-next benötigt 0 Argumente" - -#~ msgid "--bisect-log requires 0 arguments" -#~ msgstr "--bisect-log benötigt 0 Argumente" - -#~ msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -#~ msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>" - -#~ msgid "default for git_env_*(...) to fall back on" -#~ msgstr "Standard für git_env_*(...), um darauf zurückzugreifen" - -#~ msgid "be quiet only use git_env_*() value as exit code" -#~ msgstr "" -#~ "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden" - -#, c-format -#~ msgid "" -#~ "option `--default' expects a boolean value with `--type=bool`, not `%s`" -#~ msgstr "" -#~ "Option `--default' erwartet einen booleschen Wert bei `--type=bool`, " -#~ "nicht `%s`" - -#, c-format -#~ msgid "" -#~ "option `--default' expects an unsigned long value with `--type=ulong`, " -#~ "not `%s`" -#~ msgstr "" -#~ "Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--" -#~ "type=ulong`, nicht `%s`" - -#, c-format -#~ msgid "%s doesn't support --super-prefix" -#~ msgstr "%s unterstützt kein --super-prefix" - -#, c-format -#~ msgid "no prefix given for --super-prefix\n" -#~ msgstr "Kein Präfix für --super-prefix angegeben.\n" - -#, c-format -#~ msgid "failed to read object %s" -#~ msgstr "Konnte Objekt %s nicht lesen." - -#~ msgid "file write error" -#~ msgstr "Fehler beim Schreiben einer Datei." - -#~ msgid "corrupt commit" -#~ msgstr "fehlerhafter Commit" - -#~ msgid "corrupt tag" -#~ msgstr "fehlerhaftes Tag" - -#, c-format -#~ msgid "%%(objecttype) does not take arguments" -#~ msgstr "%%(objecttype) akzeptiert keine Argumente" - -#, c-format -#~ msgid "%%(deltabase) does not take arguments" -#~ msgstr "%%(deltabase) akzeptiert keine Argumente" - -#, c-format -#~ msgid "%%(body) does not take arguments" -#~ msgstr "%%(body) akzeptiert keine Argumente" - -#, c-format -#~ msgid "unrecognized email option: %s" -#~ msgstr "nicht erkannte E-Mail Option: %s" - -#, c-format -#~ msgid "" -#~ "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -#~ "may speed it up, but you have to be careful not to forget to add\n" -#~ "new files yourself (see 'git help status')." -#~ msgstr "" -#~ "Es dauerte %.2f Sekunden die unversionierten Dateien zu bestimmen.\n" -#~ "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" -#~ "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." - -#, perl-format -#~ msgid "%12s %12s %s" -#~ msgstr "%28s %25s %s" - -#, perl-format -#~ msgid "touched %d path\n" -#~ msgid_plural "touched %d paths\n" -#~ msgstr[0] "%d Pfad angefasst\n" -#~ msgstr[1] "%d Pfade angefasst\n" - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for staging." -#~ msgstr "" -#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -#~ "Patch-Block direkt zum Hinzufügen zur Staging-Area markiert." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for stashing." -#~ msgstr "" -#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -#~ "Patch-Block direkt zum Hinzufügen zum Stash markiert." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for unstaging." -#~ msgstr "" -#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -#~ "Patch-Block direkt zum Entfernen aus der Staging-Area markiert." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for applying." -#~ msgstr "" -#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -#~ "Patch-Block direkt zum Anwenden markiert." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for discarding." -#~ msgstr "" -#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -#~ "Patch-Block direkt zum Verwerfen markiert." - -#, perl-format -#~ msgid "failed to open hunk edit file for writing: %s" -#~ msgstr "" -#~ "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s" - -#, perl-format -#~ msgid "" -#~ "---\n" -#~ "To remove '%s' lines, make them ' ' lines (context).\n" -#~ "To remove '%s' lines, delete them.\n" -#~ "Lines starting with %s will be removed.\n" -#~ msgstr "" -#~ "---\n" -#~ "Um '%s' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n" -#~ "Um '%s' Zeilen zu entfernen, löschen Sie diese.\n" -#~ "Zeilen, die mit %s beginnen, werden entfernt.\n" - -#, perl-format -#~ msgid "failed to open hunk edit file for reading: %s" -#~ msgstr "" -#~ "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" - -#~ msgid "" -#~ "y - stage this hunk\n" -#~ "n - do not stage this hunk\n" -#~ "q - quit; do not stage this hunk or any of the remaining ones\n" -#~ "a - stage this hunk and all later hunks in the file\n" -#~ "d - do not stage this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - diesen Patch-Block zum Commit vormerken\n" -#~ "n - diesen Patch-Block nicht zum Commit vormerken\n" -#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit " -#~ "vormerken\n" -#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit " -#~ "vormerken\n" -#~ "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum " -#~ "Commit vormerken" - -#~ msgid "" -#~ "y - stash this hunk\n" -#~ "n - do not stash this hunk\n" -#~ "q - quit; do not stash this hunk or any of the remaining ones\n" -#~ "a - stash this hunk and all later hunks in the file\n" -#~ "d - do not stash this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - diesen Patch-Block stashen\n" -#~ "n - diesen Patch-Block nicht stashen\n" -#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht stashen\n" -#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" -#~ "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen" - -#~ msgid "" -#~ "y - unstage this hunk\n" -#~ "n - do not unstage this hunk\n" -#~ "q - quit; do not unstage this hunk or any of the remaining ones\n" -#~ "a - unstage this hunk and all later hunks in the file\n" -#~ "d - do not unstage this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - diesen Patch-Block unstashen\n" -#~ "n - diesen Patch-Block nicht unstashen\n" -#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht unstashen\n" -#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n" -#~ "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen" - -#~ msgid "" -#~ "y - apply this hunk to index\n" -#~ "n - do not apply this hunk to index\n" -#~ "q - quit; do not apply this hunk or any of the remaining ones\n" -#~ "a - apply this hunk and all later hunks in the file\n" -#~ "d - do not apply this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - diesen Patch-Block auf den Index anwenden\n" -#~ "n - diesen Patch-Block nicht auf den Index anwenden\n" -#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den " -#~ "Index anwenden\n" -#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index " -#~ "anwenden\n" -#~ "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den " -#~ "Index anwenden" - -#~ msgid "" -#~ "y - discard this hunk from worktree\n" -#~ "n - do not discard this hunk from worktree\n" -#~ "q - quit; do not discard this hunk or any of the remaining ones\n" -#~ "a - discard this hunk and all later hunks in the file\n" -#~ "d - do not discard this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n" -#~ "n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n" -#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im " -#~ "Arbeitsverzeichnis verwerfen\n" -#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei im " -#~ "Arbeitsverzeichnis verwerfen\n" -#~ "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " -#~ "Arbeitsverzeichnis verwerfen" - -#~ msgid "" -#~ "y - discard this hunk from index and worktree\n" -#~ "n - do not discard this hunk from index and worktree\n" -#~ "q - quit; do not discard this hunk or any of the remaining ones\n" -#~ "a - discard this hunk and all later hunks in the file\n" -#~ "d - do not discard this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n" -#~ "n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n" -#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Index " -#~ "und Arbeitsverzeichnis verwerfen\n" -#~ "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n" -#~ "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen" - -#~ msgid "" -#~ "y - apply this hunk to index and worktree\n" -#~ "n - do not apply this hunk to index and worktree\n" -#~ "q - quit; do not apply this hunk or any of the remaining ones\n" -#~ "a - apply this hunk and all later hunks in the file\n" -#~ "d - do not apply this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - diesen Patch-Block im Index und auf Arbeitsverzeichnis anwenden\n" -#~ "n - diesen Patch-Block nicht im Index und auf Arbeitsverzeichnis " -#~ "anwenden\n" -#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht anwenden\n" -#~ "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" -#~ "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden" - -#~ msgid "" -#~ "y - apply this hunk to worktree\n" -#~ "n - do not apply this hunk to worktree\n" -#~ "q - quit; do not apply this hunk or any of the remaining ones\n" -#~ "a - apply this hunk and all later hunks in the file\n" -#~ "d - do not apply this hunk or any of the later hunks in the file" -#~ msgstr "" -#~ "y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n" -#~ "n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n" -#~ "q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n" -#~ "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" -#~ "d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden" - -#~ msgid "" -#~ "g - select a hunk to go to\n" -#~ "/ - search for a hunk matching the given regex\n" -#~ "j - leave this hunk undecided, see next undecided hunk\n" -#~ "J - leave this hunk undecided, see next hunk\n" -#~ "k - leave this hunk undecided, see previous undecided hunk\n" -#~ "K - leave this hunk undecided, see previous hunk\n" -#~ "s - split the current hunk into smaller hunks\n" -#~ "e - manually edit the current hunk\n" -#~ "? - print help\n" -#~ msgstr "" -#~ "g - Patch-Block zum Hinspringen auswählen\n" -#~ "/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n" -#~ "j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-" -#~ "Block anzeigen\n" -#~ "J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n" -#~ "k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-" -#~ "Block anzeigen\n" -#~ "K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block " -#~ "anzeigen\n" -#~ "s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n" -#~ "e - aktuellen Patch-Block manuell editieren\n" -#~ "? - Hilfe anzeigen\n" - -#~ msgid "The selected hunks do not apply to the index!\n" -#~ msgstr "" -#~ "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet " -#~ "werden!\n" - -#, perl-format -#~ msgid "ignoring unmerged: %s\n" -#~ msgstr "ignoriere nicht zusammengeführte Datei: %s\n" - -#~ msgid "No other hunks to goto\n" -#~ msgstr "Keine anderen Patch-Blöcke verbleibend\n" - -#, perl-format -#~ msgid "Invalid number: '%s'\n" -#~ msgstr "Ungültige Nummer: '%s'\n" - -#, perl-format -#~ msgid "Sorry, only %d hunk available.\n" -#~ msgid_plural "Sorry, only %d hunks available.\n" -#~ msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n" -#~ msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n" - -#~ msgid "No other hunks to search\n" -#~ msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n" - -#, perl-format -#~ msgid "Malformed search regexp %s: %s\n" -#~ msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n" - -#~ msgid "No hunk matches the given pattern\n" -#~ msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n" - -#~ msgid "No previous hunk\n" -#~ msgstr "Kein vorheriger Patch-Block\n" - -#~ msgid "No next hunk\n" -#~ msgstr "Kein folgender Patch-Block\n" - -#~ msgid "Sorry, cannot split this hunk\n" -#~ msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n" - -#, perl-format -#~ msgid "Split into %d hunk.\n" -#~ msgid_plural "Split into %d hunks.\n" -#~ msgstr[0] "In %d Patch-Block aufgeteilt.\n" -#~ msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n" - -#~ msgid "Sorry, cannot edit this hunk\n" -#~ msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n" - -#~ msgid "" -#~ "status - show paths with changes\n" -#~ "update - add working tree state to the staged set of changes\n" -#~ "revert - revert staged set of changes back to the HEAD version\n" -#~ "patch - pick hunks and update selectively\n" -#~ "diff - view diff between HEAD and index\n" -#~ "add untracked - add contents of untracked files to the staged set of " -#~ "changes\n" -#~ msgstr "" -#~ "status - Pfade mit Änderungen anzeigen\n" -#~ "update - Zustand des Arbeitsverzeichnisses den zum Commit " -#~ "vorgemerkten Änderungen hinzufügen\n" -#~ "revert - zum Commit vorgemerkte Änderungen auf HEAD Version " -#~ "zurücksetzen\n" -#~ "patch - Patch-Blöcke auswählen und selektiv aktualisieren\n" -#~ "diff - Unterschiede zwischen HEAD und Index anzeigen\n" -#~ "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n" - -#~ msgid "missing --" -#~ msgstr "-- fehlt" - -#, perl-format -#~ msgid "unknown --patch mode: %s" -#~ msgstr "Unbekannter --patch Modus: %s" - -#, perl-format -#~ msgid "invalid argument %s, expecting --" -#~ msgstr "ungültiges Argument %s, erwarte --" @@ -78,8 +78,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-01 01:20+0000\n" -"PO-Revision-Date: 2023-03-02 18:44+0100\n" +"POT-Creation-Date: 2023-05-20 12:25+0200\n" +"PO-Revision-Date: 2023-05-18 18:50+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -739,6 +739,24 @@ msgstr "Veuillez valider vos changements avant de fusionner." msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"Des branches divergentes ne peuvent pas être gérées en avance rapide, vous " +"devez soit :\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"ou :\n" +"\n" +"\tgit rebase\n" + msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." @@ -1200,6 +1218,10 @@ msgid "cannot open %s" msgstr "impossible d'ouvrir %s" #, c-format +msgid "cannot unlink '%s'" +msgstr "impossible de délier '%s'" + +#, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." @@ -1391,6 +1413,12 @@ msgid "cannot read '%s'" msgstr "impossible de lire '%s'" #, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "" +"le spécificateur de chemin '%s' correspond à des fichiers hors du répertoire " +"actuel" + +#, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -1406,9 +1434,6 @@ msgstr "nom d'objet invalide : %s" msgid "not a tree object: %s" msgstr "objet arbre invalide : %s" -msgid "current working directory is untracked" -msgstr "l'arbre de travail actuel est non-suivi" - #, c-format msgid "File not found: %s" msgstr "Fichier non trouvé : %s" @@ -1535,6 +1560,9 @@ msgstr "fichier gitattributes trop gros ignoré '%s'" msgid "ignoring overly large gitattributes blob '%s'" msgstr "blob gitattributes trop gros ignoré '%s'" +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "mauvais --attr-source ou GIT_ATTR_SOURCE" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" @@ -1641,9 +1669,6 @@ msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -msgid "cannot use --contents with final commit object name" -msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" - msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " @@ -1827,10 +1852,6 @@ msgstr "sous-module '%s' : impossible de créer la branche '%s'" msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" - msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." @@ -2889,6 +2910,14 @@ msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvée." #, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"branche '%s' non trouvée.\n" +"Avez-vous oublié --remote ?" + +#, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." @@ -2919,6 +2948,10 @@ msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" #, 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" + +#, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" @@ -3022,6 +3055,9 @@ msgstr "déplacer/renommer une branche et son reflog" msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" +msgid "do not output a newline after empty formatted refs" +msgstr "ne pas générer de nouvelle ligne après des réfs formatées vides" + msgid "copy a branch and its reflog" msgstr "copier une branche et son reflog" @@ -3247,13 +3283,11 @@ msgid "Created new report at '%s'.\n" msgstr "Nouveau rapport créé à '%s'.\n" msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" -" [--version=<version>] <file> <args-de-git-rev-list>" +"git bundle create [-q | --quiet | --progress]\n" +" [--version=<version>] <fichier> <args-de-git-rev-list>" msgid "git bundle verify [-q | --quiet] <file>" msgstr "git bundle verify [-q | --quiet] <fichier>" @@ -3273,11 +3307,11 @@ msgstr "ne pas afficher la barre de progression" msgid "show progress meter" msgstr "afficher la barre de progression" -msgid "show progress meter during object writing phase" -msgstr "afficher la barre de progression durant la phase d'écrite des objets" +msgid "historical; same as --progress" +msgstr "option historique ; identique à --progress" -msgid "similar to --all-progress when progress meter is shown" -msgstr "similaire à --all-progress quand la barre de progression est affichée" +msgid "historical; does nothing" +msgstr "option historique ; ne fait rien" msgid "specify bundle format version" msgstr "spécifier la version du format de colis" @@ -4301,6 +4335,10 @@ msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' est un lien symbolique, refus de cloner avec --local" + +#, c-format msgid "failed to start iterator over '%s'" msgstr "échec du démarrage un itérateur sur '%s'" @@ -5841,123 +5879,14 @@ msgstr "git fetch --all [<options>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel ne peut pas être négatif" -msgid "fetch from all remotes" -msgstr "récupérer depuis tous les dépôts distants" - -msgid "set upstream for git pull/fetch" -msgstr "définir la branche amont pour git pull/fetch" - -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" - -msgid "use atomic transaction to update references" -msgstr "utiliser une transaction atomique pour mettre à jour les références" - -msgid "path to upload pack on remote end" -msgstr "chemin vers lequel télécharger le paquet sur le poste distant" - -msgid "force overwrite of local reference" -msgstr "forcer l'écrasement de la branche locale" - -msgid "fetch from multiple remotes" -msgstr "récupérer depuis plusieurs dépôts distants" - -msgid "fetch all tags and associated objects" -msgstr "récupérer toutes les étiquettes et leurs objets associés" - -msgid "do not fetch all tags (--no-tags)" -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" - -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "" -"modifier le spécificateur de référence pour placer les références dans refs/" -"prefetch/" - -msgid "prune remote-tracking branches no longer on remote" -msgstr "" -"élaguer les branches de suivi distant si la branche n'existe plus dans le " -"dépôt distant" - -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "" -"élaguer les étiquettes locales qui ont disparu du dépôt distant et qui " -"encombrent les étiquettes modifiées" - -msgid "on-demand" -msgstr "à la demande" - -msgid "control recursive fetching of submodules" -msgstr "contrôler la récupération récursive dans les sous-modules" - -msgid "write fetched references to the FETCH_HEAD file" -msgstr "écrire les références récupérées dans le fichier FETCH_HEAD" - -msgid "keep downloaded pack" -msgstr "conserver le paquet téléchargé" - -msgid "allow updating of HEAD ref" -msgstr "permettre la mise à jour de la référence HEAD" - -msgid "deepen history of shallow clone" -msgstr "approfondir l'historique d'un clone superficiel" - -msgid "deepen history of shallow repository based on time" -msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" - -msgid "convert to a complete repository" -msgstr "convertir en un dépôt complet" - -msgid "re-fetch without negotiating common commits" -msgstr "re-récupérer sans négocier les commits communs" - -msgid "prepend this to submodule path output" -msgstr "préfixer ceci à la sortie du chemin du sous-module" - -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "" -"par défaut pour la récupération récursive de sous-modules (priorité plus " -"basse que les fichiers de config)" - -msgid "accept refs that update .git/shallow" -msgstr "accepter les références qui mettent à jour .git/shallow" - -msgid "refmap" -msgstr "correspondance de référence" - -msgid "specify fetch refmap" -msgstr "spécifier une correspondance de référence pour la récupération" - -msgid "report that we have only objects reachable from this object" -msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" - -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "" -"ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des " -"sommets de négociation" - -msgid "run 'maintenance --auto' after fetching" -msgstr "lancer 'maintenance --auto' après la récupération" - -msgid "check for forced-updates on all updated branches" -msgstr "" -"vérifier les mises à jour forcées (forced-updates) sur toutes les branches " -"mises à jour" - -msgid "write the commit-graph after fetching" -msgstr "écrire le graphe de commits après le rapatriement" - -msgid "accept refspecs from stdin" -msgstr "lire les spécificateurs de référence depuis l'entrée standard" - msgid "couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" #, c-format +msgid "From %.*s\n" +msgstr "Depuis %.*s\n" + +#, c-format msgid "object %s not found" msgstr "objet %s non trouvé" @@ -6029,10 +5958,6 @@ msgstr "" "permises" #, c-format -msgid "From %.*s\n" -msgstr "Depuis %.*s\n" - -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -6123,6 +6048,119 @@ msgstr "" msgid "you need to specify a tag name" msgstr "Vous devez spécifier un nom d'étiquette" +msgid "fetch from all remotes" +msgstr "récupérer depuis tous les dépôts distants" + +msgid "set upstream for git pull/fetch" +msgstr "définir la branche amont pour git pull/fetch" + +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" + +msgid "use atomic transaction to update references" +msgstr "utiliser une transaction atomique pour mettre à jour les références" + +msgid "path to upload pack on remote end" +msgstr "chemin vers lequel télécharger le paquet sur le poste distant" + +msgid "force overwrite of local reference" +msgstr "forcer l'écrasement de la branche locale" + +msgid "fetch from multiple remotes" +msgstr "récupérer depuis plusieurs dépôts distants" + +msgid "fetch all tags and associated objects" +msgstr "récupérer toutes les étiquettes et leurs objets associés" + +msgid "do not fetch all tags (--no-tags)" +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" + +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"modifier le spécificateur de référence pour placer les références dans refs/" +"prefetch/" + +msgid "prune remote-tracking branches no longer on remote" +msgstr "" +"élaguer les branches de suivi distant si la branche n'existe plus dans le " +"dépôt distant" + +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" +"élaguer les étiquettes locales qui ont disparu du dépôt distant et qui " +"encombrent les étiquettes modifiées" + +msgid "on-demand" +msgstr "à la demande" + +msgid "control recursive fetching of submodules" +msgstr "contrôler la récupération récursive dans les sous-modules" + +msgid "write fetched references to the FETCH_HEAD file" +msgstr "écrire les références récupérées dans le fichier FETCH_HEAD" + +msgid "keep downloaded pack" +msgstr "conserver le paquet téléchargé" + +msgid "allow updating of HEAD ref" +msgstr "permettre la mise à jour de la référence HEAD" + +msgid "deepen history of shallow clone" +msgstr "approfondir l'historique d'un clone superficiel" + +msgid "deepen history of shallow repository based on time" +msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" + +msgid "convert to a complete repository" +msgstr "convertir en un dépôt complet" + +msgid "re-fetch without negotiating common commits" +msgstr "re-récupérer sans négocier les commits communs" + +msgid "prepend this to submodule path output" +msgstr "préfixer ceci à la sortie du chemin du sous-module" + +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"par défaut pour la récupération récursive de sous-modules (priorité plus " +"basse que les fichiers de config)" + +msgid "accept refs that update .git/shallow" +msgstr "accepter les références qui mettent à jour .git/shallow" + +msgid "refmap" +msgstr "correspondance de référence" + +msgid "specify fetch refmap" +msgstr "spécifier une correspondance de référence pour la récupération" + +msgid "report that we have only objects reachable from this object" +msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" + +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" +"ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des " +"sommets de négociation" + +msgid "run 'maintenance --auto' after fetching" +msgstr "lancer 'maintenance --auto' après la récupération" + +msgid "check for forced-updates on all updated branches" +msgstr "" +"vérifier les mises à jour forcées (forced-updates) sur toutes les branches " +"mises à jour" + +msgid "write the commit-graph after fetching" +msgstr "écrire le graphe de commits après le rapatriement" + +msgid "accept refspecs from stdin" +msgstr "lire les spécificateurs de référence depuis l'entrée standard" + msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only nécessite au moins un --negotiation-tip=*" @@ -6238,6 +6276,12 @@ msgstr "afficher seulement les références qui contiennent le commit" msgid "print only refs which don't contain the commit" msgstr "afficher seulement les références qui ne contiennent pas le commit" +msgid "read reference patterns from stdin" +msgstr "lire les motifs de références depuis l'entrée standard" + +msgid "unknown arguments supplied with --stdin" +msgstr "arguments inconnus fournis avec l'option --stdin" + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<config> [--] <arguments>" @@ -6250,6 +6294,10 @@ msgstr "clé de config qui stocke la liste des chemins de dépôts" msgid "missing --config=<config>" msgstr "--config=<config> manquant" +#, c-format +msgid "got bad config --config=%s" +msgstr "config incorrecte --config=%s" + msgid "unknown" msgstr "inconnu" @@ -6396,19 +6444,28 @@ msgstr "%s : la HEAD détachée ne pointe sur rien" msgid "notice: %s points to an unborn branch (%s)" msgstr "note : %s pointe sur une branche non-née (%s)" -msgid "Checking cache tree" -msgstr "Vérification de l'arbre cache" +#, c-format +msgid "Checking cache tree of %s" +msgstr "Vérification de l'arbre cache de %s" #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s : pointer sha1 invalide dans l'arbre de cache" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s : pointer sha1 invalide dans l'arbre de cache de %s" msgid "non-tree in cache-tree" msgstr "non-arbre dans l'arbre de cache" #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s : pointeur sha1 invalide dans resolve-undo" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s : pointeur sha1 invalide dans resolve-undo de %s" + +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "impossible de charger le rev-index pour le paquet '%s'" + +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "rev-index invalide pour le paquet '%s'" msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" @@ -9321,6 +9378,12 @@ msgstr "version d'index non supportée %s" msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" +msgid "show progress meter during object writing phase" +msgstr "afficher la barre de progression durant la phase d'écrite des objets" + +msgid "similar to --all-progress when progress meter is shown" +msgstr "similaire à --all-progress quand la barre de progression est affichée" + msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" @@ -9518,6 +9581,9 @@ msgstr "" "sur la ligne de commande pour nous avertir par\n" "un courriel à <git@vger.kernel.org>. Merci.\n" +msgid "refusing to run without --i-still-use-this" +msgstr "refus de lancer sans --i-still-use-this" + msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -9694,8 +9760,8 @@ msgstr "" msgid "pull with rebase" msgstr "tirer avec un rebasage" -msgid "please commit or stash them." -msgstr "veuillez les valider ou les remiser." +msgid "Please commit or stash them." +msgstr "Veuillez les valider ou les remiser." #, c-format msgid "" @@ -9946,8 +10012,8 @@ msgstr "valeur invalide pour '%s'" msgid "repository" msgstr "dépôt" -msgid "push all refs" -msgstr "pousser toutes les références" +msgid "push all branches" +msgstr "pousser toutes les branches" msgid "mirror all refs" msgstr "refléter toutes les références" @@ -9955,9 +10021,10 @@ msgstr "refléter toutes les références" msgid "delete refs" msgstr "supprimer les références" -msgid "push tags (can't be used with --all or --mirror)" +msgid "push tags (can't be used with --all or --branches or --mirror)" msgstr "" -"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" +"pousser les étiquettes (ne peut pas être utilisé avec --all, --branches ou --" +"mirror)" msgid "force updates" msgstr "forcer les mises à jour" @@ -10225,6 +10292,10 @@ msgstr "" "Résultat, git ne peut pas les rebaser." #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "Mode de rebase-merges inconnu : %s" + +#, c-format msgid "could not switch to %s" msgstr "impossible de basculer vers %s" @@ -10240,6 +10311,15 @@ msgstr "" "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), " "\"keep\" (garder) et \"ask\" (demander)." +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"--rebase-merges avec un argument chaîne vide est obsolète et cessera de " +"fonctionner dans une version future de Git. Utilisez à la place --rebase-" +"merges sans argument, qui a le même effet." + #, c-format msgid "" "%s\n" @@ -10460,21 +10540,24 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -#, c-format -msgid "Unknown mode: %s" -msgstr "Mode inconnu : %s" - msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" msgid "" -"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" "autosquash" msgstr "" -"les options d'application sont incompatibles avec rebase.autosquash. " +"les options d'application sont incompatibles avec rebase.autoSquash. " "Considérez l'ajout de --no-autosquash" msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "" +"les options d'application sont incompatibles avec rebase.rebaseMerges. " +"Considérez l'ajout de --no-rebase-merges" + +msgid "" "apply options are incompatible with rebase.updateRefs. Consider adding --no-" "update-refs" msgstr "" @@ -10518,9 +10601,6 @@ msgstr "'%s': exactement une base de fusion nécessaire" msgid "Does not point to a valid commit '%s'" msgstr "Ne pointe pas sur une validation valide : '%s'" -msgid "Please commit or stash them." -msgstr "Veuillez les valider ou les remiser." - msgid "HEAD is up to date." msgstr "HEAD est à jour." @@ -11197,8 +11277,8 @@ msgstr "" msgid "approxidate" msgstr "date approximative" -msgid "with -C, expire objects older than this" -msgstr "avec -C, faire expirer les objets plus vieux que celui-ci" +msgid "with --cruft, expire objects older than this" +msgstr "avec --cruft, faire expirer les objets plus vieux que celui-ci" msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" @@ -11871,6 +11951,9 @@ msgstr "" msgid "remote name" msgstr "nom distant" +msgid "push all refs" +msgstr "pousser toutes les références" + msgid "use stateless RPC protocol" msgstr "utiliser un protocole RPC sans état" @@ -12081,9 +12164,11 @@ msgstr "" "local" msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgid "this worktree is not sparse" msgstr "cet arbre de travail n'est pas clairsemé" @@ -12213,6 +12298,24 @@ msgstr "" msgid "error while refreshing working directory" msgstr "erreur lors du rafraîchissement du répertoire de travail" +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <fichier>]" + +msgid "terminate input and output files by a NUL character" +msgstr "terminer les fichiers en entrée et en sortie par un caractère NUL" + +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "" +"quand utilisé avec --rules-file, interpréter les motifs comme des motifs en " +"mode cone" + +msgid "use patterns in <file> instead of the current ones." +msgstr "utiliser les motifs dans <fichier> plutôt que les actuels." + msgid "git stash list [<log-options>]" msgstr "git stash list [<options-de-log>]" @@ -12419,7 +12522,7 @@ msgid "stash staged changes only" msgstr "remiser seulement les modifications indexées" msgid "stash in patch mode" -msgstr "remiser une mode rustine" +msgstr "remiser en mode rustine" msgid "quiet mode" msgstr "mode silencieux" @@ -15146,8 +15249,8 @@ msgstr "longueur d'abbrev hors plage : %d" msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -msgid "core.commentChar should only be one character" -msgstr "core.commentChar ne devrait être qu'un unique caractère" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar ne devrait être qu'un unique caractère ASCII" #, c-format msgid "ignoring unknown core.fsyncMethod value '%s'" @@ -15262,6 +15365,12 @@ msgid "invalid section name: %s" msgstr "nom de section invalide : %s" #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "" +"refus de travailler avec des lignes trop longues dans '%s' à la ligne " +"%<PRIuMAX>" + +#, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -15950,6 +16059,9 @@ msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" +msgid "use default prefixes a/ and b/" +msgstr "utiliser les préfixes par défaut a/ et b/" + msgid "show context between diff hunks up to the specified number of lines" msgstr "" "afficher le contexte entre les sections à concurrence du nombre de ligne " @@ -16271,6 +16383,14 @@ msgstr "" "suggestion : en attente de la fermeture du fichier par votre éditeur de " "texte…%c" +#, c-format +msgid "could not write to '%s'" +msgstr "impossible d'écrire dans '%s'" + +#, c-format +msgid "could not edit '%s'" +msgstr "impossible d'éditer '%s'" + msgid "Filtering content" msgstr "Filtrage du contenu" @@ -16570,6 +16690,10 @@ msgid "no config key given for --config-env\n" msgstr "aucune clé de configuration fournie pour --config-env\n" #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "aucune source d'attribut fournie pour --attr-source\n" + +#, c-format msgid "unknown option: %s\n" msgstr "option inconnue : %s\n" @@ -18265,6 +18389,10 @@ msgid "unable to get disk usage of '%s'" msgstr "impossible de récupérer l'utilisation du disque de '%s'" #, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "le fichier bitmap '%s' a une somme de contrôle invalide" + +#, c-format msgid "mtimes file %s is too small" msgstr "le fichier de mtimes %s est trop petit" @@ -18304,6 +18432,13 @@ msgstr "le fichier d'index inverse %s a une version non gérée %<PRIu32>" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "le fichier d'index inverse %s a un id d'empreinte non géré %<PRIu32>" +msgid "invalid checksum" +msgstr "somme de contrôle invalide" + +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "position de rev-index invalide à %<PRIu64> : %<PRIu32> != %<PRIu32>" + msgid "cannot both write and verify reverse index" msgstr "impossible de lire et vérifier à la fois l'index inverse" @@ -19038,6 +19173,10 @@ msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "format attendu : %%(ahead-behind:<commit-esque>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" @@ -19672,10 +19811,6 @@ msgid "no remembered resolution for '%s'" msgstr "aucune résolution enregistrée pour '%s'" #, c-format -msgid "cannot unlink '%s'" -msgstr "impossible de délier '%s'" - -#, c-format msgid "Updated preimage for '%s'" msgstr "Pré-image mise à jour pour '%s'" @@ -20014,10 +20149,6 @@ msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" #, c-format -msgid "could not write to '%s'" -msgstr "impossible d'écrire dans '%s'" - -#, c-format msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" @@ -20382,9 +20513,6 @@ msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -msgid "could not lock HEAD" -msgstr "impossible de verrouiller HEAD" - msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" @@ -20480,20 +20608,20 @@ msgstr "" "git rebase --continue\n" "\n" -msgid "and made changes to the index and/or the working tree\n" -msgstr "et a mis à jour l'index ou l'arbre de travail\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "et a mis à jour l'index ou l'arbre de travail.\n" #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "l'exécution a réussi : %s\n" -"mais a laissé des modifications dans l'index ou la copie de travail\n" +"mais a laissé des modifications dans l'index ou la copie de travail.\n" "Validez ou remisez vos modification, puis lancez\n" "\n" " git rebase --continue\n" @@ -20937,10 +21065,6 @@ msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" #, c-format -msgid "could not edit '%s'" -msgstr "impossible d'éditer '%s'" - -#, c-format msgid "ignoring suspicious submodule name: %s" msgstr "nom de sous-module suspicieux %s ignoré" @@ -22698,13 +22822,17 @@ msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exécuter '%s'" #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) Sortie malformée depuis '%s'" #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) échec de la fermeture du pipe vers '%s'" +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" + msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" @@ -22741,3 +22869,19 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " + +#~ msgid "current working directory is untracked" +#~ msgstr "l'arbre de travail actuel est non-suivi" + +#~ msgid "cannot use --contents with final commit object name" +#~ msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" + +#~ msgid "please commit or stash them." +#~ msgstr "veuillez les valider ou les remiser." + +#, c-format +#~ msgid "Unknown mode: %s" +#~ msgstr "Mode inconnu : %s" + +#~ msgid "could not lock HEAD" +#~ msgstr "impossible de verrouiller HEAD" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-02 15:18+0700\n" -"PO-Revision-Date: 2023-03-02 17:52+0700\n" +"POT-Creation-Date: 2023-05-19 19:57+0000\n" +"PO-Revision-Date: 2023-05-22 15:24+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -793,6 +793,25 @@ msgid "Exiting because of unfinished merge." msgstr "Keluar karena penggabungan belum selesai." #: advice.c +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"Cabang yang menyebar tidak dapat dimajucepatkan, Anda perlu salah satu " +"dari:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"atau:\n" +"\n" +"\tgit rebase\n" + +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "Tidak mungkin untuk maju cepat, batalkan." @@ -1339,6 +1358,11 @@ msgstr "memotong nama berkas .rej ke %.*s.rej" msgid "cannot open %s" msgstr "tidak dapat membuka %s" +#: apply.c rerere.c +#, c-format +msgid "cannot unlink '%s'" +msgstr "tidak dapat batal taut '%s'" + #: apply.c #, c-format msgid "Hunk #%d applied cleanly." @@ -1579,6 +1603,11 @@ msgstr "git archive --remote <repo> [--exec <perintah>] --list" msgid "cannot read '%s'" msgstr "tidak dapat membaca '%s'" +#: archive.c +#, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "spek jalur '%s' mencocoki berkas di luar direktori saat ini" + #: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" @@ -1600,10 +1629,6 @@ msgid "not a tree object: %s" msgstr "bukan objek pohon: %s" #: archive.c -msgid "current working directory is untracked" -msgstr "direktori kerja saat ini tak terlacak" - -#: archive.c #, c-format msgid "File not found: %s" msgstr "Berkas tidak ditemukan: %s" @@ -1771,6 +1796,10 @@ msgstr "mengabaikan berkas gitattributes yang terlalu besar '%s'" msgid "ignoring overly large gitattributes blob '%s'" msgstr "mengabaikan blob gitattributes '%s' yang terlalu besar" +#: attr.c +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "--attr-source atau GIT_ATTR_SOURCE jelek" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1895,17 +1924,13 @@ msgid "--contents and --reverse do not blend well." msgstr "--contents dan --reverse tidak dapat dipadu dengan baik." #: blame.c -msgid "cannot use --contents with final commit object name" -msgstr "tidak dapat menggunakan --contents dengan nama objek komit final" - -#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c ref-filter.c -#: remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c +#: sequencer.c submodule.c msgid "revision walk setup failed" msgstr "persiapan jalan revisi gagal" @@ -2111,11 +2136,6 @@ msgstr "submodul '%s': tidak dapat membuat cabang '%s'" msgid "'%s' is already checked out at '%s'" msgstr "'%s' sudah di-checkout pada '%s'" -#: branch.c -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "HEAD dari pohon kerja %s tidak diperbarui" - #: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opsi>] [--] <pathspec>..." @@ -2386,7 +2406,7 @@ msgstr "fseek gagal" msgid "could not open '%s' for reading" msgstr "tidak dapat membuka '%s' untuk dibaca" -#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "tidak dapat membuka '%s' untuk ditulis" @@ -3431,6 +3451,15 @@ msgstr "cabang pelacak remote '%s' tidak ditemukan." #: builtin/branch.c #, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"cabang '%s' tidak ditemukan.\n" +"Mungkin anda lupa menambahkan --remote?" + +#: builtin/branch.c +#, c-format msgid "branch '%s' not found." msgstr "cabang '%s' tidak ditemukan." @@ -3469,6 +3498,11 @@ msgstr "Cabang %s sedang dibagi dua pada %s" #: builtin/branch.c #, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD dari pohon kerja %s tidak diperbarui" + +#: builtin/branch.c +#, c-format msgid "Invalid branch name: '%s'" msgstr "Nama cabang tidak valid: '%s'" @@ -3596,6 +3630,10 @@ msgstr "pindah/ganti nama cabang dan reflog-nya" msgid "move/rename a branch, even if target exists" msgstr "pindah/ganti nama cabang, walaupun target ada" +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +msgid "do not output a newline after empty formatted refs" +msgstr "jangan keluarkan baris baru setelah referensi terformat kosong" + #: builtin/branch.c msgid "copy a branch and its reflog" msgstr "salin cabang dan reflog-nya" @@ -3872,12 +3910,10 @@ msgstr "Laporan baru dibuat pada '%s'.\n" #: builtin/bundle.c msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [-all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<versi>] <berkas> <argumen git-rev-list>" #: builtin/bundle.c @@ -3904,13 +3940,13 @@ msgstr "jangan perlihatkan meteran perkembangan" msgid "show progress meter" msgstr "perlihatkan meteran perkembangan" -#: builtin/bundle.c builtin/pack-objects.c -msgid "show progress meter during object writing phase" -msgstr "perlihatkan meteran perkembangan saat fase penulisan objek" +#: builtin/bundle.c +msgid "historical; same as --progress" +msgstr "opsi bersejarah; sama dengan --progress" -#: builtin/bundle.c builtin/pack-objects.c -msgid "similar to --all-progress when progress meter is shown" -msgstr "sama seperti --all-progress ketika meteran perkembangan diperlihatkan" +#: builtin/bundle.c +msgid "historical; does nothing" +msgstr "opsi bersejarah: tidak apa-apa" #: builtin/bundle.c msgid "specify bundle format version" @@ -5181,6 +5217,11 @@ msgstr "%s ada dan bukan direktori" #: builtin/clone.c #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' tautan simbolik, menolak mengkloning dengan --local" + +#: builtin/clone.c +#, c-format msgid "failed to start iterator over '%s'" msgstr "gagal memulai iterator pada '%s'" @@ -5983,7 +6024,7 @@ msgstr "hitung nilai didepan/dibelakang penuh" msgid "version" msgstr "versi" -#: builtin/commit.c builtin/push.c builtin/worktree.c +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "keluaran yang dapat dibaca mesin" @@ -7078,152 +7119,17 @@ msgstr "git fetch --all [<opsi>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel tidak dapat bernilai negatif" -#: builtin/fetch.c builtin/pull.c -msgid "fetch from all remotes" -msgstr "ambil dari semua remote" - -#: builtin/fetch.c builtin/pull.c -msgid "set upstream for git pull/fetch" -msgstr "setel hulu untuk git pull/fetch" - -#: builtin/fetch.c builtin/pull.c -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "tambah ke .git/FETCH_HEAD daripada timpa" - -#: builtin/fetch.c -msgid "use atomic transaction to update references" -msgstr "gunakan transaksi atomik untuk memperbarui referensi" - -#: builtin/fetch.c builtin/pull.c -msgid "path to upload pack on remote end" -msgstr "jalur ke paket unggah pada sisi remote" - -#: builtin/fetch.c -msgid "force overwrite of local reference" -msgstr "paksa timpa referensi lokal" - -#: builtin/fetch.c -msgid "fetch from multiple remotes" -msgstr "ambil dari banyak remote" - -#: builtin/fetch.c builtin/pull.c -msgid "fetch all tags and associated objects" -msgstr "ambil semua tag dan objek yang bersesuaian" - -#: builtin/fetch.c -msgid "do not fetch all tags (--no-tags)" -msgstr "jangan ambil semua tag (--no-tags)" - -#: builtin/fetch.c -msgid "number of submodules fetched in parallel" -msgstr "jumlah submodul yang diambil secara bersamaan" - -#: builtin/fetch.c -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "" -"modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/" -"prefetch/" - -#: builtin/fetch.c builtin/pull.c -msgid "prune remote-tracking branches no longer on remote" -msgstr "buang cabang pelacak remote yang tidak ada pada remote" - -#: builtin/fetch.c -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah" - -#: builtin/fetch.c builtin/pull.c -msgid "on-demand" -msgstr "sesuai permintaan" - -#: builtin/fetch.c -msgid "control recursive fetching of submodules" -msgstr "kontrol pengambilan submodul rekursif" - -#: builtin/fetch.c -msgid "write fetched references to the FETCH_HEAD file" -msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD" - -#: builtin/fetch.c builtin/pull.c -msgid "keep downloaded pack" -msgstr "simpan paket yang diunduh" - -#: builtin/fetch.c -msgid "allow updating of HEAD ref" -msgstr "bolehkan perbarui referensi HEAD" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow clone" -msgstr "perdalam riwayat klon dangkal" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow repository based on time" -msgstr "perdalam riwayat repositori dangkal berdasarkan waktu" - -#: builtin/fetch.c builtin/pull.c -msgid "convert to a complete repository" -msgstr "ubah ke repositori penuh" - -#: builtin/fetch.c -msgid "re-fetch without negotiating common commits" -msgstr "ambil ulang tanpa menegosiasikan komit yang sama" - -#: builtin/fetch.c -msgid "prepend this to submodule path output" -msgstr "tambahkan ini ke jalur keluaran submodul" - -#: builtin/fetch.c -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "" -"default untuk ambil submodul secara rekursif (prioritas lebih rendah " -"dariberkas konfigurasi)" - -#: builtin/fetch.c builtin/pull.c -msgid "accept refs that update .git/shallow" -msgstr "terima referensi yang memperbarui .git/shallow" - -#: builtin/fetch.c builtin/pull.c -msgid "refmap" -msgstr "peta referensi" - -#: builtin/fetch.c builtin/pull.c -msgid "specify fetch refmap" -msgstr "sebutkan ambil peta referensi" - -#: builtin/fetch.c builtin/pull.c -msgid "report that we have only objects reachable from this object" -msgstr "" -"laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini" - -#: builtin/fetch.c -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "" -"jangan ambil berkas pak; sebagai gantinya cetak leluhur dari ujung negosiasi" - -#: builtin/fetch.c -msgid "run 'maintenance --auto' after fetching" -msgstr "lakukan 'maintenance --auto' setelah pengambilan" - -#: builtin/fetch.c builtin/pull.c -msgid "check for forced-updates on all updated branches" -msgstr "periksa pembaruan terpaksa pada semua cabang" - -#: builtin/fetch.c -msgid "write the commit-graph after fetching" -msgstr "tulis grafik komit setelah pengambilan" - -#: builtin/fetch.c -msgid "accept refspecs from stdin" -msgstr "terima spek referensi dari masukan standar" - #: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "tidak dapat menemukan referensi remote HEAD" #: builtin/fetch.c #, c-format +msgid "From %.*s\n" +msgstr "Dari %.*s\n" + +#: builtin/fetch.c +#, c-format msgid "object %s not found" msgstr "objek %s tidak ditemukan" @@ -7313,11 +7219,6 @@ msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui" #: builtin/fetch.c #, c-format -msgid "From %.*s\n" -msgstr "Dari %.*s\n" - -#: builtin/fetch.c -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -7428,6 +7329,146 @@ msgstr "" msgid "you need to specify a tag name" msgstr "Anda perlu sebutkan sebuah nama tag" +#: builtin/fetch.c builtin/pull.c +msgid "fetch from all remotes" +msgstr "ambil dari semua remote" + +#: builtin/fetch.c builtin/pull.c +msgid "set upstream for git pull/fetch" +msgstr "setel hulu untuk git pull/fetch" + +#: builtin/fetch.c builtin/pull.c +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "tambah ke .git/FETCH_HEAD daripada timpa" + +#: builtin/fetch.c +msgid "use atomic transaction to update references" +msgstr "gunakan transaksi atomik untuk memperbarui referensi" + +#: builtin/fetch.c builtin/pull.c +msgid "path to upload pack on remote end" +msgstr "jalur ke paket unggah pada sisi remote" + +#: builtin/fetch.c +msgid "force overwrite of local reference" +msgstr "paksa timpa referensi lokal" + +#: builtin/fetch.c +msgid "fetch from multiple remotes" +msgstr "ambil dari banyak remote" + +#: builtin/fetch.c builtin/pull.c +msgid "fetch all tags and associated objects" +msgstr "ambil semua tag dan objek yang bersesuaian" + +#: builtin/fetch.c +msgid "do not fetch all tags (--no-tags)" +msgstr "jangan ambil semua tag (--no-tags)" + +#: builtin/fetch.c +msgid "number of submodules fetched in parallel" +msgstr "jumlah submodul yang diambil secara bersamaan" + +#: builtin/fetch.c +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/" +"prefetch/" + +#: builtin/fetch.c builtin/pull.c +msgid "prune remote-tracking branches no longer on remote" +msgstr "buang cabang pelacak remote yang tidak ada pada remote" + +#: builtin/fetch.c +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah" + +#: builtin/fetch.c builtin/pull.c +msgid "on-demand" +msgstr "sesuai permintaan" + +#: builtin/fetch.c +msgid "control recursive fetching of submodules" +msgstr "kontrol pengambilan submodul rekursif" + +#: builtin/fetch.c +msgid "write fetched references to the FETCH_HEAD file" +msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD" + +#: builtin/fetch.c builtin/pull.c +msgid "keep downloaded pack" +msgstr "simpan paket yang diunduh" + +#: builtin/fetch.c +msgid "allow updating of HEAD ref" +msgstr "bolehkan perbarui referensi HEAD" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow clone" +msgstr "perdalam riwayat klon dangkal" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow repository based on time" +msgstr "perdalam riwayat repositori dangkal berdasarkan waktu" + +#: builtin/fetch.c builtin/pull.c +msgid "convert to a complete repository" +msgstr "ubah ke repositori penuh" + +#: builtin/fetch.c +msgid "re-fetch without negotiating common commits" +msgstr "ambil ulang tanpa menegosiasikan komit yang sama" + +#: builtin/fetch.c +msgid "prepend this to submodule path output" +msgstr "tambahkan ini ke jalur keluaran submodul" + +#: builtin/fetch.c +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"default untuk ambil submodul secara rekursif (prioritas lebih rendah " +"dariberkas konfigurasi)" + +#: builtin/fetch.c builtin/pull.c +msgid "accept refs that update .git/shallow" +msgstr "terima referensi yang memperbarui .git/shallow" + +#: builtin/fetch.c builtin/pull.c +msgid "refmap" +msgstr "peta referensi" + +#: builtin/fetch.c builtin/pull.c +msgid "specify fetch refmap" +msgstr "sebutkan ambil peta referensi" + +#: builtin/fetch.c builtin/pull.c +msgid "report that we have only objects reachable from this object" +msgstr "" +"laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini" + +#: builtin/fetch.c +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" +"jangan ambil berkas pak; sebagai gantinya cetak leluhur dari ujung negosiasi" + +#: builtin/fetch.c +msgid "run 'maintenance --auto' after fetching" +msgstr "lakukan 'maintenance --auto' setelah pengambilan" + +#: builtin/fetch.c builtin/pull.c +msgid "check for forced-updates on all updated branches" +msgstr "periksa pembaruan terpaksa pada semua cabang" + +#: builtin/fetch.c +msgid "write the commit-graph after fetching" +msgstr "tulis grafik komit setelah pengambilan" + +#: builtin/fetch.c +msgid "accept refspecs from stdin" +msgstr "terima spek referensi dari masukan standar" + #: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only perlu satu atau lebih --negotiation-tip=*" @@ -7576,6 +7617,14 @@ msgstr "hanya cetak referensi yang berisi komit" msgid "print only refs which don't contain the commit" msgstr "hanya cetak referensi yang tidak berisi komit" +#: builtin/for-each-ref.c +msgid "read reference patterns from stdin" +msgstr "baca pola referensi dari masukan standar" + +#: builtin/for-each-ref.c +msgid "unknown arguments supplied with --stdin" +msgstr "argumen tidak dikenal diberikan dengan --stdin" + #: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<konfigurasi> [--] <argumen perintah>" @@ -7592,6 +7641,11 @@ msgstr "kunci konfigurasi yang menampung daftar jalur repositori" msgid "missing --config=<config>" msgstr "kehilangan --config=<config>" +#: builtin/for-each-repo.c +#, c-format +msgid "got bad config --config=%s" +msgstr "dapat konfigurasi jelek --config=%s" + #: builtin/fsck.c msgid "unknown" msgstr "tidak dikenal" @@ -7777,13 +7831,14 @@ msgid "notice: %s points to an unborn branch (%s)" msgstr "catatan: %s menunjuk ke cabang yang belum lahir (%s)" #: builtin/fsck.c -msgid "Checking cache tree" -msgstr "Memeriksa pohon tembolok" +#, c-format +msgid "Checking cache tree of %s" +msgstr "Memeriksa pohon tembolok %s" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok %s" #: builtin/fsck.c msgid "non-tree in cache-tree" @@ -7791,8 +7846,18 @@ msgstr "bukan pohon pada pohon tembolok" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s: penunjuk sha1 tidak valid di resolve-undo" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s: penunjuk sha1 tidak valid di resolve-undo %s" + +#: builtin/fsck.c +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "tidak dapat memuat indeks balik untuk pak '%s'" + +#: builtin/fsck.c +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "indeks balik tidak valid untuk pak '%s'" #: builtin/fsck.c msgid "" @@ -10422,7 +10487,7 @@ msgstr "Tidak ada cabang pelacak remote untuk %s dari %s" msgid "Bad value '%s' in environment '%s'" msgstr "Nilai jelek '%s' dalam lingkungan '%s'" -#: builtin/merge.c read-cache.c strbuf.c wrapper.c +#: builtin/merge.c editor.c read-cache.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "tidak dapat menutup '%s'" @@ -11278,7 +11343,7 @@ msgstr "gagal menulis indeks bitmap" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objek ditulish ketika mengharapkan %<PRIu32>" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/repack.c msgid "disabling bitmap writing, as some objects are not being packed" msgstr "menonaktifkan penulisan bitmap, saat beberapa objek tidak sedang dipak" @@ -11447,6 +11512,14 @@ msgid "bad index version '%s'" msgstr "versi indeks jelek '%s'" #: builtin/pack-objects.c +msgid "show progress meter during object writing phase" +msgstr "perlihatkan meteran perkembangan saat fase penulisan objek" + +#: builtin/pack-objects.c +msgid "similar to --all-progress when progress meter is shown" +msgstr "sama seperti --all-progress ketika meteran perkembangan diperlihatkan" + +#: builtin/pack-objects.c msgid "<version>[,<offset>]" msgstr "<versi>[,<offset>]" @@ -11693,6 +11766,10 @@ msgstr "" "Anda masih menggunakannya dengan mengirimkan surel ke\n" "<git@vger.kernel.org>. Terima kasih.\n" +#: builtin/pack-redundant.c +msgid "refusing to run without --i-still-use-this" +msgstr "menolak menjalankan tanpa --i-still-use-this" + #: builtin/pack-refs.c msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -11909,9 +11986,9 @@ msgstr "" msgid "pull with rebase" msgstr "tarik dengan pendasaran ulang" -#: builtin/pull.c -msgid "please commit or stash them." -msgstr "mohon komit atau stase." +#: builtin/pull.c builtin/rebase.c +msgid "Please commit or stash them." +msgstr "Mohon komit atau stase." #: builtin/pull.c #, c-format @@ -12174,9 +12251,9 @@ msgstr "nilai tidak valid untuk '%s'" msgid "repository" msgstr "repositori" -#: builtin/push.c builtin/send-pack.c -msgid "push all refs" -msgstr "dorong semua referensi" +#: builtin/push.c +msgid "push all branches" +msgstr "dorong semua cabang" #: builtin/push.c builtin/send-pack.c msgid "mirror all refs" @@ -12187,8 +12264,10 @@ msgid "delete refs" msgstr "hapus referensi" #: builtin/push.c -msgid "push tags (can't be used with --all or --mirror)" -msgstr "dorong tag (tidak dapat digunakan dengan --all atau --mirror)" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "" +"dorong tag (tidak dapat digunakan bersamaan dengan --all, --branches, atau --" +"mirror)" #: builtin/push.c builtin/send-pack.c msgid "force updates" @@ -12520,6 +12599,11 @@ msgstr "" #: builtin/rebase.c #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "Mode rebase-merges tidak dikenal: %s" + +#: builtin/rebase.c +#, c-format msgid "could not switch to %s" msgstr "tidak dapat mengganti ke %s" @@ -12537,6 +12621,16 @@ msgstr "" "dan \"ask\"." #: builtin/rebase.c +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"--rebase-merges dengan argumen untai kosong usang dan akan berhenti bekerja " +"pada versi Git berikutnya. Sebagai gantinya, gunakan --rebase-merges tanpa " +"argumen, yang melakukan hal yang sama." + +#: builtin/rebase.c #, c-format msgid "" "%s\n" @@ -12803,24 +12897,27 @@ msgid "switch `C' expects a numerical value" msgstr "tombol `C' harap nilai numerik" #: builtin/rebase.c -#, c-format -msgid "Unknown mode: %s" -msgstr "Mode tidak dikenal: %s" - -#: builtin/rebase.c msgid "--strategy requires --merge or --interactive" msgstr "--strategy butuh --merge atau --interactive" #: builtin/rebase.c msgid "" -"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" "autosquash" msgstr "" -"opsi penerapan tidak kompatibel dengan rebase.autosquash. " +"opsi penerapan tidak kompatibel dengan rebase.autoSquash. " "Pertimbangkanmenambahkan --no-autosquash" #: builtin/rebase.c msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "" +"opsi penerapan tidak kompatibel dengan rebase.rebaseMerges. " +"Pertimbangkanmenambahkan --no-rebase-merges" + +#: builtin/rebase.c +msgid "" "apply options are incompatible with rebase.updateRefs. Consider adding --no-" "update-refs" msgstr "" @@ -12875,10 +12972,6 @@ msgid "Does not point to a valid commit '%s'" msgstr "Tidak menunjuk pada komit yang valid '%s'" #: builtin/rebase.c -msgid "Please commit or stash them." -msgstr "Mohon komit atau stase." - -#: builtin/rebase.c msgid "HEAD is up to date." msgstr "HEAD terbaru." @@ -13693,8 +13786,8 @@ msgid "approxidate" msgstr "tanggal aproksimasi" #: builtin/repack.c -msgid "with -C, expire objects older than this" -msgstr "dengan -C, jangan kadaluarsakan objek lebih lama dari ini" +msgid "with --cruft, expire objects older than this" +msgstr "dengan --cruft, kadaluarsakan objek yang lebih tua dari ini" #: builtin/repack.c msgid "remove redundant packs, and run git-prune-packed" @@ -14539,6 +14632,10 @@ msgid "remote name" msgstr "nama remote" #: builtin/send-pack.c +msgid "push all refs" +msgstr "dorong semua referensi" + +#: builtin/send-pack.c msgid "use stateless RPC protocol" msgstr "gunakan protokol RPC nirkeadaan" @@ -14798,9 +14895,11 @@ msgstr "" #: builtin/sparse-checkout.c msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<opsi>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<opsi>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -14951,6 +15050,27 @@ msgstr "" msgid "error while refreshing working directory" msgstr "kesalahan saat menyegarkan direktori kerja" +#: builtin/sparse-checkout.c +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no]-cone] [--rules-" +"file <file>]" + +#: builtin/sparse-checkout.c +msgid "terminate input and output files by a NUL character" +msgstr "akhiri berkas masukan dan keluaran oleh satu karakter NUL" + +#: builtin/sparse-checkout.c +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "" +"ketika digunakan dengan --rules-file tafsirkan pola sebagai pola mode kerucut" + +#: builtin/sparse-checkout.c +msgid "use patterns in <file> instead of the current ones." +msgstr "gunakan pola di dalam <berkas> daripada yang saat ini." + #: builtin/stash.c msgid "git stash list [<log-options>]" msgstr "git stash list [<opsi log>]" @@ -18547,8 +18667,8 @@ msgid "bad zlib compression level %d" msgstr "level kompresi zlib jelek %d" #: config.c -msgid "core.commentChar should only be one character" -msgstr "core.commentChar harusnya hanya satu karakter" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar seharusnya hanya satu karakter ASCII" #: config.c #, c-format @@ -18688,6 +18808,13 @@ msgstr "nama bagian tidak valid: %s" #: config.c #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "" +"menolak bekerja dengan baris yang terlalu panjang di '%s' pada baris " +"%<PRIuMAX>" + +#: config.c +#, c-format msgid "missing value for '%s'" msgstr "nilai hilang untuk '%s'" @@ -19518,6 +19645,10 @@ msgid "do not show any source or destination prefix" msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun" #: diff.c +msgid "use default prefixes a/ and b/" +msgstr "gunakan awalan asali a/ dan b/" + +#: diff.c msgid "show context between diff hunks up to the specified number of lines" msgstr "" "perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan" @@ -19901,6 +20032,16 @@ msgstr "tidak dapat memigrasikan direktori git dari '%s' ke '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "petunjuk: Menunggu penyunting Anda untuk menutup berkas...%c" +#: editor.c sequencer.c wrapper.c +#, c-format +msgid "could not write to '%s'" +msgstr "tidak dapat menulis ke '%s'" + +#: editor.c +#, c-format +msgid "could not edit '%s'" +msgstr "tidak dapat menyunting '%s'" + #: entry.c msgid "Filtering content" msgstr "Menyaring isi" @@ -20273,6 +20414,11 @@ msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n" #: git.c #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "tidak ada atribut yang diberikan untuk --attr-source\n" + +#: git.c +#, c-format msgid "unknown option: %s\n" msgstr "opsi tidak dikenal: %s\n" @@ -22304,6 +22450,11 @@ msgstr "tidak dapat menemukan %s di dalam pak '%s' pada offset %<PRIuMAX>" msgid "unable to get disk usage of '%s'" msgstr "tidak dapat mendapatkan penggunaan disk dari '%s'" +#: pack-bitmap.c +#, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "checksum berkas bitmap '%s' tidak valid" + #: pack-mtimes.c #, c-format msgid "mtimes file %s is too small" @@ -22354,6 +22505,15 @@ msgstr "berkas indeks balik %s punya versi tidak didukung %<PRIu32>" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "berkas indeks balik %s punya id hash tidak didukung %<PRIu32>" +#: pack-revindex.c +msgid "invalid checksum" +msgstr "checksum tidak valid" + +#: pack-revindex.c +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "posisi indeks balik tidak valid pada %<PRIu64>: %<PRIu32> != %<PRIu32>" + #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "tidak dapat kedua-duanya menulis dan memverifikasi indeks balik" @@ -23230,6 +23390,11 @@ msgstr "lebar positif diharapkan dengan atom %%(align)" #: ref-filter.c #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "format yang diharapkan: %%(ahead-behind:<mirip komit>)" + +#: ref-filter.c +#, c-format msgid "malformed field name: %.*s" msgstr "nama bidang rusak: %.*s" @@ -23995,11 +24160,6 @@ msgstr "tidak ada resolusi yang diingat untuk '%s'" #: rerere.c #, c-format -msgid "cannot unlink '%s'" -msgstr "tidak dapat batal taut '%s'" - -#: rerere.c -#, c-format msgid "Updated preimage for '%s'" msgstr "Pracitra diperbarui untuk '%s'" @@ -24419,11 +24579,6 @@ msgstr "" msgid "could not lock '%s'" msgstr "tidak dapat mengunci '%s'" -#: sequencer.c strbuf.c wrapper.c -#, c-format -msgid "could not write to '%s'" -msgstr "tidak dapat menulis ke '%s'" - #: sequencer.c #, c-format msgid "could not write eol to '%s'" @@ -24867,10 +25022,6 @@ msgid "could not create sequencer directory '%s'" msgstr "tidak dapat membuat direktori pembaris '%s'" #: sequencer.c -msgid "could not lock HEAD" -msgstr "tidak dapat mengunci HEAD" - -#: sequencer.c msgid "no cherry-pick or revert in progress" msgstr "tidak ada pemetikan ceri atau pembalikkan yang sedang berjalan" @@ -24986,21 +25137,21 @@ msgstr "" "\n" #: sequencer.c -msgid "and made changes to the index and/or the working tree\n" -msgstr "dan buat perubahan ke indeks dan/atau pohon kerja\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "dan buat perubahan ke indeks dan/atau pohon kerja.\n" #: sequencer.c #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "eksekusi berhasil: %s\n" -"tapi meninggalkan perubahan ke indeks dan/atau pohon kerja\n" +"tapi meninggalkan perubahan ke indeks dan/atau pohon kerja.\n" "Komit atau stase perubahan Anda, lalu jalankan\n" "\n" " git rebase --continue\n" @@ -25528,11 +25679,6 @@ msgid_plural "%u bytes/s" msgstr[0] "%u bita/detik" msgstr[1] "%u bita/detik" -#: strbuf.c -#, c-format -msgid "could not edit '%s'" -msgstr "tidak dapat menyunting '%s'" - #: submodule-config.c #, c-format msgid "ignoring suspicious submodule name: %s" @@ -27643,8 +27789,8 @@ msgstr "(%s) Tidak dapat menjalankan '%s'" #: git-send-email.perl #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) Menambahkan %s: %s dari: '%s'\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) Baris masukan salah format: '%s'" #: git-send-email.perl #, perl-format @@ -27652,6 +27798,11 @@ msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) gagal menutup pipa ke '%s'" #: git-send-email.perl +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Menambahkan %s: %s dari: '%s'\n" + +#: git-send-email.perl msgid "cannot send message as 7bit" msgstr "tidak dapat mengirim pesan sebagai 7bit" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.40.0\n" +"Project-Id-Version: git 2.41.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-02 09:34+0100\n" -"PO-Revision-Date: 2023-03-02 09:35+0100\n" +"POT-Creation-Date: 2023-05-31 13:14+0100\n" +"PO-Revision-Date: 2023-05-31 13:15+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -665,6 +665,23 @@ msgstr "Checka in dina ändringar innan du utför sammanslagningen." msgid "Exiting because of unfinished merge." msgstr "Avslutar pÃ¥ grund av ofullbordad sammanslagning." +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"Divergerande grenar kan inte snabbspolas, du mÃ¥ste antingen använda:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"eller:\n" +"\n" +"\tgit rebase\n" + msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." @@ -1110,6 +1127,10 @@ msgid "cannot open %s" msgstr "kan inte öppna %s" #, c-format +msgid "cannot unlink '%s'" +msgstr "kan inte ta bort länken \"%s\"" + +#, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." @@ -1296,6 +1317,10 @@ msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" #, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "sökvägsangivelsen \"%s\" motsvarar filer utanför aktuell katalog" + +#, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte nÃ¥gra filer" @@ -1311,9 +1336,6 @@ msgstr "objektnamnet är inte giltigt: %s" msgid "not a tree object: %s" msgstr "inte ett trädobjekt: %s" -msgid "current working directory is untracked" -msgstr "aktuell arbetskatalog är inte spÃ¥rad" - #, c-format msgid "File not found: %s" msgstr "Hittar inte filen: %s" @@ -1440,6 +1462,9 @@ msgstr "ignorerar allt för stor gitattributes-fil \"%s\"" msgid "ignoring overly large gitattributes blob '%s'" msgstr "ignorerar allt för stor gitattributes-objekt \"%s\"" +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "felaktig --attr-source eller GIT_ATTR_SOURCE" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehÃ¥ll i filen \"%s\": %s" @@ -1546,9 +1571,6 @@ msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte sÃ¥ bra tillsammans." -msgid "cannot use --contents with final commit object name" -msgstr "kan inte använda --contents med namn pÃ¥ slutgiltigt incheckningsobjekt" - msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " @@ -1731,10 +1753,6 @@ msgstr "undermodulen \"%s\": kan inte skapa grenen \"%s\"" msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad pÃ¥ \"%s\"" -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" - msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." @@ -2765,6 +2783,14 @@ msgid "remote-tracking branch '%s' not found." msgstr "fjärrspÃ¥rande grenen \"%s\" hittades inte." #, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"grenen \"%s\" hittades inte.\n" +"Glömde du --remote?" + +#, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." @@ -2795,6 +2821,10 @@ msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" pÃ¥ %s" #, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" + +#, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn pÃ¥ gren: \"%s\"" @@ -2894,6 +2924,9 @@ msgstr "flytta/ta bort en gren och dess reflogg" msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om mÃ¥let finns" +msgid "do not output a newline after empty formatted refs" +msgstr "skriv inte ut ett nyradstecken efter tomma formaterade referenser" + msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" @@ -3115,12 +3148,10 @@ msgid "Created new report at '%s'.\n" msgstr "Skapade ny rapport pÃ¥ \"%s\"\n" msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <fil> <git-rev-list-flaggor>" msgid "git bundle verify [-q | --quiet] <file>" @@ -3141,11 +3172,11 @@ msgstr "visa inte förloppsindikator" msgid "show progress meter" msgstr "visa förloppsindikator" -msgid "show progress meter during object writing phase" -msgstr "visa förloppsindikator under objektskrivningsfasen" +msgid "historical; same as --progress" +msgstr "historisk; samma som --progress" -msgid "similar to --all-progress when progress meter is shown" -msgstr "som --all-progress när förloppsindikatorn visas" +msgid "historical; does nothing" +msgstr "historisk flagga; gör ingenting" msgid "specify bundle format version" msgstr "ange formatversion för bunten." @@ -3171,7 +3202,7 @@ msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" msgid "flush is only for --buffer mode" -msgstr "flush är endast till för --buffer-läge" +msgstr "flush är endast till för \"--buffer\"-läge" msgid "empty command in input" msgstr "tomt kommando i indata" @@ -4148,6 +4179,10 @@ msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "\"%s\" är en symbolisk länk, vägrar klona med --local" + +#, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" @@ -5649,116 +5684,14 @@ msgstr "git fetch --all [<flaggor>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -msgid "fetch from all remotes" -msgstr "hämta frÃ¥n alla fjärrar" - -msgid "set upstream for git pull/fetch" -msgstr "ställ in uppström för git pull/fetch" - -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" - -msgid "use atomic transaction to update references" -msgstr "använd atomiska transaktioner för att uppdatera referenser" - -msgid "path to upload pack on remote end" -msgstr "sökväg till upload pack pÃ¥ fjärren" - -msgid "force overwrite of local reference" -msgstr "tvinga överskrivning av lokal referens" - -msgid "fetch from multiple remotes" -msgstr "hämta frÃ¥n flera fjärrar" - -msgid "fetch all tags and associated objects" -msgstr "hämta alla taggar och associerade objekt" - -msgid "do not fetch all tags (--no-tags)" -msgstr "hämta inte alla taggar (--no-tags)" - -msgid "number of submodules fetched in parallel" -msgstr "antal undermoduler som hämtas parallellt" - -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "" -"modifiera referensspecifikationen sÃ¥ att alla referenser hamnar i refs/" -"prefetch/" - -msgid "prune remote-tracking branches no longer on remote" -msgstr "rensa fjärrspÃ¥rande grenar ej längre pÃ¥ fjärren" - -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "" -"rensa lokala taggar inte längre pÃ¥ fjärren och skriv över ändrade taggar" - -msgid "on-demand" -msgstr "on-demand" - -msgid "control recursive fetching of submodules" -msgstr "styr rekursiv hämtning av undermoduler" - -msgid "write fetched references to the FETCH_HEAD file" -msgstr "skriv hämtade referenser till FETCH_HEAD-filen" - -msgid "keep downloaded pack" -msgstr "behÃ¥ll hämtade paket" - -msgid "allow updating of HEAD ref" -msgstr "tillÃ¥t uppdatering av HEAD-referens" - -msgid "deepen history of shallow clone" -msgstr "fördjupa historik för grund klon" - -msgid "deepen history of shallow repository based on time" -msgstr "fördjupa historik för grund klon baserad pÃ¥ tid" - -msgid "convert to a complete repository" -msgstr "konvertera till komplett arkiv" - -msgid "re-fetch without negotiating common commits" -msgstr "hämta om utan att förhandla om gemensamma incheckningar" - -msgid "prepend this to submodule path output" -msgstr "lägg till i början av undermodulens sökvägsutdata" - -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "" -"standard för rekursiv hämtning av undermoduler (lägre prioritet än " -"konfigurationsfiler)" - -msgid "accept refs that update .git/shallow" -msgstr "tar emot referenser som uppdaterar .git/shallow" - -msgid "refmap" -msgstr "referenskarta" - -msgid "specify fetch refmap" -msgstr "ange referenskarta för \"fetch\"" - -msgid "report that we have only objects reachable from this object" -msgstr "rapportera att vi bara har objekt nÃ¥bara frÃ¥n detta objektet" - -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips" - -msgid "run 'maintenance --auto' after fetching" -msgstr "kör \"maintenance --auto\" efter hämtning" - -msgid "check for forced-updates on all updated branches" -msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" - -msgid "write the commit-graph after fetching" -msgstr "skriv incheckingsgrafen efter hämtning" - -msgid "accept refspecs from stdin" -msgstr "ta emot referenser frÃ¥n standard in" - msgid "couldn't find remote ref HEAD" msgstr "kunde inte hitta fjärr-referensen HEAD" #, c-format +msgid "From %.*s\n" +msgstr "FrÃ¥n %.*s\n" + +#, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" @@ -5830,10 +5763,6 @@ msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "avvisade %s dÃ¥ grunda rötter inte tillÃ¥ts uppdateras" #, c-format -msgid "From %.*s\n" -msgstr "FrÃ¥n %.*s\n" - -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -5924,6 +5853,112 @@ msgstr "" msgid "you need to specify a tag name" msgstr "du mÃ¥ste ange namnet pÃ¥ en tagg" +msgid "fetch from all remotes" +msgstr "hämta frÃ¥n alla fjärrar" + +msgid "set upstream for git pull/fetch" +msgstr "ställ in uppström för git pull/fetch" + +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" + +msgid "use atomic transaction to update references" +msgstr "använd atomiska transaktioner för att uppdatera referenser" + +msgid "path to upload pack on remote end" +msgstr "sökväg till upload pack pÃ¥ fjärren" + +msgid "force overwrite of local reference" +msgstr "tvinga överskrivning av lokal referens" + +msgid "fetch from multiple remotes" +msgstr "hämta frÃ¥n flera fjärrar" + +msgid "fetch all tags and associated objects" +msgstr "hämta alla taggar och associerade objekt" + +msgid "do not fetch all tags (--no-tags)" +msgstr "hämta inte alla taggar (--no-tags)" + +msgid "number of submodules fetched in parallel" +msgstr "antal undermoduler som hämtas parallellt" + +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"modifiera referensspecifikationen sÃ¥ att alla referenser hamnar i refs/" +"prefetch/" + +msgid "prune remote-tracking branches no longer on remote" +msgstr "rensa fjärrspÃ¥rande grenar ej längre pÃ¥ fjärren" + +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" +"rensa lokala taggar inte längre pÃ¥ fjärren och skriv över ändrade taggar" + +msgid "on-demand" +msgstr "on-demand" + +msgid "control recursive fetching of submodules" +msgstr "styr rekursiv hämtning av undermoduler" + +msgid "write fetched references to the FETCH_HEAD file" +msgstr "skriv hämtade referenser till FETCH_HEAD-filen" + +msgid "keep downloaded pack" +msgstr "behÃ¥ll hämtade paket" + +msgid "allow updating of HEAD ref" +msgstr "tillÃ¥t uppdatering av HEAD-referens" + +msgid "deepen history of shallow clone" +msgstr "fördjupa historik för grund klon" + +msgid "deepen history of shallow repository based on time" +msgstr "fördjupa historik för grund klon baserad pÃ¥ tid" + +msgid "convert to a complete repository" +msgstr "konvertera till komplett arkiv" + +msgid "re-fetch without negotiating common commits" +msgstr "hämta om utan att förhandla om gemensamma incheckningar" + +msgid "prepend this to submodule path output" +msgstr "lägg till i början av undermodulens sökvägsutdata" + +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"standard för rekursiv hämtning av undermoduler (lägre prioritet än " +"konfigurationsfiler)" + +msgid "accept refs that update .git/shallow" +msgstr "tar emot referenser som uppdaterar .git/shallow" + +msgid "refmap" +msgstr "referenskarta" + +msgid "specify fetch refmap" +msgstr "ange referenskarta för \"fetch\"" + +msgid "report that we have only objects reachable from this object" +msgstr "rapportera att vi bara har objekt nÃ¥bara frÃ¥n detta objektet" + +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips" + +msgid "run 'maintenance --auto' after fetching" +msgstr "kör \"maintenance --auto\" efter hämtning" + +msgid "check for forced-updates on all updated branches" +msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" + +msgid "write the commit-graph after fetching" +msgstr "skriv incheckingsgrafen efter hämtning" + +msgid "accept refspecs from stdin" +msgstr "ta emot referenser frÃ¥n standard in" + msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only behöver en eller flera --negotiation-tip=*" @@ -6039,6 +6074,12 @@ msgstr "visa endast referenser som innehÃ¥ller incheckningen" msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehÃ¥ller incheckningen" +msgid "read reference patterns from stdin" +msgstr "läs referensmönster frÃ¥n standard in" + +msgid "unknown arguments supplied with --stdin" +msgstr "okända argument angavs tillsammans med --stdin" + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<konfig> [--] <argument>" @@ -6051,6 +6092,10 @@ msgstr "konfigurationsnyckel som innehÃ¥ller en lista över arkivsökvägar" msgid "missing --config=<config>" msgstr "saknar --config=<konfig>" +#, c-format +msgid "got bad config --config=%s" +msgstr "fick felaktig konfiguration --config=%s" + msgid "unknown" msgstr "okänd" @@ -6201,19 +6246,28 @@ msgstr "%s: frÃ¥nkopplat HEAD pekar pÃ¥ ingenting" msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar pÃ¥ en ofödd gren (%s)" -msgid "Checking cache tree" -msgstr "Kontrollerar cacheträd" +#, c-format +msgid "Checking cache tree of %s" +msgstr "Kontrollerar cacheträd för %s" #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s: ogiltig sha1-pekare i cacheträd" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s: ogiltig sha1-pekare i cacheträd för %s" msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s: ogiltig sha1-pekare i resolve-undo" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s: ogiltig sha1-pekare i resolve-undo för %s" + +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "kunde inte läsa rev-index för paketfil \"%s\"" + +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "ogiltigt rev-index för paketet \"%s\"" msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" @@ -9055,6 +9109,12 @@ msgstr "indexversionen %s stöds ej" msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" +msgid "show progress meter during object writing phase" +msgstr "visa förloppsindikator under objektskrivningsfasen" + +msgid "similar to --all-progress when progress meter is shown" +msgstr "som --all-progress när förloppsindikatorn visas" + msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" @@ -9243,6 +9303,9 @@ msgstr "" "oss att du fortfarande använder det pÃ¥ e-post till\n" "<git@vger.kernel.org>. Tack.\n" +msgid "refusing to run without --i-still-use-this" +msgstr "vägrar köra utan --i-still-use-this" + msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -9413,8 +9476,8 @@ msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." msgid "pull with rebase" msgstr "pull med ombasering" -msgid "please commit or stash them." -msgstr "checka in eller använd \"stash\" pÃ¥ dem." +msgid "Please commit or stash them." +msgstr "Checka in eller använd \"stash\" pÃ¥ dem." #, c-format msgid "" @@ -9648,8 +9711,8 @@ msgstr "ogiltigt värde för \"%s\"" msgid "repository" msgstr "arkiv" -msgid "push all refs" -msgstr "sänd alla referenser" +msgid "push all branches" +msgstr "sänd alla grenar" msgid "mirror all refs" msgstr "spegla alla referenser" @@ -9657,8 +9720,9 @@ msgstr "spegla alla referenser" msgid "delete refs" msgstr "ta bort referenser" -msgid "push tags (can't be used with --all or --mirror)" -msgstr "sänd taggar (kan inte användas med --all eller --mirror)" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "" +"sänd taggar (kan inte användas med --all eller --branches eller --mirror)" msgid "force updates" msgstr "tvinga uppdateringar" @@ -9921,6 +9985,10 @@ msgstr "" "Därför kan inte git ombasera dessa." #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "Okänd rebase-merges-läge: %s" + +#, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" @@ -9935,6 +10003,15 @@ msgid "" msgstr "" "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"--rebase-merges med en tom sträng som argument avrÃ¥ds frÃ¥n och kommer sluta " +"fungera i en framtida version av Git. Använd istället --rebase-merges utan " +"argument, vilket har samma effekt." + #, c-format msgid "" "%s\n" @@ -10149,21 +10226,24 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#, c-format -msgid "Unknown mode: %s" -msgstr "Okänt läge: %s" - msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" msgid "" -"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" "autosquash" msgstr "" -"argument för \"apply\" är inkompatibla med rebase.autosquash. Överväg att " +"argument för \"apply\" är inkompatibla med rebase.autoSquash. Överväg att " "lägga till --no-autosquash" msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "" +"argument för \"apply\" är inkompatibla med rebase.rebaseMerges. Överväg att " +"lägga till --no-rebase-merges" + +msgid "" "apply options are incompatible with rebase.updateRefs. Consider adding --no-" "update-refs" msgstr "" @@ -10207,9 +10287,6 @@ msgstr "\"%s\": behöver precis en sammanslagningsbas" msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte pÃ¥ en giltig incheckning: \"%s\"" -msgid "Please commit or stash them." -msgstr "Checka in eller använd \"stash\" pÃ¥ dem." - msgid "HEAD is up to date." msgstr "HEAD är à jour." @@ -10863,8 +10940,8 @@ msgstr "samma som -a, packa onÃ¥bara onödiga objekt separat" msgid "approxidate" msgstr "cirkadatum" -msgid "with -C, expire objects older than this" -msgstr "med -C, lÃ¥t tid gÃ¥ ut för objekt äldre än detta" +msgid "with --cruft, expire objects older than this" +msgstr "med --cruft, lÃ¥t tid gÃ¥ ut för objekt äldre än detta" msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" @@ -11528,6 +11605,9 @@ msgstr "" msgid "remote name" msgstr "fjärrnamn" +msgid "push all refs" +msgstr "sänd alla referenser" + msgid "use stateless RPC protocol" msgstr "använd tillstÃ¥ndslöst RPC-protokoll" @@ -11728,9 +11808,11 @@ msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser frÃ¥n standard in som inte finns i lokalt arkiv" msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) <flaggor>" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) <flaggor>" msgid "this worktree is not sparse" msgstr "arbetskatalogen är inte gren" @@ -11853,6 +11935,22 @@ msgstr "" msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks] [--[no-]cone] [--rules-" +"file <fil>]" + +msgid "terminate input and output files by a NUL character" +msgstr "avsluta in- och utdatafiler med NUL-tecken" + +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "om används med --rules-file tolka mönster som kon-lägemönster" + +msgid "use patterns in <file> instead of the current ones." +msgstr "använd mönster i <fil> istället för de nuvarande." + msgid "git stash list [<log-options>]" msgstr "git stash list [<\"log\"-flaggor>]" @@ -14685,8 +14783,8 @@ msgstr "förkortningslängd utanför intervallet: %d" msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -msgid "core.commentChar should only be one character" -msgstr "core.commentChar kan bara vara ett tecken" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar kan bara vara ett ASCII-tecken" #, c-format msgid "ignoring unknown core.fsyncMethod value '%s'" @@ -14798,6 +14896,10 @@ msgid "invalid section name: %s" msgstr "felaktigt namn pÃ¥ stycke: %s" #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "vägrar arbeta med för lÃ¥nga rader i \"%s\" pÃ¥ rad %<PRIuMAX>" + +#, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -15466,6 +15568,9 @@ msgstr "lägg till ytterligare prefix pÃ¥ alla rader i utdata" msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller mÃ¥lprefix" +msgid "use default prefixes a/ and b/" +msgstr "använd standardprefixen a/ och b/" + msgid "show context between diff hunks up to the specified number of lines" msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" @@ -15759,6 +15864,14 @@ msgstr "kunde inte migrera git-katalog frÃ¥n \"%s\" till \"%s\"" msgid "hint: Waiting for your editor to close the file...%c" msgstr "tips: Väntar pÃ¥ att textredigeringsprogrammet ska stänga filen...%c" +#, c-format +msgid "could not write to '%s'" +msgstr "kunde inte skriva till \"%s\"" + +#, c-format +msgid "could not edit '%s'" +msgstr "kunde inte redigera \"%s\"" + msgid "Filtering content" msgstr "Filtrerar innehÃ¥ll" @@ -16057,6 +16170,10 @@ msgid "no config key given for --config-env\n" msgstr "ingen konfigurationsnyckel angavs för --config-env\n" #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "ingen attributkälla angavs för --attr-source\n" + +#, c-format msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" @@ -17716,6 +17833,10 @@ msgid "unable to get disk usage of '%s'" msgstr "kan inte hämta diskanvändning för \"%s\"" #, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "bitkartefilen \"%s\" har ogiltig kontrollsumma" + +#, c-format msgid "mtimes file %s is too small" msgstr "mtimes-filen %s är för liten" @@ -17755,6 +17876,13 @@ msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds" +msgid "invalid checksum" +msgstr "ogiltig kontrollsumma" + +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "ogiltig rev-indexposition vid %<PRIu64>: %<PRIu32> != %<PRIu32>" + msgid "cannot both write and verify reverse index" msgstr "kan inte bÃ¥de skriva och bekräfta reverse-index" @@ -18477,6 +18605,10 @@ msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "förväntat format: %%(ahead-behind:<incheckning-igt>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" @@ -19096,10 +19228,6 @@ msgid "no remembered resolution for '%s'" msgstr "inget sparat sammanslagningsresultat för \"%s\"" #, c-format -msgid "cannot unlink '%s'" -msgstr "kan inte ta bort länken \"%s\"" - -#, c-format msgid "Updated preimage for '%s'" msgstr "Uppdaterade förhandsbild för \"%s\"" @@ -19432,10 +19560,6 @@ msgid "could not lock '%s'" msgstr "kunde inte lÃ¥sa \"%s\"" #, c-format -msgid "could not write to '%s'" -msgstr "kunde inte skriva till \"%s\"" - -#, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" @@ -19795,9 +19919,6 @@ msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -msgid "could not lock HEAD" -msgstr "kunde inte lÃ¥sa HEAD" - msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pÃ¥gÃ¥r" @@ -19894,20 +20015,20 @@ msgstr "" "\tgit rebase --continue\n" "\n" -msgid "and made changes to the index and/or the working tree\n" -msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen.\n" #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "körningen lyckades: %s\n" -"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n" +"men lämnade kvar ändringar i indexet och/eller arbetskatalogen.\n" "Checka in eller utför \"stash\" pÃ¥ ändringarna och kör sedan\n" "\n" "\tgit rebase --continue\n" @@ -20342,10 +20463,6 @@ msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" #, c-format -msgid "could not edit '%s'" -msgstr "kunde inte redigera \"%s\"" - -#, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignorerar misstänkt undermodulnamn: %s" @@ -22058,13 +22175,17 @@ msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) Lägger till %s: %s frÃ¥n: \"%s\"\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) Felformaterad utdata frÃ¥n \"%s\"" #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Lägger till %s: %s frÃ¥n: \"%s\"\n" + msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" @@ -92,8 +92,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-03 11:32+0300\n" -"PO-Revision-Date: 2023-03-03 11:40+0300\n" +"POT-Creation-Date: 2023-05-20 12:55+0300\n" +"PO-Revision-Date: 2023-05-20 14:00+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -741,6 +741,23 @@ msgstr "BirleÅŸtirme öncesinde deÄŸiÅŸikliklerinizi iÅŸleyin." msgid "Exiting because of unfinished merge." msgstr "Tamamlanmamış birleÅŸtirmeden dolayı çıkılıyor." +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"Iraksak dallar ileri sarılamaz; ÅŸunlardan birini yapmanız gerekiyor:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"veya\n" +"\n" +"\tgit rebase\n" + msgid "Not possible to fast-forward, aborting." msgstr "Ä°leri sarma olanaklı deÄŸil, iptal ediliyor." @@ -1183,6 +1200,10 @@ msgid "cannot open %s" msgstr "%s açılamıyor" #, c-format +msgid "cannot unlink '%s'" +msgstr "'%s' baÄŸlantısı kesilemiyor" + +#, c-format msgid "Hunk #%d applied cleanly." msgstr "Parça #%d sorunsuzca uygulandı." @@ -1366,8 +1387,12 @@ msgid "cannot read '%s'" msgstr "'%s' okunamıyor" #, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "yol belirteci '%s', geçerli dizinin dışındaki dosyalarla eÅŸleÅŸiyor" + +#, c-format msgid "pathspec '%s' did not match any files" -msgstr "yol belirteci '%s' hiçbir dosya ile eÅŸleÅŸmedi" +msgstr "yol belirteci '%s', hiçbir dosya ile eÅŸleÅŸmedi" #, c-format msgid "no such ref: %.*s" @@ -1381,9 +1406,6 @@ msgstr "geçerli bir nesne adı deÄŸil: %s" msgid "not a tree object: %s" msgstr "bir aÄŸaç nesnesi deÄŸil: %s" -msgid "current working directory is untracked" -msgstr "geçerli çalışma dizini izlenmiyor" - #, c-format msgid "File not found: %s" msgstr "Dosya bulunamadı: %s" @@ -1510,6 +1532,9 @@ msgstr "pek büyük gitattributes dosyası '%s' dosyası yok sayılıyor" msgid "ignoring overly large gitattributes blob '%s'" msgstr "pek büyük gitattributes ikili nesnesi '%s' yok sayılıyor" +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "hatalı --attr-source veya GIT_ATTR_SOURCE" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "'%s' dosyasında hatalı tırnaÄŸa alınmış içerik: %s" @@ -1615,9 +1640,6 @@ msgstr[1] "Ä°kili arama: Åžundan sonra sınanacak %d revizyon kaldı: %s\n" msgid "--contents and --reverse do not blend well." msgstr "--contents ve --reverse birlikte pek iyi gitmiyor." -msgid "cannot use --contents with final commit object name" -msgstr "--contents son iÅŸleme nesnesi adı ile kullanılamıyor" - msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse ve --first-parent birlikte en son iÅŸlemenin belirtilmesini " @@ -1800,10 +1822,6 @@ msgstr "'%s' altmodülü: '%s' dalı oluÅŸturulamıyor" msgid "'%s' is already checked out at '%s'" msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış" -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "%s çalışma aÄŸacının HEAD'i güncellenmemiÅŸ" - msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<seçenekler>] [--] <yol-blrtç>..." @@ -2838,6 +2856,14 @@ msgid "remote-tracking branch '%s' not found." msgstr "Uzak izleme dalı '%s' bulunamadı." #, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"'%s' dalı bulunamadı.\n" +"--remote yazmayı mı unuttunuz?" + +#, c-format msgid "branch '%s' not found." msgstr "'%s' dalı bulunamadı." @@ -2868,6 +2894,10 @@ msgid "Branch %s is being bisected at %s" msgstr "%s dalı %s konumunda ikili aranıyor" #, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "%s çalışma aÄŸacının HEAD'i güncellenmemiÅŸ" + +#, c-format msgid "Invalid branch name: '%s'" msgstr "Geçersiz dal adı: '%s'" @@ -2967,6 +2997,9 @@ msgstr "bir dalı ve onun baÅŸvuru günlüğünü taşı/yeniden adlandır" msgid "move/rename a branch, even if target exists" msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile" +msgid "do not output a newline after empty formatted refs" +msgstr "boÅŸ biçimli baÅŸvurulardan sonra bir yenisatır çıktılama" + msgid "copy a branch and its reflog" msgstr "bir dalı ve onun baÅŸvuru günlüğünü kopyala" @@ -3185,13 +3218,11 @@ msgid "Created new report at '%s'.\n" msgstr "Hata raporu '%s' dosyasına yazıldı.\n" msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" -" [--version=<sürüm>] <dosya> <git-rev-liste-argümanları>" +"git bundle create [-q | --quiet | --progress]\n" +" [--version=<sürüm>] <dosya> <git-rev-listesi-argümanları>" msgid "git bundle verify [-q | --quiet] <file>" msgstr "git bundle verify [-q | --quiet] <dosya>" @@ -3211,11 +3242,11 @@ msgstr "ilerleme çubuÄŸunu gösterme" msgid "show progress meter" msgstr "ilerleme çubuÄŸunu göster" -msgid "show progress meter during object writing phase" -msgstr "ilerleme çubuÄŸunu nesne yazımı aÅŸaması sırasında göster" +msgid "historical; same as --progress" +msgstr "eski seçenek; --progress ile aynı" -msgid "similar to --all-progress when progress meter is shown" -msgstr "ilerleme çubuÄŸu gösterildiÄŸinde --all-progress'e benzer" +msgid "historical; does nothing" +msgstr "eski seçenek; bir ÅŸey yapmaz" msgid "specify bundle format version" msgstr "demet biçim sürümünü belirt" @@ -4221,6 +4252,10 @@ msgid "%s exists and is not a directory" msgstr "%s var ve bir dizin deÄŸil" #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' bir sembolik baÄŸlantı; --local ile klonlama reddediliyor" + +#, c-format msgid "failed to start iterator over '%s'" msgstr "yineleyici '%s' üzerinden çalıştırılamadı" @@ -5733,119 +5768,14 @@ msgstr "git fetch --all [<seçenekler>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel negatif olamaz" -msgid "fetch from all remotes" -msgstr "tüm uzak konumlardan getir" - -msgid "set upstream for git pull/fetch" -msgstr "git pull/fetch için üstkaynak ayarla" - -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliÅŸtir" - -msgid "use atomic transaction to update references" -msgstr "baÅŸvuruları güncellemek için atomsal iÅŸlem kullan" - -msgid "path to upload pack on remote end" -msgstr "uzak uçtaki yükleme paketine olan yol" - -msgid "force overwrite of local reference" -msgstr "yerel baÅŸvurunun üzerine zorla yaz" - -msgid "fetch from multiple remotes" -msgstr "birden çok uzak konumdan getir" - -msgid "fetch all tags and associated objects" -msgstr "tüm etiketleri ve iliÅŸkilendirilen nesneleri getir" - -msgid "do not fetch all tags (--no-tags)" -msgstr "tüm etiketleri getirme (--no-tags)" - -msgid "number of submodules fetched in parallel" -msgstr "paralelde getirilen altmodüllerin sayısı" - -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "" -"baÅŸvuru belirtecini tüm baÅŸvuruları refs/prefetch/'e yerleÅŸtirecek biçimde " -"deÄŸiÅŸtir" - -msgid "prune remote-tracking branches no longer on remote" -msgstr "artık uzak konumda olmayan uzak izleme dallarını buda" - -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "" -"artık uzak konumda olmayan yerel etiketleri buda ve deÄŸiÅŸtirilen etiketleri " -"güncelle" - -msgid "on-demand" -msgstr "istek üzerine" - -msgid "control recursive fetching of submodules" -msgstr "altmodüllerin özyineli getirilmesini denetle" - -msgid "write fetched references to the FETCH_HEAD file" -msgstr "getirilen baÅŸvuruları FETCH_HEAD dosyasına yaz" - -msgid "keep downloaded pack" -msgstr "indirilen paketi tut" - -msgid "allow updating of HEAD ref" -msgstr "HEAD baÅŸvurusunun güncellenmesine izin ver" - -msgid "deepen history of shallow clone" -msgstr "sığ klonun geçmiÅŸini derinleÅŸtir" - -msgid "deepen history of shallow repository based on time" -msgstr "zamana baÄŸlı olarak sığ deponun geçmiÅŸini derinleÅŸtir" - -msgid "convert to a complete repository" -msgstr "tam bir depoya dönüştür" - -msgid "re-fetch without negotiating common commits" -msgstr "ortak iÅŸlemeleri pazarlık etmeden yeniden getir" - -msgid "prepend this to submodule path output" -msgstr "bunu altmodül yol çıktısının başına ekle" - -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "" -"altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma " -"dosyalarından daha az önceliÄŸe iye)" - -msgid "accept refs that update .git/shallow" -msgstr ".git/shallow'u güncelleyen baÅŸvuruları kabul et" - -msgid "refmap" -msgstr "ilgili baÅŸvuru" - -msgid "specify fetch refmap" -msgstr "getirme ile ilgili baÅŸvuruları belirt" - -msgid "report that we have only objects reachable from this object" -msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduÄŸunu bildir" - -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "" -"bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını " -"yazdır" - -msgid "run 'maintenance --auto' after fetching" -msgstr "getirme sonrasında 'maintenance --auto' çalıştır" - -msgid "check for forced-updates on all updated branches" -msgstr "tüm güncellenmiÅŸ dalları zorlanmış güncellemeler için denetle" - -msgid "write the commit-graph after fetching" -msgstr "getirdikten sonra iÅŸleme grafiÄŸini yaz" - -msgid "accept refspecs from stdin" -msgstr "baÅŸvuru belirteçlerini stdin'den oku" - msgid "couldn't find remote ref HEAD" msgstr "uzak HEAD baÅŸvurusu bulunamadı" #, c-format +msgid "From %.*s\n" +msgstr "Åžu konumdan: %.*s\n" + +#, c-format msgid "object %s not found" msgstr "%s nesnesi bulunamadı" @@ -5916,10 +5846,6 @@ msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor" #, c-format -msgid "From %.*s\n" -msgstr "Åžu konumdan: %.*s\n" - -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -6010,6 +5936,115 @@ msgstr "" msgid "you need to specify a tag name" msgstr "bir etiket adı belirtmeniz gerekiyor" +msgid "fetch from all remotes" +msgstr "tüm uzak konumlardan getir" + +msgid "set upstream for git pull/fetch" +msgstr "git pull/fetch için üstkaynak ayarla" + +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliÅŸtir" + +msgid "use atomic transaction to update references" +msgstr "baÅŸvuruları güncellemek için atomsal iÅŸlem kullan" + +msgid "path to upload pack on remote end" +msgstr "uzak uçtaki yükleme paketine olan yol" + +msgid "force overwrite of local reference" +msgstr "yerel baÅŸvurunun üzerine zorla yaz" + +msgid "fetch from multiple remotes" +msgstr "birden çok uzak konumdan getir" + +msgid "fetch all tags and associated objects" +msgstr "tüm etiketleri ve iliÅŸkilendirilen nesneleri getir" + +msgid "do not fetch all tags (--no-tags)" +msgstr "tüm etiketleri getirme (--no-tags)" + +msgid "number of submodules fetched in parallel" +msgstr "paralelde getirilen altmodüllerin sayısı" + +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"baÅŸvuru belirtecini tüm baÅŸvuruları refs/prefetch/'e yerleÅŸtirecek biçimde " +"deÄŸiÅŸtir" + +msgid "prune remote-tracking branches no longer on remote" +msgstr "artık uzak konumda olmayan uzak izleme dallarını buda" + +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" +"artık uzak konumda olmayan yerel etiketleri buda ve deÄŸiÅŸtirilen etiketleri " +"güncelle" + +msgid "on-demand" +msgstr "istek üzerine" + +msgid "control recursive fetching of submodules" +msgstr "altmodüllerin özyineli getirilmesini denetle" + +msgid "write fetched references to the FETCH_HEAD file" +msgstr "getirilen baÅŸvuruları FETCH_HEAD dosyasına yaz" + +msgid "keep downloaded pack" +msgstr "indirilen paketi tut" + +msgid "allow updating of HEAD ref" +msgstr "HEAD baÅŸvurusunun güncellenmesine izin ver" + +msgid "deepen history of shallow clone" +msgstr "sığ klonun geçmiÅŸini derinleÅŸtir" + +msgid "deepen history of shallow repository based on time" +msgstr "zamana baÄŸlı olarak sığ deponun geçmiÅŸini derinleÅŸtir" + +msgid "convert to a complete repository" +msgstr "tam bir depoya dönüştür" + +msgid "re-fetch without negotiating common commits" +msgstr "ortak iÅŸlemeleri pazarlık etmeden yeniden getir" + +msgid "prepend this to submodule path output" +msgstr "bunu altmodül yol çıktısının başına ekle" + +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma " +"dosyalarından daha az önceliÄŸe iye)" + +msgid "accept refs that update .git/shallow" +msgstr ".git/shallow'u güncelleyen baÅŸvuruları kabul et" + +msgid "refmap" +msgstr "ilgili baÅŸvuru" + +msgid "specify fetch refmap" +msgstr "getirme ile ilgili baÅŸvuruları belirt" + +msgid "report that we have only objects reachable from this object" +msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduÄŸunu bildir" + +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" +"bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını " +"yazdır" + +msgid "run 'maintenance --auto' after fetching" +msgstr "getirme sonrasında 'maintenance --auto' çalıştır" + +msgid "check for forced-updates on all updated branches" +msgstr "tüm güncellenmiÅŸ dalları zorlanmış güncellemeler için denetle" + +msgid "write the commit-graph after fetching" +msgstr "getirdikten sonra iÅŸleme grafiÄŸini yaz" + +msgid "accept refspecs from stdin" +msgstr "baÅŸvuru belirteçlerini stdin'den oku" + msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only'e bir veya daha çok --negotiation-tip=* gerekiyor" @@ -6125,6 +6160,12 @@ msgstr "yalnızca iÅŸlemeyi içeren baÅŸvuruları yazdır" msgid "print only refs which don't contain the commit" msgstr "yalnızca iÅŸlemeyi içermeyen baÅŸvuruları yazdır" +msgid "read reference patterns from stdin" +msgstr "baÅŸvuru dizgilerini stdin'den oku" + +msgid "unknown arguments supplied with --stdin" +msgstr "--stdin ile bilinmeyen argümanlar verilmiÅŸ" + msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<yapılandırma> [--] <argümanlar>" @@ -6137,6 +6178,10 @@ msgstr "bir depo yolları listesi tutan yapılandırma anahtarı" msgid "missing --config=<config>" msgstr "--config=<yapılandırma> eksik" +#, c-format +msgid "got bad config --config=%s" +msgstr "hatayı yapılandırma alındı, --config=%s" + msgid "unknown" msgstr "bilinmeyen" @@ -6283,19 +6328,28 @@ msgstr "%s: ayrık HEAD bir ÅŸeye iÅŸaret etmiyor" msgid "notice: %s points to an unborn branch (%s)" msgstr "Uyarı: %s henüz doÄŸmamış bir dala iÅŸaret ediyor (%s)" -msgid "Checking cache tree" -msgstr "Önbellek aÄŸacı denetleniyor" +#, c-format +msgid "Checking cache tree of %s" +msgstr "%s ögesinin önbellek aÄŸacı denetleniyor" #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s: cache-tree içinde geçersiz sha1 iÅŸaretçisi" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s: %s ögesinin cache-tree'si içinde geçersiz sha1 iÅŸaretçisi" msgid "non-tree in cache-tree" msgstr "cache-tree içinde aÄŸaç olmayan öge" #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s: resolve-undo içinde geçersiz sha1 iÅŸaretçisi" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s: %s ögesinin resolve-undo'su içinde geçersiz sha1 iÅŸaretçisi" + +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "'%s' paketi için rev-index yüklenemiyor" + +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "'%s' paketi için geçersiz rev-index" msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" @@ -9139,6 +9193,12 @@ msgstr "desteklenmeyen indeks sürümü %s" msgid "bad index version '%s'" msgstr "hatalı indeks sürümü '%s'" +msgid "show progress meter during object writing phase" +msgstr "ilerleme çubuÄŸunu nesne yazımı aÅŸaması sırasında göster" + +msgid "similar to --all-progress when progress meter is shown" +msgstr "ilerleme çubuÄŸu gösterildiÄŸinde --all-progress'e benzer" + msgid "<version>[,<offset>]" msgstr "<sürüm>[,<ofset>]" @@ -9329,6 +9389,9 @@ msgstr "" "<git@vger.kernel.org> adresine bir e-posta atarak\n" "bize haber verin. SaÄŸ olun.\n" +msgid "refusing to run without --i-still-use-this" +msgstr "--i-still-use-this olmadan çalıştırma reddediliyor" + msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -9499,7 +9562,7 @@ msgstr "Ä°ndekse eklenen deÄŸiÅŸikliklerle henüz doÄŸmamış bir dal güncellen msgid "pull with rebase" msgstr "yeniden temellendirme ile çekim" -msgid "please commit or stash them." +msgid "Please commit or stash them." msgstr "Lütfen onları iÅŸleyin veya zulalayın." #, c-format @@ -9735,8 +9798,8 @@ msgstr "'%s' için geçersiz deÄŸer" msgid "repository" msgstr "depo" -msgid "push all refs" -msgstr "tüm baÅŸvuruları it" +msgid "push all branches" +msgstr "tüm dalları it" msgid "mirror all refs" msgstr "tüm baÅŸvuruları yansıla" @@ -9744,11 +9807,11 @@ msgstr "tüm baÅŸvuruları yansıla" msgid "delete refs" msgstr "baÅŸvuruları sil" -msgid "push tags (can't be used with --all or --mirror)" -msgstr "etiketleri it (--all veya --mirror ile kullanılamaz)" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "etiketleri it (--all, --branches veya --mirror ile kullanılamaz)" msgid "force updates" -msgstr "zorla güncelle" +msgstr "güncellemeleri zorla" msgid "<refname>:<expect>" msgstr "<bÅŸvr-adı>:<bekle>" @@ -10009,6 +10072,10 @@ msgstr "" "Bunun sonucu olarak git onları yeniden temellendiremiyor." #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "Bilinmeyen rebase-merges kipi: %s" + +#, c-format msgid "could not switch to %s" msgstr "ÅŸuraya geçilemedi: %s" @@ -10022,6 +10089,15 @@ msgid "" msgstr "" "Tanımlanamayan boÅŸ tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\"." +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"bir boÅŸ dizi argümanıyla --rebase-merges yapmak artık kullanılmıyor ve " +"Git'in ileriki bir sürümünde tümüyle kaldırılacak. Bunun yerine, aynı ÅŸeyi " +"yapan argümansız bir --rebase-merges kullanın." + #, c-format msgid "" "%s\n" @@ -10243,18 +10319,21 @@ msgstr "" msgid "switch `C' expects a numerical value" msgstr "'C' anahtarı sayısal bir deÄŸer bekliyor" -#, c-format -msgid "Unknown mode: %s" -msgstr "Bilinmeyen kip: %s" - msgid "--strategy requires --merge or --interactive" msgstr "--strategy, --merge veya --interactive gerektiriyor" msgid "" -"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" "autosquash" msgstr "" -"uygulama seçenekleri, rebase.autosquash ile uyumlu deÄŸil. --no-autosquash " +"seçenekleri uygula, rebase.autoSquash ile uyumlu deÄŸil. --no-autosquash " +"eklemeyi düşünün" + +msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "" +"seçenekleri uygula, rebase.rebaseMerges ile uyumlu deÄŸil. --no-rebase-merges " "eklemeyi düşünün" msgid "" @@ -10301,9 +10380,6 @@ msgstr "'%s': tam olarak bir birleÅŸtirme temeli gerekiyor" msgid "Does not point to a valid commit '%s'" msgstr "'%s' geçerli bir iÅŸlemeye iÅŸaret etmiyor" -msgid "Please commit or stash them." -msgstr "Lütfen onları iÅŸleyin veya zulalayın." - msgid "HEAD is up to date." msgstr "HEAD güncel." @@ -10965,8 +11041,8 @@ msgstr "-a ile aynı, ulaşılamayan süprüntü nesneleri ayrı paketle" msgid "approxidate" msgstr "yaklaşık tarih" -msgid "with -C, expire objects older than this" -msgstr "-C ile, bundan daha eski nesneleri yürürlükten kaldır" +msgid "with --cruft, expire objects older than this" +msgstr "--cruft ile, bundan daha eski nesneleri yürürlükten kaldır" msgid "remove redundant packs, and run git-prune-packed" msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır" @@ -11634,6 +11710,9 @@ msgstr "" msgid "remote name" msgstr "uzak konum adı" +msgid "push all refs" +msgstr "tüm baÅŸvuruları it" + msgid "use stateless RPC protocol" msgstr "durumsuz RPC protokolünü kullan" @@ -11834,9 +11913,11 @@ msgid "show refs from stdin that aren't in local repository" msgstr "stdin'den yerel bir depoda olmayan baÅŸvuruları göster" msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<sçnklr>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<seçenekler>]" msgid "this worktree is not sparse" msgstr "bu çalışma aÄŸacı aralıklı deÄŸil" @@ -11958,6 +12039,23 @@ msgstr "" msgid "error while refreshing working directory" msgstr "çalışma dizini yenilenirken hata" +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <dosya>]" + +msgid "terminate input and output files by a NUL character" +msgstr "girdi ve çıktı dosyalarını bir NUL karakteri ile sonlandır" + +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "" +"--rules-file ile kullanıldığında dizgileri koni kipi dizgileri olarak yorumla" + +msgid "use patterns in <file> instead of the current ones." +msgstr "geçerli dizgiler yerine <dosya> içindekileri kullan." + msgid "git stash list [<log-options>]" msgstr "git stash list [<günlük-seçenekleri>]" @@ -14778,8 +14876,8 @@ msgstr "kısaltma uzunluÄŸu erim dışında: %d" msgid "bad zlib compression level %d" msgstr "hatalı zlib sıkıştırma düzeyi %d" -msgid "core.commentChar should only be one character" -msgstr "core.commentChar yalnızca bir karakter olmalı" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar yalnızca bir ASCII karakter olmalı" #, c-format msgid "ignoring unknown core.fsyncMethod value '%s'" @@ -14890,6 +14988,10 @@ msgid "invalid section name: %s" msgstr "geçersiz bölüm adı: %s" #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "'%s' içindeki haddinden uzun %<PRIuMAX>. satırla çalışma reddediliyor" + +#, c-format msgid "missing value for '%s'" msgstr "'%s' için deÄŸer eksik" @@ -15559,6 +15661,9 @@ msgstr "çıktının her satırının başına ek bir önek ekle" msgid "do not show any source or destination prefix" msgstr "hiçbir kaynak ve hedef önekini gösterme" +msgid "use default prefixes a/ and b/" +msgstr "a/ ve b/ ögelerinin öntanımlı öneklerini kullan" + msgid "show context between diff hunks up to the specified number of lines" msgstr "diff parçaları arasındaki baÄŸlamı belirtilen satır sayısı kadar göster" @@ -15856,6 +15961,14 @@ msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi" msgid "hint: Waiting for your editor to close the file...%c" msgstr "Ä°pucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c" +#, c-format +msgid "could not write to '%s'" +msgstr "ÅŸuraya yazılamadı: '%s'" + +#, c-format +msgid "could not edit '%s'" +msgstr "'%s' düzenlenemedi" + msgid "Filtering content" msgstr "İçerik süzülüyor" @@ -16151,6 +16264,10 @@ msgid "no config key given for --config-env\n" msgstr "--config-env için bir yapılandırma anahtarı verilmedi\n" #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "--attr-source için öznitelik kaynağı verilmedi\n" + +#, c-format msgid "unknown option: %s\n" msgstr "bilinmeyen seçenek: %s\n" @@ -17823,6 +17940,10 @@ msgid "unable to get disk usage of '%s'" msgstr "'%s' ögesinin disk kullanımı alınamadı" #, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "biteÅŸlem dosyası '%s', geçersiz saÄŸlama toplamına iye" + +#, c-format msgid "mtimes file %s is too small" msgstr "mtimes dosyası %s pek küçük" @@ -17862,6 +17983,13 @@ msgstr "%s reverse-index dosyasının sürümü %<PRIu32> desteklenmiyor" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "%s reverse-index dosyasının saÄŸlama numarası %<PRIu32> desteklenmiyor" +msgid "invalid checksum" +msgstr "geçersiz saÄŸlama toplamı" + +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "%<PRIu64> konumunda geçersiz rev-index konumu: %<PRIu32> != %<PRIu32>" + msgid "cannot both write and verify reverse index" msgstr "ters indeks dosyası hem yazılıp hem doÄŸrulanamıyor" @@ -18573,6 +18701,10 @@ msgid "positive width expected with the %%(align) atom" msgstr "pozitif geniÅŸlik %%(align) ögeciÄŸi ile birlikte bekleniyordu" #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "beklenen biçim: %%(ahead-behind:<iÅŸlememsi>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "hatalı oluÅŸturulmuÅŸ alan adı: %.*s" @@ -19194,10 +19326,6 @@ msgid "no remembered resolution for '%s'" msgstr "'%s' için hatırlanan çözüm yok" #, c-format -msgid "cannot unlink '%s'" -msgstr "'%s' baÄŸlantısı kesilemiyor" - -#, c-format msgid "Updated preimage for '%s'" msgstr "'%s' için öngörüntü güncellendi" @@ -19531,10 +19659,6 @@ msgid "could not lock '%s'" msgstr "'%s' kilitlenemedi" #, c-format -msgid "could not write to '%s'" -msgstr "ÅŸuraya yazılamadı: '%s'" - -#, c-format msgid "could not write eol to '%s'" msgstr "satır sonu ÅŸuraya yazılamadı: '%s'" @@ -19894,9 +20018,6 @@ msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin" msgid "could not create sequencer directory '%s'" msgstr "ardıştırıcı dizini '%s' oluÅŸturulamadı" -msgid "could not lock HEAD" -msgstr "HEAD kilitlenemedi" - msgid "no cherry-pick or revert in progress" msgstr "süren bir seç-al veya geri al yok" @@ -19991,20 +20112,20 @@ msgstr "" "\tgit rebase --continue\n" "\n" -msgid "and made changes to the index and/or the working tree\n" -msgstr "ve indekse ve/veya çalışma aÄŸacına deÄŸiÅŸiklikler yapıldı\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "ve indekse ve/veya çalışma aÄŸacına deÄŸiÅŸiklikler yapıldı.\n" #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" -"Yürütme baÅŸarılı oldu: %s,\n" -"ancak indeksinize ve/veya çalışma aÄŸacınıza deÄŸiÅŸiklikler bıraktı\n" +"Yürütme baÅŸarılı oldu: %s;\n" +"ancak indeksinize ve/veya çalışma aÄŸacınıza deÄŸiÅŸiklikler bıraktı.\n" "DeÄŸiÅŸikliklerinizi iÅŸleyin veya zulalayın, ardından ÅŸunu çalıştırın:\n" "\n" "\tgit rebase --continue\n" @@ -20438,10 +20559,6 @@ msgstr[0] "%u bayt/sn" msgstr[1] "%u bayt/sn" #, c-format -msgid "could not edit '%s'" -msgstr "'%s' düzenlenemedi" - -#, c-format msgid "ignoring suspicious submodule name: %s" msgstr "kuÅŸku doÄŸuran altmodül yok sayılıyor: %s" @@ -22147,12 +22264,16 @@ msgid "(%s) Could not execute '%s'" msgstr "(%s) '%s' yürütülemedi" #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) '%s' ögesinden hatalı oluÅŸturulmuÅŸ çıktı" #, perl-format msgid "(%s) failed to close pipe to '%s'" -msgstr "(%s) ÅŸuraya olan veri yolu kapatılamadı: '%s'" +msgstr "(%s) ÅŸuraya olan veriyolu kapatılamadı: '%s'" + +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n" msgid "cannot send message as 7bit" msgstr "ileti 7 bit olarak gönderilemiyor" diff --git a/po/uk.po b/po/uk.po new file mode 100644 index 0000000000..11c57b958b --- /dev/null +++ b/po/uk.po @@ -0,0 +1,21554 @@ +# Ukrainian translation for Git package. +# УкраїнÑький переклад пакету Git. +# Copyright (c) 2023 Arkadii Yakovets. +# Copyright (c) 2023 Kateryna Golovanova. +# This file is distributed under the same license as the Git package. +# +msgid "" +msgstr "" +"Project-Id-Version: Git v2.41\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2023-05-15 23:57+0000\n" +"PO-Revision-Date: 2023-05-17 13:51-0700\n" +"Last-Translator: Arkadii Yakovets <ark@cho.red>\n" +"Language-Team: Ukrainian <https://github.com/arkid15r/git-ukrainian-l10n/>\n" +"Language: uk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"X-Generator: Poedit 3.3.1\n" + +#, c-format +msgid "Huh (%s)?" +msgstr "Га (%s)?" + +msgid "could not read index" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ індекÑ" + +msgid "binary" +msgstr "бінарний" + +msgid "nothing" +msgstr "нічого" + +msgid "unchanged" +msgstr "без змін" + +msgid "Update" +msgstr "Оновити" + +#, c-format +msgid "could not stage '%s'" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ до індекÑа %s" + +msgid "could not write index" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати індекÑ" + +#, c-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "оновлено %d шлÑÑ…\n" +msgstr[1] "оновлено %d шлÑхи\n" +msgstr[2] "оновлено %d шлÑхів\n" + +#, c-format +msgid "note: %s is untracked now.\n" +msgstr "примітка: %s зараз не відÑтежуєтьÑÑ.\n" + +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "невдала Ñпроба make_cache_entry Ð´Ð»Ñ ÑˆÐ»Ñху '%s'" + +msgid "Revert" +msgstr "Вивернути" + +msgid "Could not parse HEAD^{tree}" +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ HEAD^{tree}" + +#, c-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "вивернуто %d шлÑÑ…\n" +msgstr[1] "вивернуто %d шлÑхи\n" +msgstr[2] "вивернуто %d шлÑхів\n" + +#, c-format +msgid "No untracked files.\n" +msgstr "ÐевідÑтежуваних файлів немає\n" + +msgid "Add untracked" +msgstr "Додати невідÑтежувані" + +#, c-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "додано %d шлÑÑ…\n" +msgstr[1] "додано %d шлÑхи\n" +msgstr[2] "додано %d шлÑхів\n" + +#, c-format +msgid "ignoring unmerged: %s" +msgstr "ігноруютьÑÑ Ð½ÐµÐ·Ð»Ð¸Ñ‚Ñ– запиÑи: %s" + +#, c-format +msgid "Only binary files changed.\n" +msgstr "ЗмінилиÑÑ Ð»Ð¸ÑˆÐµ бінарні файли.\n" + +#, c-format +msgid "No changes.\n" +msgstr "Ðічого не змінено.\n" + +msgid "Patch update" +msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ‚Ñ‡Ð°" + +msgid "Review diff" +msgstr "ПереглÑнути різницю" + +msgid "show paths with changes" +msgstr "показати шлÑхи зі змінами" + +msgid "add working tree state to the staged set of changes" +msgstr "додати Ñтан робочого дерева до індекÑу" + +msgid "revert staged set of changes back to the HEAD version" +msgstr "вивернути зміни індекÑу до верÑÑ–Ñ— HEAD" + +msgid "pick hunks and update selectively" +msgstr "вибирати шматки Ñ– оновлювати вибірково" + +msgid "view diff between HEAD and index" +msgstr "переглÑнути різницю між HEAD та індекÑом" + +msgid "add contents of untracked files to the staged set of changes" +msgstr "додати вміÑÑ‚ невідÑтежуваних файлів до індекÑу" + +msgid "Prompt help:" +msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ опції:" + +msgid "select a single item" +msgstr "вибрати один елемент" + +msgid "select a range of items" +msgstr "вибрати діапазон елементів" + +msgid "select multiple ranges" +msgstr "вибрати кілька діапазонів" + +msgid "select item based on unique prefix" +msgstr "вибрати елемент за унікальним префікÑом" + +msgid "unselect specified items" +msgstr "знÑти позначку із зазначених елементів" + +msgid "choose all items" +msgstr "вибрати вÑÑ– елементи" + +msgid "(empty) finish selecting" +msgstr "(пуÑто) закінчити вибір" + +msgid "select a numbered item" +msgstr "вибрати пронумерований елемент" + +msgid "(empty) select nothing" +msgstr "(пуÑто) нічого не вибирати" + +msgid "*** Commands ***" +msgstr "*** Команди ***" + +msgid "What now" +msgstr "Що тепер" + +msgid "staged" +msgstr "в індекÑÑ–" + +msgid "unstaged" +msgstr "поза індекÑом" + +msgid "path" +msgstr "шлÑÑ…" + +msgid "could not refresh index" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ індекÑ" + +#, c-format +msgid "Bye.\n" +msgstr "До побаченнÑ.\n" + +#, c-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "ІндекÑувати зміну режиму [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "ІндекÑувати Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "ІндекÑувати Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "ІндекÑувати цей шматок [y,n,q,a,d%s,?]? " + +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Якщо патч буде заÑтоÑовано без помилок, відредагований шматок буде одразу ж " +"позначено Ð´Ð»Ñ Ñ–Ð½Ð´ÐµÐºÑації." + +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - індекÑувати цей шматок\n" +"n - не індекÑувати цей шматок\n" +"q - вийти; не індекÑувати ні цей шматок, ні решту\n" +"a - індекÑувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" +"d - не індекÑувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" + +#, c-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Сховати зміну режиму [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Сховати Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Сховати Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Сховати цей шматок [y,n,q,a,d%s,?]? " + +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Якщо патч буде заÑтоÑовано без помилок, відредагований шматок буде одразу ж " +"позначено Ð´Ð»Ñ Ñхову." + +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" +"y - Ñховати цей шматок\n" +"n - не ховати цей шматок\n" +"q - вийти; не ховати ні цей шматок, ні решту\n" +"a - Ñховати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" +"d - не ховати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" + +#, c-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "РозіндекÑувати зміну режиму [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "РозіндекÑувати Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "РозіндекÑувати Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "РозіндекÑувати цей шматок [y,n,q,a,d%s,?]? " + +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Якщо патч буде заÑтоÑовано без помилок, відредагований шматок буде одразу ж " +"позначено Ð´Ð»Ñ Ñ€Ð¾Ð·Ñ–Ð½Ð´ÐµÐºÑації." + +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - розіндекÑувати цей шматок\n" +"n - не розіндекÑовувати цей шматок\n" +"q - вийти; не розіндекÑовувати ні цей шматок, ні решту\n" +"a - розіндекÑувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" +"d - не розіндекÑувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" + +#, c-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати зміну режиму до індекÑу [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ індекÑу [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð´Ð¾ індекÑу [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати цей шматок до індекÑу [y,n,q,a,d%s,?]? " + +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Якщо патч буде заÑтоÑовано без помилок, відредагований шматок буде одразу ж " +"позначено Ð´Ð»Ñ Ð·Ð°ÑтоÑуваннÑ." + +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - заÑтоÑувати цей шматок до індекÑу\n" +"n - не заÑтоÑовувати цей шматок до індекÑу\n" +"q - вийти; не заÑтоÑовувати ні цей шматок, ні решту\n" +"a - заÑтоÑувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" +"d - не заÑтоÑовувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" + +#, c-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Відкинути зміну режиму з робочого дерева [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Відкинути Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð· робочого дерева [y,n,q,a,d%s,?] " + +#, c-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Відкинути Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð· робочого дерева [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Відкинути цей шматок з робочого дерева [y,n,q,a,d%s,?]? " + +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Якщо патч буде заÑтоÑовано без помилок, відредагований шматок буде одразу ж " +"позначено Ð´Ð»Ñ Ð²Ñ–Ð´ÐºÐ¸Ð´Ð°Ð½Ð½Ñ." + +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - відкинути цей шматок з робочого дерева\n" +"n - не відкидати цей шматок з робочого дерева\n" +"q - вийти; не відкидати ні цей шматок, ні решту\n" +"a - відкинути цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" +"d - не відкидати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" + +#, c-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Відкинути зміну режиму з індекÑу та робочого дерева [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Відкинути Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð· індекÑу та робочого дерева [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Відкинути Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð· індекÑу та робочого дерева [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Відкинути цей шматок з індекÑу та робочого дерева [y,n,q,a,d%s,?]? " + +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - відкинути цей шматок з індекÑу та робочого дерева\n" +"n - не відкидати цей шматок з індекÑу та робочого дерева\n" +"q - вийти; не відкидати ні цей шматок, ні решту\n" +"a - відкинути цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" +"d - не відкидати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" + +#, c-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"ЗаÑтоÑувати зміну режиму до індекÑу та робочого дерева [y,n,q,a,d%s,?] " + +#, c-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ індекÑу та робочого дерева [y,n,q,a,d%s,?] " + +#, c-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð´Ð¾ індекÑу та робочого дерева [y,n,q,a,d%s,?] " + +#, c-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати цей шматок до індекÑу та робочого дерева [y,n,q,a,d%s,?] " + +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - заÑтоÑувати цей шматок до індекÑу та робочого дерева\n" +"n - не заÑтоÑовувати цей шматок до індекÑу та робочого дерева\n" +"q - вийти; не заÑтоÑовувати ні цей шматок, ні решту\n" +"a - заÑтоÑувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" +"d - не заÑтоÑовувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" + +#, c-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати зміну режиму до робочого дерева [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ робочого дерева [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð´Ð¾ робочого дерева [y,n,q,a,d%s,?]? " + +#, c-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "ЗаÑтоÑувати цей шматок до робочого дерева [y,n,q,a,d%s,?]? " + +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - заÑтоÑувати цей шматок до робочого дерева\n" +"n - не заÑтоÑовувати цей шматок до робочого дерева\n" +"q - вийти; не заÑтоÑовувати ні цей шматок, ні решту\n" +"a - заÑтоÑувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" +"d - не заÑтоÑовувати цей шматок Ñ– вÑÑ– наÑтупні шматки у файлі\n" + +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ заголовок шматка \"%.*s\"" + +msgid "could not parse diff" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ різницю" + +msgid "could not parse colored diff" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ кольоровану різницю" + +#, c-format +msgid "failed to run '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити \"%s\"" + +msgid "mismatched output from interactive.diffFilter" +msgstr "неÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð²Ð¸Ð²Ð¾Ð´Ñƒ з interactive.diffFilter" + +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" +"Ваш фільтр повинен підтримувати один до одного відповідніÑÑ‚ÑŒ\n" +"між його вхідними та вихідними Ñ€Ñдками." + +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"очікувавÑÑ Ñ€Ñдок контекÑту #%d в\n" +"%.*s" + +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"шматки не перетинаютьÑÑ:\n" +"%.*s\n" +"\tне закінчуєтьÑÑ Ð½Ð°:\n" +"%.*s" + +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Режим ручного Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ ÑˆÐ¼Ð°Ñ‚ÐºÐ° -- див. короткий поÑібник внизу.\n" + +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"Щоб видалити Ñ€Ñдки \"%c\", зробіть Ñ—Ñ… Ñ€Ñдками \" \" (контекÑÑ‚).\n" +"Щоб видалити Ñ€Ñдки \"%c\", вилучіть Ñ—Ñ….\n" +"Буде видалено Ñ€Ñдки, що починаютьÑÑ Ð· %c.\n" + +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Якщо шматок буде заÑтоÑований з помилками, вам буде надана можливіÑÑ‚ÑŒ\n" +"відредагувати ще раз. Якщо вÑÑ– Ñ€Ñдки шматка буде вилучено, то Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ " +"буде\n" +"перервано, Ñ– шматок залишитьÑÑ Ð±ÐµÐ· змін.\n" + +msgid "could not parse hunk header" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ заголовок шматка" + +msgid "'git apply --cached' failed" +msgstr "\"git apply --cached\" завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. + +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Ваш відредагований шматок неможливо заÑтоÑувати. Відредагувати ще раз " +"(\"no\" - відкинути!) [y/n]? " + +msgid "The selected hunks do not apply to the index!" +msgstr "Вибрані шматки неможливо заÑтоÑувати до індекÑу!" + +msgid "Apply them to the worktree anyway? " +msgstr "Ð’Ñе одно заÑтоÑувати Ñ—Ñ… до робочого дерева? " + +msgid "Nothing was applied.\n" +msgstr "Ðічого не заÑтоÑовано.\n" + +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - залишити цей шматок невизначеним, перейти до наÑтупного невизначеного " +"шматка\n" +"J - залишити цей шматок невизначеним, перейти до наÑтупного шматка\n" +"k - залишити цей шматок невизначеним, перейти до попереднього невизначеного " +"шматка\n" +"K - залишити цей шматок невизначеним, перейти до попереднього шматка\n" +"g - вибрати шматок, до Ñкого ви хочете перейти\n" +"/ - шукати шматок, що відповідає заданому регвиру\n" +"s - розбити поточний шматок на менші шматки\n" +"e - редагувати поточний шматок вручну\n" +"? - показати довідку\n" + +msgid "No previous hunk" +msgstr "Ðемає попереднього шматка" + +msgid "No next hunk" +msgstr "Ðемає наÑтупного шматка" + +msgid "No other hunks to goto" +msgstr "Ðемає інших шматків Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñƒ" + +msgid "go to which hunk (<ret> to see more)? " +msgstr "до Ñкого шматка перейти (<ret>, щоб побачити більше)? " + +msgid "go to which hunk? " +msgstr "до Ñкого шматка перейти? " + +#, c-format +msgid "Invalid number: '%s'" +msgstr "ÐеприпуÑтиме чиÑло: \"%s\"" + +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "Вибачте, доÑтупний лише %d шматок." +msgstr[1] "Вибачте, доÑтупно лише %d шматки." +msgstr[2] "Вибачте, доÑтупно лише %d шматків." + +msgid "No other hunks to search" +msgstr "Ðемає інших шматків Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ" + +msgid "search for regex? " +msgstr "шукати регвир? " + +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Ðевірно Ñформований регвир пошуку %s: %s" + +msgid "No hunk matches the given pattern" +msgstr "Жоден шматок не відповідає заданому шаблону" + +msgid "Sorry, cannot split this hunk" +msgstr "Вибачте, не можу розділити цей шматок" + +#, c-format +msgid "Split into %d hunks." +msgstr "Розділити на %d шматків." + +msgid "Sorry, cannot edit this hunk" +msgstr "Вибачте, не можу редагувати цей шматок" + +msgid "'git apply' failed" +msgstr "\"git apply\" завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" +"\n" +"Вимкнути це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° за допомогою \"git config advice.%s false\"" + +#, c-format +msgid "%shint: %.*s%s\n" +msgstr "%sпідказка: %.*s%s\n" + +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "ВиÑÐ¼Ð¸ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ, оÑкільки у Ð²Ð°Ñ Ñ” не злиті файли." + +msgid "Committing is not possible because you have unmerged files." +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ неможливе, оÑкільки у Ð²Ð°Ñ Ñ” не злиті файли." + +msgid "Merging is not possible because you have unmerged files." +msgstr "Ð—Ð»Ð¸Ñ‚Ñ‚Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ, оÑкільки у Ð²Ð°Ñ Ñ” не злиті файли." + +msgid "Pulling is not possible because you have unmerged files." +msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ, оÑкільки у Ð²Ð°Ñ Ñ” не злиті файли." + +msgid "Reverting is not possible because you have unmerged files." +msgstr "Ð’Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ, оÑкільки у Ð²Ð°Ñ Ñ” не злиті файли." + +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "Ðеможливо виконати %s, оÑкільки у Ð²Ð°Ñ Ñ” не злиті файли." + +msgid "" +"Fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution and make a commit." +msgstr "" +"Виправте Ñ—Ñ… у робочому дереві, а потім ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ \"git add/rm " +"<файл>\"\n" +"щоб позначити розвʼÑÐ·Ð°Ð½Ð½Ñ Ñ– зробити коміт." + +msgid "Exiting because of an unresolved conflict." +msgstr "Вихід через нерозв’Ñзаний конфлікт." + +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Ви не завершили Ð·Ð»Ð¸Ñ‚Ñ‚Ñ (Ñ–Ñнує MERGE_HEAD)." + +msgid "Please, commit your changes before merging." +msgstr "Будь лаÑка, зробіть коміт ваших змін перед злиттÑм." + +msgid "Exiting because of unfinished merge." +msgstr "Вихід через незавершене злиттÑ." + +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"Гілки, що розходÑÑ‚ÑŒÑÑ, не можуть бути перемотані вперед, вам потрібно " +"зробити:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"або\n" +"\n" +"\tgit rebase\n" + +msgid "Not possible to fast-forward, aborting." +msgstr "Ðеможливо перемотати вперед, перериваннÑ." + +#, c-format +msgid "" +"The following paths and/or pathspecs matched paths that exist\n" +"outside of your sparse-checkout definition, so will not be\n" +"updated in the index:\n" +msgstr "" +"ÐаÑтупні шлÑхи та/або визначники шлÑхів відповідають шлÑхам, Ñкі Ñ–Ñнують\n" +"за межами Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ чаÑткового переходу, тому не будуть\n" +"оновлені в індекÑÑ–:\n" + +msgid "" +"If you intend to update such entries, try one of the following:\n" +"* Use the --sparse option.\n" +"* Disable or modify the sparsity rules." +msgstr "" +"Якщо ви маєте намір оновити такі запиÑи, Ñпробуйте один із наведених нижче " +"ÑпоÑобів:\n" +"* ВикориÑтайте параметр --sparse.\n" +"* Вимкніть або змініть правила чаÑтковоÑÑ‚Ñ–." + +#, c-format +msgid "" +"Note: switching to '%s'.\n" +"\n" +"You are in 'detached HEAD' state. You can look around, make experimental\n" +"changes and commit them, and you can discard any commits you make in this\n" +"state without impacting any branches by switching back to a branch.\n" +"\n" +"If you want to create a new branch to retain commits you create, you may\n" +"do so (now or later) by using -c with the switch command. Example:\n" +"\n" +" git switch -c <new-branch-name>\n" +"\n" +"Or undo this operation with:\n" +"\n" +" git switch -\n" +"\n" +"Turn off this advice by setting config variable advice.detachedHead to " +"false\n" +"\n" +msgstr "" +"Примітка: Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð½Ð° \"%s\".\n" +"\n" +"Ви перебуваєте в Ñтані \"відʼєднаного HEAD\". Ви можете озирнутиÑÑ Ð´Ð¾Ð²ÐºÐ¾Ð»Ð°, " +"внеÑти екÑпериментальні\n" +"зміни Ñ– зробити коміт, також ви можете відкинути будь-Ñкі коміти, зроблені у " +"цьому\n" +"Ñтані, не впливаючи на інші гілки, проÑто перейшовши до іншної гілки.\n" +"\n" +"Якщо ви хочете Ñтворити нову гілку Ð´Ð»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð·Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¸Ñ… вами комітів, ви " +"можете\n" +"викориÑтати (зараз або пізніше) -c з командою switch. Ðаприклад:\n" +"\n" +" git switch -c <назва-нової-гілки\n" +"\n" +"Ðбо ÑкаÑувати цю операцію за допомогою:\n" +"\n" +" git switch -\n" +"\n" +"Щоб вимкнути цю пораду, вÑтановіть конфігураційний параметр advice." +"detachedHead у false\n" + +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" +"ÐаÑтупні шлÑхи, що було винеÑено за межі Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‡Ð°Ñткового\n" +"переходу, не Ñ” чаÑтковими через локальні\n" +"зміни.\n" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse <paths>\" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" +"Щоб виправити чаÑтковіÑÑ‚ÑŒ цих шлÑхів, виконайте наÑтупне:\n" +"* ВикориÑтайте \"git add --sparse <шлÑхи>\" Ð´Ð»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑу\n" +"* ВикориÑтайте \"git sparse-checkout reapply\", щоб заÑтоÑувати правила " +"чаÑтковоÑÑ‚Ñ–" + +msgid "cmdline ends with \\" +msgstr "cmdline завершуєтьÑÑ Ñимволом \\" + +msgid "unclosed quote" +msgstr "незакриті лапки" + +msgid "too many arguments" +msgstr "забагато аргументів" + +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "нерозпізнана Ð¾Ð¿Ñ†Ñ–Ñ Ð¿Ñ€Ð¾Ð±Ñ–Ð»ÑŒÐ½Ð¸Ñ… Ñимволів \"%s\"" + +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "нерозпізнана Ð¾Ð¿Ñ†Ñ–Ñ Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ð±Ñ–Ð»ÑŒÐ½Ð¸Ñ… Ñимволів \"%s\"" + +#, c-format +msgid "options '%s' and '%s' cannot be used together" +msgstr "опції '%s' Ñ– '%s' не можна викориÑтовувати разом" + +#, c-format +msgid "'%s' outside a repository" +msgstr "\"%s\" поза Ñховищем" + +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Ðеможливо підготувати регвир позначки чаÑу %s" + +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec повернув %d Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ñƒ: %s" + +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñ–Ð¼â€™Ñ Ñ„Ð°Ð¹Ð»Ñƒ у латці в Ñ€Ñдку %d" + +#, 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" + +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply: невірний git-diff - невідповідне Ñ–Ð¼â€™Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ файлу у Ñ€Ñдку %d" + +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" +"git apply: невірний git-diff - невідповідне Ñ–Ð¼â€™Ñ Ñтарого файлу у Ñ€Ñдку %d" + +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: невірний git-diff - очікувавÑÑ /dev/null у Ñ€Ñдку %d" + +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "недійÑний режим у Ñ€Ñдку %d: %s" + +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "невідповідні Ñ€Ñдки заголовка %d та %d" + +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +"у заголовку git diff відÑÑƒÑ‚Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ назву файла при видаленні %d " +"провідного компонента назви шлÑху (Ñ€Ñдок %d)" +msgstr[1] "" +"у заголовку git diff відÑÑƒÑ‚Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ назву файла при видаленні %d " +"провідних компонентів назви шлÑху (Ñ€Ñдок %d)" +msgstr[2] "" +"у заголовку git diff відÑÑƒÑ‚Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ назву файла при видаленні %d " +"провідних компонентів назви шлÑху (Ñ€Ñдок %d)" + +#, c-format +msgid "git diff header lacks filename information (line %d)" +msgstr "у заголовку git diff відÑÑƒÑ‚Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ назву файла (Ñ€Ñдок %d)" + +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: неочікуваний Ñ€Ñдок: %.*s" + +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "фрагмент латки без заголовка у Ñ€Ñдку %d: %.*s" + +msgid "new file depends on old contents" +msgstr "новий файл залежить від Ñтарого вміÑту" + +msgid "deleted file still has contents" +msgstr "видалений файл вÑе ще має вміÑÑ‚" + +#, c-format +msgid "corrupt patch at line %d" +msgstr "пошкоджена латка у Ñ€Ñдку %d" + +#, c-format +msgid "new file %s depends on old contents" +msgstr "новий файл %s залежить від Ñтарого вміÑту" + +#, c-format +msgid "deleted file %s still has contents" +msgstr "видалений файл %s вÑе ще має вміÑÑ‚" + +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** попередженнÑ: файл %s Ñтане порожнім, але не буде видалений" + +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "пошкоджена бінарна латка у Ñ€Ñдку %d: %.*s" + +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "нерозпізнана бінарна латка у Ñ€Ñдку %d" + +#, c-format +msgid "patch with only garbage at line %d" +msgstr "латка, що міÑтить лише непотріб у Ñ€Ñдку %d" + +#, c-format +msgid "unable to read symlink %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "unable to open or read %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ або прочитати %s" + +#, c-format +msgid "invalid start of line: '%c'" +msgstr "неприпуÑтимий початок Ñ€Ñдка: \"%c\"" + +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "Шматок #%d уÑпішно заÑтоÑовано на позиції %d (Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ %d Ñ€Ñдок)." +msgstr[1] "Шматок #%d уÑпішно заÑтоÑовано на позиції %d (Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ %d Ñ€Ñдки)." +msgstr[2] "Шматок #%d уÑпішно заÑтоÑовано на позиції %d (Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ %d Ñ€Ñдків)." + +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "" +"КонтекÑÑ‚ Ñкорочено до (%ld/%ld), щоб заÑтоÑувати фрагмент на позиції %d" + +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"поки йде пошук:\n" +"%.*s" + +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "відÑутні дані бінарної латки Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" +msgstr "" +"неможливо виконати reverse-apply бінарної латки без зворотнього шматка до " +"\"%s\"" + +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" +msgstr "" +"неможливо заÑтоÑувати бінарну латку до \"%s\" без повного індекÑного Ñ€Ñдка" + +#, c-format +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" +"латка заÑтоÑовуєтьÑÑ Ð´Ð¾ \"%s\" (%s), Ñкий не збігаєтьÑÑ Ð· поточним вміÑтом." + +#, c-format +msgid "the patch applies to an empty '%s' but it is not empty" +msgstr "латка заÑтоÑовуєтьÑÑ Ð´Ð¾ порожнього \"%s\", Ñкий не Ñ” порожнім" + +#, c-format +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "неможливо прочитати необхідний postimage %s Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "бінарна латка не заÑтоÑовуєтьÑÑ Ð´Ð¾ \"%s\"" + +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"бінарна латка Ð´Ð»Ñ \"%s\" призводить до некоректного результату (очікувалоÑÑ " +"%s, отримано %s)" + +#, c-format +msgid "patch failed: %s:%ld" +msgstr "Ð»Ð°Ñ‚Ð°Ð½Ð½Ñ Ð½Ðµ вдалоÑÑ: %s:%ld" + +#, c-format +msgid "cannot checkout %s" +msgstr "неможливо переключити Ñтан %s" + +#, c-format +msgid "failed to read %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ %s" + +#, c-format +msgid "reading from '%s' beyond a symbolic link" +msgstr "Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð· \"%s\" за Ñимвольним поÑиланнÑм" + +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "шлÑÑ… %s перейменовано/видалено" + +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: не Ñ–Ñнує в індекÑÑ–" + +#, c-format +msgid "%s: does not match index" +msgstr "%s: не Ñпівпадає з індекÑом" + +msgid "repository lacks the necessary blob to perform 3-way merge." +msgstr "" +"у Ñховищі відÑутній необхідний blob Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ñ‚Ñ€Ð¸Ñтороннього злиттÑ." + +#, c-format +msgid "Performing three-way merge...\n" +msgstr "Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ñ‚Ñ€Ð¸Ñтороннього злиттÑ...\n" + +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "неможливо прочитати поточний вміÑÑ‚ \"%s\"" + +#, c-format +msgid "Failed to perform three-way merge...\n" +msgstr "Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ триÑтороннє злиттÑ...\n" + +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "Латка до \"%s\" заÑтоÑована з конфліктами.\n" + +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "Латка до \"%s\" заÑтоÑована чиÑто.\n" + +#, c-format +msgid "Falling back to direct application...\n" +msgstr "ÐŸÐ¾Ð²ÐµÑ€Ð½ÐµÐ½Ð½Ñ Ð´Ð¾ прÑмого заÑтоÑуваннÑ...\n" + +msgid "removal patch leaves file contents" +msgstr "латка Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð»Ð¸ÑˆÐ°Ñ” вміÑÑ‚ файлу" + +#, c-format +msgid "%s: wrong type" +msgstr "%s: невірний тип" + +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s має тип %o, очікувавÑÑ %o" + +#, c-format +msgid "invalid path '%s'" +msgstr "неприпуÑтимий шлÑÑ… \"%s\"" + +#, c-format +msgid "%s: already exists in index" +msgstr "%s: вже Ñ–Ñнує в індекÑÑ–" + +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: вже Ñ–Ñнує в робочій директорії" + +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "новий режим (%o) Ð´Ð»Ñ %s не відповідає Ñтарому режиму (%o)" + +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "новий режим (%o) Ð´Ð»Ñ %s не відповідає Ñтарому режиму (%o) Ð´Ð»Ñ %s" + +#, c-format +msgid "affected file '%s' is beyond a symbolic link" +msgstr "уражений файл \"%s\" знаходитьÑÑ Ð·Ð° межами Ñимволічного поÑиланнÑ" + +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: латка не може бути заÑтоÑована" + +#, c-format +msgid "Checking patch %s..." +msgstr "Перевірка латки %s..." + +#, c-format +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "sha1 Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ Ð°Ð±Ð¾ марна Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s" + +#, c-format +msgid "mode change for %s, which is not in current HEAD" +msgstr "зміна режиму Ð´Ð»Ñ %s, Ñкого немає в поточному HEAD" + +#, c-format +msgid "sha1 information is lacking or useless (%s)." +msgstr "sha1 Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ Ð°Ð±Ð¾ марна (%s)." + +#, c-format +msgid "could not add %s to temporary index" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ %s до тимчаÑового індекÑу" + +#, c-format +msgid "could not write temporary index to %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати тимчаÑовий Ñ–Ð½Ð´ÐµÐºÑ Ñƒ %s" + +#, c-format +msgid "unable to remove %s from index" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s з індекÑу" + +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "пошкоджена латка Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s" + +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ інформацію про щойно Ñтворений файл \"%s\"" + +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "не вдалоÑÑ Ñтворити підтримуюче Ñховище Ð´Ð»Ñ Ñ‰Ð¾Ð¹Ð½Ð¾ Ñтвореного файлу %s" + +#, c-format +msgid "unable to add cache entry for %s" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ ÐºÐµÑˆÑƒ Ð´Ð»Ñ %s" + +#, c-format +msgid "failed to write to '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати в \"%s\"" + +#, c-format +msgid "closing file '%s'" +msgstr "Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ñƒ \"%s\"" + +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл \"%s\" в режимі %o" + +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Латка %s заÑтоÑована чиÑто." + +msgid "internal error" +msgstr "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" + +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "ЗаÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð°Ñ‚ÐºÐ¸ %%s з %d відкиданнÑм..." +msgstr[1] "ЗаÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð°Ñ‚ÐºÐ¸ %%s з %d відкиданнÑми..." +msgstr[2] "ЗаÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð°Ñ‚ÐºÐ¸ %%s з %d відкиданнÑми..." + +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ð·Ð²Ð¸ файлу .rej до %.*s.rej" + +#, c-format +msgid "cannot open %s" +msgstr "неможливо відкрити %s" + +#, c-format +msgid "cannot unlink '%s'" +msgstr "неможливо відʼєднати \"%s\"" + +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Шматок #%d заÑтоÑовано чиÑто." + +#, c-format +msgid "Rejected hunk #%d." +msgstr "Шматок #%d відкинуто." + +#, c-format +msgid "Skipped patch '%s'." +msgstr "Пропущена латка \"%s\"." + +msgid "No valid patches in input (allow with \"--allow-empty\")" +msgstr "Ðемає коректних латок на вході (дозволити через \"--allow-empty\")" + +msgid "unable to read index file" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ індекÑний файл" + +#, c-format +msgid "can't open patch '%s': %s" +msgstr "неможливо відкрити латку \"%s\": %s" + +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "ігнорована %d помилка пробільних Ñимволів" +msgstr[1] "ігноровані %d помилки пробільних Ñимволів" +msgstr[2] "ігноровані %d помилок пробільних Ñимволів" + +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d Ñ€Ñдок додає помилки пробільних Ñимволів." +msgstr[1] "%d Ñ€Ñдки додають помилки пробільних Ñимволів." +msgstr[2] "%d Ñ€Ñдків додають помилки пробільних Ñимволів." + +#, c-format +msgid "%d line applied after fixing whitespace errors." +msgid_plural "%d lines applied after fixing whitespace errors." +msgstr[0] "%d Ñ€Ñдок заÑтоÑовано піÑÐ»Ñ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº пробільних Ñимволів." +msgstr[1] "%d Ñ€Ñдки заÑтоÑовано піÑÐ»Ñ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº пробільних Ñимволів." +msgstr[2] "" +"%d Ñ€Ñдків заÑтоÑовано піÑÐ»Ñ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº пробільних Ñимволів." + +msgid "Unable to write new index file" +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати новий файл індекÑу" + +msgid "don't apply changes matching the given path" +msgstr "не заÑтоÑовувати зміни, що відповідають вказаному шлÑху" + +msgid "apply changes matching the given path" +msgstr "заÑтоÑувати зміни, що відповідають вказаному шлÑху" + +msgid "num" +msgstr "чиÑло" + +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "видалити <num> перших Ñлешів з традиційних diff-шлÑхів" + +msgid "ignore additions made by the patch" +msgstr "ігнорувати доповненнÑ, зроблені латкою" + +msgid "instead of applying the patch, output diffstat for the input" +msgstr "заміÑÑ‚ÑŒ заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð°Ñ‚ÐºÐ¸ вивеÑти diffstat Ð´Ð»Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¸Ñ… даних" + +msgid "show number of added and deleted lines in decimal notation" +msgstr "показати кількіÑÑ‚ÑŒ доданих Ñ– видалених Ñ€Ñдків у деÑÑтковій нотації" + +msgid "instead of applying the patch, output a summary for the input" +msgstr "заміÑÑ‚ÑŒ заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð°Ñ‚ÐºÐ¸ вивеÑти підÑумок Ð´Ð»Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¸Ñ… даних" + +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "заміÑÑ‚ÑŒ заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð°Ñ‚ÐºÐ¸ перевірити можливіÑÑ‚ÑŒ Ñ—Ñ— заÑтоÑуваннÑ" + +msgid "make sure the patch is applicable to the current index" +msgstr "переконатиÑÑ, що латка може бути заÑтоÑовна до поточного індекÑу" + +msgid "mark new files with `git add --intent-to-add`" +msgstr "позначити нові файли командою \"git add --intent-to-add\"" + +msgid "apply a patch without touching the working tree" +msgstr "заÑтоÑувати латку, не торкаючиÑÑŒ робочого дерева" + +msgid "accept a patch that touches outside the working area" +msgstr "прийнÑти латку, Ñка виходить за межі робочого проÑтору" + +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "також заÑтоÑувати патч (викориÑтовуйте з --stat/--summary/--check)" + +msgid "attempt three-way merge, fall back on normal patch if that fails" +msgstr "" +"Ñпробувати триÑтороннє злиттÑ, повернутиÑÑ Ð´Ð¾ звичайного латаннÑ, Ñкщо це не " +"вдаÑÑ‚ÑŒÑÑ" + +msgid "build a temporary index based on embedded index information" +msgstr "Ñтворити тимчаÑовий Ñ–Ð½Ð´ÐµÐºÑ Ð½Ð° оÑнові вбудованої індекÑної інформації" + +msgid "paths are separated with NUL character" +msgstr "шлÑхи відокремлюютьÑÑ Ñимволом NUL" + +msgid "ensure at least <n> lines of context match" +msgstr "забезпечити збіг принаймні <n> Ñ€Ñдків контекÑту" + +msgid "action" +msgstr "діÑ" + +msgid "detect new or modified lines that have whitespace errors" +msgstr "виÑвлÑти нові або змінені Ñ€Ñдки з помилками пробільних Ñимволів" + +msgid "ignore changes in whitespace when finding context" +msgstr "ігнорувати зміни пробільних Ñимволів при пошуку контекÑту" + +msgid "apply the patch in reverse" +msgstr "заÑтоÑувати латку у зворотному порÑдку" + +msgid "don't expect at least one line of context" +msgstr "не очікувати на хоча б один Ñ€Ñдок контекÑту" + +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "залишити відкинуті шматки у відповідних *.rej файлах" + +msgid "allow overlapping hunks" +msgstr "дозволити Ð¿ÐµÑ€ÐµÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÑˆÐ¼Ð°Ñ‚ÐºÑ–Ð²" + +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "дозволÑти некоректно виÑвлену відÑутніÑÑ‚ÑŒ нового Ñ€Ñдка в кінці файлу" + +msgid "do not trust the line counts in the hunk headers" +msgstr "не довірÑти кількоÑÑ‚Ñ– Ñ€Ñдків у заголовках шматків" + +msgid "root" +msgstr "корінь" + +msgid "prepend <root> to all filenames" +msgstr "додати <корінь> до вÑÑ–Ñ… назв файлів" + +msgid "don't return error for empty patches" +msgstr "не повертати помилку Ð´Ð»Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ–Ñ… латок" + +#, c-format +msgid "cannot stream blob %s" +msgstr "неможливо транÑлювати blob %s" + +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "непідтримуваний режим файлу: 0%o (SHA1: %s)" + +#, c-format +msgid "deflate error (%d)" +msgstr "помилка Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ (%d)" + +#, c-format +msgid "unable to start '%s' filter" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити \"%s\" фільтр" + +msgid "unable to redirect descriptor" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ деÑкриптор" + +#, c-format +msgid "'%s' filter reported error" +msgstr "Фільтр \"%s\" повідомив про помилку" + +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "шлÑÑ… не Ñ” припуÑтимим UTF-8: %s" + +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "шлÑÑ… занадто довгий (%d Ñимволів, SHA1: %s): %s" + +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "позначка чаÑу занадто велика Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— ÑиÑтеми: %<PRIuMAX>" + +msgid "git archive [<options>] <tree-ish> [<path>...]" +msgstr "git archive [<опції>] <деревоподібне джерело> [<шлÑÑ…>...]" + +msgid "" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <Ñховище> [--exec <команда>] [<опції>] <деревоподібне " +"джерело> [<шлÑÑ…>...]" + +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <Ñховище> [--exec <команда>] --list" + +#, c-format +msgid "cannot read '%s'" +msgstr "неможливо прочитати \"%s\"" + +#, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "" + +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "визначник шлÑxу \"%s\" не відповідає жодному файлу" + +#, c-format +msgid "no such ref: %.*s" +msgstr "немає такого поÑиланнÑ: %.*s" + +#, c-format +msgid "not a valid object name: %s" +msgstr "невірне Ñ–Ð¼â€™Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ð°: %s" + +#, c-format +msgid "not a tree object: %s" +msgstr "не Ñ” об’єктом дерева: %s" + +#, c-format +msgid "File not found: %s" +msgstr "Файл не знайдено: %s" + +#, c-format +msgid "Not a regular file: %s" +msgstr "Ðе звичайний файл: %s" + +#, c-format +msgid "unclosed quote: '%s'" +msgstr "незакриті лапки: \"%s\"" + +#, c-format +msgid "missing colon: '%s'" +msgstr "відÑÑƒÑ‚Ð½Ñ Ð´Ð²Ð¾ÐºÑ€Ð°Ð¿ÐºÐ°: \"%s\"" + +#, c-format +msgid "empty file name: '%s'" +msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ Ð½Ð°Ð·Ð²Ð° файлу: \"%s\"" + +msgid "fmt" +msgstr "fmt" + +msgid "archive format" +msgstr "формат архіву" + +msgid "prefix" +msgstr "префікÑ" + +msgid "prepend prefix to each pathname in the archive" +msgstr "додати Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ Ð´Ð¾ кожної назви шлÑху в архіві" + +msgid "file" +msgstr "файл" + +msgid "add untracked file to archive" +msgstr "додати невідÑтежуваний файл до архіву" + +msgid "path:content" +msgstr "шлÑÑ…:вміÑÑ‚" + +msgid "write the archive to this file" +msgstr "запиÑати архів до цього файлу" + +msgid "read .gitattributes in working directory" +msgstr "прочитати .gitattributes робочої директорії" + +msgid "report archived files on stderr" +msgstr "звітувати про заархівовані файли в stderr" + +msgid "time" +msgstr "чаÑ" + +msgid "set modification time of archive entries" +msgstr "вÑтановити Ñ‡Ð°Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— архівних запиÑів" + +msgid "set compression level" +msgstr "вÑтановити рівень компреÑÑ–Ñ—" + +msgid "list supported archive formats" +msgstr "показати ÑпиÑок підтримуваних форматів архівів" + +msgid "repo" +msgstr "Ñховище" + +msgid "retrieve the archive from remote repository <repo>" +msgstr "отримати архів з віддаленого <Ñховища>" + +msgid "command" +msgstr "команда" + +msgid "path to the remote git-upload-archive command" +msgstr "шлÑÑ… до віддаленої команди git-upload-archive" + +msgid "Unexpected option --remote" +msgstr "Ðеочікувана Ð¾Ð¿Ñ†Ñ–Ñ --remote" + +#, c-format +msgid "the option '%s' requires '%s'" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ \"%s\" вимагає \"%s\"" + +msgid "Unexpected option --output" +msgstr "Ðеочікувана Ð¾Ð¿Ñ†Ñ–Ñ --output" + +#, c-format +msgid "Unknown archive format '%s'" +msgstr "Ðевідомий формат архіву \"%s\"" + +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "Ðргумент не підтримуєтьÑÑ Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñƒ \"%s\": -%d" + +#, c-format +msgid "%.*s is not a valid attribute name" +msgstr "%.*s не Ñ” припуÑтимою назвою атрибута" + +msgid "unable to add additional attribute" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ додатковий атрибут" + +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгого Ñ€Ñдка атрибутів %d" + +#, c-format +msgid "%s not allowed: %s:%d" +msgstr "%s не дозволено: %s:%d" + +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" +"Ðегативні шаблони ігноруютьÑÑ Ð² git атрибутах\n" +"ВикориÑтовуйте \"\\!\" Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ð½Ð½Ñ Ð·Ð½Ð°ÐºÐ° оклику." + +#, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "неможливо виконати fstat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° git атрибутів \"%s\"" + +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ великого файлу gitattributes \"%s\"" + +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ великих gitattributes blob \"%s\"" + +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "Ðевірно процитований вміÑÑ‚ у файлі \"%s\": %s" + +#, c-format +msgid "We cannot bisect more!\n" +msgstr "Ðеможливо біÑектувати більше!\n" + +#, c-format +msgid "Not a valid commit name %s" +msgstr "Ðе Ñ” дійÑною назвою коміта %s" + +#, c-format +msgid "" +"The merge base %s is bad.\n" +"This means the bug has been fixed between %s and [%s].\n" +msgstr "" +"База Ð·Ð»Ð¸Ñ‚Ñ‚Ñ %s Ñ” невірною.\n" +"Це означає, що помилку було виправлено між %s та [%s].\n" + +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "" +"База Ð·Ð»Ð¸Ñ‚Ñ‚Ñ %s Ñ” новою.\n" +"ВлаÑтивіÑÑ‚ÑŒ змінилаÑÑ Ð¼Ñ–Ð¶ %s та [%s].\n" + +#, c-format +msgid "" +"The merge base %s is %s.\n" +"This means the first '%s' commit is between %s and [%s].\n" +msgstr "" +"Базою Ð·Ð»Ð¸Ñ‚Ñ‚Ñ %s Ñ” %s.\n" +"Це означає, що перший \"%s\" коміт знаходитьÑÑ Ð¼Ñ–Ð¶ %s Ñ– [%s].\n" + +#, c-format +msgid "" +"Some %s revs are not ancestors of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "" +"ДеÑкі %s revs не Ñ” предками %s rev.\n" +"git bisect не може працювати належним чином в таких випадках.\n" +"Можливо, ви переплутали %s Ñ– %s revs?\n" + +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "" +"базу Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¼Ñ–Ð¶ %s Ñ– [%s] потрібно пропуÑтити.\n" +"Тому ми не можемо бути впевнені, що перший коміт %s знаходитьÑÑ Ð¼Ñ–Ð¶ %s Ñ– " +"%s.\n" +"Ми вÑе одно продовжимо." + +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "БіÑекціÑ: база Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð° бути протеÑтована\n" + +#, c-format +msgid "a %s revision is needed" +msgstr "необхідна Ñ€ÐµÐ²Ñ–Ð·Ñ–Ñ %s" + +#, c-format +msgid "could not create file '%s'" +msgstr "не вдалоÑÑ Ñтворити файл \"%s\"" + +#, c-format +msgid "could not read file '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл \"%s\"" + +msgid "reading bisect refs failed" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ біÑекційні поÑиланнÑ" + +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s був одночаÑно Ñ– %s, Ñ– %s\n" + +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path arguments?\n" +msgstr "" +"Ðе знайдено коміт Ð´Ð»Ñ Ñ‚ÐµÑтуваннÑ.\n" +"Можливо, ви почали з неправильних аргументів шлÑху?\n" + +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "(приблизно %d крок)" +msgstr[1] "(приблизно %d кроки)" +msgstr[2] "(приблизно %d кроків)" + +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. + +#, c-format +msgid "Bisecting: %d revision left to test after this %s\n" +msgid_plural "Bisecting: %d revisions left to test after this %s\n" +msgstr[0] "БіÑекціÑ: залишилоÑÑ Ð¿Ñ€Ð¾Ñ‚ÐµÑтувати %d ревізію піÑÐ»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ %s\n" +msgstr[1] "БіÑекціÑ: залишилоÑÑ Ð¿Ñ€Ð¾Ñ‚ÐµÑтувати %d ревізії піÑÐ»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ %s\n" +msgstr[2] "БіÑекціÑ: залишилоÑÑ Ð¿Ñ€Ð¾Ñ‚ÐµÑтувати %d ревізій піÑÐ»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ %s\n" + +msgid "--contents and --reverse do not blend well." +msgstr "--contents Ñ– --reverse поєднуютьÑÑ Ð½Ðµ дуже добре." + +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "--reverse Ñ– --first-parent разом вимагають вказівки оÑтаннього коміту" + +msgid "revision walk setup failed" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ ревізіÑм" + +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent разом вимагають вказівки діапазона вздовж ланцюжка " +"першого батька" + +#, c-format +msgid "no such path %s in %s" +msgstr "немає шлÑху %s в %s" + +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "неможливо прочитати blob %s Ð´Ð»Ñ ÑˆÐ»Ñху %s" + +msgid "" +"cannot inherit upstream tracking configuration of multiple refs when " +"rebasing is requested" +msgstr "" +"неможливо уÑпадковувати першоджерельну конфігурацію відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð´ÐµÐºÑ–Ð»ÑŒÐºÐ¾Ñ… " +"поÑилань при запиті перебазуваннÑ" + +#, c-format +msgid "not setting branch '%s' as its own upstream" +msgstr "гілку \"%s\" не вÑтановлено влаÑним першоджерельним Ñховищем" + +#, c-format +msgid "branch '%s' set up to track '%s' by rebasing." +msgstr "гілку \"%s\" налаштовано на відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ \"%s\" через перебазуваннÑ." + +#, c-format +msgid "branch '%s' set up to track '%s'." +msgstr "гілку \"%s\" налаштовано на відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ñ \"%s\"." + +#, c-format +msgid "branch '%s' set up to track:" +msgstr "гілку \"%s\" налаштовано на відÑтежуваннÑ:" + +msgid "unable to write upstream branch configuration" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати конфігурацію гілки першоджерельного Ñховища" + +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking:" +msgstr "" +"\n" +"ПіÑÐ»Ñ ÑƒÑÑƒÐ½ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð¸ помилки ви можете Ñпробувати виправити\n" +"інформацію про віддалене відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð´Ñ–Ð¹Ñнівши виклик:" + +#, c-format +msgid "asked to inherit tracking from '%s', but no remote is set" +msgstr "" +"проÑили уÑпадкувати відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð· \"%s\", але віддалене Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ " +"вÑтановлено" + +#, c-format +msgid "asked to inherit tracking from '%s', but no merge configuration is set" +msgstr "" +"проÑили уÑпадкувати відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð· \"%s\", але конфігурацію Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ задано" + +#, c-format +msgid "not tracking: ambiguous information for ref '%s'" +msgstr "не відÑтежуєтьÑÑ: неоднозначна Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð´Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\"" + +#. TRANSLATORS: This is a line listing a remote with duplicate +#. refspecs in the advice message below. For RTL languages you'll +#. probably want to swap the "%s" and leading " " space around. +#. +#. TRANSLATORS: This is line item of ambiguous object output +#. from describe_ambiguous_object() above. For RTL languages +#. you'll probably want to swap the "%s" and leading " " space +#. around. +#. + +#, c-format +msgid " %s\n" +msgstr " %s\n" + +#. TRANSLATORS: The second argument is a \n-delimited list of +#. duplicate refspecs, composed above. +#. + +#, c-format +msgid "" +"There are multiple remotes whose fetch refspecs map to the remote\n" +"tracking ref '%s':\n" +"%s\n" +"This is typically a configuration error.\n" +"\n" +"To support setting up tracking branches, ensure that\n" +"different remotes' fetch refspecs map into different\n" +"tracking namespaces." +msgstr "" +"ІÑнує декілька віддалених призначень, визначники Ð¾Ñ‚Ñ€Ð¸Ð¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñилань Ñких " +"розвʼÑзуютьÑÑ Ñƒ віддалено \n" +"відÑтежуване поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\":\n" +"%s\n" +"Зазвичай це помилка конфігурації.\n" +"\n" +"Щоб підтримувати Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ñ–Ð»Ð¾Ðº відÑтежуваннÑ, переконайтеÑÑ, що\n" +"визначники Ð¾Ñ‚Ñ€Ð¸Ð¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñилань різних віддалених призначень розвʼÑзуютьÑÑ Ñƒ " +"різні\n" +" проÑтори імен відÑтежуваннÑ." + +#, c-format +msgid "'%s' is not a valid branch name" +msgstr "\"%s\" не Ñ” допуÑтимою назвою гілки" + +#, c-format +msgid "a branch named '%s' already exists" +msgstr "гілка з ім’Ñм \"%s\" вже Ñ–Ñнує" + +#, c-format +msgid "cannot force update the branch '%s' checked out at '%s'" +msgstr "неможливо примуÑово оновити гілку \"%s\", розташовану в \"%s\"" + +#, c-format +msgid "cannot set up tracking information; starting point '%s' is not a branch" +msgstr "" +"неможливо налаштувати інформацію про відÑтежуваннÑ; початкова точка \"%s\" " +"не Ñ” гілкою" + +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "запитувана гілка \"%s\" не Ñ–Ñнує у першоджерельному Ñховищі" + +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "" +"\n" +"Якщо ви плануєте базувати Ñвою роботу на оÑнові першоджерельної\n" +"гілки, Ñка вже Ñ–Ñнує на віддаленому призначенні, вам може знадобитиÑÑ\n" +"запуÑтити \"git fetch\", щоб отримати Ñ—Ñ—.\n" +"\n" +"Якщо ви плануєте надіÑлати нову локальну гілку, Ñка\n" +"буде відÑтежувати Ñвою віддалену гілку, вам Ñлід ÑкориÑтатиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ\n" +"\"git push -u\", щоб вÑтановити конфігурацію першоджерельного Ñховища під " +"Ñ‡Ð°Ñ Ð½Ð°Ð´ÑиланнÑ." + +#, c-format +msgid "not a valid object name: '%s'" +msgstr "не Ñ” допуÑтимим ім’Ñм об’єкта: \"%s\"" + +#, c-format +msgid "ambiguous object name: '%s'" +msgstr "неоднозначне Ñ–Ð¼â€™Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ð°: \"%s\"" + +#, c-format +msgid "not a valid branch point: '%s'" +msgstr "не Ñ” допуÑтимим ім’Ñм точки розгалуженнÑ: \"%s\"" + +#, c-format +msgid "submodule '%s': unable to find submodule" +msgstr "підмодуль \"%s\": не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ підмодуль" + +#, c-format +msgid "" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" +msgstr "" +"Ви можете Ñпробувати оновити підмодулі за допомогою \"git checkout --no-" +"recurse-submodules %s && git submodule update --init\"." + +#, c-format +msgid "submodule '%s': cannot create branch '%s'" +msgstr "підмодуль \"%s\": неможливо Ñтворити гілку \"%s\"" + +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "\"%s\" вже Ñ–Ñнує в \"%s\"" + +msgid "git add [<options>] [--] <pathspec>..." +msgstr "git add [<опції>] [--] <визначник шлÑху>..." + +#, c-format +msgid "cannot chmod %cx '%s'" +msgstr "неможливо виконати chmod %cx \"%s\"" + +#, c-format +msgid "unexpected diff status %c" +msgstr "неочікуваний ÑÑ‚Ð°Ñ‚ÑƒÑ diff %c" + +msgid "updating files failed" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ файли" + +#, c-format +msgid "remove '%s'\n" +msgstr "видалити \"%s\"\n" + +msgid "Unstaged changes after refreshing the index:" +msgstr "ÐеіндекÑовані зміни піÑÐ»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑу:" + +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"параметр add.interactive.useBuiltin було видалено!\n" +"ДивітьÑÑ Ð·Ð°Ð¿Ð¸Ñ Ñƒ \"git help config\" Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ детальної інформації." + +msgid "Could not read the index" +msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ індекÑ" + +msgid "Could not write patch" +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати латку" + +msgid "editing patch failed" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ латку" + +#, c-format +msgid "Could not stat '%s'" +msgstr "Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat \"%s\"" + +msgid "Empty patch. Aborted." +msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ Ð»Ð°Ñ‚ÐºÐ°. Перервано." + +#, c-format +msgid "Could not apply '%s'" +msgstr "Ðе вдалоÑÑ Ð·Ð°ÑтоÑувати \"%s\"" + +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "ÐаÑтупні шлÑхи ігноруютьÑÑ Ð¾Ð´Ð½Ð¸Ð¼ з ваших .gitignore файлів:\n" + +msgid "dry run" +msgstr "пробний запуÑк" + +msgid "be verbose" +msgstr "розгорнутий вивід" + +msgid "interactive picking" +msgstr "інтерактивний вибір" + +msgid "select hunks interactively" +msgstr "обирати шматки інтерактивно" + +msgid "edit current diff and apply" +msgstr "відредагувати поточну різницю Ñ– заÑтоÑувати" + +msgid "allow adding otherwise ignored files" +msgstr "дозволити Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ–Ð³Ð½Ð¾Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ… файлів" + +msgid "update tracked files" +msgstr "оновити відÑтежувані файли" + +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "перенормувати EOL відÑтежуваних файлів (маєтьÑÑ Ð½Ð° увазі -u)" + +msgid "record only the fact that the path will be added later" +msgstr "запиÑати лише той факт, що шлÑÑ… будe додано пізніше" + +msgid "add changes from all tracked and untracked files" +msgstr "додати зміни з уÑÑ–Ñ… відÑтежуваних Ñ– невідÑтежуваних файлів" + +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "ігнорувати шлÑхи, видалені у робочому дереві (те Ñаме, що й --no-all)" + +msgid "don't add, only refresh the index" +msgstr "не додавати, лише оновити індекÑ" + +msgid "just skip files which cannot be added because of errors" +msgstr "проÑто пропуÑтити файли, Ñкі не можуть бути додані через помилки" + +msgid "check if - even missing - files are ignored in dry run" +msgstr "" +"перевірити, чи ігноруютьÑÑ Ñ„Ð°Ð¹Ð»Ð¸, навіть Ñкщо вони відÑутні, під Ñ‡Ð°Ñ " +"пробного запуÑку" + +msgid "allow updating entries outside of the sparse-checkout cone" +msgstr "дозволити Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñів за межами конуÑа чаÑткового переходу" + +msgid "override the executable bit of the listed files" +msgstr "перевизначити біт Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð·Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ… файлів" + +msgid "warn when adding an embedded repository" +msgstr "попереджувати при додаванні вбудованого Ñховища" + +#, c-format +msgid "" +"You've added another git repository inside your current repository.\n" +"Clones of the outer repository will not contain the contents of\n" +"the embedded repository and will not know how to obtain it.\n" +"If you meant to add a submodule, use:\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"If you added this path by mistake, you can remove it from the\n" +"index with:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"See \"git help submodule\" for more information." +msgstr "" +"Ви додали ще одне git Ñховище вÑередині вашого поточного Ñховища.\n" +"Клони зовнішнього Ñховища не міÑтитимуть вміÑту\n" +"вбудованого Ñховища Ñ– не знатимуть, Ñк його отримати.\n" +"Якщо ви хочете додати підмодуль, ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"Якщо ви додали цей шлÑÑ… помилково, ви можете видалити його з\n" +"індекÑу за допомогою:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"Докладніше дивітьÑÑ Ñƒ \"git help submodule\"." + +#, c-format +msgid "adding embedded git repository: %s" +msgstr "Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð²Ð±ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ git Ñховища: %s" + +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"ВикориÑтовуйте -f, Ñкщо ви дійÑно хочете Ñ—Ñ… додати.\n" +"Щоб вимкнути це повідомленнÑ, виконайте\n" +"\"git config advice.addIgnoredFile false\"" + +msgid "adding files failed" +msgstr "Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² завершилоÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "--chmod param '%s' must be either -x or +x" +msgstr "--chmod параметр \"%s\" має бути -x або +x" + +#, c-format +msgid "'%s' and pathspec arguments cannot be used together" +msgstr "\"%s\" та аргументи визначника шлÑху не можна викориÑтовувати разом" + +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Ðічого не зазначено, нічого не додано.\n" + +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"Можливо, ви хотіли вказати \"git add .\"?\n" +"Щоб вимкнути це повідомленнÑ, виконайте\n" +"\"git config advice.addEmptyPathspec false\"" + +msgid "index file corrupt" +msgstr "індекÑний файл пошкоджено" + +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "невірна Ð´Ñ–Ñ \"%s\" Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "invalid value for '%s': '%s'" +msgstr "неприпуÑтиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ \"%s\": \"%s\"" + +#, c-format +msgid "could not read '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ \"%s\"" + +msgid "could not parse author script" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ author script" + +#, c-format +msgid "could not parse %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ %s" + +#, c-format +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "\"%s\" було видалено applypatch-msg гачком" + +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Ðевірно Ñформований Ñ€Ñдок вводу: \"%s\"." + +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Ðе вдалоÑÑ Ñкопіювати нотатки з \"%s\" в \"%s\"" + +msgid "fseek failed" +msgstr "fseek завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "could not open '%s' for reading" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\" Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ" + +#, c-format +msgid "could not open '%s' for writing" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу" + +#, c-format +msgid "could not parse patch '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ латку \"%s\"" + +msgid "Only one StGIT patch series can be applied at once" +msgstr "Можна заÑтоÑовувати лише одну Ñерію StGIT латок одразу" + +msgid "invalid timestamp" +msgstr "неприпуÑтима позначка чаÑу" + +msgid "invalid Date line" +msgstr "неприпуÑтимий Ñ€Ñдок дати" + +msgid "invalid timezone offset" +msgstr "неприпуÑтиме Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñ‡Ð°Ñового поÑÑу" + +msgid "Patch format detection failed." +msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ формат латки." + +#, c-format +msgid "failed to create directory '%s'" +msgstr "не вдалоÑÑ Ñтворити директорію \"%s\"" + +msgid "Failed to split patches." +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ латки." + +#, c-format +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "Коли ви вирішите цю проблему, виконайте \"%s --continue\"." + +#, c-format +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "" +"Якщо ви бажаєте пропуÑтити цю латку, виконайте \"%s --skip\" заміÑÑ‚ÑŒ цього." + +#, c-format +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." +msgstr "" +"Щоб запиÑати порожню латку Ñк порожній коміт, виконайте \"%s --allow-empty\"." + +#, c-format +msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgstr "" +"Щоб повернути гілку до початкового Ñтану Ñ– зупинити латаннÑ, виконайте \"%s " +"--abort\"." + +msgid "Patch sent with format=flowed; space at the end of lines might be lost." +msgstr "" +"Латку надіÑлано з параметром format=flowed; пробіли в кінці Ñ€Ñдків можуть " +"бути втрачені." + +#, c-format +msgid "missing author line in commit %s" +msgstr "відÑутній Ñ€Ñдок автора в коміті %s" + +#, c-format +msgid "invalid ident line: %.*s" +msgstr "неприпуÑтимий ідентифікаційний Ñ€Ñдок: %.*s" + +#, c-format +msgid "unable to parse commit %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ коміт %s" + +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" +"У Ñховищі не виÑтачає необхідних blob-обʼєктів, щоб повернутиÑÑ Ð´Ð¾ " +"триÑтороннього злиттÑ." + +msgid "Using index info to reconstruct a base tree..." +msgstr "" +"ВикориÑÑ‚Ð°Ð½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑної інформації Ð´Ð»Ñ Ñ€ÐµÐºÐ¾Ð½ÑÑ‚Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð³Ð¾ дерева..." + +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Ви відредагували Ñвою латку вручну?\n" +"Це не ÑтоÑуєтьÑÑ blob-обʼєктів, запиÑаних у його індекÑÑ–." + +msgid "Falling back to patching base and 3-way merge..." +msgstr "ÐŸÐ¾Ð²ÐµÑ€Ð½ÐµÐ½Ð½Ñ Ð´Ð¾ бази латки та триÑтороннього злиттÑ..." + +msgid "Failed to merge in the changes." +msgstr "Ðе вдалоÑÑ Ð·Ð»Ð¸Ñ‚Ð¸ зміни." + +msgid "git write-tree failed to write a tree" +msgstr "git write-tree не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати дерево" + +msgid "applying to an empty history" +msgstr "заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾ порожньої Ñ–Ñторії" + +msgid "failed to write commit object" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати об’єкт коміту" + +#, c-format +msgid "cannot resume: %s does not exist." +msgstr "неможливо продовжити: %s не Ñ–Ñнує." + +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. +#. + +#, c-format +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "" +"ЗаÑтоÑувати? [y]-так / [n]-ні / [e]-редагувати / [v]-переглÑнути латку / [a]-" +"заÑтоÑувати вÑе: " + +msgid "unable to write index file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати індекÑний файл" + +#, c-format +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "Ð†Ð½Ð´ÐµÐºÑ Ð·Ð°Ð±Ñ€ÑƒÐ´Ð½ÐµÐ½Ð¾: неможливо заÑтоÑувати латки (забруднено: %s)" + +#, c-format +msgid "Skipping: %.*s" +msgstr "ПропуÑк: %.*s" + +#, c-format +msgid "Creating an empty commit: %.*s" +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŒÐ¾Ð³Ð¾ коміту: %.*s" + +msgid "Patch is empty." +msgstr "Латка порожнÑ." + +#, c-format +msgid "Applying: %.*s" +msgstr "ЗаÑтоÑуваннÑ: %.*s" + +msgid "No changes -- Patch already applied." +msgstr "Без змін - латку вже заÑтоÑовано." + +#, c-format +msgid "Patch failed at %s %.*s" +msgstr "Ð›Ð°Ñ‚Ð°Ð½Ð½Ñ Ð½Ðµ вдалоÑÑ Ð½Ð° %s %.*s" + +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "" +"ВикориÑтовуйте \"git am --show-current-patch=diff\", щоб побачити невдалу " +"латку" + +msgid "No changes - recorded it as an empty commit." +msgstr "Без змін - запиÑаний Ñк порожній коміт." + +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"Без змін - ви забули викориÑтати \"git add\"?\n" +"Якщо нічого індекÑувати, Ñ” ймовірніÑÑ‚ÑŒ того, що хтоÑÑŒ інший\n" +"вже Ð²Ð½Ñ–Ñ Ñ‚Ñ– Ñамі зміни; можливо, ви захочете пропуÑтити цю латку." + +msgid "" +"You still have unmerged paths in your index.\n" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" +"You might run `git rm` on a file to accept \"deleted by them\" for it." +msgstr "" +"У вашому індекÑÑ– вÑе ще залишаютьÑÑ Ð½Ðµ злиті шлÑхи.\n" +"Вам Ñлід виконати \"git add\" Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ файлу з розвʼÑзаними конфліктами, " +"щоб позначити Ñ—Ñ… Ñк такі.\n" +"Ви можете виконати \"git rm\" Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ, щоб прийнÑти \"видалено ними\"." + +msgid "unable to write new index file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати новий файл індекÑу" + +#, c-format +msgid "Could not parse object '%s'." +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ об'єкт '%s'." + +msgid "failed to clean index" +msgstr "не вдалоÑÑ Ð¾Ñ‡Ð¸Ñтити індекÑ" + +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"ЗдаєтьÑÑ, ви переÑунули HEAD піÑÐ»Ñ Ð¾Ñтанньої невдачі з \"am\".\n" +"Ðе відбуваєтьÑÑ Ð¿ÐµÑ€ÐµÐ¼Ð¾Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾ ORIG_HEAD" + +#, c-format +msgid "failed to read '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "options '%s=%s' and '%s=%s' cannot be used together" +msgstr "опції \"%s=%s\" and \"%s=%s\" не можна викориÑтовувати разом" + +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<опції>] [(<Ñкринька> [<поштова директоріÑ>)...]" + +msgid "git am [<options>] (--continue | --skip | --abort)" +msgstr "git am [<опції>] (--continue | --skip | --abort)" + +msgid "run interactively" +msgstr "запуÑтити інтерактивно" + +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "обійти pre-applypatch та applypatch-msg гачки" + +msgid "historical option -- no-op" +msgstr "Ñтара Ð¾Ð¿Ñ†Ñ–Ñ -- не працює" + +msgid "allow fall back on 3way merging if needed" +msgstr "дозволити повернутиÑÑ Ð´Ð¾ триÑтороннього Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñƒ разі потреби" + +msgid "be quiet" +msgstr "працювати тихеÑенько" + +msgid "add a Signed-off-by trailer to the commit message" +msgstr "додати Signed-off-by причеп у Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміту" + +msgid "recode into utf8 (default)" +msgstr "перекодувати в utf8 (за замовчуваннÑм)" + +msgid "pass -k flag to git-mailinfo" +msgstr "передати -k прапорець до git-mailinfo" + +msgid "pass -b flag to git-mailinfo" +msgstr "передати -b прапорець до git-mailinfo" + +msgid "pass -m flag to git-mailinfo" +msgstr "передати -m прапорець до git-mailinfo" + +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "передати --keep-cr прапорець до git-mailsplit Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñƒ mbox" + +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +msgstr "" +"не передавати --keep-cr прапорець до git-mailsplit незалежно від am.keepcr" + +msgid "strip everything before a scissors line" +msgstr "прибрати вÑе раніше відрізної лінії" + +msgid "pass it through git-mailinfo" +msgstr "передати через git-mailinfo" + +msgid "pass it through git-apply" +msgstr "передати через git-apply" + +msgid "n" +msgstr "n" + +msgid "format" +msgstr "формат" + +msgid "format the patch(es) are in" +msgstr "формат латки(-ок)" + +msgid "override error message when patch failure occurs" +msgstr "перевизначити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилку при збої латаннÑ" + +msgid "continue applying patches after resolving a conflict" +msgstr "продовжити заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð°Ñ‚ÐºÐ¸ піÑÐ»Ñ Ñ€Ð¾Ð·Ð²Ê¼ÑÐ·Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ð»Ñ–ÐºÑ‚Ñƒ" + +msgid "synonyms for --continue" +msgstr "те ж Ñаме, що й --continue" + +msgid "skip the current patch" +msgstr "пропуÑтити поточну латку" + +msgid "restore the original branch and abort the patching operation" +msgstr "відновити початкову гілку Ñ– перервати операцію латаннÑ" + +msgid "abort the patching operation but keep HEAD where it is" +msgstr "перервати латаннÑ, але залишити HEAD на тому міÑці, де він знаходитьÑÑ" + +msgid "show the patch being applied" +msgstr "показати латку, що заÑтоÑовуєтьÑÑ" + +msgid "record the empty patch as an empty commit" +msgstr "запиÑати порожню латку Ñк порожній коміт" + +msgid "lie about committer date" +msgstr "брехати про дату комітера" + +msgid "use current timestamp for author date" +msgstr "викориÑтовувати поточну мітку чаÑу Ð´Ð»Ñ Ð´Ð°Ñ‚Ð¸ автора" + +msgid "key-id" +msgstr "key-id" + +msgid "GPG-sign commits" +msgstr "підпиÑати коміти GPG-підпиÑом" + +msgid "how to handle empty patches" +msgstr "Ñк оброблÑти порожні латки" + +msgid "(internal use for git-rebase)" +msgstr "(внутрішнє викориÑÑ‚Ð°Ð½Ð½Ñ Ð´Ð»Ñ git-rebase)" + +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" +"ÐžÐ¿Ñ†Ñ–Ñ -b/--binary вже давно не працює Ñ–\n" +"буде видалена. Будь лаÑка, не викориÑтовуйте Ñ—Ñ— більше." + +msgid "failed to read the index" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ індекÑ" + +#, c-format +msgid "previous rebase directory %s still exists but mbox given." +msgstr "" +"Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ %s вÑе ще Ñ–Ñнує, але було надано mbox." + +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"Знайдено блукаючу директорію %s.\n" +"СкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ \"git am --abort\", щоб вилучити Ñ—Ñ—." + +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Ðаразі не виконуєтьÑÑ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ñ€Ð¾Ð·Ð²Ê¼ÑзаннÑ, ми не продовжуємо." + +msgid "interactive mode requires patches on the command line" +msgstr "інтерактивний режим вимагає латки у командному Ñ€Ñдку" + +msgid "git apply [<options>] [<patch>...]" +msgstr "git apply [<опції>] [<латка>...]" + +msgid "could not redirect output" +msgstr "неможливо перенаправити вивід" + +msgid "git archive: Remote with no URL" +msgstr "git archive: віддалене Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÐµÐ· URL" + +msgid "git archive: expected ACK/NAK, got a flush packet" +msgstr "git archive: очікувалоÑÑ ACK/NAK, отримано flush-пакет" + +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +msgid "git archive: protocol error" +msgstr "git archive: помилка протоколу" + +msgid "git archive: expected a flush" +msgstr "git archive: очікувавÑÑ flush" + +msgid "" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" +msgstr "" +"git bisect start [--term-{new,bad}=<термін> --term-{old,good}=<термін>] " +"[--no-checkout] [--first-parent] [<поганий> [<добрий>...]] [--] " +"[<визначник шлÑху>...]" + +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (добрий|поганий) [<ревізіÑ>...]" + +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<ревізіÑ>|<діапазон>)...]" + +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<коміт>]" + +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <лог файл>" + +msgid "git bisect run <cmd>..." +msgstr "git bisect run <команда>..." + +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "неможливо відкрити файл \"%s\" у режимі \"%s\"" + +#, c-format +msgid "could not write to file '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати в файл \"%s\"" + +#, c-format +msgid "cannot open file '%s' for reading" +msgstr "неможливо відкрити файл \"%s\" Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ" + +#, c-format +msgid "'%s' is not a valid term" +msgstr "\"%s\" не Ñ” допуÑтимим терміном" + +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "неможливо викориÑтати вбудовану команду \"%s\" Ñк термін" + +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "неможливо змінити Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ñƒ \"%s\"" + +msgid "please use two different terms" +msgstr "будь лаÑка, викориÑтовуйте два різних терміна" + +#, c-format +msgid "We are not bisecting.\n" +msgstr "Ми не робимо біÑекцію.\n" + +#, c-format +msgid "'%s' is not a valid commit" +msgstr "\"%s\" не Ñ” дійÑним комітом" + +#, c-format +msgid "" +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." +msgstr "" +"не вдалоÑÑ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑ Ð½Ð° початковий HEAD \"%s\". Спробуйте \"git bisect " +"reset <коміт>\"." + +#, c-format +msgid "Bad bisect_write argument: %s" +msgstr "Ðевірний bisect_write аргумент: %s" + +#, c-format +msgid "couldn't get the oid of the rev '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ oid Ð´Ð»Ñ rev \"%s\"" + +#, c-format +msgid "couldn't open the file '%s'" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл \"%s\"" + +#, c-format +msgid "Invalid command: you're currently in a %s/%s bisect" +msgstr "ÐеприпуÑтима команда: наразі ви в процеÑÑ– %s/%s біÑекції" + +#, c-format +msgid "" +"You need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"Ви маєте надати принаймні одну %s та %s ревізію.\n" +"Ð”Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ви можете ÑкориÑтатиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ð¼Ð¸ \"git bisect %s\" Ñ– \"git bisect " +"%s\"." + +#, c-format +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"Вам потрібно почати з \"git bisect start\".\n" +"Потім вам потрібно надати принаймні одну %s Ñ– %s ревізію.\n" +"Ð”Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ви можете ÑкориÑтатиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ð¼Ð¸ \"git bisect %s\" Ñ– \"git bisect " +"%s\"." + +#, c-format +msgid "bisecting only with a %s commit" +msgstr "біÑÐµÐºÑ†Ñ–Ñ Ð»Ð¸ÑˆÐµ з %s комітом" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. + +msgid "Are you sure [Y/n]? " +msgstr "Ви впевнені [Y/n]? " + +msgid "status: waiting for both good and bad commits\n" +msgstr "ÑтатуÑ: чекаємо на добрий Ñ– поганий коміти\n" + +#, c-format +msgid "status: waiting for bad commit, %d good commit known\n" +msgid_plural "status: waiting for bad commit, %d good commits known\n" +msgstr[0] "ÑтатуÑ: чекаємо на поганий коміт, відомий %d добрий коміт\n" +msgstr[1] "ÑтатуÑ: чекаємо на поганий коміт, відомі %d добрих коміти\n" +msgstr[2] "ÑтатуÑ: чекаємо на поганий коміт, відомі %d добрих комітів\n" + +msgid "status: waiting for good commit(s), bad commit known\n" +msgstr "ÑтатуÑ: чекаємо на добрий коміт(и), поганий коміт відомий\n" + +msgid "no terms defined" +msgstr "терміни не визначені" + +#, c-format +msgid "" +"Your current terms are %s for the old state\n" +"and %s for the new state.\n" +msgstr "" +"Ваші поточні терміни: %s Ð´Ð»Ñ Ñтарого Ñтану\n" +"Ñ– %s Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ñтану.\n" + +#, c-format +msgid "" +"invalid argument %s for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"неприпуÑтимий аргумент %s Ð´Ð»Ñ \"git bisect terms\".\n" +"Підтримувані опції: --term-good|--term-old Ñ– --term-bad|--term-new." + +msgid "revision walk setup failed\n" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ ревізіÑм\n" + +#, c-format +msgid "could not open '%s' for appending" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\" Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ" + +msgid "'' is not a valid term" +msgstr "\"\" не Ñ” допуÑтимим терміном" + +#, c-format +msgid "unrecognized option: '%s'" +msgstr "нерозпізнана опціÑ: \"%s\"" + +#, c-format +msgid "'%s' does not appear to be a valid revision" +msgstr "\"%s\" не Ñ” дійÑною ревізією" + +msgid "bad HEAD - I need a HEAD" +msgstr "невірний HEAD - потрібен HEAD" + +#, c-format +msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." +msgstr "" +"Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð½Ð° \"%s\" завершилоÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾. Спробуйте \"git bisect start " +"<дійÑна-гілка>\"." + +msgid "bad HEAD - strange symbolic ref" +msgstr "невірний HEAD - дивне Ñимвольне поÑиланнÑ" + +#, c-format +msgid "invalid ref: '%s'" +msgstr "неприпуÑтиме поÑиланнÑ: \"%s\"" + +msgid "You need to start by \"git bisect start\"\n" +msgstr "Вам потрібно почати з \"git bisect start\"\n" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. + +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Ви хочете, щоб Ñ Ð·Ñ€Ð¾Ð±Ð¸Ð² це Ð´Ð»Ñ Ð²Ð°Ñ [Y/n]? " + +msgid "Please call `--bisect-state` with at least one argument" +msgstr "" +"Будь лаÑка, викориÑтовуйте \"--bisect-state\" з принаймні одним аргументом" + +#, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "\"git bisect %s\" приймає лише один аргумент." + +#, c-format +msgid "Bad rev input: %s" +msgstr "Ðевірне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ€ÐµÐ²Ñ–Ð·Ñ–Ñ—: %s" + +#, c-format +msgid "Bad rev input (not a commit): %s" +msgstr "Ðевірне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ€ÐµÐ²Ñ–Ð·Ñ–Ñ— (не Ñ” комітом): %s" + +msgid "We are not bisecting." +msgstr "Ðаразі ви не робите біÑекцію." + +#, c-format +msgid "'%s'?? what are you talking about?" +msgstr "\"%s\"? Що ви маєте на увазі?" + +#, c-format +msgid "cannot read file '%s' for replaying" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл \"%s\" Ð´Ð»Ñ Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ" + +#, c-format +msgid "running %s\n" +msgstr "Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ %s\n" + +msgid "bisect run failed: no command provided." +msgstr "біÑÐµÐºÑ†Ñ–Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾: не надано команду." + +#, c-format +msgid "unable to verify %s on good revision" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ %s Ñк припуÑтиму ревізію" + +#, c-format +msgid "bogus exit code %d for good revision" +msgstr "хибний код виходу %d Ð´Ð»Ñ Ð´Ð¾Ð±Ñ€Ð¾Ñ— ревізії" + +#, c-format +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" +msgstr "біÑÐµÐºÑ†Ñ–Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾: код виходу %d з %s Ñ” < 0 або >= 128" + +#, c-format +msgid "cannot open file '%s' for writing" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу" + +msgid "bisect run cannot continue any more" +msgstr "неможливо продовжити біÑекцію" + +msgid "bisect run success" +msgstr "біÑекцію завершено уÑпішно" + +msgid "bisect found first bad commit" +msgstr "біÑÐµÐºÑ†Ñ–Ñ Ð·Ð½Ð°Ð¹ÑˆÐ»Ð° перший поганий коміт" + +#, c-format +msgid "bisect run failed: 'git bisect %s' exited with error code %d" +msgstr "" +"біÑÐµÐºÑ†Ñ–Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾: \"git bisect %s\" завершено з кодом помилки %d" + +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "\"%s\" вимагає або відÑутноÑÑ‚Ñ– аргументу, або коміт" + +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "\"%s\" вимагає 0 або 1 аргумент" + +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "\"%s\" вимагає 0 аргументів" + +msgid "no logfile given" +msgstr "не надано лог-файл" + +#, c-format +msgid "'%s' failed: no command provided." +msgstr "\"%s\" завершено невдало: не надано команду." + +msgid "need a command" +msgstr "потрібна команда" + +#, c-format +msgid "unknown command: '%s'" +msgstr "невідома команда: \"%s\"" + +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git blame [<опції>] [<rev-опції>] [<ревізіÑ>] [--] <файл>" + +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<опції>] [<rev-опції>] [<ревізіÑ>] [--] <файл>" + +msgid "<rev-opts> are documented in git-rev-list(1)" +msgstr "<rev-опції> задокументовані у git-rev-list(1)" + +#, c-format +msgid "expecting a color: %s" +msgstr "Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð»ÑŒÐ¾Ñ€Ñƒ: %s" + +msgid "must end with a color" +msgstr "повинно закінчуватиÑÑ ÐºÐ¾Ð»ÑŒÐ¾Ñ€Ð¾Ð¼" + +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "неможливо знайти ревізію %s Ð´Ð»Ñ Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ" + +msgid "show blame entries as we find them, incrementally" +msgstr "показувати blame запиÑи по мірі того, Ñк ми Ñ—Ñ… знаходимо, поÑтупово" + +msgid "do not show object names of boundary commits (Default: off)" +msgstr "не показувати назви об’єктів межевих комітів (за замовчуваннÑм: off)" + +msgid "do not treat root commits as boundaries (Default: off)" +msgstr "не розглÑдати кореневі коміти Ñк межі (за замовчуваннÑм: off)" + +msgid "show work cost statistics" +msgstr "показати ÑтатиÑтику вартоÑÑ‚Ñ– робіт" + +msgid "force progress reporting" +msgstr "примуÑово звітувати прогреÑ" + +msgid "show output score for blame entries" +msgstr "показати вихідний показник Ð´Ð»Ñ blame запиÑів" + +msgid "show original filename (Default: auto)" +msgstr "показати оригінальне Ñ–Ð¼â€™Ñ Ñ„Ð°Ð¹Ð»Ñƒ (за замовчуваннÑм: auto)" + +msgid "show original linenumber (Default: off)" +msgstr "показати початковий номер Ñ€Ñдка (за замовчуваннÑм: off)" + +msgid "show in a format designed for machine consumption" +msgstr "" + +msgid "show porcelain format with per-line commit information" +msgstr "" + +msgid "use the same output mode as git-annotate (Default: off)" +msgstr "" + +msgid "show raw timestamp (Default: off)" +msgstr "" + +msgid "show long commit SHA1 (Default: off)" +msgstr "" + +msgid "suppress author name and timestamp (Default: off)" +msgstr "" + +msgid "show author email instead of name (Default: off)" +msgstr "" + +msgid "ignore whitespace differences" +msgstr "" + +msgid "rev" +msgstr "" + +msgid "ignore <rev> when blaming" +msgstr "" + +msgid "ignore revisions from <file>" +msgstr "" + +msgid "color redundant metadata from previous line differently" +msgstr "" + +msgid "color lines by age" +msgstr "" + +msgid "spend extra cycles to find better match" +msgstr "" + +msgid "use revisions from <file> instead of calling git-rev-list" +msgstr "" + +msgid "use <file>'s contents as the final image" +msgstr "" + +msgid "score" +msgstr "" + +msgid "find line copies within and across files" +msgstr "" + +msgid "find line movements within and across files" +msgstr "" + +msgid "range" +msgstr "" + +msgid "process only line range <start>,<end> or function :<funcname>" +msgstr "" + +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "" +"--progress не можна викориÑтовувати з форматами --incremental або porcelain" + +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. + +msgid "4 years, 11 months ago" +msgstr "" + +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Blaming lines" +msgstr "" + +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "" + +msgid "" +"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" +"point>]" +msgstr "" + +msgid "git branch [<options>] [-l] [<pattern>...]" +msgstr "git branch [<опції>] [-l] [<шаблон>...]" + +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." +msgstr "git branch [<опції>] [-r] (-d | -D) <имʼÑ-гілки>..." + +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" +msgstr "git branch [<опції>] (-m | -M) [<Ñтара-гілка>] <нова-гілка>" + +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "git branch [<опції>] (-c | -C) [<Ñтара-гілка>] <нова-гілка>" + +msgid "git branch [<options>] [-r | -a] [--points-at]" +msgstr "git branch [<опції>] [-r | -a] [--points-at]" + +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "git branch [<опції>] [-r | -a] [--format]" + +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" + +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" + +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ об’єкт коміту Ð´Ð»Ñ \"%s\"" + +#, 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 "" + +msgid "Update of config-file failed" +msgstr "" + +msgid "cannot use -a with -d" +msgstr "не можна викориÑтовувати -a з -d" + +#, c-format +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Ðеможливо видалити гілку \"%s\" за адреÑою \"%s\"" + +#, c-format +msgid "remote-tracking branch '%s' not found." +msgstr "віддалено відÑтежувана гілка \"%s\" не знайдена." + +#, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"гілка \"%s\" не знайдена.\n" +"Ви забули --remote?" + +#, c-format +msgid "branch '%s' not found." +msgstr "гілка \"%s\" не знайдена." + +#, c-format +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "" + +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Видалено гілку %s (була %s).\n" + +msgid "unable to parse format string" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ Ñ€Ñдок форматуваннÑ" + +msgid "could not resolve HEAD" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð²Ê¼Ñзати HEAD" + +#, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) пунктів за межами refs/heads/" + +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "" + +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "Гілка %s біÑектуєтьÑÑ Ð² точці %s" + +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD робочого дерева %s не оновлено" + +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "ÐеприпуÑтима назва гілки: \"%s\"" + +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Поки що немає комітів в гілці \"%s\"." + +#, c-format +msgid "No branch named '%s'." +msgstr "Ðемає гілки з ім’Ñм \"%s\"." + +msgid "Branch rename failed" +msgstr "" + +msgid "Branch copy failed" +msgstr "" + +#, c-format +msgid "Created a copy of a misnamed branch '%s'" +msgstr "Створено копію неправильно названої гілки \"%s\"" + +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Перейменовано неправильно названу гілку \"%s\"" + +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "" + +msgid "Branch is renamed, but update of config-file failed" +msgstr "" + +msgid "Branch is copied, but update of config-file failed" +msgstr "" + +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "" + +msgid "Generic options" +msgstr "" + +msgid "show hash and subject, give twice for upstream branch" +msgstr "" + +msgid "suppress informational messages" +msgstr "" + +msgid "set branch tracking configuration" +msgstr "налаштувати конфігурацію відÑтежуваних гілок" + +msgid "do not use" +msgstr "" + +msgid "upstream" +msgstr "" + +msgid "change the upstream info" +msgstr "" + +msgid "unset the upstream info" +msgstr "" + +msgid "use colored output" +msgstr "" + +msgid "act on remote-tracking branches" +msgstr "працювати з віддалено відÑтежуваними гілками" + +msgid "print only branches that contain the commit" +msgstr "" + +msgid "print only branches that don't contain the commit" +msgstr "" + +msgid "Specific git-branch actions:" +msgstr "" + +msgid "list both remote-tracking and local branches" +msgstr "" + +msgid "delete fully merged branch" +msgstr "" + +msgid "delete branch (even if not merged)" +msgstr "" + +msgid "move/rename a branch and its reflog" +msgstr "" + +msgid "move/rename a branch, even if target exists" +msgstr "" + +msgid "do not output a newline after empty formatted refs" +msgstr "" + +msgid "copy a branch and its reflog" +msgstr "" + +msgid "copy a branch, even if target exists" +msgstr "" + +msgid "list branch names" +msgstr "показати назви гілок" + +msgid "show current branch name" +msgstr "показати назву поточної гілки" + +msgid "create the branch's reflog" +msgstr "" + +msgid "edit the description for the branch" +msgstr "редагувати Ð¾Ð¿Ð¸Ñ Ð³Ñ–Ð»ÐºÐ¸" + +msgid "force creation, move/rename, deletion" +msgstr "" + +msgid "print only branches that are merged" +msgstr "" + +msgid "print only branches that are not merged" +msgstr "" + +msgid "list branches in columns" +msgstr "" + +msgid "object" +msgstr "" + +msgid "print only branches of the object" +msgstr "" + +msgid "sorting and filtering are case insensitive" +msgstr "" + +msgid "recurse through submodules" +msgstr "рекурÑивно через підмодулі" + +msgid "format to use for the output" +msgstr "" + +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ HEAD Ñк дійÑне поÑиланнÑ." + +msgid "HEAD not found below refs/heads!" +msgstr "HEAD не знайдено під поÑиланнÑми/заголовками!" + +msgid "" +"branch with --recurse-submodules can only be used if submodule." +"propagateBranches is enabled" +msgstr "" + +msgid "--recurse-submodules can only be used to create branches" +msgstr "" + +msgid "branch name required" +msgstr "" + +msgid "Cannot give description to detached HEAD" +msgstr "" + +msgid "cannot edit description of more than one branch" +msgstr "" + +msgid "cannot copy the current branch while not on any." +msgstr "" + +msgid "cannot rename the current branch while not on any." +msgstr "" + +msgid "too many branches for a copy operation" +msgstr "" + +msgid "too many arguments for a rename operation" +msgstr "" + +msgid "too many arguments to set new upstream" +msgstr "" + +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" + +#, c-format +msgid "no such branch '%s'" +msgstr "немає такої гілки \"%s\"" + +#, c-format +msgid "branch '%s' does not exist" +msgstr "гілка \"%s\" не Ñ–Ñнує" + +msgid "too many arguments to unset upstream" +msgstr "забагато аргументів Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð´Ð¶ÐµÑ€ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ñховища" + +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "" +"неможливво Ñкинути Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð´Ð¶ÐµÑ€ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ñховища Ð´Ð»Ñ HEAD, Ñкщо він не " +"вказує на жодну гілку." + +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Гілка \"%s\" не має інформації щодо першоджерельного Ñховища" + +msgid "" +"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"Did you mean to use: -a|-r --list <pattern>?" +msgstr "" + +msgid "" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." +msgstr "" + +msgid "git version:\n" +msgstr "" + +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "" + +msgid "compiler info: " +msgstr "" + +msgid "libc info: " +msgstr "" + +msgid "not run from a git repository - no hooks to show\n" +msgstr "" + +msgid "" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" +msgstr "" + +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" + +msgid "mode" +msgstr "" + +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" +msgstr "" + +msgid "specify a destination for the bugreport file(s)" +msgstr "" + +msgid "specify a strftime format suffix for the filename(s)" +msgstr "" + +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "не вдалоÑÑ Ñтворити провідні каталоги Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "не вдалоÑÑ Ñтворити архів діагноÑтики %s" + +msgid "System Info" +msgstr "" + +msgid "Enabled Hooks" +msgstr "" + +#, c-format +msgid "unable to write to %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати до %s" + +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "" + +msgid "" +"git bundle create [-q | --quiet | --progress]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" + +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "" + +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "" + +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "" + +msgid "need a <file> argument" +msgstr "" + +msgid "do not show progress meter" +msgstr "" + +msgid "show progress meter" +msgstr "показувати Ð¿Ñ€Ð¾Ð³Ñ€ÐµÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ" + +msgid "historical; same as --progress" +msgstr "" + +msgid "historical; does nothing" +msgstr "Ñ–Ñторична; не робить нічогіÑенько" + +msgid "specify bundle format version" +msgstr "" + +msgid "Need a repository to create a bundle." +msgstr "" + +msgid "do not show bundle details" +msgstr "" + +#, c-format +msgid "%s is okay\n" +msgstr "" + +msgid "Need a repository to unbundle." +msgstr "Потрібне Ñховище Ð´Ð»Ñ Ñ€Ð¾Ð·Ð´Ñ–Ð»ÐµÐ½Ð½Ñ." + +msgid "Unbundling objects" +msgstr "Ð Ð¾Ð·Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñ–Ð²" + +#, c-format +msgid "cannot read object %s '%s'" +msgstr "неможливо прочитати об’єкт %s \"%s\"" + +msgid "flush is only for --buffer mode" +msgstr "" + +msgid "empty command in input" +msgstr "" + +#, c-format +msgid "whitespace before command: '%s'" +msgstr "" + +#, c-format +msgid "%s requires arguments" +msgstr "" + +#, c-format +msgid "%s takes no arguments" +msgstr "%s не потребує аргументів" + +msgid "only one batch option may be specified" +msgstr "" + +msgid "git cat-file <type> <object>" +msgstr "" + +msgid "git cat-file (-e | -p) <object>" +msgstr "" + +msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>" +msgstr "" + +msgid "" +"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" +"objects]\n" +" [--buffer] [--follow-symlinks] [--unordered]\n" +" [--textconv | --filters] [-z]" +msgstr "" + +msgid "" +"git cat-file (--textconv | --filters)\n" +" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" +msgstr "" + +msgid "Check object existence or emit object contents" +msgstr "" + +msgid "check if <object> exists" +msgstr "перевірити, чи Ñ–Ñнує <об’єкт>" + +msgid "pretty-print <object> content" +msgstr "" + +msgid "Emit [broken] object attributes" +msgstr "" + +msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" +msgstr "" + +msgid "show object size" +msgstr "" + +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "" + +msgid "use mail map file" +msgstr "" + +msgid "Batch objects requested on stdin (or --batch-all-objects)" +msgstr "" + +msgid "show full <object> or <rev> contents" +msgstr "" + +msgid "like --batch, but don't emit <contents>" +msgstr "" + +msgid "stdin is NUL-terminated" +msgstr "" + +msgid "read commands from stdin" +msgstr "читати команди з stdin" + +msgid "with --batch[-check]: ignores stdin, batches all known objects" +msgstr "" + +msgid "Change or optimize batch output" +msgstr "" + +msgid "buffer --batch output" +msgstr "" + +msgid "follow in-tree symlinks" +msgstr "" + +msgid "do not order objects before emitting them" +msgstr "" + +msgid "" +"Emit object (blob or tree) with conversion or filter (stand-alone, or with " +"batch)" +msgstr "" + +msgid "run textconv on object's content" +msgstr "" + +msgid "run filters on object's content" +msgstr "" + +msgid "blob|tree" +msgstr "" + +msgid "use a <path> for (--textconv | --filters); Not with 'batch'" +msgstr "" + +#, c-format +msgid "'%s=<%s>' needs '%s' or '%s'" +msgstr "" + +msgid "path|tree-ish" +msgstr "" + +#, c-format +msgid "'%s' requires a batch mode" +msgstr "" + +#, c-format +msgid "'-%c' is incompatible with batch mode" +msgstr "" + +msgid "batch modes take no arguments" +msgstr "" + +#, c-format +msgid "<rev> required with '%s'" +msgstr "" + +#, c-format +msgid "<object> required with '-%c'" +msgstr "" + +#, c-format +msgid "only two arguments allowed in <type> <object> mode, not %d" +msgstr "" + +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" + +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <деревоподібне джерело>] [-a | --all | " +"<атрибут>...]" + +msgid "report all attributes set on file" +msgstr "" + +msgid "use .gitattributes only from the index" +msgstr "" + +msgid "read file names from stdin" +msgstr "" + +msgid "terminate input and output records by a NUL character" +msgstr "" + +msgid "<tree-ish>" +msgstr "" + +msgid "which tree-ish to check attributes at" +msgstr "атрибути Ñкого деревоподібного джерела перевірÑти" + +msgid "suppress progress reporting" +msgstr "не звітувати прогреÑ" + +msgid "show non-matching input paths" +msgstr "" + +msgid "ignore index when checking" +msgstr "" + +msgid "cannot specify pathnames with --stdin" +msgstr "" + +msgid "-z only makes sense with --stdin" +msgstr "" + +msgid "no path specified" +msgstr "шлÑÑ… не вказано" + +msgid "--quiet is only valid with a single pathname" +msgstr "" + +msgid "cannot have both --quiet and --verbose" +msgstr "" + +msgid "--non-matching is only valid with --verbose" +msgstr "" + +msgid "git check-mailmap [<options>] <contact>..." +msgstr "git check-mailmap [<опції>] <контакт>..." + +msgid "also read contacts from stdin" +msgstr "" + +#, c-format +msgid "unable to parse contact: %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ контакт: %s" + +msgid "no contacts specified" +msgstr "" + +msgid "git checkout--worker [<options>]" +msgstr "git checkout--worker [<опції>]" + +msgid "string" +msgstr "" + +msgid "when creating files, prepend <string>" +msgstr "" + +msgid "git checkout-index [<options>] [--] [<file>...]" +msgstr "git checkout-index [<опції>] [—] [<файл>...]" + +msgid "stage should be between 1 and 3 or all" +msgstr "" + +msgid "check out all files in the index" +msgstr "" + +msgid "do not skip files with skip-worktree set" +msgstr "" + +msgid "force overwrite of existing files" +msgstr "" + +msgid "no warning for existing files and files not in index" +msgstr "" + +msgid "don't checkout new files" +msgstr "" + +msgid "update stat information in the index file" +msgstr "оновити ÑтатиÑтичну інформацію в індекÑному файлі" + +msgid "read list of paths from the standard input" +msgstr "" + +msgid "write the content to temporary files" +msgstr "" + +msgid "copy out the files from named stage" +msgstr "" + +msgid "git checkout [<options>] <branch>" +msgstr "git checkout [<опції>] <гілка>" + +msgid "git checkout [<options>] [<branch>] -- <file>..." +msgstr "git checkout [<опції>] [<гілка>] -- <файл>..." + +msgid "git switch [<options>] [<branch>]" +msgstr "git switch [<опції>] [<гілка>]" + +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<опції>] [--source=<гілка>] <файл>..." + +#, c-format +msgid "path '%s' does not have our version" +msgstr "шлÑÑ… '%s' не міÑтить нашої верÑÑ–Ñ—" + +#, c-format +msgid "path '%s' does not have their version" +msgstr "шлÑÑ… '%s' не міÑтить їхньої верÑÑ–Ñ—" + +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "шлÑÑ… '%s' не міÑтить вÑÑ–Ñ… необхідних верÑій" + +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "шлÑÑ… '%s' не міÑтить необхідних верÑій" + +#, c-format +msgid "path '%s': cannot merge" +msgstr "шлÑÑ… '%s': неможливо злити" + +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Ðеможливо додати результат Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð´Ð»Ñ '%s'" + +#, c-format +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "Відтворено %d конфлікт злиттÑ" +msgstr[1] "Відтворено %d конфлікта злиттÑ" +msgstr[2] "Відтворено %d конфліктів злиттÑ" + +#, c-format +msgid "Updated %d path from %s" +msgid_plural "Updated %d paths from %s" +msgstr[0] "Оновлено %d шлÑÑ… з %s" +msgstr[1] "Оновлено %d шлÑхи з %s" +msgstr[2] "Оновлено %d шлÑхів з %s" + +#, c-format +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "Оновлено %d шлÑÑ… з індекÑу" +msgstr[1] "Оновлено %d шлÑхи з індекÑу" +msgstr[2] "Оновлено %d шлÑхів з індекÑу" + +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "'%s' не можна викориÑтовувати зі шлÑхами оновленнÑ" + +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "Ðеможливо одночаÑно оновити шлÑхи та переключитиÑÑŒ на гілку '%s'." + +#, c-format +msgid "neither '%s' or '%s' is specified" +msgstr "не вказано ні '%s', ні '%s'" + +#, c-format +msgid "'%s' must be used when '%s' is not specified" +msgstr "'%s' повинен викориÑтовуватиÑÑ, Ñкщо не вказано '%s'" + +#, c-format +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' або '%s' не можна викориÑтовувати з %s" + +#, c-format +msgid "path '%s' is unmerged" +msgstr "шлÑÑ… '%s' не злитий" + +msgid "you need to resolve your current index first" +msgstr "Ñпочатку потрібно розібратиÑÑŒ з вашим поточним індекÑом" + +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"неможливо продовжити з індекÑованими змінами в наÑтупних файлах:\n" +"%s" + +#, c-format +msgid "Can not do reflog for '%s': %s\n" +msgstr "Ðеможливо виконати reflog Ð´Ð»Ñ '%s': %s\n" + +msgid "HEAD is now at" +msgstr "HEAD зараз на" + +msgid "unable to update HEAD" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ HEAD" + +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Скинути гілку '%s'\n" + +#, c-format +msgid "Already on '%s'\n" +msgstr "Вже на '%s'\n" + +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Переключено на та Ñкинуто гілку '%s'\n" + +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Переключено на нову гілку '%s'\n" + +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Переключено на гілку '%s'\n" + +#, c-format +msgid " ... and %d more.\n" +msgstr " ... та ще %d.\n" + +#, c-format +msgid "" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgstr[0] "" +"ПопередженнÑ: ви залишаєте позаду %d коміт, не підключений до\n" +"жодної з ваших гілок:\n" +"\n" +"%s\n" +msgstr[1] "" +"ПопередженнÑ: ви залишаєте позаду %d коміта, не підключених до\n" +"жодної з ваших гілок:\n" +"\n" +"%s\n" +msgstr[2] "" +"ПопередженнÑ: ви залишаєте позаду %d комітів, не підключених до\n" +"жодної з ваших гілок:\n" +"\n" +"%s\n" + +#, c-format +msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgid_plural "" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch <new-branch-name> %s\n" +"\n" +msgstr[0] "" +"Якщо ви хочете зберегти його, Ñтворивши нову гілку, то зараз Ñ” чудова " +"нагода\n" +"зробити це за допомогою:\n" +"git branch <назва-нової-гілки> %s\n" +"\n" +msgstr[1] "" +"Якщо ви хочете зберегти Ñ—Ñ…, Ñтворивши нову гілку, то зараз Ñ” чудова нагода\n" +"зробити це за допомогою:\n" +"git branch <назва-нової-гілки> %s\n" +"\n" +msgstr[2] "" +"Якщо ви хочете зберегти Ñ—Ñ…, Ñтворивши нову гілку, то зараз Ñ” чудова нагода\n" +"зробити це за допомогою:\n" +"git branch <назва-нової-гілки> %s\n" +"\n" + +msgid "internal error in revision walk" +msgstr "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° при проходженні по ревізіÑм" + +msgid "Previous HEAD position was" +msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ñ–Ñ HEAD була" + +msgid "You are on a branch yet to be born" +msgstr "Ви на гілці, Ñка ще не iÑнує" + +#, c-format +msgid "" +"'%s' could be both a local file and a tracking branch.\n" +"Please use -- (and optionally --no-guess) to disambiguate" +msgstr "" +"\"%s\" може бути Ñк локальним файлом, так Ñ– відÑтежуваною гілкою.\n" +"Будь лаÑка, викориÑтовуйте -- (Ñ–, за бажаннÑм, --no-guess), Ð´Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ" + +msgid "" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"Якщо ви хотіли переключитиÑÑŒ на віддалено відÑтежувану гілку, наприклад, " +"'origin',\n" +"ви можете зробити це, повніÑÑ‚ÑŽ вказавши назву з опцією --track:\n" +"\n" +" git checkout --track origin/<назва>.\n" +"\n" +"Якщо при переключенні з неоднозначною <назвою> ви бажаєте завжди віддавати " +"перевагу\n" +"певному віддаленому Ñховищу, наприклад, 'origin', розглÑньте можливіÑÑ‚ÑŒ " +"доданнÑ\n" +"checkout.defaultRemote=origin до вашого конфігураційного файлу." + +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "\"%s\" відповідає декільком (%d) гілкам віддаленого відÑтежуваннÑ" + +msgid "only one reference expected" +msgstr "очікувалоÑÑŒ тільки одне поÑиланнÑ" + +#, c-format +msgid "only one reference expected, %d given." +msgstr "очікувалоÑÑŒ тільки одне поÑиланнÑ, надано %d." + +#, c-format +msgid "invalid reference: %s" +msgstr "неприпуÑтиме поÑиланнÑ: %s" + +#, c-format +msgid "reference is not a tree: %s" +msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ Ñ” деревом: %s" + +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "очікувалаÑÑŒ гілка, надано тег '%s'" + +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "очікувалаÑÑŒ гілка, надана віддалена гілка '%s'" + +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "очікувалаÑÑŒ гілка, надано '%s'" + +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "очікувалаÑÑŒ гілка, надано коміт '%s'" + +msgid "" +"If you want to detach HEAD at the commit, try again with the --detach option." +msgstr "" +"Якщо ви хочете від'єднати HEAD на цьому коміті, Ñпробуйте ще раз з опцією --" +"detach." + +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"неможливо змінити гілку під Ñ‡Ð°Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ\n" +"Спробуйте \"git merge --quit\" або \"git worktree add\"." + +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" +"неможливо змінити гілку під Ñ‡Ð°Ñ am ÑеанÑу\n" +"Спробуйте \"git am --quit\" або \"git worktree add\"." + +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"неможливо змінити гілку під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ\n" +"Спробуйте \"git rebase --quit\" або \"git worktree add\"." + +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"неможливо змінити гілку під Ñ‡Ð°Ñ Ð²Ð¸ÑмикуваннÑ\n" +"Спробуйте \"git cherry-pick --quit\" або \"git worktree add\"." + +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"неможливо змінити гілку під Ñ‡Ð°Ñ Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ\n" +"Спробуйте \"git revert --quit\" або \"git worktree add\"." + +msgid "you are switching branch while bisecting" +msgstr "ви переключаєте гілку під Ñ‡Ð°Ñ Ð±Ñ–Ñекції" + +msgid "paths cannot be used with switching branches" +msgstr "шлÑхи не можуть викориÑтовуватиÑÑŒ при переключенні гілок" + +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "'%s' не може викориÑтовуватиÑÑŒ при переключенні гілок" + +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s' не може викориÑтовуватиÑÑŒ з '%s'" + +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "'%s' не може прийнÑти <Ñтартова-точка>" + +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Ðеможливо переключити гілку на не коміт '%s'" + +msgid "missing branch or commit argument" +msgstr "відÑÑƒÑ‚Ð½Ñ Ð³Ñ–Ð»ÐºÐ° або коміт" + +msgid "perform a 3-way merge with the new branch" +msgstr "здійÑнити 3-Ñтороннє Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð· новою гілкою" + +msgid "style" +msgstr "Ñтиль" + +msgid "conflict style (merge, diff3, or zdiff3)" +msgstr "конфлікт Ñтилю (merge, diff3 або zdiff3)" + +msgid "detach HEAD at named commit" +msgstr "відʼєднати HEAD на вказаному коміті" + +msgid "force checkout (throw away local modifications)" +msgstr "переключити примуÑово (викинути локальні зміни)" + +msgid "new-branch" +msgstr "нова-гілка" + +msgid "new unparented branch" +msgstr "нова гілка без джерела" + +msgid "update ignored files (default)" +msgstr "оновити ігноровані файли (за замовчуваннÑм)" + +msgid "do not check if another worktree is holding the given ref" +msgstr "не перевірÑти, чи інше робоче дерево міÑтить дане поÑиланнÑ" + +msgid "checkout our version for unmerged files" +msgstr "викориÑтовувати нашу верÑÑ–ÑŽ Ð´Ð»Ñ Ð½ÐµÐ·Ð»Ð¸Ñ‚Ð¸Ñ… файлів" + +msgid "checkout their version for unmerged files" +msgstr "викориÑтовувати їхню верÑÑ–ÑŽ Ð´Ð»Ñ Ð½ÐµÐ·Ð»Ð¸Ñ‚Ð¸Ñ… файлів" + +msgid "do not limit pathspecs to sparse entries only" +msgstr "не обмежувати визначники шлÑхів лише розрідженими запиÑами" + +#, c-format +msgid "options '-%c', '-%c', and '%s' cannot be used together" +msgstr "опції '-%c', '-%c' та '%s' не можуть викориÑтовуватиÑÑŒ разом" + +msgid "--track needs a branch name" +msgstr "--track потребує назви гілки" + +#, c-format +msgid "missing branch name; try -%c" +msgstr "відÑÑƒÑ‚Ð½Ñ Ð½Ð°Ð·Ð²Ð° гілки; Ñпробуйте -%c" + +#, c-format +msgid "could not resolve %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð²Ê¼Ñзати %s" + +msgid "invalid path specification" +msgstr "неприпуÑтиме Ð·Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÑˆÐ»Ñху" + +#, c-format +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' не Ñ” комітом, Ñ– з нього не можна Ñтворити гілку '%s'" + +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout: --detach не приймає аргумент шлÑху '%s'" + +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force та --merge неÑуміÑні при\n" +"при прееключенні індекÑу." + +msgid "you must specify path(s) to restore" +msgstr "необхідно вказати шлÑÑ…(и) Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ" + +msgid "branch" +msgstr "гілка" + +msgid "create and checkout a new branch" +msgstr "Ñтворити та перейти до нової гілки" + +msgid "create/reset and checkout a branch" +msgstr "Ñтворити/Ñкинути та перейти до нової гілки" + +msgid "create reflog for new branch" +msgstr "Ñтворити reflog Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ñ— гілки" + +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "друга здогадка \"git checkout <гілка-не-Ñ–Ñнує>\" (за замовчуваннÑм)" + +msgid "use overlay mode (default)" +msgstr "викориÑтовувати режим Ð½Ð°ÐºÐ»Ð°Ð´ÐµÐ½Ð½Ñ (за замовчуваннÑм)" + +msgid "create and switch to a new branch" +msgstr "Ñтворити та переключити на нову гілку" + +msgid "create/reset and switch to a branch" +msgstr "Ñтворити/Ñкинути та переключити на гілку" + +msgid "second guess 'git switch <no-such-branch>'" +msgstr "друга здогадка \"git switch <гілка-не-Ñ–Ñнує>\" (за замовчуваннÑм)" + +msgid "throw away local modifications" +msgstr "викинути локальні зміни" + +msgid "which tree-ish to checkout from" +msgstr "з Ñкого деревоподібного джерела Ñтворювати" + +msgid "restore the index" +msgstr "відновити індекÑ" + +msgid "restore the working tree (default)" +msgstr "відновити робоче дерево (за замовчуваннÑм)" + +msgid "ignore unmerged entries" +msgstr "ігнорувати незлиті запиÑи" + +msgid "use overlay mode" +msgstr "викориÑтовувати режим накладеннÑ" + +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" +msgstr "" + +#, c-format +msgid "Removing %s\n" +msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ %s\n" + +#, c-format +msgid "Would remove %s\n" +msgstr "Було б видалено %s\n" + +#, c-format +msgid "Skipping repository %s\n" +msgstr "ПропуÑк Ñховища %s\n" + +#, c-format +msgid "Would skip repository %s\n" +msgstr "Було б пропущено Ñховище %s\n" + +#, c-format +msgid "failed to remove %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s" + +#, c-format +msgid "could not lstat %s\n" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ lstat %s\n" + +msgid "Refusing to remove current working directory\n" +msgstr "Відмова в видаленні поточної робочої директорії\n" + +msgid "Would refuse to remove current working directory\n" +msgstr "Було б відмовлено в видаленні поточної робочої директорії\n" + +#, c-format +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing\n" +msgstr "" + +#, c-format +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting\n" +msgstr "" + +#, c-format +msgid "Huh (%s)?\n" +msgstr "" + +#, c-format +msgid "Input ignore patterns>> " +msgstr "" + +#, c-format +msgid "WARNING: Cannot find items matched by: %s" +msgstr "" + +msgid "Select items to delete" +msgstr "" + +#. TRANSLATORS: Make sure to keep [y/N] as is + +#, c-format +msgid "Remove %s [y/N]? " +msgstr "" + +msgid "" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" +msgstr "" + +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "No more files to clean, exiting." +msgstr "" + +msgid "do not print names of files removed" +msgstr "" + +msgid "force" +msgstr "" + +msgid "interactive cleaning" +msgstr "" + +msgid "remove whole directories" +msgstr "" + +msgid "pattern" +msgstr "" + +msgid "add <pattern> to ignore rules" +msgstr "" + +msgid "remove ignored files, too" +msgstr "видалити також ігноровані файли" + +msgid "remove only ignored files" +msgstr "видалити лише ігноровані файли" + +msgid "" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" +msgstr "" + +msgid "" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" +msgstr "" + +msgid "-x and -X cannot be used together" +msgstr "-x та -X не можна викориÑтовувати разом" + +msgid "git clone [<options>] [--] <repo> [<dir>]" +msgstr "git clone [<опції>] [--] <Ñховище> [<директоріÑ>]" + +msgid "don't clone shallow repository" +msgstr "не клонувати неглибоке Ñховище" + +msgid "don't create a checkout" +msgstr "не переходити до гілки" + +msgid "create a bare repository" +msgstr "Ñтворити порожнє Ñховище" + +msgid "create a mirror repository (implies bare)" +msgstr "Ñтворити дзеркальне Ñховище (включає опцію bare)" + +msgid "to clone from a local repository" +msgstr "клонувати з локального Ñховища" + +msgid "don't use local hardlinks, always copy" +msgstr "не викориÑтовувати локальні жорÑткі поÑиланнÑ, завжди копіювати" + +msgid "setup as shared repository" +msgstr "налаштувати Ñк Ñпільне Ñховище" + +msgid "pathspec" +msgstr "визначник шлÑху" + +msgid "initialize submodules in the clone" +msgstr "ініціалізувати підмодулі в клоні" + +msgid "number of submodules cloned in parallel" +msgstr "кількіÑÑ‚ÑŒ підмодулів, що клонуютьÑÑ Ð¿Ð°Ñ€Ð°Ð»ÐµÐ»ÑŒÐ½Ð¾" + +msgid "template-directory" +msgstr "директоріÑ-шаблонів" + +msgid "directory from which templates will be used" +msgstr "директоріÑ, з Ñкої брати шаблони" + +msgid "reference repository" +msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° Ñховище" + +msgid "use --reference only while cloning" +msgstr "викориÑтовуйте --reference тільки під Ñ‡Ð°Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ" + +msgid "name" +msgstr "назва" + +msgid "use <name> instead of 'origin' to track upstream" +msgstr "" +"викориÑтовуйте <назва> заміÑÑ‚ÑŒ \"origin\" Ð´Ð»Ñ Ð²Ñ–Ð´ÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð´Ð¶ÐµÑ€ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ " +"Ñховища" + +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "перейти до <гілки> заміÑÑ‚ÑŒ HEAD віддаленого Ñховища" + +msgid "path to git-upload-pack on the remote" +msgstr "шлÑÑ… до git-upload-pack на віддаленому Ñервері" + +msgid "depth" +msgstr "глибина" + +msgid "create a shallow clone of that depth" +msgstr "Ñтворити поверхневий клон вказаної глибини" + +msgid "create a shallow clone since a specific time" +msgstr "Ñтворити поверхневий клон з певного чаÑу" + +msgid "revision" +msgstr "ревізіÑ" + +msgid "deepen history of shallow clone, excluding rev" +msgstr "поглибити Ñ–Ñторію поверхневого клону, за винÑтком rev" + +msgid "clone only one branch, HEAD or --branch" +msgstr "клонувати лише одну гілку, HEAD або --branch" + +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "" +"не клонувати жодних тегів Ñ– не Ñлідувати за ними під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼ÑƒÐ²Ð°Ð½ÑŒ пізніше" + +msgid "any cloned submodules will be shallow" +msgstr "будь-Ñкі клоновані підмодулі будуть поверхневими" + +msgid "gitdir" +msgstr "git-директоріÑ" + +msgid "separate git dir from working tree" +msgstr "відокремити git-директорію від робочого дерева" + +msgid "key=value" +msgstr "ключ=значеннÑ" + +msgid "set config inside the new repository" +msgstr "вÑтановити конфігурацію вÑередині нового Ñховища" + +msgid "server-specific" +msgstr "тільки Ð´Ð»Ñ Ñервера" + +msgid "option to transmit" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ñ–" + +msgid "use IPv4 addresses only" +msgstr "викориÑтовувати тільки IPv4 адреÑи" + +msgid "use IPv6 addresses only" +msgstr "викориÑтовувати тільки IPv6 адреÑи" + +msgid "apply partial clone filters to submodules" +msgstr "заÑтоÑувати чаÑткові фільтри клонів до підмодулів" + +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "" +"будь-Ñкі клоновані підмодулі будуть викориÑтовувати Ñвою віддалено " +"відÑтежувану гілку" + +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" +"ініціалізувати, щоб файл чаÑткового переходу включав лише файли в корені" + +msgid "uri" +msgstr "uri" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "URI Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÑ–Ð² перед отриманнÑм з віддаленого джерела" + +#, c-format +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "инфо: Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ альтернативу Ð´Ð»Ñ '%s': %s\n" + +#, c-format +msgid "failed to stat '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat '%s'" + +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s Ñ–Ñнує Ñ– не Ñ” директорією" + +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "\"%s\" Ñ” Ñимвольним поÑиланнÑм, відмова від ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð· --local" + +#, c-format +msgid "failed to start iterator over '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити перебір Ð´Ð»Ñ '%s'" + +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ '%s' Ñ–Ñнує, не можу клонувати з --local" + +#, c-format +msgid "failed to unlink '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸ '%s'" + +#, c-format +msgid "failed to create link '%s'" +msgstr "не вдалоÑÑ Ñтворити поÑÐ¸Ð»Ð°Ð½Ð½Ñ '%s'" + +#, c-format +msgid "failed to copy file to '%s'" +msgstr "не вдалоÑÑ Ñкопіювати файл у '%s'" + +#, c-format +msgid "failed to iterate over '%s'" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ±Ñ€Ð°Ñ‚Ð¸ '%s'" + +#, c-format +msgid "done.\n" +msgstr "готово.\n" + +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "" +"ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ð¹ÑˆÐ»Ð¾ уÑпішно, але не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ до гілки.\n" +"Ви можете перевірити, що було додано за допомогою 'git status'\n" +"Ñ– повторити Ñпробу за допомогою 'git restore --source=HEAD :/'\n" + +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ віддалену гілку %s Ð´Ð»Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ." + +msgid "remote did not send all necessary objects" +msgstr "віддалене Ñховище не надіÑлало вÑÑ– необхідні обʼєкти" + +#, c-format +msgid "unable to update %s" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ %s" + +msgid "failed to initialize sparse-checkout" +msgstr "не вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ чаÑтковий перехід" + +msgid "remote HEAD refers to nonexistent ref, unable to checkout" +msgstr "віддалений HEAD поÑилаєтьÑÑ Ð½Ð° неіÑнуючого рефа, неможливо перейти" + +msgid "unable to checkout working tree" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ñтан робочої директорії" + +msgid "unable to write parameters to config file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати параметри до конфігураційного файлу" + +msgid "cannot repack to clean up" +msgstr "неможливо перепакувати, щоб очиÑтити" + +msgid "cannot unlink temporary alternates file" +msgstr "не вдаєтьÑÑ Ñ€Ð¾Ð·Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸ файл тимчаÑових альтернатив" + +msgid "Too many arguments." +msgstr "Забагато аргументів." + +msgid "You must specify a repository to clone." +msgstr "Треба вказати Ñховище Ð´Ð»Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ." + +msgid "" +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +"exclude" +msgstr "" +"--bundle-uri неÑуміÑний з --depth, --shallow-since та --shallow-exclude" + +#, c-format +msgid "repository '%s' does not exist" +msgstr "Ñховище '%s' не Ñ–Ñнує" + +#, c-format +msgid "depth %s is not a positive number" +msgstr "глибина %s не Ñ” додатнім чиÑлом" + +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "шлÑÑ… Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ '%s' вже Ñ–Ñнує Ñ– не Ñ” порожньою директорією." + +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "шлÑÑ… до Ñховища '%s' вже Ñ–Ñнує Ñ– не Ñ” порожньою директорією." + +#, c-format +msgid "working tree '%s' already exists." +msgstr "робоче дерево '%s' вже Ñ–Ñнує." + +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "не вдалоÑÑ Ñтворити провідні директорії Ð´Ð»Ñ '%s'" + +#, c-format +msgid "could not create work tree dir '%s'" +msgstr "не вдалоÑÑ Ñтворити директорію робочого дерева '%s'" + +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñƒ порожнє Ñховище '%s'...\n" + +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "ÐšÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð² '%s'...\n" + +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"clone --recursive не ÑуміÑне з --reference та --reference-if-able одночаÑно" + +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "\"%s\" не Ñ” дійÑною назвою віддаленого Ñховища" + +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" +"--depth ігноруєтьÑÑ Ñƒ локальних клонах; викориÑтовуйте file:// заміÑÑ‚ÑŒ цього." + +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "" +"--shallow-since ігноруєтьÑÑ Ñƒ локальних клонах; викориÑтовуйте file:// " +"заміÑÑ‚ÑŒ цього." + +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "" +"--shallow-exclude ігноруєтьÑÑ Ñƒ локальних клонах; викориÑтовуйте file:// " +"заміÑÑ‚ÑŒ цього." + +msgid "--filter is ignored in local clones; use file:// instead." +msgstr "" +"--filter ігноруєтьÑÑ Ñƒ локальних клонах; викориÑтовуйте file:// заміÑÑ‚ÑŒ " +"нього." + +msgid "source repository is shallow, reject to clone." +msgstr "джерельне Ñховище Ñ” неглибоким, ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ñ…Ð¸Ð»ÐµÐ½Ð¾." + +msgid "source repository is shallow, ignoring --local" +msgstr "джерельне Ñховище Ñ” неглибоким, --local ігноруєтьÑÑ" + +msgid "--local is ignored" +msgstr "--local ігноруєтьÑÑ" + +msgid "cannot clone from filtered bundle" +msgstr "неможливо клонувати з відфільтрованого пакета" + +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "не вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ репо, URI пакета пропуÑкаєтьÑÑ" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ об'єкти з пакету URI '%s'" + +msgid "failed to fetch advertised bundles" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ обіцÑні пакети" + +msgid "remote transport reported error" +msgstr "Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð¸Ð»Ð° про помилку" + +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Віддалену гілку %s не знайдено у першоджерельному Ñховищі %s" + +msgid "You appear to have cloned an empty repository." +msgstr "ЗдаєтьÑÑ, ви клонували порожнє Ñховище." + +msgid "git column [<options>]" +msgstr "git column [<опції>]" + +msgid "lookup config vars" +msgstr "" + +msgid "layout to use" +msgstr "" + +msgid "maximum width" +msgstr "" + +msgid "padding space on left border" +msgstr "" + +msgid "padding space on right border" +msgstr "" + +msgid "padding space between columns" +msgstr "" + +msgid "--command must be the first argument" +msgstr "" + +msgid "" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" +msgstr "" + +msgid "" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" +msgstr "" + +msgid "dir" +msgstr "dir" + +msgid "the object directory to store the graph" +msgstr "" + +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" + +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ коміт-граф \"%s\"" + +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "" + +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "" + +#, c-format +msgid "invalid object: %s" +msgstr "неприпуÑтимий об’єкт: %s" + +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "" + +msgid "start walk at all refs" +msgstr "" + +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +msgid "start walk at commits listed by stdin" +msgstr "" + +msgid "include all commits already in the commit-graph file" +msgstr "" + +msgid "enable computation for changed paths" +msgstr "" + +msgid "allow writing an incremental commit-graph file" +msgstr "" + +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "" + +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "" + +msgid "only expire files older than a given date-time" +msgstr "" + +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "" + +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" + +msgid "Collecting commits from input" +msgstr "" + +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "" + +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" +msgstr "" + +#, c-format +msgid "duplicate parent %s ignored" +msgstr "" + +#, c-format +msgid "not a valid object name %s" +msgstr "невірне Ñ–Ð¼â€™Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ð° %s" + +#, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "" + +#, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "" + +msgid "parent" +msgstr "" + +msgid "id of a parent commit object" +msgstr "" + +msgid "message" +msgstr "" + +msgid "commit message" +msgstr "" + +msgid "read commit log message from file" +msgstr "" + +msgid "GPG sign commit" +msgstr "підпиÑати коміт за допомогою GPG" + +msgid "must give exactly one tree" +msgstr "" + +msgid "git commit-tree: failed to read" +msgstr "" + +msgid "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" +"reword):]<commit>)]\n" +" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" + +msgid "git status [<options>] [--] [<pathspec>...]" +msgstr "git status [<опції>] [--] [<визначник шлÑху>...]" + +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" + +msgid "" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" +"\n" +" git commit --allow-empty\n" +"\n" +msgstr "" + +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "" + +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "" + +msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" +"If you wish to skip this commit, use:\n" +"\n" +" git cherry-pick --skip\n" +"\n" +msgstr "" + +msgid "failed to unpack HEAD tree object" +msgstr "" + +msgid "No paths with --include/--only does not make sense." +msgstr "" + +msgid "unable to create temporary index" +msgstr "не вдалоÑÑ Ñтворити тимчаÑовий індекÑ" + +msgid "interactive add failed" +msgstr "" + +msgid "unable to update temporary index" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ тимчаÑовий індекÑ" + +msgid "Failed to update main cache tree" +msgstr "" + +msgid "unable to write new_index file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати new_index файл" + +msgid "cannot do a partial commit during a merge." +msgstr "неможливо зробити чаÑтковий коміт під Ñ‡Ð°Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ." + +msgid "cannot do a partial commit during a cherry-pick." +msgstr "" + +msgid "cannot do a partial commit during a rebase." +msgstr "неможливо зробити чаÑтковий коміт під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ." + +msgid "cannot read the index" +msgstr "неможливо прочитати індекÑ" + +msgid "unable to write temporary index file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати тимчаÑовий файл індекÑу" + +#, c-format +msgid "commit '%s' lacks author header" +msgstr "" + +#, c-format +msgid "commit '%s' has malformed author line" +msgstr "" + +msgid "malformed --author parameter" +msgstr "" + +#, c-format +msgid "invalid date format: %s" +msgstr "неприпуÑтимий формат дати: %s" + +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "" + +#, c-format +msgid "could not lookup commit %s" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ коміт %s" + +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "" + +msgid "could not read log from standard input" +msgstr "" + +#, c-format +msgid "could not read log file '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ лог файл \"%s\"" + +#, c-format +msgid "options '%s' and '%s:%s' cannot be used together" +msgstr "опції \"%s\" та \"%s:%s\" не можна викориÑтовувати разом" + +msgid "could not read SQUASH_MSG" +msgstr "" + +msgid "could not read MERGE_MSG" +msgstr "" + +#, c-format +msgid "could not open '%s'" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\"" + +msgid "could not write commit template" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати шаблон комітів" + +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" + +#, 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 "" + +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" + +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" + +msgid "" +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" +"and try again.\n" +msgstr "" + +msgid "" +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"and try again.\n" +msgstr "" + +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "" + +#, c-format +msgid "%sDate: %s" +msgstr "" + +#, c-format +msgid "%sCommitter: %.*s <%.*s>" +msgstr "" + +msgid "Cannot read index" +msgstr "Ðеможливо прочитати індекÑ" + +msgid "unable to pass trailers to --trailers" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸ trailers до --trailers" + +msgid "Error building trees" +msgstr "" + +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "" + +#, c-format +msgid "--author '%s' is not 'Name <email>' and matches no existing author" +msgstr "" + +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "ÐеприпуÑтимий режим Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ \"%s\"" + +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "ÐеприпуÑтимий режим невідÑтежуваних файлів \"%s\"" + +msgid "You are in the middle of a merge -- cannot reword." +msgstr "Ви перебуваєте в процеÑÑ– Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -- неможливо переформулювати." + +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "" +"Ви перебуваєте в Ñередині процеÑу виÑÐ¼Ð¸ÐºÑƒÐ²Ð°Ð½Ð½Ñ -- неможливо переформулювати." + +#, c-format +msgid "reword option of '%s' and path '%s' cannot be used together" +msgstr "" +"параметр Ð¿ÐµÑ€ÐµÑ„Ð¾Ñ€Ð¼ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ \"%s\" Ñ– шлÑÑ… \"%s\" не можна викориÑтовувати разом" + +#, c-format +msgid "reword option of '%s' and '%s' cannot be used together" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ Ð¿ÐµÑ€ÐµÑ„Ð¾Ñ€Ð¼ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ \"%s\" Ñ– \"%s\" не може бути викориÑтана разом" + +msgid "You have nothing to amend." +msgstr "" + +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Ви перебуваєте в процеÑÑ– Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -- не можна вноÑити зміни." + +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "Ви перебуваєте в процеÑÑ– виÑÐ¼Ð¸ÐºÑƒÐ²Ð°Ð½Ð½Ñ - не можна вноÑити зміни." + +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Ви перебуваєте в процеÑÑ– Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ°Ð²Ð½Ð½Ñ -- не можна вноÑити зміни." + +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "" + +#, c-format +msgid "unknown option: --fixup=%s:%s" +msgstr "" + +#, c-format +msgid "paths '%s ...' with -a does not make sense" +msgstr "шлÑхи \"%s ...\" з -a не мають ÑенÑу" + +msgid "show status concisely" +msgstr "" + +msgid "show branch information" +msgstr "показати інформацію про гілку" + +msgid "show stash information" +msgstr "" + +msgid "compute full ahead/behind values" +msgstr "" + +msgid "version" +msgstr "верÑÑ–Ñ" + +msgid "machine-readable output" +msgstr "машинозчитуваний вивід" + +msgid "show status in long format (default)" +msgstr "" + +msgid "terminate entries with NUL" +msgstr "" + +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "" + +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" + +msgid "when" +msgstr "" + +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" + +msgid "list untracked files in columns" +msgstr "показати невідÑтежувані файли в Ñтовпчиках" + +msgid "do not detect renames" +msgstr "" + +msgid "detect renames, optionally set similarity index" +msgstr "" + +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "" + +msgid "suppress summary after successful commit" +msgstr "" + +msgid "show diff in commit message template" +msgstr "" + +msgid "Commit message options" +msgstr "" + +msgid "read message from file" +msgstr "" + +msgid "author" +msgstr "" + +msgid "override author for commit" +msgstr "" + +msgid "date" +msgstr "" + +msgid "override date for commit" +msgstr "" + +msgid "commit" +msgstr "коміт" + +msgid "reuse and edit message from specified commit" +msgstr "" + +msgid "reuse message from specified commit" +msgstr "" + +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate <commit>. +#. + +msgid "[(amend|reword):]commit" +msgstr "" + +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" +msgstr "" + +msgid "use autosquash formatted message to squash specified commit" +msgstr "" + +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "" + +msgid "trailer" +msgstr "" + +msgid "add custom trailer(s)" +msgstr "" + +msgid "add a Signed-off-by trailer" +msgstr "" + +msgid "use specified template file" +msgstr "" + +msgid "force edit of commit" +msgstr "редагувати коміт примуÑово" + +msgid "include status in commit message template" +msgstr "" + +msgid "Commit contents options" +msgstr "" + +msgid "commit all changed files" +msgstr "" + +msgid "add specified files to index for commit" +msgstr "" + +msgid "interactively add files" +msgstr "додавати файли інтерактивно" + +msgid "interactively add changes" +msgstr "" + +msgid "commit only specified files" +msgstr "" + +msgid "bypass pre-commit and commit-msg hooks" +msgstr "" + +msgid "show what would be committed" +msgstr "показати, що буде додано до коміту" + +msgid "amend previous commit" +msgstr "" + +msgid "bypass post-rewrite hook" +msgstr "обійти post-rewrite гачок" + +msgid "ok to record an empty change" +msgstr "" + +msgid "ok to record a change with an empty message" +msgstr "" + +msgid "could not parse HEAD commit" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ HEAD коміт" + +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +msgid "could not read MERGE_MODE" +msgstr "" + +#, c-format +msgid "could not read commit message: %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта: %s" + +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "" + +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "" + +#, c-format +msgid "Aborting commit due to empty commit message body.\n" +msgstr "" + +msgid "" +"repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full and quota is\n" +"not exceeded, and then \"git restore --staged :/\" to recover." +msgstr "" + +msgid "git config [<options>]" +msgstr "git config [<опції>]" + +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "" + +msgid "only one type at a time" +msgstr "" + +msgid "Config file location" +msgstr "" + +msgid "use global config file" +msgstr "" + +msgid "use system config file" +msgstr "" + +msgid "use repository config file" +msgstr "викориÑтовувати конфігураційний файл Ñховища" + +msgid "use per-worktree config file" +msgstr "викориÑтовувати конфігураційний файл робочого дерева" + +msgid "use given config file" +msgstr "" + +msgid "blob-id" +msgstr "" + +msgid "read config from given blob object" +msgstr "" + +msgid "Action" +msgstr "" + +msgid "get value: name [value-pattern]" +msgstr "" + +msgid "get all values: key [value-pattern]" +msgstr "" + +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "" + +msgid "get value specific for the URL: section[.var] URL" +msgstr "" + +msgid "replace all matching variables: name value [value-pattern]" +msgstr "" + +msgid "add a new variable: name value" +msgstr "" + +msgid "remove a variable: name [value-pattern]" +msgstr "" + +msgid "remove all matches: name [value-pattern]" +msgstr "" + +msgid "rename section: old-name new-name" +msgstr "" + +msgid "remove a section: name" +msgstr "" + +msgid "list all" +msgstr "" + +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "" + +msgid "open an editor" +msgstr "" + +msgid "find the color configured: slot [default]" +msgstr "" + +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "" + +msgid "Type" +msgstr "" + +msgid "type" +msgstr "" + +msgid "value is given this type" +msgstr "" + +msgid "value is \"true\" or \"false\"" +msgstr "" + +msgid "value is decimal number" +msgstr "" + +msgid "value is --bool or --int" +msgstr "" + +msgid "value is --bool or string" +msgstr "" + +msgid "value is a path (file or directory name)" +msgstr "" + +msgid "value is an expiry date" +msgstr "" + +msgid "Other" +msgstr "" + +msgid "terminate values with NUL byte" +msgstr "" + +msgid "show variable names only" +msgstr "" + +msgid "respect include directives on lookup" +msgstr "" + +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "" + +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" + +msgid "value" +msgstr "значеннÑ" + +msgid "with --get, use default value when missing entry" +msgstr "" + +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "" + +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "" + +#, c-format +msgid "invalid key pattern: %s" +msgstr "неприпуÑтимий шаблон ключа: %s" + +#, c-format +msgid "invalid pattern: %s" +msgstr "неприпуÑтимий шаблон: %s" + +#, c-format +msgid "failed to format default config value: %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ початкове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—: %s" + +#, c-format +msgid "cannot parse color '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ колір \"%s\"" + +msgid "unable to parse default color value" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ початкове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð»ÑŒÐ¾Ñ€Ñƒ" + +msgid "not in a git directory" +msgstr "не в директорії git" + +msgid "writing to stdin is not supported" +msgstr "" + +msgid "writing config blobs is not supported" +msgstr "" + +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[user]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tname = %s\n" +"#\temail = %s\n" +msgstr "" + +msgid "only one config file at a time" +msgstr "" + +msgid "--local can only be used inside a git repository" +msgstr "--local можна викориÑтовувати лише вÑередині git Ñховища" + +msgid "--blob can only be used inside a git repository" +msgstr "--blob можна викориÑтовувати лише вÑередині git Ñховища" + +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree можна викориÑтовувати лише вÑередині git Ñховища" + +msgid "$HOME not set" +msgstr "" + +msgid "" +"--worktree cannot be used with multiple working trees unless the config\n" +"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" +"section in \"git help worktree\" for details" +msgstr "" + +msgid "--get-color and variable type are incoherent" +msgstr "" + +msgid "only one action at a time" +msgstr "" + +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "" + +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" + +msgid "--default is only applicable to --get" +msgstr "" + +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "" + +#, c-format +msgid "unable to read config file '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл конфігурації \"%s\"" + +msgid "error processing config file(s)" +msgstr "помилка при обробці файлу(ів) конфігурації" + +msgid "editing stdin is not supported" +msgstr "" + +msgid "editing blobs is not supported" +msgstr "" + +#, c-format +msgid "cannot create configuration file %s" +msgstr "неможливо Ñтворити конфігураційний файл %s" + +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" + +#, c-format +msgid "no such section: %s" +msgstr "немає такого розділу: %s" + +msgid "print sizes in human readable format" +msgstr "" + +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" + +msgid "print debugging messages to stderr" +msgstr "" + +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" + +msgid "credential-cache unavailable; no unix socket support" +msgstr "" + +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "" + +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" + +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" + +msgid "git describe <blob>" +msgstr "" + +msgid "head" +msgstr "head" + +msgid "lightweight" +msgstr "" + +msgid "annotated" +msgstr "" + +#, c-format +msgid "annotated tag %s not available" +msgstr "" + +#, c-format +msgid "tag '%s' is externally known as '%s'" +msgstr "" + +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "" + +#, c-format +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "" + +#, c-format +msgid "finished search at %s\n" +msgstr "" + +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" + +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" + +#, c-format +msgid "traversed %lu commits\n" +msgstr "" + +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" + +#, c-format +msgid "describe %s\n" +msgstr "" + +#, c-format +msgid "Not a valid object name %s" +msgstr "ÐеприпуÑтиме Ñ–Ð¼â€™Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ð° %s" + +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "" + +msgid "find the tag that comes after the commit" +msgstr "" + +msgid "debug search strategy on stderr" +msgstr "" + +msgid "use any ref" +msgstr "викориÑтати будь-Ñке поÑиланнÑ" + +msgid "use any tag, even unannotated" +msgstr "" + +msgid "always use long format" +msgstr "" + +msgid "only follow first parent" +msgstr "" + +msgid "only output exact matches" +msgstr "" + +msgid "consider <n> most recent tags (default: 10)" +msgstr "" + +msgid "only consider tags matching <pattern>" +msgstr "" + +msgid "do not consider tags matching <pattern>" +msgstr "" + +msgid "show abbreviated commit object as fallback" +msgstr "" + +msgid "mark" +msgstr "" + +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "" +"додати <mark> на брудному робочому дереві (за замовчуваннÑм: \\â€-dirty\\â€)" + +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "" + +msgid "No names found, cannot describe anything." +msgstr "" + +#, c-format +msgid "option '%s' and commit-ishes cannot be used together" +msgstr "опцію \"%s\" не можна викориÑтовувати разом з комітоподібними" + +msgid "" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" +msgstr "" + +msgid "specify a destination for the diagnostics archive" +msgstr "" + +msgid "specify a strftime format suffix for the filename" +msgstr "" + +msgid "specify the content of the diagnostic archive" +msgstr "" + +msgid "--merge-base only works with two commits" +msgstr "" + +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "" + +msgid "no merge given, only parents." +msgstr "" + +#, c-format +msgid "invalid option: %s" +msgstr "неприпуÑтима Ð¾Ð¿Ñ†Ñ–Ñ %s" + +#, c-format +msgid "%s...%s: no merge base" +msgstr "" + +msgid "Not a git repository" +msgstr "Ðе Ñ” git Ñховищем" + +#, c-format +msgid "invalid object '%s' given." +msgstr "надано неприпуÑтимий об’єкт \"%s\"." + +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "" + +#, c-format +msgid "unhandled object '%s' given." +msgstr "надано необроблений об’єкт \"%s\"." + +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "" + +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "" + +#, c-format +msgid "could not read symlink %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "could not read symlink file %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл Ñимвольного поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ об’єкт %s Ð´Ð»Ñ Ñимвольного поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +msgid "" +"combined diff formats ('-c' and '--cc') are not supported in\n" +"directory diff mode ('-d' and '--dir-diff')." +msgstr "" + +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "" + +msgid "working tree file has been left." +msgstr "залишено файл робочого дерева." + +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "не вдалоÑÑ Ñкопіювати \"%s\" в \"%s\"" + +#, c-format +msgid "temporary files exist in '%s'." +msgstr "" + +msgid "you may want to cleanup or recover these." +msgstr "" + +#, c-format +msgid "failed: %d" +msgstr "" + +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "" + +msgid "perform a full-directory diff" +msgstr "" + +msgid "do not prompt before launching a diff tool" +msgstr "" + +msgid "use symlinks in dir-diff mode" +msgstr "" + +msgid "tool" +msgstr "" + +msgid "use the specified diff tool" +msgstr "" + +msgid "print a list of diff tools that may be used with `--tool`" +msgstr "" + +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " +"code" +msgstr "" + +msgid "specify a custom command for viewing diffs" +msgstr "" + +msgid "passed to `diff`" +msgstr "" + +msgid "difftool requires worktree or --no-index" +msgstr "" + +msgid "no <tool> given for --tool=<tool>" +msgstr "" + +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "" + +msgid "git fast-export [<rev-list-opts>]" +msgstr "" + +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" + +msgid "--anonymize-map token cannot be empty" +msgstr "" + +msgid "show progress after <n> objects" +msgstr "" + +msgid "select handling of signed tags" +msgstr "" + +msgid "select handling of tags that tag filtered objects" +msgstr "" + +msgid "select handling of commit messages in an alternate encoding" +msgstr "" + +msgid "dump marks to this file" +msgstr "" + +msgid "import marks from this file" +msgstr "" + +msgid "import marks from this file if it exists" +msgstr "" + +msgid "fake a tagger when tags lack one" +msgstr "" + +msgid "output full tree for each commit" +msgstr "" + +msgid "use the done feature to terminate the stream" +msgstr "" + +msgid "skip output of blob data" +msgstr "" + +msgid "refspec" +msgstr "" + +msgid "apply refspec to exported refs" +msgstr "" + +msgid "anonymize output" +msgstr "" + +msgid "from:to" +msgstr "" + +msgid "convert <from> to <to> in anonymized output" +msgstr "" + +msgid "reference parents which are not in fast-export stream by object id" +msgstr "" + +msgid "show original object ids of blobs/commits" +msgstr "" + +msgid "label tags with mark ids" +msgstr "" + +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "" + +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "" + +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "" + +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "" + +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" + +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" + +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Файл Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñтворено, але не звітовано: %s" + +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<опції>] [<Ñховище> [<визначник поÑиланнÑ>...]]" + +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<опції>] [<група>]" + +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<опції>] [(<Ñховище> | <група>)...]" + +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<опції>]" + +msgid "fetch.parallel cannot be negative" +msgstr "" + +msgid "couldn't find remote ref HEAD" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ HEAD" + +#, c-format +msgid "From %.*s\n" +msgstr "" + +#, c-format +msgid "object %s not found" +msgstr "об’єкт %s не знайдено" + +msgid "[up to date]" +msgstr "" + +msgid "[rejected]" +msgstr "" + +msgid "can't fetch into checked-out branch" +msgstr "неможливо виконати Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð² активну гілку" + +msgid "[tag update]" +msgstr "" + +msgid "unable to update local ref" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ локальне поÑиланнÑ" + +msgid "would clobber existing tag" +msgstr "" + +msgid "[new tag]" +msgstr "" + +msgid "[new branch]" +msgstr "[нова гілка]" + +msgid "[new ref]" +msgstr "[нове поÑиланнÑ]" + +msgid "forced update" +msgstr "примуÑове оновленнÑ" + +msgid "non-fast-forward" +msgstr "" + +#, c-format +msgid "cannot open '%s'" +msgstr "неможливо відкрити \"%s\"" + +msgid "" +"fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'" +msgstr "" + +#, c-format +msgid "" +"it took %.2f seconds to check forced updates; you can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +"to avoid this check\n" +msgstr "" + +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s не надіÑлав вÑÑ– необхідні обʼєкти\n" + +#, c-format +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "" + +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" + +#, c-format +msgid " (%s will become dangling)" +msgstr "" + +#, c-format +msgid " (%s has become dangling)" +msgstr "" + +msgid "[deleted]" +msgstr "[видалено]" + +msgid "(none)" +msgstr "" + +#, c-format +msgid "refusing to fetch into branch '%s' checked out at '%s'" +msgstr "" + +#, c-format +msgid "option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#, c-format +msgid "option \"%s\" is ignored for %s\n" +msgstr "" + +#, c-format +msgid "%s is not a valid object" +msgstr "%s не Ñ” припуÑтимим об’єктом" + +#, c-format +msgid "the object %s does not exist" +msgstr "об’єкт %s не Ñ–Ñнує" + +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "" + +#, c-format +msgid "" +"could not set upstream of HEAD to '%s' from '%s' when it does not point to " +"any branch." +msgstr "" + +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "" +"не вÑтановлено першоджерельне Ñховище Ð´Ð»Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾ відÑтежуваної гілки" + +msgid "not setting upstream for a remote tag" +msgstr "не вÑтановлено першоджерельне Ñховище Ð´Ð»Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ тега" + +msgid "unknown branch type" +msgstr "невідомий тип гілки" + +msgid "" +"no source branch found;\n" +"you need to specify exactly one branch with the --set-upstream option" +msgstr "" + +#, c-format +msgid "Fetching %s\n" +msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ %s\n" + +#, c-format +msgid "could not fetch %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ %s" + +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "" + +msgid "" +"no remote repository specified; please specify either a URL or a\n" +"remote name from which new revisions should be fetched" +msgstr "" + +msgid "you need to specify a tag name" +msgstr "" + +msgid "fetch from all remotes" +msgstr "" + +msgid "set upstream for git pull/fetch" +msgstr "вÑтановити першоджерельне Ñховище Ð´Ð»Ñ git pull/fetch" + +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "" + +msgid "use atomic transaction to update references" +msgstr "викориÑтати атомарну транзакцію Ð´Ð»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñилань" + +msgid "path to upload pack on remote end" +msgstr "шлÑÑ… Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° на віддаленій Ñтороні" + +msgid "force overwrite of local reference" +msgstr "" + +msgid "fetch from multiple remotes" +msgstr "" + +msgid "fetch all tags and associated objects" +msgstr "" + +msgid "do not fetch all tags (--no-tags)" +msgstr "" + +msgid "number of submodules fetched in parallel" +msgstr "кількіÑÑ‚ÑŒ підмодулів, що завантажуютьÑÑ Ð¿Ð°Ñ€Ð°Ð»ÐµÐ»ÑŒÐ½Ð¾" + +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" + +msgid "prune remote-tracking branches no longer on remote" +msgstr "" + +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" + +msgid "on-demand" +msgstr "" + +msgid "control recursive fetching of submodules" +msgstr "контролювати рекурÑивне Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ–Ð²" + +msgid "write fetched references to the FETCH_HEAD file" +msgstr "" + +msgid "keep downloaded pack" +msgstr "" + +msgid "allow updating of HEAD ref" +msgstr "" + +msgid "deepen history of shallow clone" +msgstr "поглибити Ñ–Ñторію поверхневого клону" + +msgid "deepen history of shallow repository based on time" +msgstr "поглибити Ñ–Ñторію поверхневого клону залежно від чаÑу" + +msgid "convert to a complete repository" +msgstr "перетворити на повне Ñховище" + +msgid "re-fetch without negotiating common commits" +msgstr "" + +msgid "prepend this to submodule path output" +msgstr "" + +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" + +msgid "accept refs that update .git/shallow" +msgstr "" + +msgid "refmap" +msgstr "" + +msgid "specify fetch refmap" +msgstr "" + +msgid "report that we have only objects reachable from this object" +msgstr "" + +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" + +msgid "run 'maintenance --auto' after fetching" +msgstr "" + +msgid "check for forced-updates on all updated branches" +msgstr "" + +msgid "write the commit-graph after fetching" +msgstr "" + +msgid "accept refspecs from stdin" +msgstr "" + +msgid "--negotiate-only needs one or more --negotiation-tip=*" +msgstr "" + +msgid "negative depth in --deepen is not supported" +msgstr "" + +msgid "--unshallow on a complete repository does not make sense" +msgstr "" + +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ пакунки з \"%s\"" + +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all не приймає Ñховище Ñк аргумент" + +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all не має ÑенÑу з визначниками поÑилань" + +#, c-format +msgid "no such remote or remote group: %s" +msgstr "" + +msgid "fetching a group and specifying refspecs does not make sense" +msgstr "" + +msgid "must supply remote when using --negotiate-only" +msgstr "" + +msgid "protocol does not support --negotiate-only, exiting" +msgstr "" + +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialclone" +msgstr "" + +msgid "--atomic can only be used when fetching from one remote" +msgstr "" +"--atomic може бути викориÑтано лише при отриманні з одного віддаленого " +"джерела" + +msgid "--stdin can only be used when fetching from one remote" +msgstr "" + +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "" + +msgid "populate log with at most <n> entries from shortlog" +msgstr "" + +msgid "alias for --log (deprecated)" +msgstr "" + +msgid "text" +msgstr "" + +msgid "use <text> as start of message" +msgstr "" + +msgid "use <name> instead of the real target branch" +msgstr "викориÑтовувати <назва> заміÑÑ‚ÑŒ реальної цільової гілки" + +msgid "file to read from" +msgstr "файл, з Ñкого читати" + +msgid "git for-each-ref [<options>] [<pattern>]" +msgstr "git for-each-ref [<опції>] [<шаблон>]" + +msgid "git for-each-ref [--points-at <object>]" +msgstr "" + +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "" + +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +msgstr "" + +msgid "quote placeholders suitably for shells" +msgstr "" + +msgid "quote placeholders suitably for perl" +msgstr "" + +msgid "quote placeholders suitably for python" +msgstr "" + +msgid "quote placeholders suitably for Tcl" +msgstr "" + +msgid "show only <n> matched refs" +msgstr "" + +msgid "respect format colors" +msgstr "" + +msgid "print only refs which points at the given object" +msgstr "" + +msgid "print only refs that are merged" +msgstr "" + +msgid "print only refs that are not merged" +msgstr "" + +msgid "print only refs which contain the commit" +msgstr "" + +msgid "print only refs which don't contain the commit" +msgstr "" + +msgid "read reference patterns from stdin" +msgstr "читати шаблони поÑилань з stdin" + +msgid "unknown arguments supplied with --stdin" +msgstr "" + +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "" + +msgid "config" +msgstr "" + +msgid "config key storing a list of repository paths" +msgstr "" + +msgid "missing --config=<config>" +msgstr "" + +#, c-format +msgid "got bad config --config=%s" +msgstr "" + +msgid "unknown" +msgstr "невідомо" + +#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> + +#, c-format +msgid "error in %s %s: %s" +msgstr "" + +#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> + +#, c-format +msgid "warning in %s %s: %s" +msgstr "" + +#, c-format +msgid "broken link from %7s %s" +msgstr "" + +msgid "wrong object type in link" +msgstr "невірний тип об’єкта в поÑиланні" + +#, c-format +msgid "" +"broken link from %7s %s\n" +" to %7s %s" +msgstr "" + +msgid "Checking connectivity" +msgstr "Перевірка підключеннÑ" + +#, c-format +msgid "missing %s %s" +msgstr "" + +#, c-format +msgid "unreachable %s %s" +msgstr "" + +#, c-format +msgid "dangling %s %s" +msgstr "" + +msgid "could not create lost-found" +msgstr "не вдалоÑÑ Ñтворити lost-found" + +#, c-format +msgid "could not write '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати \"%s\"" + +#, c-format +msgid "could not finish '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "Checking %s" +msgstr "Перевірка %s" + +#, c-format +msgid "Checking connectivity (%d objects)" +msgstr "Перевірка Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ (%d обʼєктів)" + +#, c-format +msgid "Checking %s %s" +msgstr "Перевірка %s %s" + +msgid "broken links" +msgstr "" + +#, c-format +msgid "root %s" +msgstr "" + +#, c-format +msgid "tagged %s %s (%s) in %s" +msgstr "" + +#, c-format +msgid "%s: object corrupt or missing" +msgstr "" + +#, c-format +msgid "%s: invalid reflog entry %s" +msgstr "%s: неприпуÑтимий Ð·Ð°Ð¿Ð¸Ñ reflog %s" + +#, c-format +msgid "Checking reflog %s->%s" +msgstr "" + +#, c-format +msgid "%s: invalid sha1 pointer %s" +msgstr "%s: невірний вказівник sha1 %s" + +#, c-format +msgid "%s: not a commit" +msgstr "%s не Ñ” комітом" + +msgid "notice: No default references" +msgstr "" + +#, c-format +msgid "%s: hash-path mismatch, found at: %s" +msgstr "" + +#, c-format +msgid "%s: object corrupt or missing: %s" +msgstr "" + +#, c-format +msgid "%s: object is of unknown type '%s': %s" +msgstr "" + +#, c-format +msgid "%s: object could not be parsed: %s" +msgstr "" + +#, c-format +msgid "bad sha1 file: %s" +msgstr "" + +msgid "Checking object directory" +msgstr "Перевірка директорії об’єкта" + +msgid "Checking object directories" +msgstr "Перевірка директорій обʼєкта" + +#, c-format +msgid "Checking %s link" +msgstr "Перевірка %s поÑиланнÑ" + +#, c-format +msgid "invalid %s" +msgstr "неприпуÑтимий %s" + +#, c-format +msgid "%s points to something strange (%s)" +msgstr "" + +#, c-format +msgid "%s: detached HEAD points at nothing" +msgstr "" + +#, c-format +msgid "notice: %s points to an unborn branch (%s)" +msgstr "" + +#, c-format +msgid "Checking cache tree of %s" +msgstr "Перевірка дерева кеша Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s: невірний sha1 вказівник в cache-tree Ð´Ð»Ñ %s" + +msgid "non-tree in cache-tree" +msgstr "" + +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s: невірний sha1 вказівник в resolve-undo Ð´Ð»Ñ %s" + +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ rev-index Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½Ð° \"%s\"" + +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "невірний rev-index Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½Ð° \"%s\"" + +msgid "" +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n" +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" +" [--[no-]name-objects] [<object>...]" +msgstr "" + +msgid "show unreachable objects" +msgstr "" + +msgid "show dangling objects" +msgstr "показувати виÑÑчі об’єкти" + +msgid "report tags" +msgstr "" + +msgid "report root nodes" +msgstr "" + +msgid "make index objects head nodes" +msgstr "" + +msgid "make reflogs head nodes (default)" +msgstr "зробити reflogs головними вузлами (за замовчуваннÑм)" + +msgid "also consider packs and alternate objects" +msgstr "" + +msgid "check only connectivity" +msgstr "" + +msgid "enable more strict checking" +msgstr "" + +msgid "write dangling objects in .git/lost-found" +msgstr "" + +msgid "show progress" +msgstr "" + +msgid "show verbose names for reachable objects" +msgstr "" + +msgid "Checking objects" +msgstr "Перевірка обʼєктів" + +#, c-format +msgid "%s: object missing" +msgstr "" + +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "неприпуÑтимий параметр: очікувавÑÑ sha1, надано \"%s\"" + +msgid "git fsmonitor--daemon start [<options>]" +msgstr "" + +msgid "git fsmonitor--daemon run [<options>]" +msgstr "" + +#, c-format +msgid "value of '%s' out of range: %d" +msgstr "" + +#, c-format +msgid "value of '%s' not bool or int: %d" +msgstr "" + +#, c-format +msgid "fsmonitor-daemon is watching '%s'\n" +msgstr "" + +#, c-format +msgid "fsmonitor-daemon is not watching '%s'\n" +msgstr "" + +#, c-format +msgid "could not create fsmonitor cookie '%s'" +msgstr "не вдалоÑÑ Ñтворити fsmonitor cookie \"%s\"" + +#, c-format +msgid "fsmonitor: cookie_result '%d' != SEEN" +msgstr "" + +#, c-format +msgid "could not start IPC thread pool on '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити пул потоків IPC на \"%s\"" + +msgid "could not start fsmonitor listener thread" +msgstr "" + +msgid "could not start fsmonitor health thread" +msgstr "" + +msgid "could not initialize listener thread" +msgstr "" + +msgid "could not initialize health thread" +msgstr "" + +#, c-format +msgid "could not cd home '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ cd home \"%s\"" + +#, c-format +msgid "fsmonitor--daemon is already running '%s'" +msgstr "" + +#, c-format +msgid "running fsmonitor-daemon in '%s'\n" +msgstr "" + +#, c-format +msgid "starting fsmonitor-daemon in '%s'\n" +msgstr "" + +msgid "daemon failed to start" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити демон" + +msgid "daemon not online yet" +msgstr "" + +msgid "daemon terminated" +msgstr "" + +msgid "detach from console" +msgstr "від’єднати від конÑолі" + +msgid "use <n> ipc worker threads" +msgstr "" + +msgid "max seconds to wait for background daemon startup" +msgstr "" + +#, c-format +msgid "invalid 'ipc-threads' value (%d)" +msgstr "невірне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"ipc-threads\" (%d)" + +#, c-format +msgid "Unhandled subcommand '%s'" +msgstr "" + +msgid "fsmonitor--daemon not supported on this platform" +msgstr "" + +msgid "git gc [<options>]" +msgstr "git gc [<опції>]" + +#, c-format +msgid "Failed to fstat %s: %s" +msgstr "Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ fstat %s: %s" + +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ \"%s\" Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\"" + +#, c-format +msgid "cannot stat '%s'" +msgstr "неможливо виконати stat \"%s\"" + +#, c-format +msgid "" +"The last gc run reported the following. Please correct the root cause\n" +"and remove %s\n" +"Automatic cleanup will not be performed until the file is removed.\n" +"\n" +"%s" +msgstr "" + +msgid "prune unreferenced objects" +msgstr "видалити об’єкти без поÑилань" + +msgid "pack unreferenced objects separately" +msgstr "" + +msgid "be more thorough (increased runtime)" +msgstr "" + +msgid "enable auto-gc mode" +msgstr "" + +msgid "force running gc even if there may be another gc running" +msgstr "" + +msgid "repack all other packs except the largest pack" +msgstr "" + +#, c-format +msgid "failed to parse gc.logExpiry value %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ gc.logExpiry Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s" + +#, c-format +msgid "failed to parse prune expiry value %s" +msgstr "" + +#, c-format +msgid "Auto packing the repository in background for optimum performance.\n" +msgstr "" + +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#, c-format +msgid "See \"git help gc\" for manual housekeeping.\n" +msgstr "" + +#, c-format +msgid "" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" +msgstr "" + +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" + +msgid "--no-schedule is not allowed" +msgstr "" + +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "" + +msgid "failed to write commit-graph" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати граф комітів" + +msgid "failed to prefetch remotes" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ попереднє Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð· віддалених Ñховищ" + +msgid "failed to start 'git pack-objects' process" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ \"git pack-objects\" процеÑ" + +msgid "failed to finish 'git pack-objects' process" +msgstr "" + +msgid "failed to write multi-pack-index" +msgstr "" + +msgid "'git multi-pack-index expire' failed" +msgstr "" + +msgid "'git multi-pack-index repack' failed" +msgstr "" + +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" + +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "" + +#, c-format +msgid "task '%s' failed" +msgstr "" + +#, c-format +msgid "'%s' is not a valid task" +msgstr "\"%s\" не Ñ” припуÑтимим завданнÑм" + +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ \"%s\" не можна вибрати кілька разів" + +msgid "run tasks based on the state of the repository" +msgstr "" + +msgid "frequency" +msgstr "" + +msgid "run tasks based on frequency" +msgstr "" + +msgid "do not report progress or other information over stderr" +msgstr "" + +msgid "task" +msgstr "" + +msgid "run a specific task" +msgstr "" + +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "" + +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\" до \"%s\"" + +msgid "return success even if repository was not registered" +msgstr "" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "не вдалоÑÑ Ñкинути Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\" Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "repository '%s' is not registered" +msgstr "Ñховище \"%s\" не зареєÑтровано" + +#, c-format +msgid "failed to expand path '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ð½ÑƒÑ‚Ð¸ шлÑÑ… \"%s\"" + +msgid "failed to start launchctl" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити launchctl" + +#, c-format +msgid "failed to create directories for '%s'" +msgstr "не вдалоÑÑ Ñтворити директорії Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "failed to bootstrap service %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ð½ÑƒÑ‚Ð¸ Ñлужбу %s" + +msgid "failed to create temp xml file" +msgstr "не вдалоÑÑ Ñтворити тимчаÑовий xml файл" + +msgid "failed to start schtasks" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити schtasks" + +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" + +msgid "failed to create crontab temporary file" +msgstr "не вдалоÑÑ Ñтворити тимчаÑовий crontab файл" + +msgid "failed to open temporary file" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл" + +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" + +msgid "'crontab' died" +msgstr "" + +msgid "failed to start systemctl" +msgstr "не вдалоÑÑ Ñтартувати systemctl" + +msgid "failed to run systemctl" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити systemctl" + +#, c-format +msgid "failed to delete '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "failed to flush '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‡Ð¸Ñтити \"%s\"" + +#, c-format +msgid "unrecognized --scheduler argument '%s'" +msgstr "" + +msgid "neither systemd timers nor crontab are available" +msgstr "" + +#, c-format +msgid "%s scheduler is not available" +msgstr "" + +msgid "another process is scheduling background maintenance" +msgstr "" + +msgid "git maintenance start [--scheduler=<scheduler>]" +msgstr "" + +msgid "scheduler" +msgstr "" + +msgid "scheduler to trigger git maintenance run" +msgstr "" + +msgid "failed to add repo to global config" +msgstr "" + +msgid "git maintenance <subcommand> [<options>]" +msgstr "" + +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [<опції>] [-e] <шаблон> [<ревізіÑ>...] [[--] <шлÑÑ…>...]" + +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: не вдалоÑÑ Ñтворити потік: %s" + +#, c-format +msgid "invalid number of threads specified (%d) for %s" +msgstr "невірно вказано кількіÑÑ‚ÑŒ потоків (%d) Ð´Ð»Ñ %s" + +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. + +#, c-format +msgid "no threads support, ignoring %s" +msgstr "немає підтримки потоків, ігноруютьÑÑ %s" + +#, c-format +msgid "unable to read tree (%s)" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ дерево (%s)" + +#, c-format +msgid "unable to grep from object of type %s" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ grep з об’єкта типу %s" + +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "" + +msgid "search in index instead of in the work tree" +msgstr "шукати в індекÑÑ– заміÑÑ‚ÑŒ робочого дерева" + +msgid "find in contents not managed by git" +msgstr "" + +msgid "search in both tracked and untracked files" +msgstr "шукати Ñк у відÑтежуваних, так Ñ– в невідÑтежуваних файлах" + +msgid "ignore files specified via '.gitignore'" +msgstr "" + +msgid "recursively search in each submodule" +msgstr "шукати рекурÑивно в кожному підмодулі" + +msgid "show non-matching lines" +msgstr "" + +msgid "case insensitive matching" +msgstr "" + +msgid "match patterns only at word boundaries" +msgstr "" + +msgid "process binary files as text" +msgstr "" + +msgid "don't match patterns in binary files" +msgstr "" + +msgid "process binary files with textconv filters" +msgstr "" + +msgid "search in subdirectories (default)" +msgstr "" + +msgid "descend at most <depth> levels" +msgstr "" + +msgid "use extended POSIX regular expressions" +msgstr "" + +msgid "use basic POSIX regular expressions (default)" +msgstr "" + +msgid "interpret patterns as fixed strings" +msgstr "" + +msgid "use Perl-compatible regular expressions" +msgstr "" + +msgid "show line numbers" +msgstr "" + +msgid "show column number of first match" +msgstr "" + +msgid "don't show filenames" +msgstr "" + +msgid "show filenames" +msgstr "" + +msgid "show filenames relative to top directory" +msgstr "" + +msgid "show only filenames instead of matching lines" +msgstr "" + +msgid "synonym for --files-with-matches" +msgstr "" + +msgid "show only the names of files without match" +msgstr "" + +msgid "print NUL after filenames" +msgstr "" + +msgid "show only matching parts of a line" +msgstr "" + +msgid "show the number of matches instead of matching lines" +msgstr "" + +msgid "highlight matches" +msgstr "" + +msgid "print empty line between matches from different files" +msgstr "" + +msgid "show filename only once above matches from same file" +msgstr "" + +msgid "show <n> context lines before and after matches" +msgstr "" + +msgid "show <n> context lines before matches" +msgstr "" + +msgid "show <n> context lines after matches" +msgstr "" + +msgid "use <n> worker threads" +msgstr "" + +msgid "shortcut for -C NUM" +msgstr "" + +msgid "show a line with the function name before matches" +msgstr "" + +msgid "show the surrounding function" +msgstr "" + +msgid "read patterns from file" +msgstr "" + +msgid "match <pattern>" +msgstr "" + +msgid "combine patterns specified with -e" +msgstr "" + +msgid "indicate hit with exit status without output" +msgstr "" + +msgid "show only matches from files that match all patterns" +msgstr "" + +msgid "pager" +msgstr "" + +msgid "show matching files in the pager" +msgstr "" + +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "" + +msgid "maximum number of results per file" +msgstr "" + +msgid "no pattern given" +msgstr "" + +msgid "--no-index or --untracked cannot be used with revs" +msgstr "--no-index або --untracked не можна викориÑтовувати з ревізіÑми" + +#, c-format +msgid "unable to resolve revision: %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð²Ê¼Ñзати ревізію: %s" + +msgid "--untracked not supported with --recurse-submodules" +msgstr "" + +msgid "invalid option combination, ignoring --threads" +msgstr "" + +msgid "no threads support, ignoring --threads" +msgstr "немає підтримки потоків, Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ --threads" + +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "вказано неприпуÑтиму кількіÑÑ‚ÑŒ потоків (%d)" + +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +msgid "--[no-]exclude-standard cannot be used for tracked contents" +msgstr "" + +msgid "both --cached and trees are given" +msgstr "" + +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." +msgstr "" + +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "" + +msgid "object type" +msgstr "тип обʼєкта" + +msgid "write the object into the object database" +msgstr "" + +msgid "read the object from stdin" +msgstr "" + +msgid "store file as is without filters" +msgstr "" + +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "" + +msgid "process file as it were from this path" +msgstr "" + +msgid "print all available commands" +msgstr "" + +msgid "show external commands in --all" +msgstr "" + +msgid "show aliases in --all" +msgstr "" + +msgid "exclude guides" +msgstr "" + +msgid "show man page" +msgstr "" + +msgid "show manual in web browser" +msgstr "" + +msgid "show info page" +msgstr "" + +msgid "print command description" +msgstr "" + +msgid "print list of useful guides" +msgstr "" + +msgid "print list of user-facing repository, command and file interfaces" +msgstr "" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "" + +msgid "print all configuration variable names" +msgstr "" + +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]" +msgstr "" + +#, c-format +msgid "unrecognized help format '%s'" +msgstr "" + +msgid "Failed to start emacsclient." +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити emacs клієнт." + +msgid "Failed to parse emacsclient version." +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ верÑÑ–ÑŽ emacs клієнта." + +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "" + +#, c-format +msgid "failed to exec '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" + +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" + +#, c-format +msgid "'%s': unknown man viewer." +msgstr "" + +msgid "no man viewer handled the request" +msgstr "" + +msgid "no info viewer handled the request" +msgstr "" + +#, c-format +msgid "'%s' is aliased to '%s'" +msgstr "\"%s\" Ñ” пÑевдонімом Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "bad alias.%s string: %s" +msgstr "" + +#, c-format +msgid "the '%s' option doesn't take any non-option arguments" +msgstr "" + +msgid "" +"the '--no-[external-commands|aliases]' options can only be used with '--all'" +msgstr "" + +#, c-format +msgid "usage: %s%s" +msgstr "" + +msgid "'git help config' for more information" +msgstr "" + +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" + +msgid "silently ignore missing requested <hook-name>" +msgstr "" + +msgid "file to read into hooks' stdin" +msgstr "файл, з Ñкого читати stdin хука" + +#, c-format +msgid "object type mismatch at %s" +msgstr "не Ñпівпадає тип обʼєкта Ð´Ð»Ñ %s" + +#, c-format +msgid "did not receive expected object %s" +msgstr "очікуваних обʼєктів не отримано %s" + +#, c-format +msgid "object %s: expected type %s, found %s" +msgstr "обʼєкт %s: очікувавÑÑ Ñ‚Ð¸Ð¿ %s, знайдено %s" + +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "не вдаєтьÑÑ Ð·Ð°Ð¿Ð¾Ð²Ð½Ð¸Ñ‚Ð¸ %d байт" +msgstr[1] "не вдаєтьÑÑ Ð·Ð°Ð¿Ð¾Ð²Ð½Ð¸Ñ‚Ð¸ %d байти" +msgstr[2] "не вдаєтьÑÑ Ð·Ð°Ð¿Ð¾Ð²Ð½Ð¸Ñ‚Ð¸ %d байтів" + +msgid "early EOF" +msgstr "ранній EOF" + +msgid "read error on input" +msgstr "помилка Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° вході" + +msgid "used more bytes than were available" +msgstr "викориÑтано більше байтів, ніж було доÑтупно" + +msgid "pack too large for current definition of off_t" +msgstr "пакунок занадто великий Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ off_t" + +#, c-format +msgid "pack exceeds maximum allowed size (%s)" +msgstr "пакунок перевищує макÑимально дозволений розмір (%s)" + +msgid "pack signature mismatch" +msgstr "не Ñпівпадає Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ°" + +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "верÑÑ–Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° %<PRIu32> не підтримуєтьÑÑ" + +#, c-format +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "пакунок має невірний обʼєкт зі зміщеннÑм %<PRIuMAX>: %s" + +#, c-format +msgid "inflate returned %d" +msgstr "розпаковувач повернув %d" + +msgid "offset value overflow for delta base object" +msgstr "Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ñуву Ð´Ð»Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ñƒ дельти з базою" + +msgid "delta base offset is out of bound" +msgstr "зÑув дельти з базою виходить за межі" + +#, c-format +msgid "unknown object type %d" +msgstr "невідомий тип обʼєкта %d" + +msgid "cannot pread pack file" +msgstr "неможливо прочитати файл пакунка" + +#, c-format +msgid "premature end of pack file, %<PRIuMAX> byte missing" +msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" +msgstr[0] "передчаÑний кінець файлу пакунка, %<PRIuMAX> байт відÑутній" +msgstr[1] "передчаÑний кінець файлу пакунка, %<PRIuMAX> байта відÑутні" +msgstr[2] "передчаÑний кінець файлу пакунка, %<PRIuMAX> байтів відÑутні" + +msgid "serious inflate inconsistency" +msgstr "Ñерйозне неÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ" + +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "ВИЯВЛЕÐО SHA1 КОЛІЗІЮ З %s!" + +#, c-format +msgid "unable to read %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ %s" + +#, c-format +msgid "cannot read existing object info %s" +msgstr "неможливо прочитати інформацію про Ñ–Ñнуючий об’єкт %s" + +#, c-format +msgid "cannot read existing object %s" +msgstr "неможливо прочитати Ñ–Ñнуючий об’єкт %s" + +#, c-format +msgid "invalid blob object %s" +msgstr "неприпуÑтимий об’єкт blob %s" + +msgid "fsck error in packed object" +msgstr "помилка fsck у запакованому обʼєкті" + +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Ðе вÑÑ– дочірні об’єкти %s доÑтупні" + +msgid "failed to apply delta" +msgstr "не вдалоÑÑ Ð·Ð°ÑтоÑувати дельту" + +msgid "Receiving objects" +msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñ–Ð²" + +msgid "Indexing objects" +msgstr "ІндекÑÐ°Ñ†Ñ–Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñ–Ð²" + +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "пакунок пошкоджено (SHA1 не Ñпівпадає)" + +msgid "cannot fstat packfile" +msgstr "неможливо зробити fstat файла пакунка" + +msgid "pack has junk at the end" +msgstr "мотлох наприкінці пакунка" + +msgid "confusion beyond insanity in parse_pack_objects()" +msgstr "плутанина на межі пекельного борошна в parse_pack_objects()" + +msgid "Resolving deltas" +msgstr "Розв’ÑÐ·Ð°Ð½Ð½Ñ Ð´ÐµÐ»ÑŒÑ‚" + +#, c-format +msgid "unable to create thread: %s" +msgstr "не вдалоÑÑ Ñтворити потік: %s" + +msgid "confusion beyond insanity" +msgstr "плутанина на межі пекельного борошна" + +#, c-format +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "завершено з %d локальним об’єктом" +msgstr[1] "завершено з %d локальними об’єктами" +msgstr[2] "завершено з %d локальними об’єктами" + +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "Ðеочікувана контрольна Ñума наприкінці %s (Ð¿Ð¾ÑˆÐºÐ¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð´Ð¸Ñка?)" + +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "пакунок має %d невирішену дельту" +msgstr[1] "пакунок має %d невирішених дельти" +msgstr[2] "пакунок має %d невирішених дельт" + +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ доданий об’єкт (%d)" + +#, c-format +msgid "local object %s is corrupt" +msgstr "локальний обʼєкт %s пошкоджено" + +#, c-format +msgid "packfile name '%s' does not end with '.%s'" +msgstr "Ñ–Ð¼â€™Ñ Ñ„Ð°Ð¹Ð»Ð° пакунка '%s' не закінчуєтьÑÑ Ð½Ð° '.%s'" + +#, c-format +msgid "cannot write %s file '%s'" +msgstr "неможливо запиÑати %s файл '%s'" + +#, c-format +msgid "cannot close written %s file '%s'" +msgstr "неможливо закрити запиÑаний %s файл '%s'" + +#, c-format +msgid "unable to rename temporary '*.%s' file to '%s'" +msgstr "не вдаєтьÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ тимчаÑовий файл '*.%s' на '%s'" + +msgid "error while closing pack file" +msgstr "помилка під Ñ‡Ð°Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ñƒ пакунка" + +#, c-format +msgid "bad pack.indexVersion=%<PRIu32>" +msgstr "невірний pack.indexVersion=%<PRIu32>" + +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Ðеможливо відкрити Ñ–Ñнуючий файл пакунка '%s" + +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "Ðеможливо відкрити Ñ–Ñнуючий індекÑний файл пакунка Ð´Ð»Ñ '%s" + +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "не дельта: %d об’єкт" +msgstr[1] "не дельта: %d об’єкта" +msgstr[2] "не дельта: %d об’єктів" + +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "довжина ланцюжка = %d: %lu об’єкт" +msgstr[1] "довжина ланцюжка = %d: %lu об’єкти" +msgstr[2] "довжина ланцюжка = %d: %lu об’єктів" + +msgid "Cannot come back to cwd" +msgstr "Ðеможливо повернутиÑÑ Ð´Ð¾ поточної робочої директорії" + +#, c-format +msgid "bad %s" +msgstr "невірний %s" + +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "невідомий хеш-алгоритм '%s'" + +msgid "--stdin requires a git repository" +msgstr "--stdin вимагає наÑвноÑÑ‚Ñ– git Ñховища" + +msgid "--verify with no packfile name given" +msgstr "--verify без Ð·Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¸Ð¼ÐµÐ½Ñ– файла пакунка" + +msgid "fsck error in pack objects" +msgstr "помилка fsck в об’єктах пакунка" + +#, c-format +msgid "cannot stat template '%s'" +msgstr "неможливо виконати stat шаблона \"%s\"" + +#, c-format +msgid "cannot opendir '%s'" +msgstr "неможливо виконати opendir \"%s\"" + +#, c-format +msgid "cannot readlink '%s'" +msgstr "неможливо виконати readlink \"%s\"" + +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "неможливо виконати symlink \"%s\" \"%s\"" + +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "неможливо Ñкопіювати \"%s\" до \"%s\"" + +#, c-format +msgid "ignoring template %s" +msgstr "" + +#, c-format +msgid "templates not found in %s" +msgstr "шаблонів не знайдено в %s" + +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "не копіюютьÑÑ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¸ з \"%s\": %s" + +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "неприпуÑтиме початкове Ñ–Ð¼â€™Ñ Ð³Ñ–Ð»ÐºÐ¸: \"%s\"" + +#, c-format +msgid "unable to handle file type %d" +msgstr "не вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ тип файлу %d" + +#, c-format +msgid "unable to move %s to %s" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñтити %s на %s" + +msgid "attempt to reinitialize repository with different hash" +msgstr "" + +#, c-format +msgid "%s already exists" +msgstr "%s вже Ñ–Ñнує" + +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "" + +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "" + +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "" + +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "" + +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "" + +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" +msgstr "" + +msgid "permissions" +msgstr "права доÑтупу" + +msgid "specify that the git repository is to be shared amongst several users" +msgstr "" + +msgid "override the name of the initial branch" +msgstr "" + +msgid "hash" +msgstr "" + +msgid "specify the hash algorithm to use" +msgstr "" + +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" + +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Ðе вдаєтьÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до робочого дерева \"%s\"" + +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir неÑуміÑна з порожнім Ñховищем" + +msgid "" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" +msgstr "" + +msgid "edit files in place" +msgstr "" + +msgid "trim empty trailers" +msgstr "" + +msgid "where to place the new trailer" +msgstr "" + +msgid "action if trailer already exists" +msgstr "що робити, Ñкщо trailer вже Ñ–Ñнує" + +msgid "action if trailer is missing" +msgstr "" + +msgid "output only the trailers" +msgstr "" + +msgid "do not apply config rules" +msgstr "" + +msgid "join whitespace-continued values" +msgstr "" + +msgid "set parsing options" +msgstr "" + +msgid "do not treat --- specially" +msgstr "" + +msgid "trailer(s) to add" +msgstr "" + +msgid "--trailer with --only-input does not make sense" +msgstr "" + +msgid "no input file given for in-place editing" +msgstr "" + +msgid "git log [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git log [<опції>] [<діапазон-ревізій>] [[--] <шлÑÑ…>...]" + +msgid "git show [<options>] <object>..." +msgstr "git show [<опції>] <обʼєкт>..." + +#, c-format +msgid "invalid --decorate option: %s" +msgstr "неприпуÑтима --decorate опціÑ: %s" + +msgid "suppress diff output" +msgstr "" + +msgid "show source" +msgstr "" + +msgid "clear all previously-defined decoration filters" +msgstr "" + +msgid "only decorate refs that match <pattern>" +msgstr "" + +msgid "do not decorate refs that match <pattern>" +msgstr "" + +msgid "decorate options" +msgstr "" + +msgid "" +"trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" + +#, c-format +msgid "unrecognized argument: %s" +msgstr "" + +msgid "-L<range>:<file> cannot be used with pathspec" +msgstr "-L<діапазон>:<файл> не можна викориÑтовувати з визначником шлÑху" + +#, c-format +msgid "Final output: %d %s\n" +msgstr "" + +msgid "unable to create temporary object directory" +msgstr "не вдалоÑÑ Ñтворити тимчаÑову директорію об’єкта" + +#, c-format +msgid "git show %s: bad file" +msgstr "" + +#, c-format +msgid "could not read object %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ об’єкт %s" + +#, c-format +msgid "unknown type: %d" +msgstr "невідомий тип: %d" + +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "" + +msgid "format.headers without value" +msgstr "" + +#, c-format +msgid "cannot open patch file %s" +msgstr "не вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл латки %s" + +msgid "need exactly one range" +msgstr "" + +msgid "not a range" +msgstr "" + +msgid "cover letter needs email format" +msgstr "" + +msgid "failed to create cover-letter file" +msgstr "не вдалоÑÑ Ñтворити файл Ñупровідного лиÑта" + +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +msgid "git format-patch [<options>] [<since> | <revision-range>]" +msgstr "git format-patch [<опції>] [<відколи> | <діапазон-ревізій>]" + +msgid "two output directories?" +msgstr "" + +#, c-format +msgid "unknown commit %s" +msgstr "невідомий коміт %s" + +#, c-format +msgid "failed to resolve '%s' as a valid ref" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ \"%s\" Ñк припуÑтиме поÑиланнÑ" + +msgid "could not find exact merge base" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ точну базу Ð´Ð»Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ" + +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 "" + +msgid "failed to find exact merge base" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ точну базу Ð´Ð»Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ" + +msgid "base commit should be the ancestor of revision list" +msgstr "" + +msgid "base commit shouldn't be in revision list" +msgstr "" + +msgid "cannot get patch id" +msgstr "неможливо отримати ідентифікатор латки" + +msgid "failed to infer range-diff origin of current series" +msgstr "" + +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "" + +msgid "use [PATCH n/m] even with a single patch" +msgstr "" + +msgid "use [PATCH] even with multiple patches" +msgstr "" + +msgid "print patches to standard out" +msgstr "" + +msgid "generate a cover letter" +msgstr "" + +msgid "use simple number sequence for output file names" +msgstr "" + +msgid "sfx" +msgstr "" + +msgid "use <sfx> instead of '.patch'" +msgstr "" + +msgid "start numbering patches at <n> instead of 1" +msgstr "" + +msgid "reroll-count" +msgstr "" + +msgid "mark the series as Nth re-roll" +msgstr "" + +msgid "max length of output filename" +msgstr "" + +msgid "use [RFC PATCH] instead of [PATCH]" +msgstr "" + +msgid "cover-from-description-mode" +msgstr "" + +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" + +msgid "use [<prefix>] instead of [PATCH]" +msgstr "" + +msgid "store resulting files in <dir>" +msgstr "" + +msgid "don't strip/add [PATCH]" +msgstr "" + +msgid "don't output binary diffs" +msgstr "" + +msgid "output all-zero hash in From header" +msgstr "" + +msgid "don't include a patch matching a commit upstream" +msgstr "" + +msgid "show patch format instead of default (patch + stat)" +msgstr "" + +msgid "Messaging" +msgstr "" + +msgid "header" +msgstr "заголовок" + +msgid "add email header" +msgstr "" + +msgid "email" +msgstr "" + +msgid "add To: header" +msgstr "" + +msgid "add Cc: header" +msgstr "" + +msgid "ident" +msgstr "" + +msgid "set From address to <ident> (or committer ident if absent)" +msgstr "" + +msgid "message-id" +msgstr "" + +msgid "make first mail a reply to <message-id>" +msgstr "" + +msgid "boundary" +msgstr "" + +msgid "attach the patch" +msgstr "" + +msgid "inline the patch" +msgstr "" + +msgid "enable message threading, styles: shallow, deep" +msgstr "" + +msgid "signature" +msgstr "" + +msgid "add a signature" +msgstr "" + +msgid "base-commit" +msgstr "" + +msgid "add prerequisite tree info to the patch series" +msgstr "" + +msgid "add a signature from a file" +msgstr "" + +msgid "don't print the patch filenames" +msgstr "" + +msgid "show progress while generating patches" +msgstr "" + +msgid "show changes against <rev> in cover letter or single patch" +msgstr "" + +msgid "show changes against <refspec> in cover letter or single patch" +msgstr "" + +msgid "percentage by which creation is weighted" +msgstr "" + +msgid "show in-body From: even if identical to the e-mail header" +msgstr "" + +#, c-format +msgid "invalid ident line: %s" +msgstr "неприпуÑтимий Ñ€Ñдок ідентифікатора: %s" + +msgid "--name-only does not make sense" +msgstr "" + +msgid "--name-status does not make sense" +msgstr "" + +msgid "--check does not make sense" +msgstr "" + +msgid "--remerge-diff does not make sense" +msgstr "" + +#, c-format +msgid "could not create directory '%s'" +msgstr "не вдалоÑÑ Ñтворити директорію \"%s\"" + +msgid "--interdiff requires --cover-letter or single patch" +msgstr "" + +msgid "Interdiff:" +msgstr "" + +#, c-format +msgid "Interdiff against v%d:" +msgstr "" + +msgid "--range-diff requires --cover-letter or single patch" +msgstr "" + +msgid "Range-diff:" +msgstr "" + +#, c-format +msgid "Range-diff against v%d:" +msgstr "" + +#, c-format +msgid "unable to read signature file '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл підпиÑу \"%s\"" + +msgid "Generating patches" +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð»Ð°Ñ‚Ð¾Ðº" + +msgid "failed to create output files" +msgstr "не вдалоÑÑ Ñтворити вихідні файли" + +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "" + +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" + +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "невірний формат ls-файлів: елемент \"%s\" не починаєтьÑÑ Ð· \"(\"" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "невірний формат ls-файлів: елемент \"%s\" не закінчуєтьÑÑ Ð½Ð° \")\"" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "" + +msgid "git ls-files [<options>] [<file>...]" +msgstr "git ls-files [<опції>] [<файл>...]" + +msgid "separate paths with the NUL character" +msgstr "" + +msgid "identify the file status with tags" +msgstr "" + +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "" + +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "" + +msgid "show cached files in the output (default)" +msgstr "" + +msgid "show deleted files in the output" +msgstr "" + +msgid "show modified files in the output" +msgstr "" + +msgid "show other files in the output" +msgstr "" + +msgid "show ignored files in the output" +msgstr "" + +msgid "show staged contents' object name in the output" +msgstr "" + +msgid "show files on the filesystem that need to be removed" +msgstr "" + +msgid "show 'other' directories' names only" +msgstr "" + +msgid "show line endings of files" +msgstr "" + +msgid "don't show empty directories" +msgstr "" + +msgid "show unmerged files in the output" +msgstr "" + +msgid "show resolve-undo information" +msgstr "" + +msgid "skip files matching pattern" +msgstr "" + +msgid "read exclude patterns from <file>" +msgstr "" + +msgid "read additional per-directory exclude patterns in <file>" +msgstr "" + +msgid "add the standard git exclusions" +msgstr "" + +msgid "make the output relative to the project top directory" +msgstr "" + +msgid "if any <file> is not in the index, treat this as an error" +msgstr "" + +msgid "tree-ish" +msgstr "" + +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "" + +msgid "show debugging data" +msgstr "" + +msgid "suppress duplicate entries" +msgstr "" + +msgid "show sparse directories in the presence of a sparse index" +msgstr "" + +msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" + +msgid "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" +" [--symref] [<repository> [<patterns>...]]" +msgstr "" + +msgid "do not print remote URL" +msgstr "" + +msgid "exec" +msgstr "" + +msgid "path of git-upload-pack on the remote host" +msgstr "шлÑÑ… до git-upload-pack на віддаленому Ñервері" + +msgid "limit to tags" +msgstr "" + +msgid "limit to heads" +msgstr "" + +msgid "do not show peeled tags" +msgstr "" + +msgid "take url.<base>.insteadOf into account" +msgstr "" + +msgid "exit with exit code 2 if no matching refs are found" +msgstr "" + +msgid "show underlying ref in addition to the object pointed by it" +msgstr "" + +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<опції>] <деревоподібне-джерело> [<шлÑÑ…>...]" + +#, c-format +msgid "could not get object info about '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ інформацію про обʼєкт \"%s\"" + +#, c-format +msgid "bad ls-tree format: element '%s' does not start with '('" +msgstr "невірний формат ls-дерева: елемент \"%s\" не починаєтьÑÑ Ð· \"(\"" + +#, c-format +msgid "bad ls-tree format: element '%s' does not end in ')'" +msgstr "невірний формат ls-дерева: елемент \"%s\" не закінчуєтьÑÑ Ð½Ð° \")\"" + +#, c-format +msgid "bad ls-tree format: %%%.*s" +msgstr "" + +msgid "only show trees" +msgstr "" + +msgid "recurse into subtrees" +msgstr "" + +msgid "show trees when recursing" +msgstr "" + +msgid "terminate entries with NUL byte" +msgstr "" + +msgid "include object size" +msgstr "включити розмір об’єкта" + +msgid "list only filenames" +msgstr "" + +msgid "list only objects" +msgstr "показати лише обʼєкти" + +msgid "use full path names" +msgstr "" + +msgid "list entire tree; not just current directory (implies --full-name)" +msgstr "" + +msgid "--format can't be combined with other format-altering options" +msgstr "--format не можна комбінувати з іншими опціÑми зміни формату" + +#. TRANSLATORS: keep <> in "<" mail ">" info. + +msgid "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "" + +msgid "keep subject" +msgstr "" + +msgid "keep non patch brackets in subject" +msgstr "" + +msgid "copy Message-ID to the end of commit message" +msgstr "" + +msgid "re-code metadata to i18n.commitEncoding" +msgstr "" + +msgid "disable charset re-coding of metadata" +msgstr "" + +msgid "encoding" +msgstr "" + +msgid "re-code metadata to this encoding" +msgstr "" + +msgid "use scissors" +msgstr "" + +msgid "<action>" +msgstr "" + +msgid "action when quoted CR is found" +msgstr "" + +msgid "use headers in message's body" +msgstr "" + +msgid "reading patches from stdin/tty..." +msgstr "" + +#, c-format +msgid "empty mbox: '%s'" +msgstr "" + +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "" + +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "" + +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "" + +msgid "git merge-base --independent <commit>..." +msgstr "" + +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "" + +msgid "output all common ancestors" +msgstr "" + +msgid "find ancestors for a single n-way merge" +msgstr "" + +msgid "list revs not reachable from others" +msgstr "" + +msgid "is the first one ancestor of the other?" +msgstr "" + +msgid "find where <commit> forked from reflog of <ref>" +msgstr "" + +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" + +msgid "send results to standard output" +msgstr "" + +msgid "use a diff3 based merge" +msgstr "" + +msgid "use a zealous diff3 based merge" +msgstr "" + +msgid "for conflicts, use our version" +msgstr "" + +msgid "for conflicts, use their version" +msgstr "" + +msgid "for conflicts, use a union version" +msgstr "" + +msgid "for conflicts, use this marker size" +msgstr "" + +msgid "do not warn about conflicts" +msgstr "" + +msgid "set labels for file1/orig-file/file2" +msgstr "" + +#, c-format +msgid "unknown option %s" +msgstr "невідома Ð¾Ð¿Ñ†Ñ–Ñ %s" + +#, c-format +msgid "could not parse object '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ обʼєкт \"%s\"" + +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "not handling anything other than two heads merge." +msgstr "" + +#, c-format +msgid "could not resolve ref '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð²Ê¼Ñзати поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\"" + +#, c-format +msgid "Merging %s with %s\n" +msgstr "" + +msgid "not something we can merge" +msgstr "" + +msgid "refusing to merge unrelated histories" +msgstr "" + +msgid "failure to merge" +msgstr "" + +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>" +msgstr "" + +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>" +msgstr "" + +msgid "do a real merge instead of a trivial merge" +msgstr "" + +msgid "do a trivial merge only" +msgstr "" + +msgid "also show informational/conflict messages" +msgstr "" + +msgid "list filenames without modes/oids/stages" +msgstr "" + +msgid "allow merging unrelated histories" +msgstr "" + +msgid "perform multiple merges, one per line of input" +msgstr "" + +msgid "specify a merge-base for the merge" +msgstr "вказати базу Ð´Ð»Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "" + +msgid "--merge-base is incompatible with --stdin" +msgstr "" + +#, c-format +msgid "malformed input line: '%s'." +msgstr "невірно Ñформований Ñ€Ñдок вводу: \"%s\"." + +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "" + +msgid "git merge [<options>] [<commit>...]" +msgstr "git merge [<опції>] [<коміт>...]" + +msgid "switch `m' requires a value" +msgstr "" + +#, c-format +msgid "option `%s' requires a value" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ \"%s\" вимагає значеннÑ" + +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñтратегію Ð·Ð»Ð¸Ñ‚Ñ‚Ñ \"%s\".\n" + +#, c-format +msgid "Available strategies are:" +msgstr "" + +#, c-format +msgid "Available custom strategies are:" +msgstr "" + +msgid "do not show a diffstat at the end of the merge" +msgstr "" + +msgid "show a diffstat at the end of the merge" +msgstr "" + +msgid "(synonym to --stat)" +msgstr "" + +msgid "add (at most <n>) entries from shortlog to merge commit message" +msgstr "" + +msgid "create a single commit instead of doing a merge" +msgstr "" + +msgid "perform a commit if the merge succeeds (default)" +msgstr "" + +msgid "edit message before committing" +msgstr "редагувати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ´ комітом" + +msgid "allow fast-forward (default)" +msgstr "" + +msgid "abort if fast-forward is not possible" +msgstr "" + +msgid "verify that the named commit has a valid GPG signature" +msgstr "" + +msgid "strategy" +msgstr "" + +msgid "merge strategy to use" +msgstr "" + +msgid "option=value" +msgstr "" + +msgid "option for selected merge strategy" +msgstr "" + +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "" + +msgid "use <name> instead of the real target" +msgstr "викориÑтовувати <назва> заміÑÑ‚ÑŒ реальної цілі" + +msgid "abort the current in-progress merge" +msgstr "перервати поточне злиттÑ" + +msgid "--abort but leave index and working tree alone" +msgstr "--abort, але зберегти Ñтан індекÑа Ñ– робочого дерева" + +msgid "continue the current in-progress merge" +msgstr "продовжити поточний Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ" + +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "" + +msgid "could not run stash." +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stash." + +msgid "stash failed" +msgstr "" + +#, c-format +msgid "not a valid object: %s" +msgstr "не Ñ” припуÑтимим обʼєктом: %s" + +msgid "read-tree failed" +msgstr "" + +msgid "Already up to date. (nothing to squash)" +msgstr "" + +msgid "Already up to date." +msgstr "" + +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "" + +#, c-format +msgid "'%s' does not point to a commit" +msgstr "\"%s\" не вказує на коміт" + +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "" + +msgid "Unable to write index." +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати індекÑ." + +msgid "Not handling anything other than two heads merge." +msgstr "" + +#, c-format +msgid "unknown strategy option: -X%s" +msgstr "" + +#, c-format +msgid "unable to write %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати %s" + +#, c-format +msgid "Could not read from '%s'" +msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ з \"%s\"" + +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" +"Ðе виконуєтьÑÑ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ; викориÑтовуйте \"git commit\" Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ.\n" + +msgid "" +"Please enter a commit message to explain why this merge is necessary,\n" +"especially if it merges an updated upstream into a topic branch.\n" +"\n" +msgstr "" + +msgid "An empty message aborts the commit.\n" +msgstr "" + +#, c-format +msgid "" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +msgid "Empty commit message." +msgstr "" + +#, c-format +msgid "Wonderful.\n" +msgstr "" + +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" + +msgid "No current branch." +msgstr "Ðемає поточної гілки." + +msgid "No remote for the current branch." +msgstr "Ðемає віддаленого Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— гілки." + +msgid "No default upstream defined for the current branch." +msgstr "" + +#, c-format +msgid "No remote-tracking branch for %s from %s" +msgstr "" + +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "" + +#, c-format +msgid "could not close '%s'" +msgstr "не вдалоÑÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "" + +msgid "--abort expects no arguments" +msgstr "" + +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "" + +msgid "--quit expects no arguments" +msgstr "" + +msgid "--continue expects no arguments" +msgstr "" + +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "" + +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you merge." +msgstr "" + +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you merge." +msgstr "" + +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "" + +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "" + +msgid "Squash commit into empty head not supported yet" +msgstr "" + +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "Ðе fast-forward коміт не має ÑенÑу з порожнім HEAD" + +#, c-format +msgid "%s - not something we can merge" +msgstr "" + +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#, c-format +msgid "Updating %s..%s\n" +msgstr "" + +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" + +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#, c-format +msgid "Nope.\n" +msgstr "" + +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "" + +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "" + +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "" + +#, c-format +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "" + +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" + +#, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "" + +#, c-format +msgid "warning: tag input does not pass fsck: %s" +msgstr "" + +#, c-format +msgid "error: tag input does not pass fsck: %s" +msgstr "" + +#, c-format +msgid "%d (FSCK_IGNORE?) should never trigger this callback" +msgstr "" + +#, c-format +msgid "could not read tagged object '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ тегований об’єкт \"%s\"" + +#, c-format +msgid "object '%s' tagged as '%s', but is a '%s' type" +msgstr "" + +msgid "could not read from stdin" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ з stdin" + +msgid "tag on stdin did not pass our strict fsck check" +msgstr "" + +msgid "tag on stdin did not refer to a valid object" +msgstr "" + +msgid "unable to write tag file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл тегів" + +msgid "input is NUL terminated" +msgstr "" + +msgid "allow missing objects" +msgstr "дозволити відÑутні об’єкти" + +msgid "allow creation of more than one tree" +msgstr "" + +msgid "" +"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" +"snapshot=<path>]" +msgstr "" + +msgid "git multi-pack-index [<options>] verify" +msgstr "git multi-pack-index [<опції>] verify" + +msgid "git multi-pack-index [<options>] expire" +msgstr "git multi-pack-index [<опції>] expire" + +msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" +msgstr "" + +msgid "directory" +msgstr "директоріÑ" + +msgid "object directory containing set of packfile and pack-index pairs" +msgstr "" + +msgid "preferred-pack" +msgstr "" + +msgid "pack for reuse when computing a multi-pack bitmap" +msgstr "" + +msgid "write multi-pack bitmap" +msgstr "" + +msgid "write multi-pack index containing only given indexes" +msgstr "" + +msgid "refs snapshot for selecting bitmap commits" +msgstr "" + +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" +msgstr "" + +msgid "git mv [<options>] <source>... <destination>" +msgstr "git mv [<опції>] <джерело>... <призначеннÑ>" + +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "" + +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "" + +#, c-format +msgid "%.*s is in index" +msgstr "" + +msgid "force move/rename even if target exists" +msgstr "" + +msgid "skip move/rename errors" +msgstr "" + +#, c-format +msgid "destination '%s' is not a directory" +msgstr "міÑце Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\" не Ñ” директорією" + +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "" + +msgid "bad source" +msgstr "невірне джерело" + +msgid "destination exists" +msgstr "" + +msgid "can not move directory into itself" +msgstr "" + +msgid "cannot move directory over file" +msgstr "" + +msgid "source directory is empty" +msgstr "" + +msgid "not under version control" +msgstr "" + +msgid "conflicted" +msgstr "" + +#, c-format +msgid "overwriting '%s'" +msgstr "" + +msgid "Cannot overwrite" +msgstr "" + +msgid "multiple sources for the same target" +msgstr "" + +msgid "destination directory does not exist" +msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ Ñ–Ñнує" + +msgid "destination exists in the index" +msgstr "Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ–Ñнує в індекÑÑ–" + +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "" + +#, c-format +msgid "Renaming %s to %s\n" +msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ %s на %s\n" + +#, c-format +msgid "renaming '%s' failed" +msgstr "" + +msgid "git name-rev [<options>] <commit>..." +msgstr "git name-rev [<опції>] <коміт>..." + +msgid "git name-rev [<options>] --all" +msgstr "git name-rev [<опції>] --all" + +msgid "git name-rev [<options>] --annotate-stdin" +msgstr "" + +msgid "print only ref-based names (no object names)" +msgstr "" + +msgid "only use tags to name the commits" +msgstr "" + +msgid "only use refs matching <pattern>" +msgstr "" + +msgid "ignore refs matching <pattern>" +msgstr "" + +msgid "list all commits reachable from all refs" +msgstr "" + +msgid "deprecated: use --annotate-stdin instead" +msgstr "" + +msgid "annotate text from stdin" +msgstr "" + +msgid "allow to print `undefined` names (default)" +msgstr "" + +msgid "dereference tags in the input (internal use)" +msgstr "" + +msgid "git notes [--ref <notes-ref>] [list [<object>]]" +msgstr "" + +msgid "" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"| (-c | -C) <object>] [<object>]" +msgstr "" + +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" +msgstr "" + +msgid "" +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"(-c | -C) <object>] [<object>]" +msgstr "" + +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" +msgstr "" + +msgid "git notes [--ref <notes-ref>] show [<object>]" +msgstr "" + +msgid "" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" +msgstr "" + +msgid "git notes [--ref <notes-ref>] remove [<object>...]" +msgstr "" + +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" +msgstr "" + +msgid "git notes [--ref <notes-ref>] get-ref" +msgstr "" + +msgid "git notes [list [<object>]]" +msgstr "" + +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<опції>] [<обʼєкт>]" + +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "" + +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "" + +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<опції>] [<обʼєкт>]" + +msgid "git notes edit [<object>]" +msgstr "" + +msgid "git notes show [<object>]" +msgstr "" + +msgid "git notes merge [<options>] <notes-ref>" +msgstr "git notes merge [<опції>] <поÑиланнÑ-нотатки>" + +msgid "git notes merge --commit [<options>]" +msgstr "" + +msgid "git notes merge --abort [<options>]" +msgstr "" + +msgid "git notes remove [<object>]" +msgstr "" + +msgid "git notes prune [<options>]" +msgstr "git notes prune [<опції>]" + +msgid "Write/edit the notes for the following object:" +msgstr "" + +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити \"show\" Ð´Ð»Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ð° \"%s\"" + +msgid "could not read 'show' output" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ вивід \"show\"" + +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ \"show\" Ð´Ð»Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ð° \"%s\"" + +msgid "please supply the note contents using either -m or -F option" +msgstr "" + +msgid "unable to write note object" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати об’єкт нотатки" + +#, c-format +msgid "the note contents have been left in %s" +msgstr "" + +#, c-format +msgid "could not open or read '%s'" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ або прочитати \"%s\"" + +#, c-format +msgid "failed to resolve '%s' as a valid ref." +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ \"%s\" Ñк припуÑтиме поÑиланнÑ." + +#, c-format +msgid "failed to read object '%s'." +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ обʼєкт \"%s\"." + +#, c-format +msgid "cannot read note data from non-blob object '%s'." +msgstr "неможливо прочитати дані нотатки з не-blob обʼєкту \"%s\"." + +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "не вдалоÑÑ Ñкопіювати нотатки з \"%s\" в \"%s\"" + +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. + +#, c-format +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "" + +#, c-format +msgid "no note found for object %s." +msgstr "Ð´Ð»Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ð° %s не знайдено жодної нотатки." + +msgid "note contents as a string" +msgstr "" + +msgid "note contents in a file" +msgstr "" + +msgid "reuse and edit specified note object" +msgstr "" + +msgid "reuse specified note object" +msgstr "" + +msgid "allow storing empty note" +msgstr "" + +msgid "replace existing notes" +msgstr "замінити Ñ–Ñнуючі нотатки" + +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "" + +#, c-format +msgid "Removing note for object %s\n" +msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð½Ð¾Ñ‚Ð°Ñ‚ÐºÐ¸ Ð´Ð»Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ð° %s\n" + +msgid "read objects from stdin" +msgstr "" + +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "" + +msgid "too few arguments" +msgstr "замало аргументів" + +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#, c-format +msgid "missing notes on source object %s. Cannot copy." +msgstr "" + +#, c-format +msgid "" +"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" +"Please use 'git notes add -f -m/-F/-c/-C' instead.\n" +msgstr "" + +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "" + +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "" + +msgid "failed to remove 'git notes merge' worktree" +msgstr "" + +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "" + +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "" + +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "" + +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "" + +msgid "failed to finalize notes merge" +msgstr "не вдалоÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ð¾Ñ‚Ð°Ñ‚Ð¾Ðº" + +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "" + +msgid "General options" +msgstr "" + +msgid "Merge options" +msgstr "" + +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" + +msgid "Committing unmerged notes" +msgstr "Ð’Ð¸ÐºÐ¾Ð½Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ незлитих нотаток" + +msgid "finalize notes merge by committing unmerged notes" +msgstr "" + +msgid "Aborting notes merge resolution" +msgstr "" + +msgid "abort notes merge" +msgstr "перервати Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ð¾Ñ‚Ð°Ñ‚Ð¾Ðº" + +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "" + +msgid "must specify a notes ref to merge" +msgstr "необхідно вказати поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð¾Ñ‚Ð°Ñ‚Ð¾Ðº Ð´Ð»Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ" + +#, c-format +msgid "unknown -s/--strategy: %s" +msgstr "" + +#, c-format +msgid "a notes merge into %s is already in-progress at %s" +msgstr "" + +#, c-format +msgid "failed to store link to current notes ref (%s)" +msgstr "не вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ ланку на поточні нотатки поÑÐ¸Ð»Ð°Ð½Ð½Ñ (%s)" + +#, c-format +msgid "" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with " +"'git notes merge --commit', or abort the merge with 'git notes merge --" +"abort'.\n" +msgstr "" + +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð²Ê¼Ñзати \"%s\" Ñк припуÑтиме поÑиланнÑ." + +#, c-format +msgid "Object %s has no note\n" +msgstr "" + +msgid "attempt to remove non-existent note is not an error" +msgstr "" + +msgid "read object names from the standard input" +msgstr "" + +msgid "do not remove, show only" +msgstr "" + +msgid "report pruned notes" +msgstr "" + +msgid "notes-ref" +msgstr "" + +msgid "use notes from <notes-ref>" +msgstr "" + +#, c-format +msgid "unknown subcommand: `%s'" +msgstr "" + +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" +msgstr "" + +msgid "" +"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" +msgstr "" + +#, c-format +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "" + +#, c-format +msgid "bad packed object CRC for %s" +msgstr "" + +#, c-format +msgid "corrupt packed object for %s" +msgstr "пошкоджений запакований обʼєкт Ð´Ð»Ñ %s" + +#, c-format +msgid "recursive delta detected for object %s" +msgstr "виÑвлено рекурÑивну дельту Ð´Ð»Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ð° %s" + +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "" + +#, c-format +msgid "expected object at offset %<PRIuMAX> in pack %s" +msgstr "очікувавÑÑ Ð¾Ð±Ê¼Ñ”ÐºÑ‚ на зміщенні %<PRIuMAX> пакунка %s" + +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" + +msgid "Writing objects" +msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ñ–Ð²" + +#, c-format +msgid "failed to stat %s" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat %s" + +#, c-format +msgid "failed utime() on %s" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ utime() на %s" + +msgid "failed to write bitmap index" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати bitmap індекÑ" + +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "" + +msgid "disabling bitmap writing, as some objects are not being packed" +msgstr "" + +#, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð´ÐµÐ»ÑŒÑ‚Ð¸ бази у пакунку Ð´Ð»Ñ %s" + +#, c-format +msgid "delta base offset out of bound for %s" +msgstr "Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð±Ð°Ð·Ð¸ дельти виходить за межі Ð´Ð»Ñ %s" + +msgid "Counting objects" +msgstr "Підрахунок обʼєктів" + +#, c-format +msgid "unable to get size of %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ розмір %s" + +#, c-format +msgid "unable to parse object header of %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ заголовок обʼєкта %s" + +#, c-format +msgid "object %s cannot be read" +msgstr "обʼєкт %s не може бути прочитаний" + +#, c-format +msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" +msgstr "" + +msgid "suboptimal pack - out of memory" +msgstr "" + +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "" + +#, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ обʼєкти, доÑтупні з тегу %s" + +#, c-format +msgid "unable to get type of object %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ тип обʼєкта %s" + +msgid "Compressing objects" +msgstr "КомпреÑÑ–Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ñ–Ð²" + +msgid "inconsistency with delta count" +msgstr "" + +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" + +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" + +#, c-format +msgid "could not get type of object %s in pack %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ тип обʼєкта %s у пакунку %s" + +#, c-format +msgid "could not find pack '%s'" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ пакунок \"%s\"" + +#, c-format +msgid "packfile %s cannot be accessed" +msgstr "" + +msgid "Enumerating cruft objects" +msgstr "ÐŸÐµÑ€ÐµÑ€Ð°Ñ…ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð°Ñ€Ð½Ð¸Ñ… обʼєктів" + +msgid "unable to add cruft objects" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ марні обʼєкти" + +msgid "Traversing cruft objects" +msgstr "ÐŸÑ€Ð¾Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ марним обʼєктам" + +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" + +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" + +msgid "could not load cruft pack .mtimes" +msgstr "" + +msgid "cannot open pack index" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ–Ð½Ð´ÐµÐºÑ Ð¿Ð°ÐºÑƒÐ½ÐºÐ°" + +#, c-format +msgid "loose object at %s could not be examined" +msgstr "" + +msgid "unable to force loose object" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¸Ð¼ÑƒÑово вивільнити обʼєкт" + +#, c-format +msgid "not a rev '%s'" +msgstr "" + +#, c-format +msgid "bad revision '%s'" +msgstr "невірна Ñ€ÐµÐ²Ñ–Ð·Ñ–Ñ \"%s\"" + +msgid "unable to add recent objects" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ нещодавні обʼєкти" + +#, c-format +msgid "unsupported index version %s" +msgstr "" + +#, c-format +msgid "bad index version '%s'" +msgstr "невірна верÑÑ–Ñ Ñ–Ð½Ð´ÐµÐºÑу \"%s\"" + +msgid "show progress meter during object writing phase" +msgstr "" + +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +msgid "<version>[,<offset>]" +msgstr "" + +msgid "write the pack index file in the specified idx format version" +msgstr "" + +msgid "maximum size of each output pack file" +msgstr "" + +msgid "ignore borrowed objects from alternate object store" +msgstr "" + +msgid "ignore packed objects" +msgstr "ігнорувати запаковані обʼєкти" + +msgid "limit pack window by objects" +msgstr "" + +msgid "limit pack window by memory in addition to object limit" +msgstr "" + +msgid "maximum length of delta chain allowed in the resulting pack" +msgstr "" + +msgid "reuse existing deltas" +msgstr "повторно викориÑтати Ñ–Ñнуючі дельти" + +msgid "reuse existing objects" +msgstr "повторно викориÑтати Ñ–Ñнуючі обʼєкти" + +msgid "use OFS_DELTA objects" +msgstr "" + +msgid "use threads when searching for best delta matches" +msgstr "" + +msgid "do not create an empty pack output" +msgstr "не Ñтворювати вивід порожнього пакунка" + +msgid "read revision arguments from standard input" +msgstr "" + +msgid "limit the objects to those that are not yet packed" +msgstr "" + +msgid "include objects reachable from any reference" +msgstr "" + +msgid "include objects referred by reflog entries" +msgstr "" + +msgid "include objects referred to by the index" +msgstr "" + +msgid "read packs from stdin" +msgstr "" + +msgid "output pack to stdout" +msgstr "" + +msgid "include tag objects that refer to objects to be packed" +msgstr "" + +msgid "keep unreachable objects" +msgstr "" + +msgid "pack loose unreachable objects" +msgstr "" + +msgid "unpack unreachable objects newer than <time>" +msgstr "" + +msgid "create a cruft pack" +msgstr "" + +msgid "expire cruft objects older than <time>" +msgstr "" + +msgid "use the sparse reachability algorithm" +msgstr "" + +msgid "create thin packs" +msgstr "Ñтворити тонкі пакунки" + +msgid "create packs suitable for shallow fetches" +msgstr "" + +msgid "ignore packs that have companion .keep file" +msgstr "" + +msgid "ignore this pack" +msgstr "ігнорувати цей пакунок" + +msgid "pack compression level" +msgstr "" + +msgid "do not hide commits by grafts" +msgstr "" + +msgid "use a bitmap index if available to speed up counting objects" +msgstr "" + +msgid "write a bitmap index together with the pack index" +msgstr "" + +msgid "write a bitmap index if possible" +msgstr "" + +msgid "handling for missing objects" +msgstr "обробка Ð´Ð»Ñ Ð²Ñ–Ð´Ñутніх обʼєктів" + +msgid "do not pack objects in promisor packfiles" +msgstr "" + +msgid "respect islands during delta compression" +msgstr "" + +msgid "protocol" +msgstr "" + +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" + +#, c-format +msgid "delta chain depth %d is too deep, forcing %d" +msgstr "" + +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "" + +#, c-format +msgid "bad pack compression level %d" +msgstr "" + +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "" + +msgid "minimum pack size limit is 1 MiB" +msgstr "" + +msgid "--thin cannot be used to build an indexable pack" +msgstr "" + +msgid "cannot use --filter without --stdout" +msgstr "" + +msgid "cannot use --filter with --stdin-packs" +msgstr "" + +msgid "cannot use internal rev list with --stdin-packs" +msgstr "" + +msgid "cannot use internal rev list with --cruft" +msgstr "" + +msgid "cannot use --stdin-packs with --cruft" +msgstr "" + +msgid "cannot use --max-pack-size with --cruft" +msgstr "" + +msgid "Enumerating objects" +msgstr "ÐŸÐµÑ€ÐµÑ€Ð°Ñ…ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ñ–Ð²" + +#, c-format +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" +msgstr "" + +msgid "" +"'git pack-redundant' is nominated for removal.\n" +"If you still use this command, please add an extra\n" +"option, '--i-still-use-this', on the command line\n" +"and let us know you still use it by sending an e-mail\n" +"to <git@vger.kernel.org>. Thanks.\n" +msgstr "" + +msgid "refusing to run without --i-still-use-this" +msgstr "" + +msgid "git pack-refs [--all] [--no-prune]" +msgstr "" + +msgid "pack everything" +msgstr "" + +msgid "prune loose refs (default)" +msgstr "видалити вивільнені поÑÐ¸Ð»Ð°Ð½Ð½Ñ (за замовчуваннÑм)" + +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "" + +msgid "use the unstable patch-id algorithm" +msgstr "" + +msgid "use the stable patch-id algorithm" +msgstr "" + +msgid "don't strip whitespace from the patch" +msgstr "" + +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "" + +msgid "report pruned objects" +msgstr "" + +msgid "expire objects older than <time>" +msgstr "" + +msgid "limit traversal to objects outside promisor packfiles" +msgstr "" + +msgid "cannot prune in a precious-objects repo" +msgstr "неможливо виконати Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð² precious-objects Ñховищі" + +msgid "git pull [<options>] [<repository> [<refspec>...]]" +msgstr "git pull [<опції>] [<Ñховище> [<визначник поÑиланнÑ>...]]" + +msgid "control for recursive fetching of submodules" +msgstr "ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ Ñ€ÐµÐºÑƒÑ€Ñивним отриманнÑм підмодулів" + +msgid "Options related to merging" +msgstr "" + +msgid "incorporate changes by rebasing rather than merging" +msgstr "" + +msgid "allow fast-forward" +msgstr "" + +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "" + +msgid "automatically stash/stash pop before and after" +msgstr "" + +msgid "Options related to fetching" +msgstr "" + +msgid "force overwrite of local branch" +msgstr "" + +msgid "number of submodules pulled in parallel" +msgstr "кількіÑÑ‚ÑŒ підмодулів, що затÑгуютьÑÑ Ð¿Ð°Ñ€Ð°Ð»ÐµÐ»ÑŒÐ½Ð¾" + +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +msgstr "" + +msgid "" +"There are no candidates for merging among the refs that you just fetched." +msgstr "" + +msgid "" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" + +#, 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 "" + +msgid "You are not currently on a branch." +msgstr "Ðаразі ви не на гілці." + +msgid "Please specify which branch you want to rebase against." +msgstr "" + +msgid "Please specify which branch you want to merge with." +msgstr "" + +msgid "See git-pull(1) for details." +msgstr "" + +msgid "<remote>" +msgstr "" + +msgid "<branch>" +msgstr "<гілка>" + +msgid "There is no tracking information for the current branch." +msgstr "" + +msgid "" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "" + +#, c-format +msgid "" +"Your configuration specifies to merge with the ref '%s'\n" +"from the remote, but no such ref was fetched." +msgstr "" + +#, c-format +msgid "unable to access commit %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до коміту %s" + +msgid "ignoring --verify-signatures for rebase" +msgstr "" + +msgid "" +"You have divergent branches and need to specify how to reconcile them.\n" +"You can do so by running one of the following commands sometime before\n" +"your next pull:\n" +"\n" +" git config pull.rebase false # merge\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" + +msgid "Updating an unborn branch with changes added to the index." +msgstr "" + +msgid "pull with rebase" +msgstr "" + +msgid "Please commit or stash them." +msgstr "" + +#, c-format +msgid "" +"fetch updated the current branch head.\n" +"fast-forwarding your working tree from\n" +"commit %s." +msgstr "" + +#, c-format +msgid "" +"Cannot fast-forward your working tree.\n" +"After making sure that you saved anything precious from\n" +"$ git diff %s\n" +"output, run\n" +"$ git reset --hard\n" +"to recover." +msgstr "" + +msgid "Cannot merge multiple branches into empty head." +msgstr "" + +msgid "Cannot rebase onto multiple branches." +msgstr "" + +msgid "Cannot fast-forward to multiple branches." +msgstr "" + +msgid "Need to specify how to reconcile divergent branches." +msgstr "" + +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "" + +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<опції>] [<Ñховище> [<визначник поÑиланнÑ>...]]" + +msgid "tag shorthand without <tag>" +msgstr "ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÐ³Ñƒ без <тег>" + +msgid "--delete only accepts plain target ref names" +msgstr "--delete приймає лише проÑÑ‚Ñ– назви поÑилань" + +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'.\n" +msgstr "" +"\n" +"Щоб обрати будь-Ñку з опцій поÑтійною, ÑкориÑтайтеÑÑŒ опцією push.default у " +"'git help config'.\n" + +msgid "" +"\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" +"in 'git help config'.\n" +msgstr "" +"\n" +"Щоб уникнути автоматичного Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ñ–Ð»ÐºÐ¸ перводжерельного Ñховища, Ñкщо " +"Ñ—Ñ— назва\n" +"не збігаєтьÑÑ Ð· назвою локальної гілки, ÑкориÑтайтеÑÑŒ опцією 'simple' Ð´Ð»Ñ " +"branch.autoSetupMerge\n" +"у “git help configâ€.\n" + +#, c-format +msgid "" +"The upstream branch of your current branch does not match\n" +"the name of your current branch. To push to the upstream branch\n" +"on the remote, use\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"To push to the branch of the same name on the remote, use\n" +"\n" +" git push %s HEAD\n" +"%s%s" +msgstr "" +"Ðазва гілки перводжерельного Ñховища Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ñ— поточної гілки не збігаєтьÑÑ " +"з\n" +"назвою вашої поточної гілки. Щоб надіÑлати до гілки\n" +"першоджерельного Ñховища, ÑкориÑтайтеÑÑŒ командою\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"Щоб надіÑлати до однойменної гілки на віддаленому Ñервері ÑкориÑтайтеÑÑŒ\n" +"\n" +" git push %s HEAD\n" +"%s%s" + +#, c-format +msgid "" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" +msgstr "" +"Ви зараз не перебуваєте на гілці.\n" +"Щоб надіÑлати Ñ–Ñторію, що веде до поточного (відокремленого HEAD)\n" +"Ñтану, ÑкориÑтайтеÑÑŒ командою\n" +"\n" +" git push %s HEAD:<назва-віддаленої-гілки>\n" + +msgid "" +"\n" +"To have this happen automatically for branches without a tracking\n" +"upstream, see 'push.autoSetupRemote' in 'git help config'.\n" +msgstr "" +"\n" +"Щоб це відбувалоÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ Ð´Ð»Ñ Ð½ÐµÐ²Ñ–Ð´Ñтежуваних гілок\n" +"першоджерельного Ñховища, дивітьÑÑ 'push.autoSetupRemote' у 'git help " +"config'.\n" + +#, c-format +msgid "" +"The current branch %s has no upstream branch.\n" +"To push the current branch and set the remote as upstream, use\n" +"\n" +" git push --set-upstream %s %s\n" +"%s" +msgstr "" +"Поточна гілка %s не має гілки у першоджeрельному Ñховищі.\n" +"Щоб надіÑлати поточну гілку Ñ– вÑтановити віддалене Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ " +"першоджерельним Ñховищем, ÑкориÑтайтеÑÑ\n" +"\n" +" git push --set-upstream %s %s\n" +"%s" + +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "Поточна гілка %s має декілька виÑхідних гілок, відмова надÑиланнÑ." + +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Ви не вказали жодних визначників поÑилань Ð´Ð»Ñ Ð½Ð°Ð´ÑиланнÑ, Ñ– push.default " +"дорівнює \"nothing\"." + +#, c-format +msgid "" +"You are pushing to remote '%s', which is not the upstream of\n" +"your current branch '%s', without telling me what to push\n" +"to update which remote branch." +msgstr "" +"Ви надÑилаєте до віддаленої гілки '%s', Ñка не Ñ” першоджерелом\n" +"вашої поточної гілки '%s', не кажучі мені, що надÑилати\n" +"Ñ– Ñку віддалену гілку оновлювати." + +msgid "" +"Updates were rejected because the tip of your current branch is behind\n" +"its remote counterpart. Integrate the remote changes (e.g.\n" +"'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ відхилено, оÑкільки верхівка вашої поточної гілки знаходитьÑÑ " +"позаду\n" +"Ñ—Ñ— віддаленого аналога. Інтегруйте віддалені зміни (наприклад, через\n" +"'git pull ...') перед повторним надÑиланнÑм.\n" +"Докладніше у \"Примітці про перемотуваннÑ\" команди \"git push --help\"." + +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. Check out this branch and integrate the remote changes\n" +"(e.g. 'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ відхилено, оÑкільки верхівка вашої поточної гілки знаходитьÑÑ " +"позаду\n" +"Ñ—Ñ— віддаленого аналога. СтÑгнить цю гілку та інтегруйте віддалені зміни\n" +"(наприклад, через 'git pull...') перед повторним надÑиланнÑм.\n" +"Докладніше у \"Примітці про перемотуваннÑ\" команди \"git push --help\"." + +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first integrate the remote changes\n" +"(e.g., 'git pull ...') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ відхилено, оÑкільки у віддаленому Ñховищі міÑтитьÑÑ Ñ€Ð¾Ð±Ð¾Ñ‚Ð°, " +"Ñкої\n" +"немає локально. Зазвичай це ÑтаєтьÑÑ, коли інше Ñховище надÑилає\n" +"до того Ñамого поÑиланнÑ. Можливо, вам Ñлід Ñпочатку інтегрувати віддалені " +"зміни\n" +"(наприклад, через 'git pull ...') перед повторним надÑиланнÑм.\n" +"Докладніше у \"Примітці про перемотуваннÑ\" команди \"git push --help\"." + +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "" +"ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ відхилено, оÑкільки тег вже Ñ–Ñнує на віддаленому Ñховищі." + +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"Ви не можете оновити віддалене поÑиланнÑ, Ñке вказує на об’єкт, що не Ñ” " +"об’єктом коміту,\n" +"або оновити віддалене поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ‚Ð°Ðº, щоб воно вказувало на об’єкт, що не Ñ” " +"об’єктом коміту,\n" +"без викориÑÑ‚Ð°Ð½Ð½Ñ Ð¾Ð¿Ñ†Ñ–Ñ— '--force'.\n" + +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ відхилено, оÑкільки верхівка віддалено відÑтежуваної \n" +"гілки була оновлена з моменту оÑтаннього ÑÑ‚ÑгуваннÑ. Можливо, ви захочете\n" +"інтегрувати ці зміни локально (наприклад, через 'git pull ...')\n" +"перед примуÑовим оновленнÑм.\n" + +#, c-format +msgid "Pushing to %s\n" +msgstr "ÐадÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð¾ %s\n" + +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "не вдалоÑÑ Ð½Ð°Ð´Ñ–Ñлати деÑкі поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð¾ '%s'" + +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"рекурÑÑ–Ñ Ð² підмодулі з push.recurseSubmodules=only; натоміÑÑ‚ÑŒ викориÑтовую " +"on-demand" + +#, c-format +msgid "invalid value for '%s'" +msgstr "неприпуÑтиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ '%s'" + +msgid "repository" +msgstr "Ñховище" + +msgid "push all branches" +msgstr "надіÑлати вÑÑ– гілки" + +msgid "mirror all refs" +msgstr "віддзеркалити вÑÑ– поÑиланнÑ" + +msgid "delete refs" +msgstr "видалити поÑиланнÑ" + +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "надіÑлати теги (не може бути викориÑтано з --all, --branches або --mirror)" + +msgid "force updates" +msgstr "оновити примуÑово" + +msgid "<refname>:<expect>" +msgstr "<refname>:<expect>" + +msgid "require old value of ref to be at this value" +msgstr "вимагати, щоб Ñтаре Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð±ÑƒÐ»Ð¾ рівним цьому значенню" + +msgid "require remote updates to be integrated locally" +msgstr "вимагати локальної інтеграції віддалених оновлень" + +msgid "control recursive pushing of submodules" +msgstr "контролювати рекурÑивне надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ–Ð²" + +msgid "use thin pack" +msgstr "викориÑтовуйте тонке пакуваннÑ" + +msgid "receive pack program" +msgstr "отримати пакетну програму" + +msgid "set upstream for git pull/status" +msgstr "вÑтановити першоджерельне Ñховище Ð´Ð»Ñ git pull/status" + +msgid "prune locally removed refs" +msgstr "обрізати локально видалені поÑиланнÑ" + +msgid "bypass pre-push hook" +msgstr "обійти pre-push гачок" + +msgid "push missing but relevant tags" +msgstr "надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ñутнє, але Ñ” релевантні теги" + +msgid "GPG sign the push" +msgstr "підпиÑати надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð·Ð° допомогою GPG" + +msgid "request atomic transaction on remote side" +msgstr "запроÑити атомарну транзакцію на віддаленій Ñтороні" + +msgid "--delete doesn't make sense without any refs" +msgstr "--delete не має ÑенÑу без рефів" + +#, c-format +msgid "bad repository '%s'" +msgstr "невірне Ñховище \"%s\"" + +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Ðемає налаштованого міÑÑ†Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ð´ÑиланнÑ.\n" +"Ðбо зазначте URL-адреÑу з командного Ñ€Ñдка, або налаштуйте віддалене Ñховище " +"за допомогою\n" +"\n" +" git remote add <назва> <адреÑа>\n" +"\n" +"а потім виконайте надÑиланнÑ, викориÑтовуючи назву віддаленого Ñховища\n" +"\n" +" git push <ім'Ñ>\n" + +msgid "--all can't be combined with refspecs" +msgstr "--all не можна комбінувати з визначниками поÑилань" + +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror не можна комбінувати з визначниками поÑилань" + +msgid "push options must not have new line characters" +msgstr "опції push не можуть міÑтити Ñимволи нового Ñ€Ñдка" + +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "" + +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "" + +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "" + +msgid "use simple diff colors" +msgstr "" + +msgid "notes" +msgstr "" + +msgid "passed to 'git log'" +msgstr "" + +msgid "only emit output related to the first range" +msgstr "" + +msgid "only emit output related to the second range" +msgstr "" + +#, c-format +msgid "not a revision: '%s'" +msgstr "не Ñ” ревізією: \"%s\"" + +#, c-format +msgid "not a commit range: '%s'" +msgstr "не діапазон комітів: \"%s\"" + +#, c-format +msgid "not a symmetric range: '%s'" +msgstr "не Ñиметричний діапазон: \"%s\"" + +msgid "need two commit ranges" +msgstr "потрібно два діапазони комітів" + +msgid "" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" + +msgid "write resulting index to <file>" +msgstr "" + +msgid "only empty the index" +msgstr "тільки очиÑтити індекÑ" + +msgid "Merging" +msgstr "" + +msgid "perform a merge in addition to a read" +msgstr "виконати Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ð° додачу до читаннÑ" + +msgid "3-way merge if no file level merging required" +msgstr "" + +msgid "3-way merge in presence of adds and removes" +msgstr "" + +msgid "same as -m, but discard unmerged entries" +msgstr "те Ñаме, що й -m, але відкидає незлиті запиÑи" + +msgid "<subdirectory>/" +msgstr "" + +msgid "read the tree into the index under <subdirectory>/" +msgstr "" + +msgid "update working tree with merge result" +msgstr "" + +msgid "gitignore" +msgstr "" + +msgid "allow explicitly ignored files to be overwritten" +msgstr "" + +msgid "don't check the working tree after merging" +msgstr "не перевірÑти робоче дерево піÑÐ»Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ" + +msgid "don't update the index or the work tree" +msgstr "" + +msgid "skip applying sparse checkout filter" +msgstr "пропуÑтити заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ sparse checkout фільтра" + +msgid "debug unpack-trees" +msgstr "" + +msgid "suppress feedback messages" +msgstr "" + +msgid "You need to resolve your current index first" +msgstr "Спочатку вам потрібно розвʼÑзати поточний індекÑ" + +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" +msgstr "" + +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" +msgstr "" + +#, c-format +msgid "could not read '%s'." +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ \"%s\"." + +#, c-format +msgid "could not create temporary %s" +msgstr "не вдалоÑÑ Ñтворити тимчаÑовий %s" + +msgid "could not mark as interactive" +msgstr "не вдалоÑÑ Ð¿Ð¾Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ Ñк інтерактивний" + +msgid "could not generate todo list" +msgstr "не вдалоÑÑ Ñтворити ÑпиÑок Ñправ" + +msgid "a base commit must be provided with --upstream or --onto" +msgstr "" + +#, c-format +msgid "%s requires the merge backend" +msgstr "" + +#, c-format +msgid "invalid onto: '%s'" +msgstr "неприпуÑтимий onto: \"%s\"" + +#, c-format +msgid "invalid orig-head: '%s'" +msgstr "неприпуÑтимий orig-head: \"%s\"" + +#, c-format +msgid "ignoring invalid allow_rerere_autoupdate: '%s'" +msgstr "" + +#, c-format +msgid "could not remove '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\"" + +msgid "" +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." +msgstr "" + +#, c-format +msgid "" +"\n" +"git encountered an error while preparing the patches to replay\n" +"these revisions:\n" +"\n" +" %s\n" +"\n" +"As a result, git cannot rebase them." +msgstr "" + +#, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "" + +#, c-format +msgid "could not switch to %s" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑŒ на %s" + +msgid "apply options and merge options cannot be used together" +msgstr "apply опції не можна викориÑтовувати разом з merge опціÑми" + +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " +"\"ask\"." +msgstr "" + +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" + +#, c-format +msgid "" +"%s\n" +"Please specify which branch you want to rebase against.\n" +"See git-rebase(1) for details.\n" +"\n" +" git rebase '<branch>'\n" +"\n" +msgstr "" + +#, c-format +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" +"\n" +msgstr "" +"Якщо ви бажаєте налаштувати відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— гілки, ви можете зробити " +"це за допомогою:\n" +"\n" +" git branch --set-upstream-to=%s/<гілка> %s\n" +"\n" + +msgid "exec commands cannot contain newlines" +msgstr "" + +msgid "empty exec command" +msgstr "" + +msgid "rebase onto given branch instead of upstream" +msgstr "" + +msgid "use the merge-base of upstream and branch as the current base" +msgstr "" + +msgid "allow pre-rebase hook to run" +msgstr "" + +msgid "be quiet. implies --no-stat" +msgstr "" + +msgid "display a diffstat of what changed upstream" +msgstr "" + +msgid "do not show diffstat of what changed upstream" +msgstr "" + +msgid "add a Signed-off-by trailer to each commit" +msgstr "" + +msgid "make committer date match author date" +msgstr "" + +msgid "ignore author date and use current date" +msgstr "" + +msgid "synonym of --reset-author-date" +msgstr "" + +msgid "passed to 'git apply'" +msgstr "" + +msgid "ignore changes in whitespace" +msgstr "" + +msgid "cherry-pick all commits, even if unchanged" +msgstr "" + +msgid "continue" +msgstr "" + +msgid "skip current patch and continue" +msgstr "" + +msgid "abort and check out the original branch" +msgstr "перервати Ñ– перейти до початкової гілки" + +msgid "abort but keep HEAD where it is" +msgstr "" + +msgid "edit the todo list during an interactive rebase" +msgstr "" + +msgid "show the patch file being applied or merged" +msgstr "" + +msgid "use apply strategies to rebase" +msgstr "" + +msgid "use merging strategies to rebase" +msgstr "" + +msgid "let the user edit the list of commits to rebase" +msgstr "" + +msgid "(REMOVED) was: try to recreate merges instead of ignoring them" +msgstr "" + +msgid "how to handle commits that become empty" +msgstr "" + +msgid "keep commits which start empty" +msgstr "" + +msgid "move commits that begin with squash!/fixup! under -i" +msgstr "" + +msgid "update branches that point to commits that are being rebased" +msgstr "" + +msgid "add exec lines after each commit of the editable list" +msgstr "" + +msgid "allow rebasing commits with empty messages" +msgstr "" + +msgid "try to rebase merges instead of skipping them" +msgstr "" + +msgid "use 'merge-base --fork-point' to refine upstream" +msgstr "" +"викориÑтовуйте \"merge-base --fork-point\" Ð´Ð»Ñ ÑƒÑ‚Ð¾Ñ‡Ð½ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð´Ð¶ÐµÑ€ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ " +"Ñховища" + +msgid "use the given merge strategy" +msgstr "" + +msgid "option" +msgstr "" + +msgid "pass the argument through to the merge strategy" +msgstr "" + +msgid "rebase all reachable commits up to the root(s)" +msgstr "" + +msgid "automatically re-schedule any `exec` that fails" +msgstr "" + +msgid "apply all changes, even those already present upstream" +msgstr "" + +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "" + +msgid "" +"`rebase --preserve-merges` (-p) is no longer supported.\n" +"Use `git rebase --abort` to terminate current rebase.\n" +"Or downgrade to v2.33, or earlier, to complete the rebase." +msgstr "" + +msgid "" +"--preserve-merges was replaced by --rebase-merges\n" +"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" +"which is no longer supported; use 'merges' instead" +msgstr "" + +msgid "No rebase in progress?" +msgstr "ÐŸÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ відбуваєтьÑÑ?" + +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "" + +msgid "Cannot read HEAD" +msgstr "" + +msgid "" +"You must edit all merge conflicts and then\n" +"mark them as resolved using git add" +msgstr "" + +msgid "could not discard worktree changes" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÐ¸Ð½ÑƒÑ‚Ð¸ зміни робочого дерева" + +#, c-format +msgid "could not move back to %s" +msgstr "не вдалоÑÑ Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ÑÑ Ð´Ð¾ %s" + +#, c-format +msgid "" +"It seems that there is already a %s directory, and\n" +"I wonder if you are in the middle of another rebase. If that is the\n" +"case, please try\n" +"\t%s\n" +"If that is not the case, please\n" +"\t%s\n" +"and run me again. I am stopping in case you still have something\n" +"valuable there.\n" +msgstr "" + +msgid "switch `C' expects a numerical value" +msgstr "" + +msgid "--strategy requires --merge or --interactive" +msgstr "" + +msgid "" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" +"autosquash" +msgstr "" + +msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "" + +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "" + +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "" + +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "" + +#, c-format +msgid "invalid upstream '%s'" +msgstr "неприпуÑтиме першоджерельне Ñховище \"%s\"" + +msgid "Could not create new root commit" +msgstr "Ðе вдалоÑÑ Ñтворити новий кореневий коміт" + +#, c-format +msgid "no such branch/commit '%s'" +msgstr "немає такої гілки/коміту \"%s\"" + +#, c-format +msgid "No such ref: %s" +msgstr "Ðемає такого поÑиланнÑ: %s" + +msgid "Could not resolve HEAD to a commit" +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð²Ê¼Ñзати HEAD у коміт" + +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "" + +#, c-format +msgid "'%s': need exactly one merge base" +msgstr "" + +#, c-format +msgid "Does not point to a valid commit '%s'" +msgstr "Ðе вказує на припуÑтимий коміт \"%s\"" + +msgid "HEAD is up to date." +msgstr "HEAD знаходитьÑÑ Ð² актуальному Ñтані." + +#, c-format +msgid "Current branch %s is up to date.\n" +msgstr "Поточна гілка %s знаходитьÑÑ Ð² актуальному Ñтані.\n" + +msgid "HEAD is up to date, rebase forced." +msgstr "" + +#, c-format +msgid "Current branch %s is up to date, rebase forced.\n" +msgstr "" +"Поточна гілка %s знаходитьÑÑ Ð² актуальному Ñтані, перебазовуйте примуÑово.\n" + +msgid "The pre-rebase hook refused to rebase." +msgstr "" + +#, c-format +msgid "Changes to %s:\n" +msgstr "Зміни у %s:\n" + +#, c-format +msgid "Changes from %s to %s:\n" +msgstr "" + +#, c-format +msgid "First, rewinding head to replay your work on top of it...\n" +msgstr "" + +msgid "Could not detach HEAD" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸ HEAD" + +#, c-format +msgid "Fast-forwarded %s to %s.\n" +msgstr "" + +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <git-директоріÑ>" + +msgid "" +"By default, updating the current branch in a non-bare repository\n" +"is denied, because it will make the index and work tree inconsistent\n" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set the 'receive.denyCurrentBranch' configuration variable\n" +"to 'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "" + +msgid "" +"By default, deleting the current branch is denied, because the next\n" +"'git clone' won't result in any file checked out, causing confusion.\n" +"\n" +"You can set 'receive.denyDeleteCurrent' configuration variable to\n" +"'warn' or 'ignore' in the remote repository to allow deleting the\n" +"current branch, with or without a warning message.\n" +"\n" +"To squelch this message, you can set it to 'refuse'." +msgstr "" + +msgid "quiet" +msgstr "" + +msgid "you must specify a directory" +msgstr "необхідно вказати директорію" + +msgid "git reflog [show] [<log-options>] [<ref>]" +msgstr "git reflog [show] [<лог-опції>] [<поÑиланнÑ>]" + +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" +" [--rewrite] [--updateref] [--stale-fix]\n" +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | " +"<refs>...]" +msgstr "" + +msgid "" +"git reflog delete [--rewrite] [--updateref]\n" +" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." +msgstr "" + +msgid "git reflog exists <ref>" +msgstr "" + +#, c-format +msgid "invalid timestamp '%s' given to '--%s'" +msgstr "неприпуÑтима позначка чаÑу \"%s\" передана до \"--%s\"" + +msgid "do not actually prune any entries" +msgstr "" + +msgid "" +"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it" +msgstr "" + +msgid "update the reference to the value of the top reflog entry" +msgstr "" + +msgid "print extra information on screen" +msgstr "" + +msgid "timestamp" +msgstr "позначка чаÑу" + +msgid "prune entries older than the specified time" +msgstr "" + +msgid "" +"prune entries older than <time> that are not reachable from the current tip " +"of the branch" +msgstr "" + +msgid "prune any reflog entries that point to broken commits" +msgstr "" + +msgid "process the reflogs of all references" +msgstr "" + +msgid "limits processing to reflogs from the current worktree only" +msgstr "" + +#, c-format +msgid "Marking reachable objects..." +msgstr "" + +#, c-format +msgid "%s points nowhere!" +msgstr "" + +msgid "no reflog specified to delete" +msgstr "" + +#, c-format +msgid "invalid ref format: %s" +msgstr "неприпуÑтимий формат поÑиланнÑ: %s" + +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" + +msgid "git remote rename [--[no-]progress] <old> <new>" +msgstr "" + +msgid "git remote remove <name>" +msgstr "" + +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" +msgstr "" + +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "" + +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "" + +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" + +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "" + +msgid "git remote get-url [--push] [--all] <name>" +msgstr "" + +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "" + +msgid "git remote set-url --add <name> <newurl>" +msgstr "" + +msgid "git remote set-url --delete <name> <url>" +msgstr "" + +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<опції>] <назва> <url>" + +msgid "git remote set-branches <name> <branch>..." +msgstr "" + +msgid "git remote set-branches --add <name> <branch>..." +msgstr "" + +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<опції>] <назва>" + +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<опції>] <назва>" + +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<опції>] [<група> | <віддаленe-призначеннÑ>]..." + +#, c-format +msgid "Updating %s" +msgstr "" + +#, c-format +msgid "Could not fetch %s" +msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ %s" + +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" + +#, c-format +msgid "unknown mirror argument: %s" +msgstr "" + +msgid "fetch the remote branches" +msgstr "" + +msgid "import all tags and associated objects when fetching" +msgstr "" + +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "" + +msgid "branch(es) to track" +msgstr "" + +msgid "master branch" +msgstr "master гілка" + +msgid "set up remote as a mirror to push to or fetch from" +msgstr "" + +msgid "specifying a master branch makes no sense with --mirror" +msgstr "" + +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "" + +#, c-format +msgid "remote %s already exists." +msgstr "віддалений %s вже Ñ–Ñнує." + +#, c-format +msgid "Could not setup master '%s'" +msgstr "Ðе вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ master \"%s\"" + +#, c-format +msgid "more than one %s" +msgstr "" + +#, c-format +msgid "unhandled branch.%s.rebase=%s; assuming 'true'" +msgstr "" + +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð±Ñ€Ð°Ñ‚Ð¸ карту Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð½Ð¸ÐºÐ° поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +msgid "(matching)" +msgstr "" + +msgid "(delete)" +msgstr "(видалити)" + +#, c-format +msgid "could not set '%s'" +msgstr "не вдалоÑÑ Ð²Ñтановити \"%s\"" + +#, c-format +msgid "could not unset '%s'" +msgstr "не вдалоÑÑ Ñкинути \"%s\"" + +#, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" + +#, c-format +msgid "No such remote: '%s'" +msgstr "Ðемає такого віддаленого призначеннÑ: \"%s\"" + +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ розділ конфігурації з \"%s\" на \"%s\"" + +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "" + +msgid "Renaming remote references" +msgstr "" + +#, c-format +msgid "deleting '%s' failed" +msgstr "" + +#, c-format +msgid "creating '%s' failed" +msgstr "" + +msgid "" +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" +"to delete it, use:" +msgid_plural "" +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" +"to delete them, use:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñекцію конфігурації \"%s\"" + +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr "" + +msgid " tracked" +msgstr " відÑтежуєтьÑÑ" + +msgid " skipped" +msgstr "" + +msgid " stale (use 'git remote prune' to remove)" +msgstr "" + +msgid " ???" +msgstr "" + +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "" + +#, c-format +msgid "rebases interactively onto remote %s" +msgstr "перебазувати інтерактивно у віддалену %s" + +#, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "" + +#, c-format +msgid "rebases onto remote %s" +msgstr "" + +#, c-format +msgid " merges with remote %s" +msgstr "" + +#, c-format +msgid "merges with remote %s" +msgstr "" + +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "" + +msgid "create" +msgstr "" + +msgid "delete" +msgstr "видалити" + +msgid "up to date" +msgstr "в актуальному Ñтані" + +msgid "fast-forwardable" +msgstr "" + +msgid "local out of date" +msgstr "" + +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr "" + +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr "" + +#, c-format +msgid " %-*s forces to %s" +msgstr "" + +#, c-format +msgid " %-*s pushes to %s" +msgstr "" + +msgid "do not query remotes" +msgstr "" + +#, c-format +msgid "* remote %s" +msgstr "" + +#, c-format +msgid " Fetch URL: %s" +msgstr "" + +msgid "(no URL)" +msgstr "" + +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. + +#, c-format +msgid " Push URL: %s" +msgstr "" + +#, c-format +msgid " HEAD branch: %s" +msgstr " HEAD гілка: %s" + +msgid "(not queried)" +msgstr "" + +msgid "(unknown)" +msgstr "(невідомо)" + +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" + +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Віддалена гілка:%s" +msgstr[1] " Віддалені гілки:%s" +msgstr[2] " Віддалених гілок:%s" + +msgid " (status not queried)" +msgstr "" + +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid " Local refs will be mirrored by 'git push'" +msgstr "" + +#, c-format +msgid " Local ref configured for 'git push'%s:" +msgid_plural " Local refs configured for 'git push'%s:" +msgstr[0] " Локальне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ \"git push\"%s:" +msgstr[1] " Локальних поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ \"git push\"%s:" +msgstr[2] " Локальних поÑилань налаштовано Ð´Ð»Ñ \"git push\"%s:" + +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "" + +msgid "delete refs/remotes/<name>/HEAD" +msgstr "" + +msgid "Cannot determine remote HEAD" +msgstr "" + +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "" + +#, c-format +msgid "Could not delete %s" +msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s" + +#, c-format +msgid "Not a valid ref: %s" +msgstr "Ðе Ñ” припуÑтимим поÑиланнÑм: %s" + +#, c-format +msgid "Could not setup %s" +msgstr "Ðе вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ %s" + +#, c-format +msgid " %s will become dangling!" +msgstr "" + +#, c-format +msgid " %s has become dangling!" +msgstr "" + +#, c-format +msgid "Pruning %s" +msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ %s" + +#, c-format +msgid "URL: %s" +msgstr "" + +#, c-format +msgid " * [would prune] %s" +msgstr "" + +#, c-format +msgid " * [pruned] %s" +msgstr "" + +msgid "prune remotes after fetching" +msgstr "" + +#, c-format +msgid "No such remote '%s'" +msgstr "Ðемає такого віддаленого Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\"" + +msgid "add branch" +msgstr "додати гілку" + +msgid "no remote specified" +msgstr "" + +msgid "query push URLs rather than fetch URLs" +msgstr "" + +msgid "return all URLs" +msgstr "" + +#, c-format +msgid "no URLs configured for remote '%s'" +msgstr "не налаштовано URL-адреÑи Ð´Ð»Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ \"%s\"" + +msgid "manipulate push URLs" +msgstr "" + +msgid "add URL" +msgstr "" + +msgid "delete URLs" +msgstr "видалити URL-адреÑи" + +msgid "--add --delete doesn't make sense" +msgstr "--add --delete не має ÑенÑу" + +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "" + +#, c-format +msgid "No such URL found: %s" +msgstr "" + +msgid "Will not delete all non-push URLs" +msgstr "" + +msgid "be verbose; must be placed before a subcommand" +msgstr "" + +msgid "git repack [<options>]" +msgstr "git repack [<опції>]" + +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writeBitmaps configuration." +msgstr "" + +msgid "could not start pack-objects to repack promisor objects" +msgstr "" + +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" + +msgid "could not finish pack-objects to repack promisor objects" +msgstr "" + +#, c-format +msgid "cannot open index for %s" +msgstr "неможливо відкрити Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ %s" + +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "" + +#, c-format +msgid "pack %s too large to roll up" +msgstr "" + +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "" + +msgid "could not close refs snapshot tempfile" +msgstr "" + +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ заÑтарілий bitmap: %s" + +msgid "pack everything in a single pack" +msgstr "" + +msgid "same as -a, and turn unreachable objects loose" +msgstr "" + +msgid "same as -a, pack unreachable cruft objects separately" +msgstr "" + +msgid "approxidate" +msgstr "" + +msgid "with --cruft, expire objects older than this" +msgstr "" + +msgid "remove redundant packs, and run git-prune-packed" +msgstr "" + +msgid "pass --no-reuse-delta to git-pack-objects" +msgstr "" + +msgid "pass --no-reuse-object to git-pack-objects" +msgstr "" + +msgid "do not run git-update-server-info" +msgstr "" + +msgid "pass --local to git-pack-objects" +msgstr "" + +msgid "write bitmap index" +msgstr "запиÑати bitmap індекÑ" + +msgid "pass --delta-islands to git-pack-objects" +msgstr "" + +msgid "with -A, do not loosen objects older than this" +msgstr "" + +msgid "with -a, repack unreachable objects" +msgstr "" + +msgid "size of the window used for delta compression" +msgstr "" + +msgid "bytes" +msgstr "" + +msgid "same as the above, but limit memory size instead of entries count" +msgstr "" + +msgid "limits the maximum delta depth" +msgstr "" + +msgid "limits the maximum number of threads" +msgstr "" + +msgid "maximum size of each packfile" +msgstr "" + +msgid "repack objects in packs marked with .keep" +msgstr "" + +msgid "do not repack this pack" +msgstr "" + +msgid "find a geometric progression with factor <N>" +msgstr "" + +msgid "write a multi-pack index of the resulting packs" +msgstr "" + +msgid "pack prefix to store a pack containing pruned objects" +msgstr "" + +msgid "cannot delete packs in a precious-objects repo" +msgstr "" + +msgid "Nothing new to pack." +msgstr "" + +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ Ð¿Ð°ÐºÑƒÐ½ÐºÑƒ %s не починаєтьÑÑ Ð· objdir %s" + +#, c-format +msgid "renaming pack to '%s' failed" +msgstr "" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "" + +#, c-format +msgid "could not unlink: %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸ %s" + +msgid "git replace [-f] <object> <replacement>" +msgstr "" + +msgid "git replace [-f] --edit <object>" +msgstr "" + +msgid "git replace [-f] --graft <commit> [<parent>...]" +msgstr "" + +msgid "git replace -d <object>..." +msgstr "" + +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "" + +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" + +#, c-format +msgid "replace ref '%s' not found" +msgstr "" + +#, c-format +msgid "Deleted replace ref '%s'" +msgstr "" + +#, c-format +msgid "'%s' is not a valid ref name" +msgstr "\"%s\" не Ñ” припуÑтимою назвою поÑиланнÑ" + +#, c-format +msgid "replace ref '%s' already exists" +msgstr "змінний ref \"%s\" вже Ñ–Ñнує" + +#, c-format +msgid "" +"Objects must be of the same type.\n" +"'%s' points to a replaced object of type '%s'\n" +"while '%s' points to a replacement object of type '%s'." +msgstr "" + +#, c-format +msgid "unable to open %s for writing" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу" + +msgid "cat-file reported failure" +msgstr "" + +#, c-format +msgid "unable to open %s for reading" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ" + +msgid "unable to spawn mktree" +msgstr "не вдалоÑÑ Ð¿Ð¾Ñ€Ð¾Ð´Ð¸Ñ‚Ð¸ mktree" + +msgid "unable to read from mktree" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ з mktree" + +msgid "mktree reported failure" +msgstr "" + +msgid "mktree did not return an object name" +msgstr "mktree не повернув назву обʼєкта" + +#, c-format +msgid "unable to fstat %s" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ fstat %s" + +msgid "unable to write object to database" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати обʼєкт до бази даних" + +#, c-format +msgid "unable to get object type for %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ тип обʼєкта Ð´Ð»Ñ %s" + +msgid "editing object file failed" +msgstr "" + +#, c-format +msgid "new object is the same as the old one: '%s'" +msgstr "" + +#, c-format +msgid "could not parse %s as a commit" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ %s Ñк коміт" + +#, c-format +msgid "bad mergetag in commit '%s'" +msgstr "неправильний mergetag в коміті \"%s\"" + +#, c-format +msgid "malformed mergetag in commit '%s'" +msgstr "" + +#, c-format +msgid "" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" +msgstr "" + +#, c-format +msgid "the original commit '%s' has a gpg signature" +msgstr "" + +msgid "the signature will be removed in the replacement commit!" +msgstr "" + +#, c-format +msgid "could not write replacement commit for: '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати коміт заміни длÑ: \"%s\"" + +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "" + +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "" + +#, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "" + +msgid "list replace refs" +msgstr "" + +msgid "delete replace refs" +msgstr "видалити змінні поÑиланнÑ" + +msgid "edit existing object" +msgstr "редагувати Ñ–Ñнуючий обʼєкт" + +msgid "change a commit's parents" +msgstr "" + +msgid "convert existing graft file" +msgstr "" + +msgid "replace the ref if it exists" +msgstr "" + +msgid "do not pretty-print contents for --edit" +msgstr "" + +msgid "use this format" +msgstr "викориÑтати цей формат" + +msgid "--format cannot be used when not listing" +msgstr "--format не можна викориÑтовувати без list" + +msgid "-f only makes sense when writing a replacement" +msgstr "" + +msgid "--raw only makes sense with --edit" +msgstr "" + +msgid "-d needs at least one argument" +msgstr "" + +msgid "bad number of arguments" +msgstr "" + +msgid "-e needs exactly one argument" +msgstr "" + +msgid "-g needs at least one argument" +msgstr "" + +msgid "--convert-graft-file takes no argument" +msgstr "" + +msgid "only one pattern can be given with -l" +msgstr "" + +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" + +msgid "register clean resolutions in index" +msgstr "" + +msgid "'git rerere forget' without paths is deprecated" +msgstr "" + +#, c-format +msgid "unable to generate diff for '%s'" +msgstr "не вдалоÑÑ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ diff Ð´Ð»Ñ \"%s\"" + +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" + +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<деревоподібне джерело>] [--] <визначник шлÑху>..." + +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<деревоподібне " +"джерело>]" + +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "" +"git reset --patch [<деревоподібне джерело>] [--] [<визначник шлÑху>...]" + +msgid "mixed" +msgstr "змішане" + +msgid "soft" +msgstr "м’Ñке" + +msgid "hard" +msgstr "жорÑтке" + +msgid "merge" +msgstr "злити" + +msgid "keep" +msgstr "зберегти" + +msgid "You do not have a valid HEAD." +msgstr "У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” дійÑного HEAD." + +msgid "Failed to find tree of HEAD." +msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ дерево HEAD." + +#, c-format +msgid "Failed to find tree of %s." +msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ дерево %s." + +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD зараз на %s" + +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "Ðеможливо виконати %s ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð¾Ñеред злиттÑ." + +msgid "be quiet, only report errors" +msgstr "тихеÑенько, повідомлÑти лише про помилки" + +msgid "skip refreshing the index after reset" +msgstr "пропуÑтити Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑу піÑÐ»Ñ ÑкиданнÑ" + +msgid "reset HEAD and index" +msgstr "Ñкинути HEAD та індекÑ" + +msgid "reset only HEAD" +msgstr "Ñкинути тільки HEAD" + +msgid "reset HEAD, index and working tree" +msgstr "Ñкинути HEAD, Ñ–Ð½Ð´ÐµÐºÑ Ñ‚Ð° робоче дерево" + +msgid "reset HEAD but keep local changes" +msgstr "Ñкинути HEAD, але зберегти локальні зміни" + +msgid "record only the fact that removed paths will be added later" +msgstr "запиÑати лише той факт, що вилучені шлÑхи будуть додані пізніше" + +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ '%s' Ñк припуÑтиму ревізію." + +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ '%s' Ñк припуÑтиме дерево." + +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "" +"викориÑÑ‚Ð°Ð½Ð½Ñ --mixed зі шлÑхами заÑтаріло; викориÑтовуйте 'git reset -- " +"<paths>' заміÑÑ‚ÑŒ цього." + +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Ðеможливо виконати %s ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð·Ñ– шлÑхами." + +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "%s ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð½Ðµ дозволÑєтьÑÑ Ñƒ порожньому Ñховищі" + +msgid "Unstaged changes after reset:" +msgstr "ÐеіндекÑовані зміни піÑÐ»Ñ ÑкиданнÑ:" + +#, c-format +msgid "" +"It took %.2f seconds to refresh the index after reset. You can use\n" +"'--no-refresh' to avoid this." +msgstr "" +"ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑу піÑÐ»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð·Ð°Ð¹Ð½Ñло %.2f Ñекунд. Ви можете " +"ÑкориÑтатиÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼\n" +"'--no-refresh', щоб уникнути цього." + +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Ðе вдалоÑÑ Ñкинути індекÑний файл до ревізії '%s'." + +msgid "Could not write new index file." +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати новий індекÑний файл." + +#, c-format +msgid "unable to get disk usage of %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ дані про викориÑÑ‚Ð°Ð½Ð½Ñ Ð´Ð¸Ñка %s" + +#, c-format +msgid "invalid value for '%s': '%s', the only allowed format is '%s'" +msgstr "" + +msgid "rev-list does not support display of notes" +msgstr "" + +#, c-format +msgid "marked counting and '%s' cannot be used together" +msgstr "позначений підрахунок та \"%s\" не можна викориÑтовувати разом" + +msgid "git rev-parse --parseopt [<options>] -- [<args>...]" +msgstr "git rev-parse --parseopt [<опції>] -- [<аргументи>...]" + +msgid "keep the `--` passed as an arg" +msgstr "" + +msgid "stop parsing after the first non-option argument" +msgstr "" + +msgid "output in stuck long form" +msgstr "" + +msgid "premature end of input" +msgstr "передчаÑне Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¸Ñ… даних" + +msgid "no usage string given before the `--' separator" +msgstr "" + +msgid "missing opt-spec before option flags" +msgstr "" + +msgid "Needed a single revision" +msgstr "" + +msgid "" +"git rev-parse --parseopt [<options>] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [<options>] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" + +msgid "--resolve-git-dir requires an argument" +msgstr "" + +#, c-format +msgid "not a gitdir '%s'" +msgstr "" + +msgid "--git-path requires an argument" +msgstr "" + +msgid "-n requires an argument" +msgstr "-n потребує аргумент" + +msgid "--path-format requires an argument" +msgstr "" + +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "" + +msgid "--default requires an argument" +msgstr "" + +msgid "--prefix requires an argument" +msgstr "" + +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "" + +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden неможливо викориÑтати разом з --branches" + +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "" + +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "" + +msgid "this operation must be run in a work tree" +msgstr "" + +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "" + +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" + +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "" + +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" + +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" + +#, c-format +msgid "option `%s' expects a number greater than zero" +msgstr "" + +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s неможливо викориÑтовувати з %s" + +msgid "end revert or cherry-pick sequence" +msgstr "" + +msgid "resume revert or cherry-pick sequence" +msgstr "" + +msgid "cancel revert or cherry-pick sequence" +msgstr "" + +msgid "skip current commit and continue" +msgstr "" + +msgid "don't automatically commit" +msgstr "не комітити автоматично" + +msgid "edit the commit message" +msgstr "" + +msgid "parent-number" +msgstr "" + +msgid "select mainline parent" +msgstr "" + +msgid "merge strategy" +msgstr "" + +msgid "option for merge strategy" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ Ð´Ð»Ñ Ñтратегії злиттÑ" + +msgid "append commit name" +msgstr "" + +msgid "preserve initially empty commits" +msgstr "" + +msgid "allow commits with empty messages" +msgstr "" + +msgid "keep redundant, empty commits" +msgstr "" + +msgid "use the 'reference' format to refer to commits" +msgstr "" + +msgid "revert failed" +msgstr "Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ðµ вдалоÑÑ" + +msgid "cherry-pick failed" +msgstr "" + +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" + +msgid "" +"the following file has staged content different from both the\n" +"file and the HEAD:" +msgid_plural "" +"the following files have staged content different from both the\n" +"file and the HEAD:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "" +"\n" +"(use -f to force removal)" +msgstr "" + +msgid "the following file has changes staged in the index:" +msgid_plural "the following files have changes staged in the index:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "" +"\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +msgid "the following file has local modifications:" +msgid_plural "the following files have local modifications:" +msgstr[0] "наÑтупний файл має локальні зміни:" +msgstr[1] "наÑтупні файли мають локальні зміни:" +msgstr[2] "наÑтупних файлів мають локальні зміни:" + +msgid "do not list removed files" +msgstr "" + +msgid "only remove from the index" +msgstr "видалити тільки з індекÑу" + +msgid "override the up-to-date check" +msgstr "" + +msgid "allow recursive removal" +msgstr "" + +msgid "exit with a zero status even if nothing matched" +msgstr "" + +msgid "No pathspec was given. Which files should I remove?" +msgstr "" + +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" + +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s" + +msgid "" +"git send-pack [--mirror] [--dry-run] [--force]\n" +" [--receive-pack=<git-receive-pack>]\n" +" [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" +" [<host>:]<directory> (--all | <ref>...)" +msgstr "" + +msgid "remote name" +msgstr "віддалена назва" + +msgid "push all refs" +msgstr "надіÑлати вÑÑ– поÑиланнÑ" + +msgid "use stateless RPC protocol" +msgstr "" + +msgid "read refs from stdin" +msgstr "" + +msgid "print status from remote helper" +msgstr "" + +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git shortlog [<опції>] [<діапазон-ревізій>] [[--] <шлÑÑ…>...]" + +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "" + +msgid "using multiple --group options with stdin is not supported" +msgstr "" + +#, c-format +msgid "using %s with stdin is not supported" +msgstr "" + +#, c-format +msgid "unknown group type: %s" +msgstr "невідомий тип групи: %s" + +msgid "group by committer rather than author" +msgstr "" + +msgid "sort output according to the number of commits per author" +msgstr "" + +msgid "suppress commit descriptions, only provides commit count" +msgstr "" + +msgid "show the email address of each author" +msgstr "" + +msgid "<w>[,<i1>[,<i2>]]" +msgstr "" + +msgid "linewrap output" +msgstr "обгортати Ñ€Ñдки виводу" + +msgid "field" +msgstr "" + +msgid "group by field" +msgstr "" + +msgid "too many arguments given outside repository" +msgstr "" + +msgid "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +" [--current] [--color[=<when>] | --no-color] [--sparse]\n" +" [--more=<n> | --list | --independent | --merge-base]\n" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" +msgstr "" + +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "" + +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "no matching refs with %s" +msgstr "" + +msgid "show remote-tracking and local branches" +msgstr "" + +msgid "show remote-tracking branches" +msgstr "показати віддалено відÑтежувані гілки" + +msgid "color '*!+-' corresponding to the branch" +msgstr "" + +msgid "show <n> more commits after the common ancestor" +msgstr "" + +msgid "synonym to more=-1" +msgstr "" + +msgid "suppress naming strings" +msgstr "не показувати назву" + +msgid "include the current branch" +msgstr "включити поточну гілку" + +msgid "name commits with their object names" +msgstr "" + +msgid "show possible merge bases" +msgstr "" + +msgid "show refs unreachable from any other ref" +msgstr "" + +msgid "show commits in topological order" +msgstr "" + +msgid "show only commits not on the first branch" +msgstr "" + +msgid "show merges reachable from only one tip" +msgstr "" + +msgid "topologically sort, maintaining date order where possible" +msgstr "" + +msgid "<n>[,<base>]" +msgstr "" + +msgid "show <n> most recent ref-log entries starting at base" +msgstr "" + +msgid "no branches given, and HEAD is not valid" +msgstr "" + +msgid "--reflog option needs one branch name" +msgstr "--reflog потребує одну назву гілки" + +#, c-format +msgid "only %d entry can be shown at one time." +msgid_plural "only %d entries can be shown at one time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "no such ref %s" +msgstr "немає такого поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "'%s' is not a valid ref." +msgstr "\"%s\" не Ñ” припуÑтимим поÑиланнÑм." + +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "" + +msgid "hash-algorithm" +msgstr "хеш-алгоритм" + +msgid "Unknown hash algorithm" +msgstr "Ðевідомий хеш-алгоритм" + +msgid "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" +msgstr "" + +msgid "git show-ref --exclude-existing[=<pattern>]" +msgstr "" + +msgid "only show tags (can be combined with heads)" +msgstr "показати тільки теги (можна комбінувати з heads)" + +msgid "only show heads (can be combined with tags)" +msgstr "показати тільки верхівки (можна комбінувати з tags)" + +msgid "stricter reference checking, requires exact ref path" +msgstr "" + +msgid "show the HEAD reference, even if it would be filtered out" +msgstr "" + +msgid "dereference tags into object IDs" +msgstr "розіменувати теги в ідентифікатори обʼєктів" + +msgid "only show SHA1 hash using <n> digits" +msgstr "" + +msgid "do not print results to stdout (useful with --verify)" +msgstr "" + +msgid "show refs from stdin that aren't in local repository" +msgstr "показати поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· stdin, Ñких немає в локальному Ñховищі" + +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" +msgstr "" + +msgid "this worktree is not sparse" +msgstr "" + +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" + +#, c-format +msgid "" +"directory '%s' contains untracked files, but is not in the sparse-checkout " +"cone" +msgstr "" + +#, c-format +msgid "failed to remove directory '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ директорію \"%s\"" + +msgid "failed to create directory for sparse-checkout file" +msgstr "не вдалоÑÑ Ñтворити директорію Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ чаÑткового переходу" + +msgid "failed to initialize worktree config" +msgstr "не вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ конфігурацію робочого дерева" + +msgid "failed to modify sparse-index config" +msgstr "не вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ sparse-index конфігурацію" + +msgid "initialize the sparse-checkout in cone mode" +msgstr "ініціалізувати чаÑтковий перехід в режимі конуÑа" + +msgid "toggle the use of a sparse index" +msgstr "" + +#, c-format +msgid "unable to create leading directories of %s" +msgstr "не вдалоÑÑ Ñтворити провідні директорії %s" + +#, c-format +msgid "failed to open '%s'" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "could not normalize path %s" +msgstr "не вдалоÑÑ Ð½Ð¾Ñ€Ð¼Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ шлÑÑ… %s" + +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "" + +msgid "unable to load existing sparse-checkout patterns" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ñ–Ñнуючі шаблони чаÑткових переходів" + +msgid "existing sparse-checkout patterns do not use cone mode" +msgstr "" + +msgid "please run from the toplevel directory in non-cone mode" +msgstr "" + +msgid "specify directories rather than patterns (no leading slash)" +msgstr "" + +msgid "" +"specify directories rather than patterns. If your directory starts with a " +"'!', pass --skip-checks" +msgstr "" + +msgid "" +"specify directories rather than patterns. If your directory really has any " +"of '*?[]\\' in it, pass --skip-checks" +msgstr "" + +#, c-format +msgid "" +"'%s' is not a directory; to treat it as a directory anyway, rerun with --" +"skip-checks" +msgstr "" + +#, c-format +msgid "" +"pass a leading slash before paths such as '%s' if you want a single file " +"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)." +msgstr "" + +msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" +msgstr "" + +msgid "" +"skip some sanity checks on the given paths that might give false positives" +msgstr "" + +msgid "read patterns from standard in" +msgstr "" + +msgid "no sparse-checkout to add to" +msgstr "" + +msgid "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " +"(--stdin | <patterns>)" +msgstr "" + +msgid "must be in a sparse-checkout to reapply sparsity patterns" +msgstr "" + +msgid "error while refreshing working directory" +msgstr "помилка під Ñ‡Ð°Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¾Ñ— директорії" + +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" + +msgid "terminate input and output files by a NUL character" +msgstr "" + +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "" + +msgid "use patterns in <file> instead of the current ones." +msgstr "викориÑтовувати шаблони з <file> заміÑÑ‚ÑŒ поточних." + +msgid "git stash list [<log-options>]" +msgstr "git stash list [<лог-опції>]" + +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" + +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "" + +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "" + +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "" + +msgid "git stash branch <branchname> [<stash>]" +msgstr "" + +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "" + +msgid "" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]]" +msgstr "" + +msgid "" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" +msgstr "" + +msgid "git stash create [<message>]" +msgstr "" + +#, c-format +msgid "'%s' is not a stash-like commit" +msgstr "\"%s\" не Ñ” Ñховоподібним комітом" + +#, c-format +msgid "Too many revisions specified:%s" +msgstr "" + +msgid "No stash entries found." +msgstr "" + +#, c-format +msgid "%s is not a valid reference" +msgstr "%s не Ñ” припуÑтимим поÑиланнÑм" + +msgid "git stash clear with arguments is unimplemented" +msgstr "" + +#, c-format +msgid "" +"WARNING: Untracked file in way of tracked file! Renaming\n" +" %s -> %s\n" +" to make room.\n" +msgstr "" + +msgid "cannot apply a stash in the middle of a merge" +msgstr "неможливо заÑтоÑувати Ñхов поÑеред злиттÑ" + +#, c-format +msgid "could not generate diff %s^!." +msgstr "не вдалоÑÑ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ різницю %s^!." + +msgid "conflicts in index. Try without --index." +msgstr "" + +msgid "could not save index tree" +msgstr "не вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ дерево індекÑа" + +#, c-format +msgid "Merging %s with %s" +msgstr "" + +msgid "Index was not unstashed." +msgstr "" + +msgid "could not restore untracked files from stash" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ невідÑтежувані файли зі Ñхову" + +msgid "attempt to recreate the index" +msgstr "Ñпроба відтворити індекÑ" + +#, c-format +msgid "Dropped %s (%s)" +msgstr "" + +#, c-format +msgid "%s: Could not drop stash entry" +msgstr "" + +#, c-format +msgid "'%s' is not a stash reference" +msgstr "\"%s\" не Ñ” поÑиланнÑм Ñхова" + +msgid "The stash entry is kept in case you need it again." +msgstr "" + +msgid "No branch name specified" +msgstr "" + +msgid "failed to parse tree" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ дерево" + +msgid "failed to unpack trees" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ дерева" + +msgid "include untracked files in the stash" +msgstr "в тому чиÑлі невідÑтежувані файли Ñхову" + +msgid "only show untracked files in the stash" +msgstr "показувати тільки невідÑтежувані файли Ñхову" + +#, c-format +msgid "Cannot update %s with %s" +msgstr "Ðеможливо оновити %s з %s" + +msgid "stash message" +msgstr "" + +msgid "\"git stash store\" requires one <commit> argument" +msgstr "" + +msgid "No staged changes" +msgstr "Ðемає індекÑованих змін" + +msgid "No changes selected" +msgstr "Ðе обрано жодних змін" + +msgid "You do not have the initial commit yet" +msgstr "У Ð²Ð°Ñ Ñ‰Ðµ немає початкового коміту" + +msgid "Cannot save the current index state" +msgstr "Ðеможливо зберегти поточний Ñтан індекÑу" + +msgid "Cannot save the untracked files" +msgstr "Ðеможливо зберегти невідÑтежувані файли" + +msgid "Cannot save the current worktree state" +msgstr "" + +msgid "Cannot save the current staged state" +msgstr "Ðеможливо зберегти поточний індекÑований Ñтан" + +msgid "Cannot record working tree state" +msgstr "Ðеможливо запиÑати Ñтан робочого дерева" + +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "" +"Ðе можна викориÑтовувати --patch Ñ– --include-untracked або --all одночаÑно" + +msgid "Can't use --staged and --include-untracked or --all at the same time" +msgstr "" + +msgid "Did you forget to 'git add'?" +msgstr "" + +msgid "No local changes to save" +msgstr "" + +msgid "Cannot initialize stash" +msgstr "Ðеможливо ініціалізувати Ñхов" + +msgid "Cannot save the current status" +msgstr "" + +#, c-format +msgid "Saved working directory and index state %s" +msgstr "" + +msgid "Cannot remove worktree changes" +msgstr "" + +msgid "keep index" +msgstr "" + +msgid "stash staged changes only" +msgstr "" + +msgid "stash in patch mode" +msgstr "" + +msgid "quiet mode" +msgstr "" + +msgid "include untracked files in stash" +msgstr "в тому чиÑлі невідÑтежувані файли Ñхову" + +msgid "include ignore files" +msgstr "в тому чиÑли файли ігноруваннÑ" + +msgid "skip and remove all lines starting with comment character" +msgstr "" + +msgid "prepend comment character and space to each line" +msgstr "" + +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "" + +#, c-format +msgid "could not get a repository handle for submodule '%s'" +msgstr "" + +#, c-format +msgid "" +"could not look up configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" + +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "" + +#, c-format +msgid "Entering '%s'\n" +msgstr "" + +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" + +#, c-format +msgid "" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" +"." +msgstr "" + +msgid "suppress output of entering each submodule command" +msgstr "" + +msgid "recurse into nested submodules" +msgstr "рекурÑивно у вкладених підмодулÑÑ…" + +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>" +msgstr "" + +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "Ðе вдалоÑÑ Ð·Ð°Ñ€ÐµÑ”Ñтрувати url Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð·Ð° шлÑхом \"%s\"" + +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "" + +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "" + +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" +"Ðе вдалоÑÑ Ð·Ð°Ñ€ÐµÑ”Ñтрувати режим Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð·Ð° шлÑхом \"%s\"" + +msgid "suppress output for initializing a submodule" +msgstr "" + +msgid "git submodule init [<options>] [<path>]" +msgstr "git submodule init [<опції>] [<шлÑÑ…>]" + +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" +msgstr "" + +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "" + +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "не вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ рекурÑивно підмодуль \"%s\"" + +msgid "suppress submodule status output" +msgstr "" + +msgid "" +"use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" + +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "" + +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "" + +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "" + +#, c-format +msgid "%s" +msgstr "" + +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "не вдалоÑÑ Ñ…ÐµÑˆÑƒÐ²Ð°Ñ‚Ð¸ обʼєкт з \"%s\"" + +#, c-format +msgid "unexpected mode %o\n" +msgstr "" + +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "викориÑтати коміт, збережений в індекÑÑ–, заміÑÑ‚ÑŒ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ HEAD" + +msgid "compare the commit in the index with that in the submodule HEAD" +msgstr "" + +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" + +msgid "limit the summary size" +msgstr "" + +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]" +msgstr "" + +msgid "could not fetch a revision for HEAD" +msgstr "" + +#, c-format +msgid "Synchronizing submodule url for '%s'\n" +msgstr "" + +#, c-format +msgid "failed to register url for submodule path '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ñ€ÐµÑ”Ñтрувати url Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð·Ð° шлÑхом \"%s\"" + +#, c-format +msgid "failed to update remote for submodule '%s'" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ віддалене Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"" + +msgid "suppress output of synchronizing submodule url" +msgstr "" + +msgid "git submodule sync [--quiet] [--recursive] [<path>]" +msgstr "" + +#, c-format +msgid "" +"Submodule work tree '%s' contains a .git directory. This will be replaced " +"with a .git file by using absorbgitdirs." +msgstr "" + +#, c-format +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "" + +#, c-format +msgid "Cleared directory '%s'\n" +msgstr "Очищено директорію \"%s\"\n" + +#, c-format +msgid "Could not remove submodule work tree '%s'\n" +msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ робоче дерево Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"\n" + +#, c-format +msgid "could not create empty submodule directory %s" +msgstr "не вдалоÑÑ Ñтворити порожню директорію Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s" + +#, c-format +msgid "Submodule '%s' (%s) unregistered for path '%s'\n" +msgstr "" + +msgid "remove submodule working trees even if they contain local changes" +msgstr "" + +msgid "unregister all submodules" +msgstr "" + +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "" + +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "" + +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" + +#, c-format +msgid "could not get a repository handle for gitdir '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ деÑкриптор Ñховища Ð´Ð»Ñ gitdir \"%s\"" + +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "підмодуль \"%s\" не може додати Ñпільний обʼєкт: %s" + +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "" + +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "" + +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" + +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "" + +#, c-format +msgid "directory not empty: '%s'" +msgstr "" + +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ директорію Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ \"%s\"" + +msgid "alternative anchor for relative paths" +msgstr "" + +msgid "where the new submodule will be cloned to" +msgstr "куди буде клоновано новий підмодуль" + +msgid "name of the new submodule" +msgstr "" + +msgid "url where to clone the submodule from" +msgstr "" + +msgid "depth for shallow clones" +msgstr "" + +msgid "force cloning progress" +msgstr "примуÑово звітувати Ð¿Ñ€Ð¾Ð³Ñ€ÐµÑ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ" + +msgid "disallow cloning into non-empty directory" +msgstr "" + +msgid "" +"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " +"<filter-spec>] --url <url> --path <path>" +msgstr "" + +#, c-format +msgid "Invalid update mode '%s' configured for submodule path '%s'" +msgstr "" +"ÐеприпуÑтимий режим Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ \"%s\" налаштовано Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð·Ð° шлÑхом " +"\"%s\"" + +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "" + +msgid "Maybe you want to use 'update --init'?" +msgstr "" + +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "" + +#, c-format +msgid "Skipping submodule '%s'" +msgstr "" + +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "" + +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "" + +#, c-format +msgid "Unable to checkout '%s' in submodule path '%s'" +msgstr "" + +#, c-format +msgid "Unable to rebase '%s' in submodule path '%s'" +msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\" в підмодулі за шлÑхом \"%s\"" + +#, c-format +msgid "Unable to merge '%s' in submodule path '%s'" +msgstr "Ðе вдалоÑÑ Ð·Ð»Ð¸Ñ‚Ð¸ \"%s\" в підмодулі за шлÑхом \"%s\"" + +#, c-format +msgid "Execution of '%s %s' failed in submodule path '%s'" +msgstr "" + +#, c-format +msgid "Submodule path '%s': checked out '%s'\n" +msgstr "" + +#, c-format +msgid "Submodule path '%s': rebased into '%s'\n" +msgstr "" + +#, c-format +msgid "Submodule path '%s': merged in '%s'\n" +msgstr "" + +#, c-format +msgid "Submodule path '%s': '%s %s'\n" +msgstr "" + +#, c-format +msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" +msgstr "" + +#, c-format +msgid "" +"Fetched in submodule path '%s', but it did not contain %s. Direct fetching " +"of that commit failed." +msgstr "" + +#, c-format +msgid "could not initialize submodule at path '%s'" +msgstr "не вдалоÑÑ Ñ–Ð½Ñ–Ñ†Ñ–Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ підмодуль за шлÑхом \"%s\"" + +#, c-format +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +msgstr "" + +#, c-format +msgid "Unable to find current revision in submodule path '%s'" +msgstr "" + +#, c-format +msgid "Unable to fetch in submodule path '%s'" +msgstr "" + +#, c-format +msgid "Unable to find %s revision in submodule path '%s'" +msgstr "" + +#, c-format +msgid "Failed to recurse into submodule path '%s'" +msgstr "Ðе вдалоÑÑ Ð¾Ð±Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ рекурÑивно підмодуль за шлÑхом \"%s\"" + +msgid "force checkout updates" +msgstr "переключитиÑÑ Ð½Ð° Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ð¼ÑƒÑово" + +msgid "initialize uninitialized submodules before update" +msgstr "ініціалізувати неініціалізовані підмодулі перед оновленнÑм" + +msgid "use SHA-1 of submodule's remote tracking branch" +msgstr "викориÑтовувати SHA-1 гілки віддаленого відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ" + +msgid "traverse submodules recursively" +msgstr "" + +msgid "don't fetch new objects from the remote site" +msgstr "" + +msgid "use the 'checkout' update strategy (default)" +msgstr "" + +msgid "use the 'merge' update strategy" +msgstr "" + +msgid "use the 'rebase' update strategy" +msgstr "" + +msgid "create a shallow clone truncated to the specified number of revisions" +msgstr "Ñтворити поверхневий клон, урізаний до вказаної кількоÑÑ‚Ñ– ревізій" + +msgid "parallel jobs" +msgstr "" + +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "" + +msgid "don't print cloning progress" +msgstr "" + +msgid "disallow cloning into non-empty directory, implies --init" +msgstr "" + +msgid "" +"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " +"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" +"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " +"[--] [<path>...]" +msgstr "" + +msgid "git submodule absorbgitdirs [<options>] [<path>...]" +msgstr "git submodule absorbgitdirs [<опції>] [<шлÑÑ…>...]" + +msgid "suppress output for setting url of a submodule" +msgstr "" + +msgid "git submodule set-url [--quiet] <path> <newurl>" +msgstr "" + +msgid "set the default tracking branch to master" +msgstr "" + +msgid "set the default tracking branch" +msgstr "вÑтановити гілку відÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° замовчуваннÑм" + +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "" + +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" + +msgid "--branch or --default required" +msgstr "" + +msgid "print only error messages" +msgstr "" + +msgid "force creation" +msgstr "" + +msgid "show whether the branch would be created" +msgstr "" + +msgid "" +"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" +"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" +msgstr "" + +#, c-format +msgid "creating branch '%s'" +msgstr "ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð³Ñ–Ð»ÐºÐ¸ \"%s\"" + +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "" + +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "\"%s\" вже Ñ–Ñнує Ñ– не Ñ” припуÑтимим git Ñховищем" + +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):\n" +msgstr "" + +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" + +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "" + +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑŒ на підмодуль \"%s\"" + +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "" + +#, c-format +msgid "Failed to add submodule '%s'" +msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ підмодуль \"%s\"" + +#, c-format +msgid "Failed to register submodule '%s'" +msgstr "Ðе вдалоÑÑ Ð·Ð°Ñ€ÐµÑ”Ñтрувати підмодуль \"%s\"" + +#, c-format +msgid "'%s' already exists in the index" +msgstr "" + +#, c-format +msgid "'%s' already exists in the index and is not a submodule" +msgstr "" + +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "\"%s\" не має активного коміту" + +msgid "branch of repository to add as submodule" +msgstr "" + +msgid "allow adding an otherwise ignored submodule path" +msgstr "" + +msgid "borrow the objects from reference repositories" +msgstr "" + +msgid "" +"sets the submodule's name to the given string instead of defaulting to its " +"path" +msgstr "" + +msgid "git submodule add [<options>] [--] <repository> [<path>]" +msgstr "git submodule add [<опції>] [--] <Ñховище> [<шлÑÑ…>]" + +msgid "Relative path can only be used from the toplevel of the working tree" +msgstr "" + +#, c-format +msgid "repo URL: '%s' must be absolute or begin with ./|../" +msgstr "" + +#, c-format +msgid "'%s' is not a valid submodule name" +msgstr "\"%s\" не Ñ” припуÑтимою назвою підмодулÑ" + +msgid "git submodule--helper <command>" +msgstr "" + +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "" + +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "" + +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "" + +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" + +msgid "delete symbolic ref" +msgstr "видалити Ñимвольне поÑиланнÑ" + +msgid "shorten ref output" +msgstr "" + +msgid "recursively dereference (default)" +msgstr "рекурÑивне Ñ€Ð¾Ð·Ñ–Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ (за замовчуваннÑм)" + +msgid "reason" +msgstr "" + +msgid "reason of the update" +msgstr "" + +msgid "" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" +msgstr "" + +msgid "git tag -d <tagname>..." +msgstr "" + +msgid "" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" +msgstr "" + +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "" + +#, c-format +msgid "tag '%s' not found." +msgstr "" + +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "" + +#, c-format +msgid "" +"\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be ignored.\n" +msgstr "" + +#, c-format +msgid "" +"\n" +"Write a message for tag:\n" +" %s\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " +"want to.\n" +msgstr "" + +msgid "unable to sign the tag" +msgstr "не вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати тег" + +#, c-format +msgid "" +"You have created a nested tag. The object referred to by your new tag is\n" +"already a tag. If you meant to tag the object that it points to, use:\n" +"\n" +"\tgit tag -f %s %s^{}" +msgstr "" + +msgid "bad object type." +msgstr "невірний тип обʼєкта." + +msgid "no tag message?" +msgstr "" + +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "" + +msgid "list tag names" +msgstr "" + +msgid "print <n> lines of each tag message" +msgstr "" + +msgid "delete tags" +msgstr "видалити теги" + +msgid "verify tags" +msgstr "" + +msgid "Tag creation options" +msgstr "" + +msgid "annotated tag, needs a message" +msgstr "" + +msgid "tag message" +msgstr "" + +msgid "force edit of tag message" +msgstr "" + +msgid "annotated and GPG-signed tag" +msgstr "" + +msgid "use another key to sign the tag" +msgstr "" + +msgid "replace the tag if exists" +msgstr "" + +msgid "create a reflog" +msgstr "Ñтворити reflog" + +msgid "Tag listing options" +msgstr "" + +msgid "show tag list in columns" +msgstr "" + +msgid "print only tags that contain the commit" +msgstr "" + +msgid "print only tags that don't contain the commit" +msgstr "" + +msgid "print only tags that are merged" +msgstr "" + +msgid "print only tags that are not merged" +msgstr "" + +msgid "print only tags of the object" +msgstr "" + +#, c-format +msgid "the '%s' option is only allowed in list mode" +msgstr "" + +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "\"%s\" не Ñ” припуÑтимою назвою тега." + +#, c-format +msgid "tag '%s' already exists" +msgstr "тег \"%s\" вже Ñ–Ñнує" + +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "ÐеприпуÑтимий режим Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ %s" + +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "" + +msgid "pack exceeds maximum allowed size" +msgstr "пакунок перевищує макÑимально дозволений розмір" + +msgid "failed to write object in stream" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати обʼєкт потоку" + +#, c-format +msgid "inflate returned (%d)" +msgstr "розпаковувач повернув (%d)" + +msgid "invalid blob object from stream" +msgstr "неприпуÑтимий обʼєкт blob з потоку" + +msgid "Unpacking objects" +msgstr "Ð Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ñ–Ð²" + +#, c-format +msgid "failed to create directory %s" +msgstr "не вдалоÑÑ Ñтворити директорію %s" + +#, c-format +msgid "failed to delete file %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ файл %s" + +#, c-format +msgid "failed to delete directory %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ директорію %s" + +#, c-format +msgid "Testing mtime in '%s' " +msgstr "" + +msgid "directory stat info does not change after adding a new file" +msgstr "" + +msgid "directory stat info does not change after adding a new directory" +msgstr "" + +msgid "directory stat info changes after updating a file" +msgstr "" + +msgid "directory stat info changes after adding a file inside subdirectory" +msgstr "" + +msgid "directory stat info does not change after deleting a file" +msgstr "" + +msgid "directory stat info does not change after deleting a directory" +msgstr "" + +msgid " OK" +msgstr "" + +msgid "git update-index [<options>] [--] [<file>...]" +msgstr "git update-index [<опції>] [--] [<файл>...]" + +msgid "continue refresh even when index needs update" +msgstr "" + +msgid "refresh: ignore submodules" +msgstr "оновити: ігнорувати підмодулі" + +msgid "do not ignore new files" +msgstr "не ігнорувати нові файли" + +msgid "let files replace directories and vice-versa" +msgstr "" + +msgid "notice files missing from worktree" +msgstr "" + +msgid "refresh even if index contains unmerged entries" +msgstr "" + +msgid "refresh stat information" +msgstr "" + +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "" + +msgid "<mode>,<object>,<path>" +msgstr "" + +msgid "add the specified entry to the index" +msgstr "додати вказаний Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ індекÑу" + +msgid "mark files as \"not changing\"" +msgstr "" + +msgid "clear assumed-unchanged bit" +msgstr "" + +msgid "mark files as \"index-only\"" +msgstr "" + +msgid "clear skip-worktree bit" +msgstr "" + +msgid "do not touch index-only entries" +msgstr "" + +msgid "add to index only; do not add content to object database" +msgstr "" + +msgid "remove named paths even if present in worktree" +msgstr "" + +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "" + +msgid "read list of paths to be updated from standard input" +msgstr "" + +msgid "add entries from standard input to the index" +msgstr "" + +msgid "repopulate stages #2 and #3 for the listed paths" +msgstr "" + +msgid "only update entries that differ from HEAD" +msgstr "" + +msgid "ignore files missing from worktree" +msgstr "" + +msgid "report actions to standard output" +msgstr "" + +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "" + +msgid "write index in this format" +msgstr "" + +msgid "enable or disable split index" +msgstr "" + +msgid "enable/disable untracked cache" +msgstr "" + +msgid "test if the filesystem supports untracked cache" +msgstr "" + +msgid "enable untracked cache without testing the filesystem" +msgstr "" + +msgid "write out the index even if is not flagged as changed" +msgstr "" + +msgid "enable or disable file system monitor" +msgstr "" + +msgid "mark files as fsmonitor valid" +msgstr "" + +msgid "clear fsmonitor valid bit" +msgstr "" + +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" + +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" + +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "" + +msgid "Untracked cache disabled" +msgstr "ÐевідÑтежуваний кеш вимкнено" + +msgid "" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" +msgstr "" + +#, c-format +msgid "Untracked cache enabled for '%s'" +msgstr "Увімкнено невідÑтежуваний кеш Ð´Ð»Ñ \"%s\"" + +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "" + +msgid "fsmonitor enabled" +msgstr "" + +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" + +msgid "fsmonitor disabled" +msgstr "" + +msgid "git update-ref [<options>] -d <refname> [<old-val>]" +msgstr "git update-ref [<опції>] -d <назва поÑиланнÑ> [<Ñтаре значеннÑ>]" + +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" +msgstr "" + +msgid "git update-ref [<options>] --stdin [-z]" +msgstr "" + +msgid "delete the reference" +msgstr "видалити поÑиланнÑ" + +msgid "update <refname> not the one it points to" +msgstr "" + +msgid "stdin has NUL-terminated arguments" +msgstr "" + +msgid "read updates from stdin" +msgstr "" + +msgid "update the info files from scratch" +msgstr "оновити інформаційні файли з чиÑтого аркуша" + +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" + +msgid "quit after a single request/response exchange" +msgstr "" + +msgid "serve up the info/refs for git-http-backend" +msgstr "" + +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "" + +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "" + +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "" + +msgid "print commit contents" +msgstr "" + +msgid "print raw gpg status output" +msgstr "" + +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "" + +msgid "verbose" +msgstr "" + +msgid "show statistics only" +msgstr "" + +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "" + +msgid "print tag contents" +msgstr "" + +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" + +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "" + +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "" + +msgid "git worktree move <worktree> <new-path>" +msgstr "" + +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "" + +msgid "git worktree remove [-f] <worktree>" +msgstr "" + +msgid "git worktree repair [<path>...]" +msgstr "" + +msgid "git worktree unlock <worktree>" +msgstr "" + +#, c-format +msgid "Removing %s/%s: %s" +msgstr "" + +msgid "report pruned working trees" +msgstr "звітувати про Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¸Ñ… дерев" + +msgid "expire working trees older than <time>" +msgstr "" + +#, c-format +msgid "'%s' already exists" +msgstr "\"%s\" вже Ñ–Ñнує" + +#, c-format +msgid "unusable worktree destination '%s'" +msgstr "непридатне міÑце Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¾Ð³Ð¾ дерева \"%s\"" + +#, c-format +msgid "" +"'%s' is a missing but locked worktree;\n" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" +msgstr "" + +#, c-format +msgid "" +"'%s' is a missing but already registered worktree;\n" +"use '%s -f' to override, or 'prune' or 'remove' to clear" +msgstr "" + +#, c-format +msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly" +msgstr "" + +#, c-format +msgid "failed to copy worktree config from '%s' to '%s'" +msgstr "не вдалоÑÑ Ñкопіювати конфігурацію робочого дерева з \"%s\" до \"%s\"" + +#, c-format +msgid "failed to unset '%s' in '%s'" +msgstr "не вдалоÑÑ Ñкинути \"%s\" в \"%s\"" + +#, c-format +msgid "could not create directory of '%s'" +msgstr "не вдалоÑÑ Ñтворити директорію \"%s\"" + +msgid "initializing" +msgstr "" + +#, c-format +msgid "Preparing worktree (new branch '%s')" +msgstr "" + +#, c-format +msgid "Preparing worktree (resetting branch '%s'; was at %s)" +msgstr "" + +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "" + +#, c-format +msgid "Preparing worktree (detached HEAD %s)" +msgstr "" + +msgid "checkout <branch> even if already checked out in other worktree" +msgstr "" + +msgid "create a new branch" +msgstr "Ñтворити нову гілку" + +msgid "create or reset a branch" +msgstr "Ñтворити або Ñкинути гілку" + +msgid "populate the new working tree" +msgstr "заповнити нове робоче дерево" + +msgid "keep the new working tree locked" +msgstr "зберегти нове робоче дерево зафікÑованим" + +msgid "reason for locking" +msgstr "" + +msgid "set up tracking mode (see git-branch(1))" +msgstr "" + +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "" +"Ñпробуйте ÑпівÑтавити нову назву гілки з назвою віддалено відÑтежуваної гілки" + +#, c-format +msgid "options '%s', '%s', and '%s' cannot be used together" +msgstr "опції \"%s\", \"%s\" та \"%s\" не можна викориÑтовувати разом" + +msgid "added with --lock" +msgstr "" + +msgid "--[no-]track can only be used if a new branch is created" +msgstr "" + +msgid "show extended annotations and reasons, if available" +msgstr "" + +msgid "add 'prunable' annotation to worktrees older than <time>" +msgstr "" + +msgid "terminate records with a NUL character" +msgstr "" + +#, c-format +msgid "'%s' is not a working tree" +msgstr "\"%s\" не Ñ” робочим деревом" + +msgid "The main working tree cannot be locked or unlocked" +msgstr "" + +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "" + +#, c-format +msgid "'%s' is already locked" +msgstr "" + +#, c-format +msgid "'%s' is not locked" +msgstr "\"%s\" не зафікÑовано" + +msgid "working trees containing submodules cannot be moved or removed" +msgstr "" + +msgid "force move even if worktree is dirty or locked" +msgstr "" + +#, c-format +msgid "'%s' is a main working tree" +msgstr "\"%s\" Ñ” головним робочим деревом" + +#, c-format +msgid "could not figure out destination name from '%s'" +msgstr "" + +#, c-format +msgid "" +"cannot move a locked working tree, lock reason: %s\n" +"use 'move -f -f' to override or unlock first" +msgstr "" + +msgid "" +"cannot move a locked working tree;\n" +"use 'move -f -f' to override or unlock first" +msgstr "" + +#, c-format +msgid "validation failed, cannot move working tree: %s" +msgstr "" + +#, c-format +msgid "failed to move '%s' to '%s'" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ½ÐµÑти \"%s\" до \"%s\"" + +#, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ \"git status\" на \"%s\"" + +#, c-format +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "" + +#, c-format +msgid "failed to run 'git status' on '%s', code %d" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ \"git status\" на \"%s\", код %d" + +msgid "force removal even if worktree is dirty or locked" +msgstr "" + +#, c-format +msgid "" +"cannot remove a locked working tree, lock reason: %s\n" +"use 'remove -f -f' to override or unlock first" +msgstr "" + +msgid "" +"cannot remove a locked working tree;\n" +"use 'remove -f -f' to override or unlock first" +msgstr "" + +#, c-format +msgid "validation failed, cannot remove working tree: %s" +msgstr "" + +#, c-format +msgid "repair: %s: %s" +msgstr "" + +#, c-format +msgid "error: %s: %s" +msgstr "" + +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "" + +msgid "<prefix>/" +msgstr "" + +msgid "write tree object for a subdirectory <prefix>" +msgstr "" + +msgid "only useful for debugging" +msgstr "" + +msgid "core.fsyncMethod = batch is unsupported on this platform" +msgstr "" + +#, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ ключ ÑпиÑку пакунків %s зі значеннÑм \"%s\"" + +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "" + +msgid "failed to create temporary file" +msgstr "не вдалоÑÑ Ñтворити тимчаÑовий файл" + +msgid "insufficient capabilities" +msgstr "" + +#, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "файл, завантажений з \"%s\", не Ñ” пакунком" + +msgid "failed to store maximum creation token" +msgstr "не вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ токен макÑимального ÑтвореннÑ" + +#, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "" + +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "" + +#, c-format +msgid "failed to download bundle from URI '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ пакунок з URI \"%s\"" + +#, c-format +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "" + +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "" + +msgid "bundle-uri: expected flush after arguments" +msgstr "" + +msgid "bundle-uri: got an empty line" +msgstr "" + +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "" + +msgid "bundle-uri: line has empty key or value" +msgstr "" + +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "нерозпізнаний хеш-алгоритм пакунка: %s" + +#, c-format +msgid "unknown capability '%s'" +msgstr "невідома влаÑтивіÑÑ‚ÑŒ \"%s\"" + +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "" + +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "" + +msgid "Repository lacks these prerequisite commits:" +msgstr "" + +msgid "need a repository to verify a bundle" +msgstr "" + +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "" + +#, c-format +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %<PRIuMAX> refs:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "The bundle records a complete history." +msgstr "" + +#, c-format +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %<PRIuMAX> refs:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "unable to dup bundle descriptor" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ð´ÑƒÐ±Ð»ÑŽÐ²Ð°Ñ‚Ð¸ деÑкриптор пакунка" + +msgid "Could not spawn pack-objects" +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð¼Ð½Ð¾Ð¶Ð¸Ñ‚Ð¸ об’єкти пакунків" + +msgid "pack-objects died" +msgstr "" + +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "" + +#, c-format +msgid "unsupported bundle version %d" +msgstr "" + +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "" + +msgid "Refusing to create empty bundle." +msgstr "" + +#, c-format +msgid "cannot create '%s'" +msgstr "неможливо Ñтворити \"%s\"" + +msgid "index-pack died" +msgstr "" + +msgid "terminating chunk id appears earlier than expected" +msgstr "" + +#, c-format +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" +msgstr "" + +#, c-format +msgid "duplicate chunk ID %<PRIx32> found" +msgstr "" + +#, c-format +msgid "final chunk has non-zero id %<PRIx32>" +msgstr "" + +msgid "invalid hash version" +msgstr "неприпуÑтима верÑÑ–Ñ Ñ…ÐµÑˆÑƒ" + +#, c-format +msgid "invalid color value: %.*s" +msgstr "неприпуÑтиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð»ÑŒÐ¾Ñ€Ñƒ: %.*s" + +msgid "Add file contents to the index" +msgstr "" + +msgid "Apply a series of patches from a mailbox" +msgstr "" + +msgid "Annotate file lines with commit information" +msgstr "" + +msgid "Apply a patch to files and/or to the index" +msgstr "" + +msgid "Import a GNU Arch repository into Git" +msgstr "" + +msgid "Create an archive of files from a named tree" +msgstr "" + +msgid "Use binary search to find the commit that introduced a bug" +msgstr "" + +msgid "Show what revision and author last modified each line of a file" +msgstr "" + +msgid "List, create, or delete branches" +msgstr "Показати, Ñтворити або видалити гілки" + +msgid "Collect information for user to file a bug report" +msgstr "" + +msgid "Move objects and refs by archive" +msgstr "" + +msgid "Provide content or type and size information for repository objects" +msgstr "" + +msgid "Display gitattributes information" +msgstr "" + +msgid "Debug gitignore / exclude files" +msgstr "" + +msgid "Show canonical names and email addresses of contacts" +msgstr "" + +msgid "Ensures that a reference name is well formed" +msgstr "" + +msgid "Switch branches or restore working tree files" +msgstr "Перемкнути гілки або відновити файли робочого дерева" + +msgid "Copy files from the index to the working tree" +msgstr "" + +msgid "Find commits yet to be applied to upstream" +msgstr "" + +msgid "Apply the changes introduced by some existing commits" +msgstr "" + +msgid "Graphical alternative to git-commit" +msgstr "" + +msgid "Remove untracked files from the working tree" +msgstr "Видалити невідÑтежувані файли з робочого дерева" + +msgid "Clone a repository into a new directory" +msgstr "" + +msgid "Display data in columns" +msgstr "" + +msgid "Record changes to the repository" +msgstr "ЗапиÑати зміни у Ñховище" + +msgid "Write and verify Git commit-graph files" +msgstr "" + +msgid "Create a new commit object" +msgstr "" + +msgid "Get and set repository or global options" +msgstr "" + +msgid "Count unpacked number of objects and their disk consumption" +msgstr "" + +msgid "Retrieve and store user credentials" +msgstr "" + +msgid "Helper to temporarily store passwords in memory" +msgstr "" + +msgid "Helper to store credentials on disk" +msgstr "" + +msgid "Export a single commit to a CVS checkout" +msgstr "" + +msgid "Salvage your data out of another SCM people love to hate" +msgstr "" + +msgid "A CVS server emulator for Git" +msgstr "" + +msgid "A really simple server for Git repositories" +msgstr "" + +msgid "Give an object a human readable name based on an available ref" +msgstr "" + +msgid "Generate a zip archive of diagnostic information" +msgstr "" + +msgid "Show changes between commits, commit and working tree, etc" +msgstr "Показати зміни між комітами, комітом та робочим деревом, тощо" + +msgid "Compares files in the working tree and the index" +msgstr "" + +msgid "Compare a tree to the working tree or index" +msgstr "ПорівнÑти дерево з робочим деревом або індекÑом" + +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "" + +msgid "Show changes using common diff tools" +msgstr "" + +msgid "Git data exporter" +msgstr "" + +msgid "Backend for fast Git data importers" +msgstr "" + +msgid "Download objects and refs from another repository" +msgstr "" + +msgid "Receive missing objects from another repository" +msgstr "" + +msgid "Rewrite branches" +msgstr "ПерезапиÑати гілки" + +msgid "Produce a merge commit message" +msgstr "" + +msgid "Output information on each ref" +msgstr "" + +msgid "Run a Git command on a list of repositories" +msgstr "" + +msgid "Prepare patches for e-mail submission" +msgstr "" + +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "" + +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "" + +msgid "Extract commit ID from an archive created using git-archive" +msgstr "" + +msgid "Print lines matching a pattern" +msgstr "" + +msgid "A portable graphical interface to Git" +msgstr "" + +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "" + +msgid "Display help information about Git" +msgstr "" + +msgid "Run git hooks" +msgstr "" + +msgid "Server side implementation of Git over HTTP" +msgstr "" + +msgid "Download from a remote Git repository via HTTP" +msgstr "" + +msgid "Push objects over HTTP/DAV to another repository" +msgstr "" + +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "" + +msgid "Build pack index file for an existing packed archive" +msgstr "" + +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "" + +msgid "Instantly browse your working repository in gitweb" +msgstr "" + +msgid "Add or parse structured information in commit messages" +msgstr "" + +msgid "Show commit logs" +msgstr "Показати лог коміта" + +msgid "Show information about files in the index and the working tree" +msgstr "" + +msgid "List references in a remote repository" +msgstr "Показати поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñƒ віддаленому Ñховищі" + +msgid "List the contents of a tree object" +msgstr "" + +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "" + +msgid "Simple UNIX mbox splitter program" +msgstr "" + +msgid "Run tasks to optimize Git repository data" +msgstr "" + +msgid "Join two or more development histories together" +msgstr "" + +msgid "Find as good common ancestors as possible for a merge" +msgstr "" + +msgid "Run a three-way file merge" +msgstr "" + +msgid "Run a merge for files needing merging" +msgstr "" + +msgid "The standard helper program to use with git-merge-index" +msgstr "" + +msgid "Perform merge without touching index or working tree" +msgstr "" + +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "" + +msgid "Creates a tag object with extra validation" +msgstr "" + +msgid "Build a tree-object from ls-tree formatted text" +msgstr "" + +msgid "Write and verify multi-pack-indexes" +msgstr "" + +msgid "Move or rename a file, a directory, or a symlink" +msgstr "" + +msgid "Find symbolic names for given revs" +msgstr "" + +msgid "Add or inspect object notes" +msgstr "Додайте або перевірте нотатки до обʼєктів" + +msgid "Import from and submit to Perforce repositories" +msgstr "" + +msgid "Create a packed archive of objects" +msgstr "" + +msgid "Find redundant pack files" +msgstr "Знайти зайві файли пакунків" + +msgid "Pack heads and tags for efficient repository access" +msgstr "" + +msgid "Compute unique ID for a patch" +msgstr "" + +msgid "Prune all unreachable objects from the object database" +msgstr "" + +msgid "Remove extra objects that are already in pack files" +msgstr "" + +msgid "Fetch from and integrate with another repository or a local branch" +msgstr "" + +msgid "Update remote refs along with associated objects" +msgstr "" + +msgid "Applies a quilt patchset onto the current branch" +msgstr "" + +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +msgid "Reads tree information into the index" +msgstr "" + +msgid "Reapply commits on top of another base tip" +msgstr "" + +msgid "Receive what is pushed into the repository" +msgstr "" + +msgid "Manage reflog information" +msgstr "" + +msgid "Manage set of tracked repositories" +msgstr "Керувати набором відÑтежуваних Ñховищ" + +msgid "Pack unpacked objects in a repository" +msgstr "" + +msgid "Create, list, delete refs to replace objects" +msgstr "" + +msgid "Generates a summary of pending changes" +msgstr "" + +msgid "Reuse recorded resolution of conflicted merges" +msgstr "" + +msgid "Reset current HEAD to the specified state" +msgstr "" + +msgid "Restore working tree files" +msgstr "Відновити файли робочого дерева" + +msgid "Lists commit objects in reverse chronological order" +msgstr "" + +msgid "Pick out and massage parameters" +msgstr "" + +msgid "Revert some existing commits" +msgstr "" + +msgid "Remove files from the working tree and from the index" +msgstr "" + +msgid "Send a collection of patches as emails" +msgstr "" + +msgid "Push objects over Git protocol to another repository" +msgstr "" + +msgid "Git's i18n setup code for shell scripts" +msgstr "" + +msgid "Common Git shell script setup code" +msgstr "" + +msgid "Restricted login shell for Git-only SSH access" +msgstr "" + +msgid "Summarize 'git log' output" +msgstr "" + +msgid "Show various types of objects" +msgstr "" + +msgid "Show branches and their commits" +msgstr "Показати гілки та їхні коміти" + +msgid "Show packed archive index" +msgstr "" + +msgid "List references in a local repository" +msgstr "Показати поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñƒ локальному Ñховищі" + +msgid "Reduce your working tree to a subset of tracked files" +msgstr "Скоротити робоче дерево до підмножини відÑтежуваних файлів" + +msgid "Add file contents to the staging area" +msgstr "" + +msgid "Stash the changes in a dirty working directory away" +msgstr "" + +msgid "Show the working tree status" +msgstr "Показати Ñтан робочого дерева" + +msgid "Remove unnecessary whitespace" +msgstr "" + +msgid "Initialize, update or inspect submodules" +msgstr "" + +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "" + +msgid "Switch branches" +msgstr "Переключити гілки" + +msgid "Read, modify and delete symbolic refs" +msgstr "" + +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "" + +msgid "Creates a temporary file with a blob's contents" +msgstr "" + +msgid "Unpack objects from a packed archive" +msgstr "" + +msgid "Register file contents in the working tree to the index" +msgstr "" + +msgid "Update the object name stored in a ref safely" +msgstr "" + +msgid "Update auxiliary info file to help dumb servers" +msgstr "" + +msgid "Send archive back to git-archive" +msgstr "" + +msgid "Send objects packed back to git-fetch-pack" +msgstr "" + +msgid "Show a Git logical variable" +msgstr "" + +msgid "Check the GPG signature of commits" +msgstr "" + +msgid "Validate packed Git archive files" +msgstr "" + +msgid "Check the GPG signature of tags" +msgstr "" + +msgid "Display version information about Git" +msgstr "" + +msgid "Show logs with difference each commit introduces" +msgstr "" + +msgid "Manage multiple working trees" +msgstr "Керувати кількома робочими деревами" + +msgid "Create a tree object from the current index" +msgstr "" + +msgid "Defining attributes per path" +msgstr "" + +msgid "Git command-line interface and conventions" +msgstr "" + +msgid "A Git core tutorial for developers" +msgstr "" + +msgid "Providing usernames and passwords to Git" +msgstr "" + +msgid "Git for CVS users" +msgstr "" + +msgid "Tweaking diff output" +msgstr "" + +msgid "A useful minimum set of commands for Everyday Git" +msgstr "" + +msgid "Frequently asked questions about using Git" +msgstr "" + +msgid "The bundle file format" +msgstr "Формат файлу пакета" + +msgid "Chunk-based file formats" +msgstr "" + +msgid "Git commit-graph format" +msgstr "" + +msgid "Git index format" +msgstr "" + +msgid "Git pack format" +msgstr "" + +msgid "Git cryptographic signature formats" +msgstr "" + +msgid "A Git Glossary" +msgstr "" + +msgid "Hooks used by Git" +msgstr "" + +msgid "Specifies intentionally untracked files to ignore" +msgstr "" + +msgid "The Git repository browser" +msgstr "" + +msgid "Map author/committer names and/or E-Mail addresses" +msgstr "" + +msgid "Defining submodule properties" +msgstr "" + +msgid "Git namespaces" +msgstr "" + +msgid "Protocol v0 and v1 capabilities" +msgstr "" + +msgid "Things common to various protocols" +msgstr "" + +msgid "Git HTTP-based protocols" +msgstr "" + +msgid "How packs are transferred over-the-wire" +msgstr "" + +msgid "Git Wire Protocol, Version 2" +msgstr "" + +msgid "Helper programs to interact with remote repositories" +msgstr "" + +msgid "Git Repository Layout" +msgstr "" + +msgid "Specifying revisions and ranges for Git" +msgstr "" + +msgid "Mounting one repository inside another" +msgstr "" + +msgid "A tutorial introduction to Git" +msgstr "" + +msgid "A tutorial introduction to Git: part two" +msgstr "" + +msgid "Git web interface (web frontend to Git repositories)" +msgstr "" + +msgid "An overview of recommended workflows with Git" +msgstr "" + +msgid "A tool for managing large Git repositories" +msgstr "" + +msgid "commit-graph file is too small" +msgstr "" + +#, c-format +msgid "commit-graph signature %X does not match signature %X" +msgstr "" + +#, c-format +msgid "commit-graph version %X does not match version %X" +msgstr "" + +#, c-format +msgid "commit-graph hash version %X does not match version %X" +msgstr "" + +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "" + +msgid "commit-graph has no base graphs chunk" +msgstr "" + +msgid "commit-graph chain does not match" +msgstr "" + +#, c-format +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "" + +msgid "unable to find all commit-graph files" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ вÑÑ– файли графа комітів" + +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "" + +#, c-format +msgid "could not find commit %s" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ коміт %s" + +msgid "commit-graph requires overflow generation data but has none" +msgstr "" + +msgid "Loading known commits in commit graph" +msgstr "" + +msgid "Expanding reachable commits in commit graph" +msgstr "" + +msgid "Clearing commit marks in commit graph" +msgstr "" + +msgid "Computing commit graph topological levels" +msgstr "" + +msgid "Computing commit graph generation numbers" +msgstr "" + +msgid "Computing commit changed paths Bloom filters" +msgstr "" + +msgid "Collecting referenced commits" +msgstr "" + +#, c-format +msgid "Finding commits for commit graph in %<PRIuMAX> pack" +msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "error adding pack %s" +msgstr "помилка Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÐµÑ‚Ñƒ %s" + +#, c-format +msgid "error opening index for %s" +msgstr "" + +msgid "Finding commits for commit graph among packed objects" +msgstr "" + +msgid "Finding extra edges in commit graph" +msgstr "" + +msgid "failed to write correct number of base graph ids" +msgstr "" + +msgid "unable to create temporary graph layer" +msgstr "не вдалоÑÑ Ñтворити тимчаÑовий шар графа" + +#, c-format +msgid "unable to adjust shared permissions for '%s'" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ñпільні дозволи Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "Writing out commit graph in %d pass" +msgid_plural "Writing out commit graph in %d passes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "unable to open commit-graph chain file" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ ланцюжковий файл графа комітів" + +msgid "failed to rename base commit-graph file" +msgstr "" + +msgid "failed to rename temporary commit-graph file" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ тимчаÑовий файл графа комітів" + +msgid "Scanning merged commits" +msgstr "" + +msgid "Merging commit-graph" +msgstr "" + +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "" + +msgid "too many commits to write graph" +msgstr "" + +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "" + +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "" + +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "" + +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ коміт %s з графа комітв" + +msgid "Verifying commits in commit graph" +msgstr "" + +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "" + +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "" + +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "" + +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "" + +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "" + +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" + +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" + +#, c-format +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "" + +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "" + +#, c-format +msgid "%s %s is not a commit!" +msgstr "" + +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" + +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Коміт %s не має GPG підпиÑу." + +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +msgid "" +"Warning: commit message did not conform to UTF-8.\n" +"You may want to amend it after fixing the message, or set the config\n" +"variable i18n.commitEncoding to the encoding your project uses.\n" +msgstr "" + +msgid "no compiler information available\n" +msgstr "" + +msgid "no libc information available\n" +msgstr "" + +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ вільний розмір диÑка Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "could not get info for '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ інформацію Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "[GLE %ld] health thread could not open '%ls'" +msgstr "" + +#, c-format +msgid "[GLE %ld] health thread getting BHFI for '%ls'" +msgstr "" + +#, c-format +msgid "could not convert to wide characters: '%s'" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ в широкі Ñимволи: \"%s\"" + +#, c-format +msgid "BHFI changed '%ls'" +msgstr "" + +#, c-format +msgid "unhandled case in 'has_worktree_moved': %d" +msgstr "" + +#, c-format +msgid "health thread wait failed [GLE %ld]" +msgstr "" + +#, c-format +msgid "Invalid path: %s" +msgstr "ÐеприпуÑтимий шлÑÑ…: %s" + +msgid "Unable to create FSEventStream." +msgstr "Ðе вдалоÑÑ Ñтворити FSEventStream." + +msgid "Failed to start the FSEventStream" +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити потік FSEventStream" + +#, c-format +msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" +msgstr "" + +#, c-format +msgid "[GLE %ld] could not watch '%s'" +msgstr "" + +#, c-format +msgid "[GLE %ld] could not get longname of '%s'" +msgstr "" + +#, c-format +msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" +msgstr "" + +#, c-format +msgid "GetOverlappedResult failed on '%s' [GLE %ld]" +msgstr "" + +#, c-format +msgid "could not read directory changes [GLE %ld]" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ зміни директорії [GLE %ld]" + +#, c-format +msgid "opendir('%s') failed" +msgstr "" + +#, c-format +msgid "lstat('%s') failed" +msgstr "" + +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "" + +#, c-format +msgid "closedir('%s') failed" +msgstr "" + +#, c-format +msgid "[GLE %ld] unable to open for read '%ls'" +msgstr "[GLE %ld] не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ \"%ls\"" + +#, c-format +msgid "[GLE %ld] unable to get protocol information for '%ls'" +msgstr "" + +#, c-format +msgid "failed to copy SID (%ld)" +msgstr "не вдалоÑÑ Ñкопіювати SID (%ld)" + +#, c-format +msgid "failed to get owner for '%s' (%ld)" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ влаÑника Ð´Ð»Ñ \"%s\" (%ld)" + +msgid "memory exhausted" +msgstr "" + +msgid "Success" +msgstr "" + +msgid "No match" +msgstr "" + +msgid "Invalid regular expression" +msgstr "" + +msgid "Invalid collation character" +msgstr "" + +msgid "Invalid character class name" +msgstr "" + +msgid "Trailing backslash" +msgstr "" + +msgid "Invalid back reference" +msgstr "ÐеприпуÑтиме зворотнє поÑиланнÑ" + +msgid "Unmatched [ or [^" +msgstr "" + +msgid "Unmatched ( or \\(" +msgstr "" + +msgid "Unmatched \\{" +msgstr "" + +msgid "Invalid content of \\{\\}" +msgstr "" + +msgid "Invalid range end" +msgstr "" + +msgid "Memory exhausted" +msgstr "" + +msgid "Invalid preceding regular expression" +msgstr "" + +msgid "Premature end of regular expression" +msgstr "" + +msgid "Regular expression too big" +msgstr "" + +msgid "Unmatched ) or \\)" +msgstr "" + +msgid "No previous regular expression" +msgstr "" + +msgid "could not send IPC command" +msgstr "" + +msgid "could not read IPC response" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ IPC відповідь" + +#, c-format +msgid "could not start accept_thread '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ accept_thread \"%s\"" + +#, c-format +msgid "could not start worker[0] for '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити worker[0] Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "ConnectNamedPipe failed for '%s' (%lu)" +msgstr "" + +#, c-format +msgid "could not create fd from pipe for '%s'" +msgstr "не вдалоÑÑ Ñтворити fd з каналу Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "could not start thread[0] for '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити thread[0] Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "wait for hEvent failed for '%s'" +msgstr "Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð° hEvent не вдалоÑÑ Ð´Ð»Ñ \"%s\"" + +msgid "cannot resume in the background, please use 'fg' to resume" +msgstr "" + +msgid "cannot restore terminal settings" +msgstr "" + +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"This might be due to circular includes." +msgstr "" + +#, c-format +msgid "could not expand include path '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ include path \"%s\"" + +msgid "relative config includes must come from files" +msgstr "" + +msgid "relative config include conditionals must come from files" +msgstr "" + +msgid "" +"remote URLs cannot be configured in file directly or indirectly included by " +"includeIf.hasconfig:remote.*.url" +msgstr "" + +#, c-format +msgid "invalid config format: %s" +msgstr "неприпуÑтимий формат конфігурації: %s" + +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "" + +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "" + +#, c-format +msgid "key does not contain a section: %s" +msgstr "" + +#, c-format +msgid "key does not contain variable name: %s" +msgstr "" + +#, c-format +msgid "invalid key: %s" +msgstr "неприпуÑтимий ключ: %s" + +#, c-format +msgid "invalid key (newline): %s" +msgstr "неприпуÑтимий ключ (новий Ñ€Ñдок): %s" + +msgid "empty config key" +msgstr "" + +#, c-format +msgid "bogus config parameter: %s" +msgstr "" + +#, c-format +msgid "bogus format in %s" +msgstr "" + +#, c-format +msgid "bogus count in %s" +msgstr "" + +#, c-format +msgid "too many entries in %s" +msgstr "" + +#, c-format +msgid "missing config key %s" +msgstr "" + +#, c-format +msgid "missing config value %s" +msgstr "" + +#, c-format +msgid "bad config line %d in blob %s" +msgstr "" + +#, c-format +msgid "bad config line %d in file %s" +msgstr "" + +#, c-format +msgid "bad config line %d in standard input" +msgstr "" + +#, c-format +msgid "bad config line %d in submodule-blob %s" +msgstr "" + +#, c-format +msgid "bad config line %d in command line %s" +msgstr "" + +#, c-format +msgid "bad config line %d in %s" +msgstr "" + +msgid "out of range" +msgstr "" + +msgid "invalid unit" +msgstr "неприпуÑтима Ð¾Ð´Ð¸Ð½Ð¸Ñ†Ñ Ð²Ð¸Ð¼Ñ–Ñ€Ñƒ" + +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "" + +#, c-format +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "" + +#, c-format +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "" + +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "" + +#, c-format +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "" + +#, c-format +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "" + +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "" + +#, c-format +msgid "invalid value for variable %s" +msgstr "неприпуÑтиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— %s" + +#, c-format +msgid "ignoring unknown core.fsync component '%s'" +msgstr "" + +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "неправильне булеве Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— \"%s\" Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ директорію кориÑтувача в: \"%s\"" + +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "\"%s\" Ð´Ð»Ñ \"%s\" не Ñ” припуÑтимою міткою чаÑу" + +#, c-format +msgid "abbrev length out of range: %d" +msgstr "" + +#, c-format +msgid "bad zlib compression level %d" +msgstr "" + +msgid "core.commentChar should only be one ASCII character" +msgstr "" + +#, c-format +msgid "ignoring unknown core.fsyncMethod value '%s'" +msgstr "" + +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" +msgstr "" + +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "неприпуÑтимий режим ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ð°: %s" + +#, c-format +msgid "malformed value for %s" +msgstr "неправильно Ñформоване Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s" + +#, c-format +msgid "malformed value for %s: %s" +msgstr "неправильно Ñформоване Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s: %s" + +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "" + +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ config blob обʼєкт \"%s\"" + +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\" не вказує на blob" + +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ config blob \"%s\"" + +#, c-format +msgid "failed to parse %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ %s" + +msgid "unable to parse command-line config" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ конфігурацію командного Ñ€Ñдка" + +msgid "unknown error occurred while reading the configuration files" +msgstr "" + +#, c-format +msgid "Invalid %s: '%s'" +msgstr "ÐеприпуÑтимий %s: \"%s\"" + +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "" + +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ \"%s\" з конфігурації командного Ñ€Ñдка" + +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "" + +#, c-format +msgid "invalid section name '%s'" +msgstr "неприпуÑтима назва Ñекції \"%s\"" + +#, c-format +msgid "%s has multiple values" +msgstr "" + +#, c-format +msgid "failed to write new configuration file %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати новий конфігураційний файл %s" + +#, c-format +msgid "could not lock config file %s" +msgstr "не вдалоÑÑ Ð·Ð°Ñ„Ñ–ÐºÑувати файл конфігурації %s" + +#, c-format +msgid "opening %s" +msgstr "" + +#, c-format +msgid "invalid config file %s" +msgstr "неприпуÑтимий конфігураційний файл %s" + +#, c-format +msgid "fstat on %s failed" +msgstr "" + +#, c-format +msgid "unable to mmap '%s'%s" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ mmap \"%s\"%s" + +#, c-format +msgid "chmod on %s failed" +msgstr "" + +#, c-format +msgid "could not write config file %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати конфігураційний файл %s" + +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "не вдалоÑÑ Ð²Ñтановити \"%s\" в \"%s\"" + +#, c-format +msgid "invalid section name: %s" +msgstr "неприпуÑтима назва Ñекції: %s" + +#, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "" + +#, c-format +msgid "missing value for '%s'" +msgstr "відÑутнє Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ \"%s\"" + +msgid "the remote end hung up upon initial contact" +msgstr "" + +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" + +#, c-format +msgid "server doesn't support '%s'" +msgstr "" + +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "" + +msgid "expected flush after capabilities" +msgstr "" + +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "" + +msgid "protocol error: unexpected capabilities^{}" +msgstr "" + +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "" + +msgid "repository on the other end cannot be shallow" +msgstr "" + +msgid "invalid packet" +msgstr "неприпуÑтимий пакет" + +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "" + +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "" + +#, c-format +msgid "error on bundle-uri response line %d: %s" +msgstr "" + +msgid "expected flush after bundle-uri listing" +msgstr "" + +msgid "expected response end packet after ref listing" +msgstr "" + +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "неприпуÑтима ls-refs відповідь: %s" + +msgid "expected flush after ref listing" +msgstr "" + +#, c-format +msgid "protocol '%s' is not supported" +msgstr "протокол \"%s\" не підтримуєтьÑÑ" + +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "" + +#, c-format +msgid "Looking up %s ... " +msgstr "" + +#, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ %s (порт %s) (%s)" + +#. TRANSLATORS: this is the end of "Looking up %s ... " + +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" + +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" +"не вдалоÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ %s:\n" +"%s" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " + +msgid "done." +msgstr "готово." + +#, c-format +msgid "unable to look up %s (%s)" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ %s (%s)" + +#, c-format +msgid "unknown port %s" +msgstr "невідомий порт %s" + +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "" + +#, c-format +msgid "strange port '%s' blocked" +msgstr "" + +#, c-format +msgid "cannot start proxy %s" +msgstr "неможливо запуÑтити прокÑÑ– %s" + +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "" + +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "" + +msgid "ssh variant 'simple' does not support -4" +msgstr "" + +msgid "ssh variant 'simple' does not support -6" +msgstr "" + +msgid "ssh variant 'simple' does not support setting port" +msgstr "" + +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "" + +msgid "unable to fork" +msgstr "неможливо розгалужити" + +msgid "Could not run 'git rev-list'" +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити \"git rev-list\"" + +msgid "failed write to rev-list" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати до rev-list" + +msgid "failed to close rev-list's stdin" +msgstr "" + +#, c-format +msgid "illegal crlf_action %d" +msgstr "" + +#, c-format +msgid "CRLF would be replaced by LF in %s" +msgstr "" + +#, c-format +msgid "" +"in the working copy of '%s', CRLF will be replaced by LF the next time Git " +"touches it" +msgstr "" + +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "" + +#, c-format +msgid "" +"in the working copy of '%s', LF will be replaced by CRLF the next time Git " +"touches it" +msgstr "" + +#, c-format +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "" + +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." +msgstr "" + +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "" + +#, c-format +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." +msgstr "" + +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "не вдалоÑÑ Ð·Ð°ÐºÐ¾Ð´ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\" з %s в %s" + +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "" + +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "неможливо розгалужити Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку зовнішнього фільтра \"%s\"" + +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "неможливо подати вхідні дані на зовнішній фільтр \"%s\"" + +#, c-format +msgid "external filter '%s' failed %d" +msgstr "" + +#, c-format +msgid "read from external filter '%s' failed" +msgstr "" + +#, c-format +msgid "external filter '%s' failed" +msgstr "" + +msgid "unexpected filter type" +msgstr "" + +msgid "path name too long for external filter" +msgstr "" + +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" + +msgid "true/false are no valid working-tree-encodings" +msgstr "" + +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "" + +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "" + +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "" + +msgid "refusing to work with credential missing host field" +msgstr "" + +msgid "refusing to work with credential missing protocol field" +msgstr "" + +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "" + +#, c-format +msgid "url has no scheme: %s" +msgstr "" + +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "" + +msgid "in the future" +msgstr "" + +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. TRANSLATORS: "%s" is "<n> years" + +#, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Propagating island marks" +msgstr "" + +#, c-format +msgid "bad tree object %s" +msgstr "невірний обʼєкт дерева %s" + +#, c-format +msgid "failed to load island regex for '%s': %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ island регвир Ð´Ð»Ñ \"%s\": %s" + +#, c-format +msgid "island regex from config has too many capture groups (max=%d)" +msgstr "" + +#, c-format +msgid "Marked %d islands, done.\n" +msgstr "" + +#, c-format +msgid "invalid --%s value '%s'" +msgstr "неприпуÑтиме --%s Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\"" + +#, c-format +msgid "could not archive missing directory '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð°Ñ€Ñ…Ñ–Ð²ÑƒÐ²Ð°Ñ‚Ð¸ відÑутню директорію \"%s\"" + +#, c-format +msgid "could not open directory '%s'" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ директорію \"%s\"" + +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "" + +msgid "could not duplicate stdout" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ð´ÑƒÐ±Ð»ÑŽÐ²Ð°Ñ‚Ð¸ stdout" + +#, c-format +msgid "could not add directory '%s' to archiver" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ директорію \"%s\" до архіватора" + +msgid "failed to write archive" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати архів" + +msgid "--merge-base does not work with ranges" +msgstr "" + +msgid "--merge-base only works with commits" +msgstr "" + +msgid "unable to get HEAD" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ HEAD" + +msgid "no merge base found" +msgstr "" + +msgid "multiple merge bases found" +msgstr "" + +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<опції>] <шлÑÑ…> <шлÑÑ…>" + +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" + +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr "" + +#, c-format +msgid " Unknown dirstat parameter '%s'\n" +msgstr "" + +msgid "" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" +msgstr "" + +#, c-format +msgid "" +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +msgstr "" + +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other " +"whitespace modes" +msgstr "" + +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "" + +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" + +#, c-format +msgid "external diff died, stopping at %s" +msgstr "" + +#, c-format +msgid "options '%s', '%s', '%s', and '%s' cannot be used together" +msgstr "опції \"%s\", \"%s\", \"%s\" та \"%s\" неможливо викориÑтовувати разом" + +#, c-format +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" +msgstr "" +"опції \"%s\" Ñ– \"%s\" неможливо викориÑтати разом, викориÑтовуйте \"%s\" з " +"\"%s\"" + +#, c-format +msgid "" +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" +msgstr "" +"опції \"%s\" Ñ– \"%s\" неможливо викориÑтати разом, викориÑтовуйте \"%s\" з " +"\"%s\" та \"%s\"" + +msgid "--follow requires exactly one pathspec" +msgstr "" + +#, c-format +msgid "invalid --stat value: %s" +msgstr "неприпуÑтиме --stat значеннÑ: %s" + +#, c-format +msgid "%s expects a numerical value" +msgstr "" + +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" + +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "" + +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "" + +#, c-format +msgid "unable to resolve '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "" + +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s очікує Ñимвол, отримано \"%s\"" + +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "" + +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "" + +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" + +#, c-format +msgid "invalid argument to %s" +msgstr "неприпуÑтимий аргумент до %s" + +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "неприпуÑтимий regex, переданий до -I: \"%s\"" + +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ параметр опції --submodule: \"%s\"" + +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "" + +msgid "Diff output format options" +msgstr "" + +msgid "generate patch" +msgstr "згенерувати латку" + +msgid "<n>" +msgstr "" + +msgid "generate diffs with <n> lines context" +msgstr "" + +msgid "generate the diff in raw format" +msgstr "" + +msgid "synonym for '-p --raw'" +msgstr "" + +msgid "synonym for '-p --stat'" +msgstr "" + +msgid "machine friendly --stat" +msgstr "машинний вивід --stat" + +msgid "output only the last line of --stat" +msgstr "" + +msgid "<param1,param2>..." +msgstr "" + +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "" + +msgid "synonym for --dirstat=cumulative" +msgstr "" + +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "" + +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "" + +msgid "condensed summary such as creations, renames and mode changes" +msgstr "" + +msgid "show only names of changed files" +msgstr "" + +msgid "show only names and status of changed files" +msgstr "" + +msgid "<width>[,<name-width>[,<count>]]" +msgstr "" + +msgid "generate diffstat" +msgstr "" + +msgid "<width>" +msgstr "" + +msgid "generate diffstat with a given width" +msgstr "" + +msgid "generate diffstat with a given name width" +msgstr "" + +msgid "generate diffstat with a given graph width" +msgstr "" + +msgid "<count>" +msgstr "" + +msgid "generate diffstat with limited lines" +msgstr "" + +msgid "generate compact summary in diffstat" +msgstr "" + +msgid "output a binary diff that can be applied" +msgstr "" + +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "" + +msgid "show colored diff" +msgstr "" + +msgid "<kind>" +msgstr "" + +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "" + +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" + +msgid "<prefix>" +msgstr "" + +msgid "show the given source prefix instead of \"a/\"" +msgstr "" + +msgid "show the given destination prefix instead of \"b/\"" +msgstr "" + +msgid "prepend an additional prefix to every line of output" +msgstr "" + +msgid "do not show any source or destination prefix" +msgstr "" + +msgid "use default prefixes a/ and b/" +msgstr "" + +msgid "show context between diff hunks up to the specified number of lines" +msgstr "" + +msgid "<char>" +msgstr "" + +msgid "specify the character to indicate a new line instead of '+'" +msgstr "" + +msgid "specify the character to indicate an old line instead of '-'" +msgstr "" + +msgid "specify the character to indicate a context instead of ' '" +msgstr "" + +msgid "Diff rename options" +msgstr "" + +msgid "<n>[/<m>]" +msgstr "" + +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "" + +msgid "detect renames" +msgstr "" + +msgid "omit the preimage for deletes" +msgstr "" + +msgid "detect copies" +msgstr "" + +msgid "use unmodified files as source to find copies" +msgstr "" + +msgid "disable rename detection" +msgstr "" + +msgid "use empty blobs as rename source" +msgstr "" + +msgid "continue listing the history of a file beyond renames" +msgstr "" + +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "" + +msgid "Diff algorithm options" +msgstr "" + +msgid "produce the smallest possible diff" +msgstr "" + +msgid "ignore whitespace when comparing lines" +msgstr "" + +msgid "ignore changes in amount of whitespace" +msgstr "" + +msgid "ignore changes in whitespace at EOL" +msgstr "" + +msgid "ignore carrier-return at the end of line" +msgstr "" + +msgid "ignore changes whose lines are all blank" +msgstr "" + +msgid "<regex>" +msgstr "" + +msgid "ignore changes whose all lines match <regex>" +msgstr "" + +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "" + +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "" + +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "" + +msgid "<algorithm>" +msgstr "" + +msgid "choose a diff algorithm" +msgstr "" + +msgid "<text>" +msgstr "" + +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "" + +msgid "<mode>" +msgstr "" + +msgid "show word diff, using <mode> to delimit changed words" +msgstr "" + +msgid "use <regex> to decide what a word is" +msgstr "" + +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "" + +msgid "moved lines of code are colored differently" +msgstr "" + +msgid "how white spaces are ignored in --color-moved" +msgstr "" + +msgid "Other diff options" +msgstr "" + +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "" + +msgid "treat all files as text" +msgstr "" + +msgid "swap two inputs, reverse the diff" +msgstr "" + +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "" + +msgid "disable all output of the program" +msgstr "" + +msgid "allow an external diff helper to be executed" +msgstr "" + +msgid "run external text conversion filters when comparing binary files" +msgstr "" + +msgid "<when>" +msgstr "" + +msgid "ignore changes to submodules in the diff generation" +msgstr "" + +msgid "<format>" +msgstr "" + +msgid "specify how differences in submodules are shown" +msgstr "" + +msgid "hide 'git add -N' entries from the index" +msgstr "приховати запиÑи \"git add -N\" з індекÑу" + +msgid "treat 'git add -N' entries as real in the index" +msgstr "" + +msgid "<string>" +msgstr "" + +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "" + +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" + +msgid "show all changes in the changeset with -S or -G" +msgstr "" + +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "" + +msgid "control the order in which files appear in the output" +msgstr "" + +msgid "<path>" +msgstr "<шлÑÑ…>" + +msgid "show the change in the specified path first" +msgstr "" + +msgid "skip the output to the specified path" +msgstr "" + +msgid "<object-id>" +msgstr "" + +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "" + +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "" + +msgid "select files by diff type" +msgstr "" + +msgid "<file>" +msgstr "" + +msgid "output to a specific file" +msgstr "" + +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "" + +msgid "only found copies from modified paths due to too many files." +msgstr "" + +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" + +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ orderfile \"%s\"" + +msgid "Performing inexact rename detection" +msgstr "" + +#, c-format +msgid "No such path '%s' in the diff" +msgstr "" + +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "" + +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "нерозпізнаний шаблон: \"%s\"" + +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "нерозпізнаний негативний шаблон: \"%s\"" + +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" + +msgid "disabling cone pattern matching" +msgstr "" + +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "неможливо викориÑтовувати %s Ñк файл виключеннÑ" + +msgid "failed to get kernel name and information" +msgstr "" + +msgid "untracked cache is disabled on this system or location" +msgstr "" + +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +msgstr "" + +#, c-format +msgid "index file corrupt in repo %s" +msgstr "пошкоджено індекÑний файл у Ñховищі %s" + +#, c-format +msgid "could not create directories for %s" +msgstr "не вдалоÑÑ Ñтворити директорії Ð´Ð»Ñ %s" + +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ½ÐµÑти git директорію з \"%s\" до \"%s\"" + +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "" + +#, c-format +msgid "could not write to '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати в \"%s\"" + +#, c-format +msgid "could not edit '%s'" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\"" + +msgid "Filtering content" +msgstr "" + +#, c-format +msgid "could not stat file '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat Ð´Ð»Ñ %s" + +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "" + +#, c-format +msgid "too many args to run %s" +msgstr "забагато аргументів Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку %s" + +msgid "git fetch-pack: expected shallow list" +msgstr "" + +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "" + +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "" + +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack: очікувалоÑÑŒ ACK/NAK, отримано \"%s\"" + +msgid "unable to write to remote" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати до віддаленого Ñховища" + +msgid "Server supports filter" +msgstr "" + +#, c-format +msgid "invalid shallow line: %s" +msgstr "неприпуÑтимий shallow Ñ€Ñдок: %s" + +#, c-format +msgid "invalid unshallow line: %s" +msgstr "неприпуÑтимий unshallow Ñ€Ñдок: %s" + +#, c-format +msgid "object not found: %s" +msgstr "" + +#, c-format +msgid "error in object: %s" +msgstr "помилка в обʼєкті: %s" + +#, c-format +msgid "no shallow found: %s" +msgstr "" + +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "" + +#, c-format +msgid "got %s %d %s" +msgstr "" + +#, c-format +msgid "invalid commit %s" +msgstr "неприпуÑтимий коміт %s" + +msgid "giving up" +msgstr "" + +msgid "done" +msgstr "готово" + +#, c-format +msgid "got %s (%d) %s" +msgstr "" + +#, c-format +msgid "Marking %s as complete" +msgstr "" + +#, c-format +msgid "already have %s (%s)" +msgstr "" + +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "" + +msgid "protocol error: bad pack header" +msgstr "" + +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "" + +msgid "fetch-pack: invalid index-pack output" +msgstr "" + +#, c-format +msgid "%s failed" +msgstr "" + +msgid "error in sideband demultiplexer" +msgstr "" + +#, c-format +msgid "Server version is %.*s" +msgstr "" + +#, c-format +msgid "Server supports %s" +msgstr "" + +msgid "Server does not support shallow clients" +msgstr "" + +msgid "Server does not support --shallow-since" +msgstr "" + +msgid "Server does not support --shallow-exclude" +msgstr "" + +msgid "Server does not support --deepen" +msgstr "" + +msgid "Server does not support this repository's object format" +msgstr "" + +msgid "no common commits" +msgstr "немає Ñпільних комітів" + +msgid "git fetch-pack: fetch failed." +msgstr "" + +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "" + +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "Ñервер не підтримує алгоритм \"%s\"" + +msgid "Server does not support shallow requests" +msgstr "" + +msgid "unable to write request to remote" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати запит до віддаленого Ñховища" + +#, c-format +msgid "expected '%s', received '%s'" +msgstr "очікувалоÑÑŒ \"%s\", отримано \"%s\"" + +#, c-format +msgid "expected '%s'" +msgstr "очікувалоÑÑŒ \"%s\"" + +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "" + +#, c-format +msgid "error processing acks: %d" +msgstr "" + +#. TRANSLATORS: The parameter will be 'ready', a protocol +#. keyword. +#. + +#, c-format +msgid "expected packfile to be sent after '%s'" +msgstr "" + +#. TRANSLATORS: The parameter will be 'ready', a protocol +#. keyword. +#. + +#, c-format +msgid "expected no other sections to be sent after no '%s'" +msgstr "" + +#, c-format +msgid "error processing shallow info: %d" +msgstr "" + +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "очікувалоÑÑ wanted-ref, отримано \"%s\"" + +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "" + +#, c-format +msgid "error processing wanted refs: %d" +msgstr "" + +msgid "git fetch-pack: expected response end packet" +msgstr "" + +msgid "no matching remote head" +msgstr "" + +msgid "unexpected 'ready' from remote" +msgstr "" + +#, c-format +msgid "no such remote ref %s" +msgstr "немає такого віддаленного поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "" + +#, c-format +msgid "fsmonitor_ipc__send_query: invalid path '%s'" +msgstr "" + +#, c-format +msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" +msgstr "" + +msgid "fsmonitor--daemon is not running" +msgstr "" + +#, c-format +msgid "could not send '%s' command to fsmonitor--daemon" +msgstr "" + +#, c-format +msgid "bare repository '%s' is incompatible with fsmonitor" +msgstr "порожнє Ñховище \"%s\" неÑуміÑне з fsmonitor" + +#, c-format +msgid "repository '%s' is incompatible with fsmonitor due to errors" +msgstr "" + +#, c-format +msgid "remote repository '%s' is incompatible with fsmonitor" +msgstr "віддалене Ñховище \"%s\" неÑуміÑне з fsmonitor" + +#, c-format +msgid "virtual repository '%s' is incompatible with fsmonitor" +msgstr "" + +#, c-format +msgid "" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" +msgstr "" + +msgid "" +"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--config-env=<name>=<envvar>] <command> [<args>]" +msgstr "" + +msgid "" +"'git help -a' and 'git help -g' list available subcommands and some\n" +"concept guides. See 'git help <command>' or 'git help <concept>'\n" +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." +msgstr "" + +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "" + +#, c-format +msgid "no directory given for '%s' option\n" +msgstr "" + +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "" + +#, c-format +msgid "-c expects a configuration string\n" +msgstr "" + +#, c-format +msgid "no config key given for --config-env\n" +msgstr "" + +#, c-format +msgid "unknown option: %s\n" +msgstr "" + +#, c-format +msgid "while expanding alias '%s': '%s'" +msgstr "" + +#, c-format +msgid "" +"alias '%s' changes environment variables.\n" +"You can use '!git' in the alias to do this" +msgstr "" + +#, c-format +msgid "empty alias for %s" +msgstr "" + +#, c-format +msgid "recursive alias: %s" +msgstr "" + +msgid "write failure on standard output" +msgstr "" + +msgid "unknown write failure on standard output" +msgstr "" + +msgid "close failed on standard output" +msgstr "" + +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "" + +#, c-format +msgid "cannot handle %s as a builtin" +msgstr "" + +#, c-format +msgid "" +"usage: %s\n" +"\n" +msgstr "" + +#, c-format +msgid "expansion of alias '%s' failed; '%s' is not a git command\n" +msgstr "" + +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ команду \"%s\": %s\n" + +msgid "could not create temporary file" +msgstr "не вдалоÑÑ Ñтворити тимчаÑовий файл" + +#, c-format +msgid "failed writing detached signature to '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати відʼєднаний Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ð´Ð¾ \"%s\"" + +msgid "" +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " +"signature verification" +msgstr "" + +msgid "" +"ssh-keygen -Y find-principals/verify is needed for ssh signature " +"verification (available in openssh version 8.2p1+)" +msgstr "" + +#, c-format +msgid "ssh signing revocation file configured but not found: %s" +msgstr "" + +#, c-format +msgid "bad/incompatible signature '%s'" +msgstr "" + +#, c-format +msgid "failed to get the ssh fingerprint for key '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ssh відбиток Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° \"%s\"" + +msgid "" +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" +msgstr "" + +#, c-format +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" +msgstr "" + +#, c-format +msgid "gpg.ssh.defaultKeyCommand failed: %s %s" +msgstr "" + +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg не вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати дані:\n" +"%s" + +msgid "user.signingKey needs to be set for ssh signing" +msgstr "" + +#, c-format +msgid "failed writing ssh signing key to '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати ssh ключ підпиÑу до \"%s\"" + +#, c-format +msgid "failed writing ssh signing key buffer to '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати буфер ssh ключа підпиÑу в \"%s\"" + +msgid "" +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version " +"8.2p1+)" +msgstr "" + +#, c-format +msgid "failed reading ssh signing data buffer from '%s'" +msgstr "" + +#, c-format +msgid "ignored invalid color '%.*s' in log.graphColors" +msgstr "" + +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" + +#, c-format +msgid "'%s': unable to read %s" +msgstr "\"%s\": не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ %s" + +#, c-format +msgid "'%s': short read" +msgstr "" + +msgid "start a working area (see also: git help tutorial)" +msgstr "" + +msgid "work on the current change (see also: git help everyday)" +msgstr "" + +msgid "examine the history and state (see also: git help revisions)" +msgstr "" + +msgid "grow, mark and tweak your common history" +msgstr "" + +msgid "collaborate (see also: git help workflows)" +msgstr "" + +msgid "Main Porcelain Commands" +msgstr "" + +msgid "Ancillary Commands / Manipulators" +msgstr "" + +msgid "Ancillary Commands / Interrogators" +msgstr "" + +msgid "Interacting with Others" +msgstr "" + +msgid "Low-level Commands / Manipulators" +msgstr "" + +msgid "Low-level Commands / Interrogators" +msgstr "" + +msgid "Low-level Commands / Syncing Repositories" +msgstr "" + +msgid "Low-level Commands / Internal Helpers" +msgstr "" + +msgid "User-facing repository, command and file interfaces" +msgstr "" + +msgid "Developer-facing file formats, protocols and other interfaces" +msgstr "" + +#, c-format +msgid "available git commands in '%s'" +msgstr "доÑтупні команди git в \"%s\"" + +msgid "git commands available from elsewhere on your $PATH" +msgstr "" + +msgid "These are common Git commands used in various situations:" +msgstr "" + +msgid "The Git concept guides are:" +msgstr "" + +msgid "User-facing repository, command and file interfaces:" +msgstr "" + +msgid "File formats, protocols and other developer interfaces:" +msgstr "" + +msgid "External commands" +msgstr "" + +msgid "Command aliases" +msgstr "" + +msgid "See 'git help <command>' to read about a specific subcommand" +msgstr "" + +#, c-format +msgid "" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" +msgstr "" + +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "" + +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "" + +#, c-format +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "" + +#, c-format +msgid "Continuing under the assumption that you meant '%s'." +msgstr "" + +#, c-format +msgid "Run '%s' instead [y/N]? " +msgstr "" + +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "" + +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "git version [--build-options]" +msgstr "" + +#, c-format +msgid "%s: %s - %s" +msgstr "" + +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" + +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "" + +msgid "not a git repository" +msgstr "не Ñ” git Ñховищем" + +#, c-format +msgid "negative value for http.postBuffer; defaulting to %d" +msgstr "" + +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "" + +msgid "Public key pinning not supported with cURL < 7.39.0" +msgstr "" + +msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" +msgstr "" + +#, c-format +msgid "Unsupported SSL backend '%s'. Supported SSL backends:" +msgstr "" + +#, c-format +msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" +msgstr "" + +#, c-format +msgid "Could not set SSL backend to '%s': already set" +msgstr "" + +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" + +msgid "Author identity unknown\n" +msgstr "" + +msgid "Committer identity unknown\n" +msgstr "" + +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "" + +msgid "no email was given and auto-detection is disabled" +msgstr "" + +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "" + +msgid "no name was given and auto-detection is disabled" +msgstr "" + +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "не вдалоÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ визначити назву (отримано \"%s\")" + +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "" + +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "" + +msgid "expected 'tree:<depth>'" +msgstr "" + +msgid "sparse:path filters support has been dropped" +msgstr "" + +#, c-format +msgid "'%s' for 'object:type=<type>' is not a valid object type" +msgstr "" + +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "неприпуÑтимий визначник фільтра \"%s\"" + +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" + +msgid "expected something after combine:" +msgstr "" + +msgid "multiple filter-specs cannot be combined" +msgstr "" + +msgid "unable to upgrade repository format to support partial clone" +msgstr "" + +msgid "args" +msgstr "" + +msgid "object filtering" +msgstr "" + +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до чаÑткового blob в \"%s\"" + +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ дані чаÑткового фільтра в %s" + +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "" + +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "" + +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ кореневе дерево Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ %s" + +#, 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 "" + +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Ðе вдалоÑÑ Ñтворити \"%s.lock\": %s" + +#, c-format +msgid "unexpected line: '%s'" +msgstr "" + +msgid "expected flush after ls-refs arguments" +msgstr "" + +msgid "quoted CRLF detected" +msgstr "" + +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "" + +#, c-format +msgid "Failed to merge submodule %s (no merge base)" +msgstr "" + +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "" + +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" + +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "" + +#, c-format +msgid "Failed to merge submodule %s" +msgstr "Ðе вдалоÑÑ Ð·Ð»Ð¸Ñ‚Ð¸ підмодуль %s" + +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists: %s" +msgstr "" + +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" + +msgid "Failed to execute internal merge" +msgstr "" + +#, c-format +msgid "Unable to add %s to database" +msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ %s до бази даних" + +#, c-format +msgid "Auto-merging %s" +msgstr "" + +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" + +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" + +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" + +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" + +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" + +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" + +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" + +#, c-format +msgid "cannot read object %s" +msgstr "неможливо прочитати обʼєкт %s" + +#, c-format +msgid "object %s is not a blob" +msgstr "обʼєкт %s не Ñ” blob" + +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed both " +"of them so each can be recorded somewhere." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" + +msgid "content" +msgstr "" + +msgid "add/add" +msgstr "" + +msgid "submodule" +msgstr "" + +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "" + +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" + +#. TRANSLATORS: This is a line of advice to resolve a merge +#. conflict in a submodule. The first argument is the submodule +#. name, and the second argument is the abbreviated id of the +#. commit that needs to be merged. For example: +#. - go to submodule (mysubmodule), and either merge commit abc1234" +#. + +#, c-format +msgid "" +" - go to submodule (%s), and either merge commit %s\n" +" or update to an existing commit which has merged those changes\n" +msgstr "" + +#, c-format +msgid "" +"Recursive merging with submodules currently only supports trivial cases.\n" +"Please manually handle the merging of each conflicted submodule.\n" +"This can be accomplished with the following steps:\n" +"%s - come back to superproject and run:\n" +"\n" +" git add %s\n" +"\n" +" to record the above merge or update\n" +" - resolve any other conflicts in the superproject\n" +" - commit the resulting index in the superproject\n" +msgstr "" + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. + +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "" + +msgid "(bad commit)\n" +msgstr "" + +#, c-format +msgid "add_cacheinfo failed for path '%s'; merge aborting." +msgstr "невдала Ñпроба add_cacheinfo Ð´Ð»Ñ ÑˆÐ»Ñху \"%s\"; Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ." + +#, c-format +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "" + +#, c-format +msgid "failed to create path '%s'%s" +msgstr "не вдалоÑÑ Ñтворити шлÑÑ… \"%s\"%s" + +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "" + +msgid ": perhaps a D/F conflict?" +msgstr "" + +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "відмова від втрати невідÑтежуваного файла \"%s\"" + +#, c-format +msgid "blob expected for %s '%s'" +msgstr "blob очікуєтьÑÑ Ð´Ð»Ñ %s \"%s\"" + +#, c-format +msgid "failed to open '%s': %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\": %s" + +#, c-format +msgid "failed to symlink '%s': %s" +msgstr "не вдалоÑÑ Ð·Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\": %s" + +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "" + +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "" + +#, c-format +msgid "Fast-forwarding submodule %s" +msgstr "" + +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "" + +#, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "" + +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "" + +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" + +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "" + +#, c-format +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" + +msgid "rename" +msgstr "перейменувати" + +msgid "renamed" +msgstr "перейменовано" + +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "Відмова від втрати брудного файла %s" + +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "" + +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" +msgstr "" + +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "" + +#, c-format +msgid "Refusing to lose untracked file at %s; adding as %s instead" +msgstr "" + +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" +msgstr "" + +msgid " (left unresolved)" +msgstr "" + +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" + +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" + +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" + +msgid "modify" +msgstr "змінити" + +msgid "modified" +msgstr "змінено" + +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "" + +#, c-format +msgid "Adding as %s instead" +msgstr "" + +#, c-format +msgid "Removing %s" +msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ %s" + +msgid "file/directory" +msgstr "файл/директоріÑ" + +msgid "directory/file" +msgstr "" + +#, c-format +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +msgstr "" + +#, c-format +msgid "Adding %s" +msgstr "" + +#, c-format +msgid "CONFLICT (add/add): Merge conflict in %s" +msgstr "" + +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "" + +msgid "Merging:" +msgstr "" + +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "merge returned no commit" +msgstr "" + +#, c-format +msgid "Could not parse object '%s'" +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ обʼєкт \"%s\"" + +msgid "failed to read the cache" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ кеш" + +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "" + +#, c-format +msgid "multi-pack-index file %s is too small" +msgstr "" + +#, c-format +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" +msgstr "" + +#, c-format +msgid "multi-pack-index version %d not recognized" +msgstr "" + +#, c-format +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "" + +msgid "multi-pack-index missing required pack-name chunk" +msgstr "" + +msgid "multi-pack-index missing required OID fanout chunk" +msgstr "" + +msgid "multi-pack-index missing required OID lookup chunk" +msgstr "" + +msgid "multi-pack-index missing required object offsets chunk" +msgstr "" + +#, c-format +msgid "multi-pack-index pack names out of order: '%s' before '%s'" +msgstr "" + +#, c-format +msgid "bad pack-int-id: %u (%u total packs)" +msgstr "" + +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "" + +#, c-format +msgid "failed to add packfile '%s'" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ packfile \"%s\"" + +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ pack-index \"%s\"" + +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "" + +msgid "cannot store reverse index file" +msgstr "неможливо зберегти файл зворотнього індекÑу" + +#, c-format +msgid "could not parse line: %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ Ñ€Ñдок: %s" + +#, c-format +msgid "malformed line: %s" +msgstr "" + +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "" + +msgid "could not load pack" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ пакет" + +#, c-format +msgid "could not open index for %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ %s" + +msgid "Adding packfiles to multi-pack-index" +msgstr "" + +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "" + +#, c-format +msgid "cannot select preferred pack %s with no objects" +msgstr "" + +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "" + +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "" + +msgid "no pack files to index." +msgstr "" + +msgid "refusing to write multi-pack .bitmap without any objects" +msgstr "" + +msgid "could not write multi-pack bitmap" +msgstr "" + +msgid "could not write multi-pack-index" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати multi-pack-index" + +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "не вдалоÑÑ Ð¾Ñ‡Ð¸Ñтити multi-pack-index при %s" + +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" + +msgid "incorrect checksum" +msgstr "" + +msgid "Looking for referenced packfiles" +msgstr "Пошук файлів пакунків, на Ñкі Ñ” поÑиланнÑ" + +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "" + +msgid "the midx contains no oid" +msgstr "" + +msgid "Verifying OID order in multi-pack-index" +msgstr "" + +#, c-format +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" +msgstr "" + +msgid "Sorting objects by packfile" +msgstr "" + +msgid "Verifying object offsets" +msgstr "Перевірка зміщень обʼєкта" + +#, c-format +msgid "failed to load pack entry for oid[%d] = %s" +msgstr "" + +#, c-format +msgid "failed to load pack-index for packfile %s" +msgstr "" + +#, c-format +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" +msgstr "" + +msgid "Counting referenced objects" +msgstr "Підрахунок обʼєктів, на Ñкі Ñ” поÑиланнÑ" + +msgid "Finding and deleting unreferenced packfiles" +msgstr "" + +msgid "could not start pack-objects" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ pack-objects" + +msgid "could not finish pack-objects" +msgstr "не вдалоÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ pack-objects" + +#, c-format +msgid "unable to create lazy_dir thread: %s" +msgstr "не вдалоÑÑ Ñтворити lazy_dir потік: %s" + +#, c-format +msgid "unable to create lazy_name thread: %s" +msgstr "не вдалоÑÑ Ñтворити lazy_name потік: %s" + +#, c-format +msgid "unable to join lazy_name thread: %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ lazy_name потоку: %s" + +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." +msgstr "" + +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "" + +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "" + +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "" + +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. + +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Ðевірне %s значеннÑ: \"%s\"" + +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "не вдалоÑÑ Ð½Ð¾Ñ€Ð¼Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ шлÑÑ… альтернативного обʼєкта: %s" + +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +msgid "unable to fdopen alternates lockfile" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ fdopen Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñпільних обʼєктів" + +msgid "unable to read alternates file" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл Ñпільних обʼєктів" + +msgid "unable to move new alternates file into place" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñтити файл нових Ñпільних обʼєктів на міÑце" + +#, c-format +msgid "path '%s' does not exist" +msgstr "шлÑÑ… \"%s\" не Ñ–Ñнує" + +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" + +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "Ñховище поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\" не Ñ” локальним Ñховищем." + +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "Ñховище поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\" Ñ” поверхневим" + +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "Ñховище поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\" прищеплено" + +#, c-format +msgid "could not find object directory matching %s" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ директорію обʼєктів, що відповідає %s" + +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "" + +#, c-format +msgid "mmap failed%s" +msgstr "" + +#, c-format +msgid "object file %s is empty" +msgstr "обʼєктний файл %s порожній" + +#, c-format +msgid "corrupt loose object '%s'" +msgstr "пошкоджено вільний обʼєкт \"%s\"" + +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "" + +#, c-format +msgid "unable to open loose object %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ вільний обʼєкт %s" + +#, c-format +msgid "unable to parse %s header" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ заголовок %s" + +msgid "invalid object type" +msgstr "неприпуÑтимий тип обʼєкта" + +#, c-format +msgid "unable to unpack %s header" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ %s заголовок" + +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "" + +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "вільний обʼєкт %s (що зберігаєтьÑÑ Ñƒ %s) пошкоджено" + +#, c-format +msgid "replacement %s not found for %s" +msgstr "заміна %s не знайдена Ð´Ð»Ñ %s" + +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "упакований обʼєкт %s (що зберігаєтьÑÑ Ñƒ %s) пошкоджено" + +#, c-format +msgid "unable to write file %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл %s" + +#, c-format +msgid "unable to set permission to '%s'" +msgstr "не вдалоÑÑ Ð²Ñтановити права доÑтупу до \"%s\"" + +msgid "error when closing loose object file" +msgstr "помилка при закритті файла вільного об’єкта" + +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +msgid "unable to create temporary file" +msgstr "не вдалоÑÑ Ñтворити тимчаÑовий файл" + +msgid "unable to write loose object file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл вільного об’єкта" + +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ новий обʼєкт %s (%d)" + +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "" + +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#, c-format +msgid "write stream object %ld != %<PRIuMAX>" +msgstr "" + +#, c-format +msgid "unable to stream deflate new object (%d)" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ новий обʼєкт (%d) при передачі" + +#, c-format +msgid "deflateEnd on stream object failed (%d)" +msgstr "" + +#, c-format +msgid "unable to create directory %s" +msgstr "не вдалоÑÑ Ñтворити директорію %s" + +#, c-format +msgid "cannot read object for %s" +msgstr "неможливо прочитати обʼєкт Ð´Ð»Ñ %s" + +#, c-format +msgid "object fails fsck: %s" +msgstr "" + +msgid "refusing to create malformed object" +msgstr "" + +#, c-format +msgid "read error while indexing %s" +msgstr "" + +#, c-format +msgid "short read while indexing %s" +msgstr "" + +#, c-format +msgid "%s: failed to insert into database" +msgstr "" + +#, c-format +msgid "%s: unsupported file type" +msgstr "" + +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s не Ñ” допуÑтимим \"%s\" обʼєктом" + +#, c-format +msgid "unable to open %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s" + +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "" + +#, c-format +msgid "unable to mmap %s" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ mmap %s" + +#, c-format +msgid "unable to unpack header of %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ заголовок %s" + +#, c-format +msgid "unable to parse header of %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ заголовок %s" + +#, c-format +msgid "unable to unpack contents of %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ вміÑÑ‚ %s" + +#. TRANSLATORS: This is a line of ambiguous object +#. output shown when we cannot look up or parse the +#. object in question. E.g. "deadbeef [bad object]". +#. + +#, c-format +msgid "%s [bad object]" +msgstr "" + +#. TRANSLATORS: This is a line of ambiguous commit +#. object output. E.g.: +#. * +#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. + +#, c-format +msgid "%s commit %s - %s" +msgstr "%s коміт %s - %s" + +#. TRANSLATORS: This is a line of ambiguous +#. tag object output. E.g.: +#. * +#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. * +#. The second argument is the YYYY-MM-DD found +#. in the tag. +#. * +#. The third argument is the "tag" string +#. from object.c. +#. + +#, c-format +msgid "%s tag %s - %s" +msgstr "%s тег %s - %s" + +#. TRANSLATORS: This is a line of ambiguous +#. tag object output where we couldn't parse +#. the tag itself. E.g.: +#. * +#. "deadbeef [bad tag, could not parse it]" +#. + +#, c-format +msgid "%s [bad tag, could not parse it]" +msgstr "" + +#. TRANSLATORS: This is a line of ambiguous <type> +#. object output. E.g. "deadbeef tree". +#. + +#, c-format +msgid "%s tree" +msgstr "" + +#. TRANSLATORS: This is a line of ambiguous <type> +#. object output. E.g. "deadbeef blob". +#. + +#, c-format +msgid "%s blob" +msgstr "" + +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "" + +#. TRANSLATORS: The argument is the list of ambiguous +#. objects composed in show_ambiguous_object(). See +#. its "TRANSLATORS" comments for details. +#. + +#, c-format +msgid "" +"The candidates are:\n" +"%s" +msgstr "" + +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" + +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "лог Ð´Ð»Ñ \"%.*s\" міÑтить запиÑи тільки до %s" + +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "лог Ð´Ð»Ñ \"%.*s\" міÑтить лише %d запиÑів" + +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "шлÑÑ… \"%s\" Ñ–Ñнує на диÑку, але не в \"%.*s\"" + +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"шлÑÑ… \"%s\" Ñ–Ñнує, але не \"%s\"\n" +"підказка: ви мали на увазі \"%.*s:%s\" або \"%.*s:./%s\"?" + +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "шлÑÑ… \"%s\" не Ñ–Ñнує в \"%.*s\"" + +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"шлÑÑ… \"%s\" Ñ” в індекÑÑ–, але відÑутній на Ñтадії %d\n" +"підказка: ви мали на увазі \":%d:%s\"?" + +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"шлÑÑ… \"%s\" Ñ” в індекÑÑ–, але не \"%s\"\n" +"підказка: ви мали на увазі \"%d:%s\" або \"%d:./%s\"?" + +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "шлÑÑ… \"%s\" Ñ–Ñнує на диÑку, але відÑутній в індекÑÑ–" + +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "шлÑÑ… \"%s\" не Ñ–Ñнує (ні на диÑку, ні в індекÑÑ–)" + +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"ÑинтакÑÐ¸Ñ Ð²Ñ–Ð´Ð½Ð¾Ñного шлÑху не можна викориÑтовувати поза робочим деревом" + +#, c-format +msgid "<object>:<path> required, only <object> '%s' given" +msgstr "потрібно <обʼєкт>:<шлÑÑ…>, надано лише <обʼєкт> \"%s\"" + +#, c-format +msgid "invalid object name '%.*s'." +msgstr "неприпуÑтима назва обʼєкта \"%.*s\"." + +#, c-format +msgid "invalid object type \"%s\"" +msgstr "неприпуÑтимий тип обʼєкту \"%s\"" + +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "обʼєкт %s Ñ” %s, а не %s" + +#, c-format +msgid "object %s has unknown type id %d" +msgstr "обʼєкт %s має невідомий тип ідентифікатора %d" + +#, c-format +msgid "unable to parse object: %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ обʼєкт: %s" + +#, c-format +msgid "hash mismatch %s" +msgstr "невідповідніÑÑ‚ÑŒ хешу %s" + +msgid "trying to write commit not in index" +msgstr "Ñпроба запиÑати коміт, Ñкого немає в індекÑÑ–" + +msgid "failed to load bitmap index (corrupted?)" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ bitmap Ñ–Ð½Ð´ÐµÐºÑ (пошкоджено?)" + +msgid "corrupted bitmap index (too small)" +msgstr "пошкоджений bitmap Ñ–Ð½Ð´ÐµÐºÑ (занадто малий)" + +msgid "corrupted bitmap index file (wrong header)" +msgstr "пошкоджений файл bitmap індекÑу (занадто малий)" + +#, c-format +msgid "unsupported version '%d' for bitmap index file" +msgstr "непідтримувана верÑÑ–Ñ \"%d\" Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ bitmap індекÑу" + +msgid "corrupted bitmap index file (too short to fit hash cache)" +msgstr "" +"пошкоджений файл bitmap індекÑу (занадто короткий щоб уміÑтити кеш хеша)" + +msgid "corrupted bitmap index file (too short to fit lookup table)" +msgstr "" +"пошкоджений файл bitmap індекÑу (занадто короткий, щоб вміÑтити таблицю " +"пошуку)" + +#, c-format +msgid "duplicate entry in bitmap index: '%s'" +msgstr "дубльований Ð·Ð°Ð¿Ð¸Ñ Ð² bitmap індекÑÑ–: \"%s\"" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for entry %d" +msgstr "пошкоджений ewah bitmap: урізаний заголовок Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу %d" + +#, c-format +msgid "corrupt ewah bitmap: commit index %u out of range" +msgstr "пошкоджений ewah bitmap: Ñ–Ð½Ð´ÐµÐºÑ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ %u поза межами діапазону" + +msgid "corrupted bitmap pack index" +msgstr "пошкоджений bitmap Ñ–Ð½Ð´ÐµÐºÑ Ð¿Ð°ÐºÑƒÐ½ÐºÐ°" + +msgid "invalid XOR offset in bitmap pack index" +msgstr "невірне XOR Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð² bitmap індекÑÑ– пакунка" + +msgid "cannot fstat bitmap file" +msgstr "неможливо виконати fstat Ð´Ð»Ñ bitmap файла" + +msgid "checksum doesn't match in MIDX and bitmap" +msgstr "контрольна Ñума не збігаєтьÑÑ Ð² MIDX Ñ– bitmap" + +msgid "multi-pack bitmap is missing required reverse index" +msgstr "у мультіпакунковому bitmap відÑутній необхідний зворотний індекÑ" + +#, c-format +msgid "could not open pack %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ пакунок %s" + +#, c-format +msgid "preferred pack (%s) is invalid" +msgstr "бажаний пакунок (%s) Ñ” неприпуÑтимим" + +msgid "corrupt bitmap lookup table: triplet position out of index" +msgstr "пошкоджена bitmap Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ: триплетна Ð¿Ð¾Ð·Ð¸Ñ†Ñ–Ñ Ð¿Ð¾Ð·Ð° індекÑом" + +msgid "corrupt bitmap lookup table: xor chain exceeds entry count" +msgstr "" +"пошкоджена bitmap Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ: xor ланцюжок перевищує кількіÑÑ‚ÑŒ запиÑів" + +#, c-format +msgid "corrupt bitmap lookup table: commit index %u out of range" +msgstr "" +"пошкоджена bitmap Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ: Ñ–Ð½Ð´ÐµÐºÑ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ %u поза межами діапазону" + +#, c-format +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" +msgstr "пошкоджений ewah bitmap: урізаний заголовок Ð´Ð»Ñ bitmap коміту \"%s\"" + +#, c-format +msgid "object '%s' not found in type bitmaps" +msgstr "обʼєкт \"%s\" не знайдено в типах bitmap" + +#, c-format +msgid "object '%s' does not have a unique type" +msgstr "обʼєкт \"%s\" не має унікального типу" + +#, c-format +msgid "object '%s': real type '%s', expected: '%s'" +msgstr "обʼєкт \"%s\": дійÑний тип \"%s\", очікуваний: \"%s\"" + +#, c-format +msgid "object not in bitmap: '%s'" +msgstr "обʼєкт не у bitmap: \"%s\"" + +msgid "failed to load bitmap indexes" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ bitmap індекÑи" + +msgid "you must specify exactly one commit to test" +msgstr "ви маєте вказати тільки один коміт Ð´Ð»Ñ Ñ‚ÐµÑтуваннÑ" + +#, c-format +msgid "commit '%s' doesn't have an indexed bitmap" +msgstr "коміт \"%s\" не має індекÑованого bitmap" + +msgid "mismatch in bitmap results" +msgstr "розбіжніÑÑ‚ÑŒ в bitmap результатах" + +#, c-format +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ \"%s\" у пакунку \"%s\" зі зміщеннÑм %<PRIuMAX>" + +#, c-format +msgid "unable to get disk usage of '%s'" +msgstr "" +"не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ дані про викориÑÑ‚Ð°Ð½Ð½Ñ Ð´Ð¸Ñкового проÑтору Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "bitmap файл \"%s\" має невірну контрольну Ñуму" + +#, c-format +msgid "mtimes file %s is too small" +msgstr "mtimes файл %s занадто малий" + +#, c-format +msgid "mtimes file %s has unknown signature" +msgstr "mtimes файл %s має невідомий підпиÑ" + +#, c-format +msgid "mtimes file %s has unsupported version %<PRIu32>" +msgstr "mtimes файл %s має непідтримувану верÑÑ–ÑŽ %<PRIu32>." + +#, c-format +msgid "mtimes file %s has unsupported hash id %<PRIu32>" +msgstr "mtimes файл %s має непідтримуваний хеш-ідентифікатор %<PRIu32>" + +#, c-format +msgid "mtimes file %s is corrupt" +msgstr "mtimes файл %s пошкоджено" + +#, c-format +msgid "reverse-index file %s is too small" +msgstr "файл зворотного індекÑу %s занадто малий" + +#, c-format +msgid "reverse-index file %s is corrupt" +msgstr "файл зворотнього індекÑу %s пошкоджено" + +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "файл зворотного індекÑу %s має невідомий підпиÑ" + +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "файл зворотного індекÑу %s має непідтримувану верÑÑ–ÑŽ %<PRIu32>" + +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "" +"файл зворотного індекÑу %s має непідтримуваний хеш-ідентифікатор %<PRIu32>" + +msgid "invalid checksum" +msgstr "невірна контрольна Ñума" + +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "" +"невірна Ð¿Ð¾Ð·Ð¸Ñ†Ñ–Ñ Ð·Ð²Ð¾Ñ€Ð¾Ñ€Ñ‚Ð½Ð¾Ð³Ð¾ індекÑу у %<PRIu64>: %<PRIu32> != %<PRIu32>" + +msgid "cannot both write and verify reverse index" +msgstr "неможливо одночаÑно запиÑувати та звірÑти зворотний індекÑ" + +#, c-format +msgid "could not stat: %s" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat: %s" + +#, c-format +msgid "failed to make %s readable" +msgstr "не вдалоÑÑ Ð·Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ %s читабельним" + +#, c-format +msgid "could not write '%s' promisor file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати promisor файл \"%s\"" + +msgid "offset before end of packfile (broken .idx?)" +msgstr "Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ´ кінцем файла пакунка (пошкоджений .idx?)" + +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "файл пакунка %s не може бути mapped%s" + +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ´ початком індекÑа пакунка Ð´Ð»Ñ %s (пошкоджений індекÑ?)" + +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð·Ð° межою ÐºÑ–Ð½Ñ†Ñ Ñ–Ð½Ð´ÐµÐºÑа пакунка Ð´Ð»Ñ %s (зрізаний індекÑ?)" + +#, c-format +msgid "malformed expiration date '%s'" +msgstr "неправильно Ñформована дата Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ñƒ дії \"%s\"" + +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ \"%s\" очікує \"always\", \"auto\" або \"never\"" + +#, c-format +msgid "malformed object name '%s'" +msgstr "неправильно Ñформована назва обʼєкта \"%s\"" + +#, c-format +msgid "option `%s' expects \"%s\" or \"%s\"" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ \"%s\" очікує \"%s\" або \"%s\"" + +#, c-format +msgid "%s requires a value" +msgstr "%s потребує значеннÑ" + +#, c-format +msgid "%s is incompatible with %s" +msgstr "%s неÑуміÑний з %s" + +#, c-format +msgid "%s : incompatible with something else" +msgstr "%s : неÑуміÑний з чимоÑÑŒ іншим" + +#, c-format +msgid "%s takes no value" +msgstr "%s не приймає значеннÑ" + +#, c-format +msgid "%s isn't available" +msgstr "%s недоÑтупний" + +#, c-format +msgid "%s expects a non-negative integer value with an optional k/m/g suffix" +msgstr "%s очікує невід'ємне ціле Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð· опціональним ÑуфікÑом k/m/g" + +#, c-format +msgid "ambiguous option: %s (could be --%s%s or --%s%s)" +msgstr "неоднозначна опціÑ: %s (може бути --%s%s або --%s%s)" + +#, c-format +msgid "did you mean `--%s` (with two dashes)?" +msgstr "ви мали на увазі \"--%s\" (з двома риÑками)?" + +#, c-format +msgid "alias of --%s" +msgstr "пÑевдонім --%s" + +msgid "need a subcommand" +msgstr "потрібна підкоманда" + +#, c-format +msgid "unknown option `%s'" +msgstr "невідома Ð¾Ð¿Ñ†Ñ–Ñ \"%s\"" + +#, c-format +msgid "unknown switch `%c'" +msgstr "невідомий перемикач \"%c\"" + +#, c-format +msgid "unknown non-ascii option in string: `%s'" +msgstr "невідомий non-ascii параметр у Ñ€Ñдку: \"%s\"" + +msgid "..." +msgstr "..." + +#, c-format +msgid "usage: %s" +msgstr "викориÑтаннÑ: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation. +#. + +#, c-format +msgid " or: %s" +msgstr " або: %s" + +#. TRANSLATORS: You should only need to translate this format +#. string if your language is a RTL language (e.g. Arabic, +#. Hebrew etc.), not if it's a LTR language (e.g. German, +#. Russian, Chinese etc.). +#. * +#. When a translated usage string has an embedded "\n" it's +#. because options have wrapped to the next line. The line +#. after the "\n" will then be padded to align with the +#. command name, such as N_("git cmd [opt]\n<8 +#. spaces>[opt2]"), where the 8 spaces are the same length as +#. "git cmd ". +#. * +#. This format string prints out that already-translated +#. line. The "%*s" is whitespace padding to account for the +#. padding at the start of the line that we add in this +#. function. The "%s" is a line in the (hopefully already +#. translated) N_() usage string, which contained embedded +#. newlines before we split it up. +#. + +#, c-format +msgid "%*s%s" +msgstr "%*s%s" + +#, c-format +msgid " %s" +msgstr " %s" + +msgid "-NUM" +msgstr "-NUM" + +msgid "expiry-date" +msgstr "Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ñтроку дії" + +msgid "no-op (backward compatibility)" +msgstr "не працює (зворотна ÑуміÑніÑÑ‚ÑŒ)" + +msgid "be more verbose" +msgstr "надавати більш розгорнутий вивід" + +msgid "be more quiet" +msgstr "надавати менш розгорнутий вивід" + +msgid "use <n> digits to display object names" +msgstr "викориÑтовувати <n> цифр Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ð°Ð·Ð² обʼєктів" + +msgid "prefixed path to initial superproject" +msgstr "префікÑний шлÑÑ… до початкового Ñуперпроекту" + +msgid "how to strip spaces and #comments from message" +msgstr "Ñк прибирати пробіли та #коментарі з допиÑу" + +msgid "read pathspec from file" +msgstr "прочитати визначник шлÑху з файлу" + +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "" +"за допомогою --pathspec-from-file елементи визначника шлÑху відокремлюютьÑÑ " +"Ñимволом NUL" + +#, c-format +msgid "Could not make %s writable by group" +msgstr "Ðе вдалоÑÑ Ð·Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ %s доÑтупним Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу групою" + +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "" +"Символ ÐµÐºÑ€Ð°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ \"\\\" не дозволÑєтьÑÑ Ñк оÑтанній Ñимвол у значенні " +"атрибута" + +msgid "Only one 'attr:' specification is allowed." +msgstr "Дозволений лише один визначник \"attr:\"." + +msgid "attr spec must not be empty" +msgstr "визначник атрибута повинен бути не порожнім" + +#, c-format +msgid "invalid attribute name %s" +msgstr "невірна назва атрибуту %s" + +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "глобальні параметри визначника шлÑху \"glob\" та \"noglob\" неÑуміÑні" + +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "" +"глобальний параметр \"literal\" визначника шлÑху неÑуміÑний з уÑіма іншими " +"глобальними параметрами визначника шлÑху" + +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "" +"неприпуÑтимий параметр Ð´Ð»Ñ Ð¼Ð°Ð³Ñ–Ñ‡Ð½Ð¾Ð³Ð¾ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"prefix\" визначника шлÑху" + +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "ÐеприпуÑтиме магічне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%.*s\" Ð´Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð½Ð¸ÐºÐ° шлÑху в \"%s\"" + +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "" +"Пропущено \")\" наприкінці магічного Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð½Ð¸ÐºÐ° шлÑху в \"%s\"" + +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "Ðереалізоване магічне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%c\" Ð´Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð½Ð¸ÐºÐ° шлÑху в \"%s\"" + +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s: \"literal\" та \"glob\" неÑуміÑні" + +#, c-format +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: \"%s\" знаходитьÑÑ Ð·Ð° межами Ñховища за адреÑою \"%s\"" + +#, c-format +msgid "'%s' (mnemonic: '%c')" +msgstr "\"%s\" (мнемонічно: \"%c\")" + +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "" +"%s: магічне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð½Ð¸ÐºÐ° шлÑху не підтримуєтьÑÑ Ñ†Ñ–Ñ”ÑŽ командою: %s" + +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "визначник шлÑху \"%s\" знаходитьÑÑ Ð·Ð° межами Ñимвольного поÑиланнÑ" + +#, c-format +msgid "line is badly quoted: %s" +msgstr "Ñ€Ñдок взÑто в лапки невірно: %s" + +msgid "unable to write flush packet" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати flush пакет" + +msgid "unable to write delim packet" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати delim пакет" + +msgid "unable to write response end packet" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати response end пакет" + +msgid "flush packet write failed" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати flush пакет" + +msgid "protocol error: impossibly long line" +msgstr "помилка протоколу: неймовірно довгий Ñ€Ñдок" + +msgid "packet write with format failed" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати пакет з форматуваннÑм" + +msgid "packet write failed - data exceeds max packet size" +msgstr "" +"не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати пакет - дані перевищують макÑимальний розмір пакета" + +#, c-format +msgid "packet write failed: %s" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати пакет: %s" + +msgid "read error" +msgstr "помилка зчитуваннÑ" + +msgid "the remote end hung up unexpectedly" +msgstr "віддалене Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½ÐµÑподівано відключилоÑÑ" + +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "помилка протоколу: невірний Ñимвол довжини Ñ€Ñдка: %.4s" + +#, c-format +msgid "protocol error: bad line length %d" +msgstr "помилка протоколу: невірна довжина Ñ€Ñдка %d" + +#, c-format +msgid "remote error: %s" +msgstr "помилка віддаленого призначеннÑ: %s" + +msgid "Refreshing index" +msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑа" + +#, c-format +msgid "unable to create threaded lstat: %s" +msgstr "не вдалоÑÑ Ñтворити потоковий lstat: %s" + +msgid "unable to parse --pretty format" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ --pretty формат" + +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: не вдалоÑÑ Ñ€Ð¾Ð·Ð³Ð°Ð»ÑƒÐ¶Ð¸Ñ‚Ð¸ Ð¿Ñ–Ð´Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ" + +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати до підпроцеÑу отриманнÑ" + +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote: не вдалоÑÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ stdin Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¿Ñ€Ð¾Ñ†ÐµÑу отриманнÑ" + +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "назва віддаленого promisor не може починатиÑÑ Ð· \"/\": %s" + +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ %s з віддаленого promisor" + +msgid "object-info: expected flush after arguments" +msgstr "object-info: очікувавÑÑ flush піÑÐ»Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð²" + +msgid "Removing duplicate objects" +msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð´ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ‚Ñ–Ð² обʼєктів" + +msgid "could not start `log`" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ \"log\"" + +msgid "could not read `log` output" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ \"log\" вивід" + +#, c-format +msgid "could not parse commit '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ коміт \"%s\"" + +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ перший Ñ€Ñдок \"log\" виводу: не починавÑÑ Ð· \"commit " +"\"': \"%s\"" + +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ git заголовок \"%.*s\"" + +msgid "failed to generate diff" +msgstr "не вдалоÑÑ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ різницю" + +#, c-format +msgid "could not parse log for '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ лог Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "will not add file alias '%s' ('%s' already exists in index)" +msgstr "не додаємо пÑевдонім файлу \"%s\" (\"%s\" вже Ñ–Ñнує в індекÑÑ–)" + +msgid "cannot create an empty blob in the object database" +msgstr "неможливо Ñтворити порожній blob в базі даних обʼєктів" + +#, c-format +msgid "%s: can only add regular files, symbolic links or git-directories" +msgstr "" +"%s: може додавати лише звичайні файли, Ñимвольні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ git-директорії" + +#, c-format +msgid "unable to index file '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ–Ð½Ð´ÐµÐºÑувати файл \"%s\"" + +#, c-format +msgid "unable to add '%s' to index" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ \"%s\" до індекÑу" + +#, c-format +msgid "unable to stat '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "'%s' appears as both a file and as a directory" +msgstr "\"%s\" відображаєтьÑÑ Ñк файл Ñ– Ñк каталог" + +msgid "Refresh index" +msgstr "Оновити індекÑ" + +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"index.version вÑтановлено, але Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½ÐµÐ¿Ñ€Ð¸Ð¿ÑƒÑтиме.\n" +"ВикориÑÑ‚Ð°Ð½Ð½Ñ Ð²ÐµÑ€ÑÑ–Ñ— %i" + +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"GIT_INDEX_VERSION вÑтановлено, але Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½ÐµÐ¿Ñ€Ð¸Ð¿ÑƒÑтиме.\n" +"ВикориÑÑ‚Ð°Ð½Ð½Ñ Ð²ÐµÑ€ÑÑ–Ñ— %i" + +#, c-format +msgid "bad signature 0x%08x" +msgstr "невірний Ð¿Ñ–Ð´Ð¿Ð¸Ñ 0x%08x" + +#, c-format +msgid "bad index version %d" +msgstr "невірна верÑÑ–Ñ Ñ–Ð½Ð´ÐµÐºÑу %d" + +msgid "bad index file sha1 signature" +msgstr "невірний sha1 Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ñ–Ð½Ð´ÐµÐºÑного файлу" + +#, c-format +msgid "index uses %.4s extension, which we do not understand" +msgstr "Ñ–Ð½Ð´ÐµÐºÑ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñтовує %.4s розширеннÑ, Ñке ми не розуміємо" + +#, c-format +msgid "ignoring %.4s extension" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ %.4s розширеннÑ" + +#, c-format +msgid "unknown index entry format 0x%08x" +msgstr "невідомий формат запиÑу індекÑу 0x%08x" + +#, c-format +msgid "malformed name field in the index, near path '%s'" +msgstr "невірно Ñформоване поле назви в індекÑÑ– Ð±Ñ–Ð»Ñ ÑˆÐ»Ñху \"%s\"" + +msgid "unordered stage entries in index" +msgstr "невпорÑдковані запиÑи в індекÑÑ–" + +#, c-format +msgid "multiple stage entries for merged file '%s'" +msgstr "багатоÑтупеневі запиÑи Ð´Ð»Ñ Ð·Ð»Ð¸Ñ‚Ð¾Ð³Ð¾ файлу \"%s\"" + +#, c-format +msgid "unordered stage entries for '%s'" +msgstr "невпорÑдковані запиÑи індекÑу Ð´Ð»Ñ '%s'" + +#, c-format +msgid "unable to create load_cache_entries thread: %s" +msgstr "не вдалоÑÑ Ñтворити потік load_cache_entries: %s" + +#, c-format +msgid "unable to join load_cache_entries thread: %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ потоку load_cache_entries: %s" + +#, c-format +msgid "%s: index file open failed" +msgstr "%s: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ індекÑний файл" + +#, c-format +msgid "%s: cannot stat the open index" +msgstr "%s: не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat відкритого індекÑу" + +#, c-format +msgid "%s: index file smaller than expected" +msgstr "%s: індекÑний файл менший, ніж очікувалоÑÑ" + +#, c-format +msgid "%s: unable to map index file%s" +msgstr "%s: не вдалоÑÑ Ð·Ñ–Ñтавити індекÑний файл%s" + +#, c-format +msgid "unable to create load_index_extensions thread: %s" +msgstr "не вдалоÑÑ Ñтворити потік load_index_extensions: %s" + +#, c-format +msgid "unable to join load_index_extensions thread: %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ потоку load_index_extensions: %s" + +#, c-format +msgid "could not freshen shared index '%s'" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñпільний Ñ–Ð½Ð´ÐµÐºÑ \"%s\"" + +#, c-format +msgid "broken index, expect %s in %s, got %s" +msgstr "пошкоджений індекÑ, очікувавÑÑ %s у %s, отримано %s" + +msgid "cannot write split index for a sparse index" +msgstr "неможливо запиÑати розділений Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ Ñ‡Ð°Ñткового індекÑу" + +msgid "failed to convert to a sparse-index" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ в sparse-index" + +#, c-format +msgid "could not stat '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat '%s'" + +#, c-format +msgid "unable to open git dir: %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ git-директорію: %s" + +#, c-format +msgid "unable to unlink: %s" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸: %s" + +#, c-format +msgid "cannot fix permission bits on '%s'" +msgstr "неможливо виправити біти дозволу на \"%s\"" + +#, c-format +msgid "%s: cannot drop to stage #0" +msgstr "%s: неможливо Ñкинути Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð¾ Ñтану #0" + +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Ви можете виправити це командою \"git rebase --edit-todo\", а потім " +"запуÑтити \"git rebase --continue\".\n" +"Ðбо ви можете перервати Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð° допомогою \"git rebase --abort\".\n" + +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"нерозпізнане Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s Ð´Ð»Ñ Ð¾Ð¿Ñ†Ñ–Ñ— rebase.missingCommitsCheck. ІгноруєтьÑÑ." + +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" +"x, exec <command> = run command (the rest of the line) using shell\n" +"b, break = stop here (continue rebase later with 'git rebase --continue')\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +" create a merge commit using the original merge commit's\n" +" message (or the oneline, if no original merge commit was\n" +" specified); use -c <commit> to reword the commit message\n" +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n" +" to this position in the new commits. The <ref> is\n" +" updated at the end of the rebase\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Команди:\n" +"p, pick <коміт> = викориÑтати коміт\n" +"r, reword <коміт> = викориÑтати коміт, але відредагувати Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміту\n" +"e, edit <коміт> = викориÑтати коміт, але зупинитиÑÑŒ Ð´Ð»Ñ Ð²Ð½ÐµÑÐµÐ½Ð½Ñ Ð¿Ð¾Ð¿Ñ€Ð°Ð²Ð¾Ðº\n" +"s, squash <коміт> = викориÑтати коміт, але обʼєднати з попереднім комітом\n" +"f, fixup [-C | -c] <коміт> = Ñк \"squash\", але зберігає лише попередній\n" +" Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміту, Ñкщо тільки не вказана Ð¾Ð¿Ñ†Ñ–Ñ -С, у Ñкому " +"разі\n" +" зберігаєтьÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ цього коміту; -c - те Ñаме, що " +"й -C, але\n" +" відкриває редактор\n" +"x, exec <команда> = виконати команду (решту Ñ€Ñдка) за допомогою shell\n" +"b, break = зупинитиÑÑŒ тут (продовжити Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð·Ð½Ñ–ÑˆÐµ за допомогою " +"'git rebase --continue')\n" +"d, drop <коміт> = видалити коміт\n" +"l, label <мітка> = помітити поточний HEAD назвою\n" +"t, reset <мітка> = Ñкинути HEAD до мітки\n" +"m, merge [-C <коміт> | -c <коміт>] <мітка> [# <однорÑдковий допиÑ>]\n" +" Ñтворити коміт злиттÑ, викориÑтовуючи Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ початкового коміту\n" +" Ð·Ð»Ð¸Ñ‚Ñ‚Ñ (або однорÑдковий допиÑ, Ñкщо не було вказано коміт\n" +" злиттÑ); викориÑтовуйте -c <коміт>, щоб перефразувати Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ " +"коміту\n" +"u, update-ref <поÑиланнÑ> = відÑтежити заповнювач Ð´Ð»Ñ <поÑиланнÑ>, Ñке " +"потрібно оновити\n" +" до цієї позиції у нових комітах. <поÑиланнÑ>\n" +" оновлюєтьÑÑ Ð² кінці перебазуваннÑ\n" +"\n" +"Ці Ñ€Ñдки можна переупорÑдкувати; вони виконуютьÑÑ Ð·Ð²ÐµÑ€Ñ…Ñƒ вниз.\n" + +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "ÐŸÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ %s на %s (%d команда)" +msgstr[1] "ÐŸÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ %s на %s (%d команди)" +msgstr[2] "ÐŸÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ %s на %s (%d команд)" + +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "" +"\n" +"Ðе видалÑйте жодного Ñ€Ñдка. ВикориÑтовуйте \"drop\", щоб Ñвно видалити " +"коміт.\n" + +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"Якщо ви видалите тут Ñ€Ñдок, ЦЕЙ КОМІТ БУДЕ ВТРÐЧЕÐО.\n" + +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"Ви редагуєте файл todo поточного інтерактивного перебазуваннÑ.\n" +"Щоб продовжити Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ, виконайте:\n" +" git rebase --continue\n" + +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"Однак, Ñкщо ви видалите вÑе, Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÐ´Ðµ перервано.\n" +"\n" + +#, c-format +msgid "could not write '%s'." +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати \"%s\"." + +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"ПопередженнÑ: деÑкі коміти могли бути видалені випадково.\n" +"Скинуті коміти (від новіших до Ñтаріших):\n" + +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"Щоб уникнути цього повідомленнÑ, викориÑтовуйте \"drop\" Ð´Ð»Ñ Ñвного " +"Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ.\n" +"\n" +"ВикориÑтовуйте \"git config rebase.missingCommitsCheck\" Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð¸ Ñ€Ñ–Ð²Ð½Ñ " +"попереджень.\n" +"Можливі варіанти поведінки: ignore, warn, error.\n" + +#, c-format +msgid "%s: 'preserve' superseded by 'merges'" +msgstr "%s: \"preserve\" замінено на \"merges\"" + +msgid "gone" +msgstr "відÑутнє" + +#, c-format +msgid "ahead %d" +msgstr "попереду %d" + +#, c-format +msgid "behind %d" +msgstr "позаду %d" + +#, c-format +msgid "ahead %d, behind %d" +msgstr "попереду %d, позаду %d" + +#, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) не приймає аргументів" + +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "нерозпізнаний %%(%.*s) аргумент: %s" + +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "очікуваний формат: %%(color:<колір>)" + +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "нерозпізнаний колір: %%(color:%s)" + +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "ОчікувалоÑÑŒ ціле чиÑло refname:lstrip=%s" + +#, c-format +msgid "Integer value expected refname:rstrip=%s" +msgstr "ОчікувалоÑÑŒ ціле чиÑло refname:rstrip=%s" + +#, c-format +msgid "expected %%(trailers:key=<value>)" +msgstr "очікувалоÑÑŒ %%(trailers:key=<значеннÑ>)" + +#, c-format +msgid "unknown %%(trailers) argument: %s" +msgstr "невідомий %%(trailers) аргумент: %s" + +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "очікувалоÑÑŒ додатне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ contents:lines=%s" + +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "очікувалоÑÑŒ додатне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\" у %%(%s)" + +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "очікуваний формат: %%(align:<ширина>,<позиціÑ>)" + +#, c-format +msgid "unrecognized position:%s" +msgstr "нерозпізнана позиціÑ:%s" + +#, c-format +msgid "unrecognized width:%s" +msgstr "нерозпізнана ширина:%s" + +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "нерозпізнаний %%(%s) аргумент: %s" + +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "очікувалаÑÑŒ додатна ширина з %%(align) чаÑткою" + +#, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "очікуваний формат: %%(ahead-behind:<комітоподібне>)" + +#, c-format +msgid "malformed field name: %.*s" +msgstr "неправильно Ñформована назва полÑ: %.*s" + +#, c-format +msgid "unknown field name: %.*s" +msgstr "невідома назва полÑ: %.*s" + +#, c-format +msgid "" +"not a git repository, but the field '%.*s' requires access to object data" +msgstr "не git Ñховище, але поле \"%.*s\" потребує доÑтупу до даних обʼєкта" + +#, c-format +msgid "format: %%(%s) atom used without a %%(%s) atom" +msgstr "формат: чаÑтка %%(%s) викориÑтано без чаÑтки %%(%s)" + +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "формат: %%(then) чаÑтка викориÑтана більше одного разу" + +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "формат: %%(then) чаÑтка викориÑтана піÑÐ»Ñ %%(else)" + +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "формат: %%(else) чаÑтка викориÑтана більше одного разу" + +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "формат: %%(end) чаÑтка викориÑтана без відповідної чаÑтки" + +#, c-format +msgid "malformed format string %s" +msgstr "неправильно Ñформований Ñ€Ñдок Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "this command reject atom %%(%.*s)" +msgstr "Ñ†Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° відхилÑÑ” чаÑтку %%(%.*s)" + +#, c-format +msgid "--format=%.*s cannot be used with --python, --shell, --tcl" +msgstr "--format=%.*s не може бути викориÑтаний з --python, --shell, --tcl" + +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(немає гілки, Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ %s)" + +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(немає гілки, Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð¾ÐºÑ€ÐµÐ¼Ð»ÐµÐ½Ð¾Ð³Ð¾ HEAD %s)" + +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "(немає гілки, біÑекцію розпочато на %s)" + +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD відʼєднано на %s)" + +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD відʼєднано від %s)" + +msgid "(no branch)" +msgstr "(немає гілки)" + +#, c-format +msgid "missing object %s for %s" +msgstr "відÑутній обʼєкт %s Ð´Ð»Ñ %s" + +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "parse_object_buffer завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾ на %s Ð´Ð»Ñ %s" + +#, c-format +msgid "malformed object at '%s'" +msgstr "неправильно Ñформований обʼєкт за адреÑою \"%s\"" + +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· пошкодженою назвою %s" + +#, c-format +msgid "ignoring broken ref %s" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑˆÐºÐ¾Ð´Ð¶ÐµÐ½Ð¸Ñ… поÑилань %s" + +#, c-format +msgid "format: %%(end) atom missing" +msgstr "формат: %%(end) чаÑтка відÑутнÑ" + +#, c-format +msgid "malformed object name %s" +msgstr "неправильно Ñформована назва обʼєкта %s" + +#, c-format +msgid "option `%s' must point to a commit" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ \"%s\" повинна вказувати на коміт" + +msgid "key" +msgstr "ключ" + +msgid "field name to sort on" +msgstr "назва Ð¿Ð¾Ð»Ñ Ð´Ð»Ñ ÑортуваннÑ" + +#, c-format +msgid "not a reflog: %s" +msgstr "не reflog: %s" + +#, c-format +msgid "no reflog for '%s'" +msgstr "немає reflog Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s не вказує на допуÑтимий обʼєкт!" + +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" +"ВикориÑÑ‚Ð°Ð½Ð½Ñ \"%s\" Ñк назви початкової гілки. Ðазву гілки за замовчуваннÑм\n" +"може бути змінено. Щоб налаштувати назву початкової гілки Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ñƒ " +"вÑÑ–Ñ…\n" +"ваших нових Ñховищах, що приховуватиме це попередженнÑ, викличте\n" +"\n" +"\tgit config --global init.defaultBranch <назва>.\n" +"\n" +"ЗаміÑÑ‚ÑŒ \"master\" зазвичай викориÑтовують такі назви, Ñк \"main\", " +"\"trunk\" та\n" +"\"development\". Щойно Ñтворену гілку можна перейменувати за допомогою цієї " +"команди:\n" +"\n" +"\tgit branch -m <назва>\n" + +#, c-format +msgid "could not retrieve `%s`" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "неприпуÑтима назва гілки: %s = %s" + +#, c-format +msgid "ignoring dangling symref %s" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸ÑÑчих symref %s" + +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "лог Ð´Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ %s має пропуÑк піÑÐ»Ñ %s" + +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "лог Ð´Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ %s неÑподівано завершивÑÑ Ð½Ð° %s" + +#, c-format +msgid "log for %s is empty" +msgstr "лог Ð´Ð»Ñ %s порожній" + +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "відмова Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· невірною назвою \"%s\"" + +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾ Ð´Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\": %s" + +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "багатократні Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\" заборонені" + +msgid "ref updates forbidden inside quarantine environment" +msgstr "Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñилань заборонено у карантинному Ñередовищі" + +msgid "ref updates aborted by hook" +msgstr "Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñилань перервано гачком" + +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "\"%s\" Ñ–Ñнує; неможливо Ñтворити \"%s\"" + +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "неможливо обробити \"%s\" Ñ– \"%s\" одночаÑно" + +#, c-format +msgid "could not remove reference %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "could not delete reference %s: %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s: %s" + +#, c-format +msgid "could not delete references: %s" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ поÑиланнÑ: %s" + +#, c-format +msgid "invalid refspec '%s'" +msgstr "неприпуÑтимий визначник поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\"" + +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "неприпуÑтимі лапки у значенні push-опції: \"%s\"" + +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs не дійÑні: це git Ñховище?" + +msgid "invalid server response; expected service, got flush packet" +msgstr "" +"неприпуÑтима відповідь Ñервера; очікувавÑÑ service, отримано flush пакет" + +#, c-format +msgid "invalid server response; got '%s'" +msgstr "неприпуÑтима відповідь Ñервера; отримано \"%s\"" + +#, c-format +msgid "repository '%s' not found" +msgstr "Ñховище \"%s\" не знайдено" + +#, c-format +msgid "Authentication failed for '%s'" +msgstr "Ðевдала Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "unable to access '%s' with http.pinnedPubkey configuration: %s" +msgstr "" +"не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до \"%s\" з конфігурацією http.pinnedPubkey: %s" + +#, c-format +msgid "unable to access '%s': %s" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до \"%s\": %s" + +#, c-format +msgid "redirecting to %s" +msgstr "Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð° %s" + +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "не повинен мати EOF, Ñкщо не Ñ” обережним з EOF" + +msgid "remote server sent unexpected response end packet" +msgstr "віддалений Ñервер надіÑлав неочікуваний response end пакет" + +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "" +"не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¼Ð¾Ñ‚Ð°Ñ‚Ð¸ rpc post дані - Ñпробуйте збільшити http.postBuffer" + +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: невірний Ñимвол довжини Ñ€Ñдка: %.4s" + +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: неочікуваний response end пакет" + +#, c-format +msgid "RPC failed; %s" +msgstr "RPC завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾; %s" + +msgid "cannot handle pushes this big" +msgstr "неможливо впоратиÑÑ Ð· такими великими надÑиланнÑми" + +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "неможливо запакувати запит; zlib помилка Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ %d" + +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "неможливо запакувати запит; zlib помилка Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ %d" + +#, c-format +msgid "%d bytes of length header were received" +msgstr "%d байтів заголовку було отримано" + +#, c-format +msgid "%d bytes of body are still expected" +msgstr "%d байтів тіла вÑе ще очікуютьÑÑ" + +msgid "dumb http transport does not support shallow capabilities" +msgstr "заÑіб передачі dumb http не підтримує shallow здібноÑÑ‚Ñ–" + +msgid "fetch failed." +msgstr "Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð¾ÑÑŒ невдало." + +msgid "cannot fetch by sha1 over smart http" +msgstr "неможливо отримати дані за допомогою sha1 через smart http" + +#, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "помилка протоколу: очікувалоÑÑ sha/ref, отримано \"%s\"" + +#, c-format +msgid "http transport does not support %s" +msgstr "http заÑіб передачі не підтримує %s" + +msgid "protocol error: expected '<url> <path>', missing space" +msgstr "помилка протоколу: очікувалоÑÑ \"<url> <шлÑÑ…>\", пропущено пробіл" + +#, c-format +msgid "failed to download file at URL '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ файл за URL-адреÑою \"%s\"" + +msgid "git-http-push failed" +msgstr "git-http-push завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "" +"remote-curl: викориÑтаннÑ: git remote-curl <віддаленe-призначеннÑ> [<url>]" + +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl: помилка Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÑƒ команд з git" + +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl: Ñпроба Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð±ÐµÐ· локального Ñховища" + +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl: невідома команда \"%s\" з git" + +#, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð½Ð¾Ñ— конфігураціі не може починатиÑÑ Ð· '/': %s" + +msgid "more than one receivepack given, using the first" +msgstr "надано більше одного пакунка Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ, викориÑтано перший" + +msgid "more than one uploadpack given, using the first" +msgstr "надано більше одного пакунка Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ, викориÑтано перший" + +#, c-format +msgid "unrecognized value transfer.credentialsInUrl: '%s'" +msgstr "нерозпізнане Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ transfer.credentialsInUrl: '%s'" + +#, c-format +msgid "URL '%s' uses plaintext credentials" +msgstr "URL-адреÑа '%s' викориÑтовує облікові дані у відкритому текÑÑ‚Ñ–" + +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Ðеможливо отримати Ñк %s, так Ñ– %s до %s" + +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s зазвичай відÑтежує %s, а не %s" + +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s відÑтежує Ñк %s, так Ñ– %s" + +#, c-format +msgid "key '%s' of pattern had no '*'" +msgstr "ключ '%s' шаблону не міÑтив '*'" + +#, c-format +msgid "value '%s' of pattern has no '*'" +msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ '%s' шаблону не міÑтить '*'" + +#, c-format +msgid "src refspec %s does not match any" +msgstr "визначник поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð¶ÐµÑ€ÐµÐ»Ð° %s не збігаєтьÑÑ Ð· жодним" + +#, c-format +msgid "src refspec %s matches more than one" +msgstr "визначник поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð¶ÐµÑ€ÐµÐ»Ð° %s збігаєтьÑÑ Ð· більш ніж одним" + +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is +#. the <src>. +#. + +#, c-format +msgid "" +"The destination you provided is not a full refname (i.e.,\n" +"starting with \"refs/\"). We tried to guess what you meant by:\n" +"\n" +"- Looking for a ref that matches '%s' on the remote side.\n" +"- Checking if the <src> being pushed ('%s')\n" +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" +" refs/{heads,tags}/ prefix on the remote side.\n" +"\n" +"Neither worked, so we gave up. You must fully qualify the ref." +msgstr "" +"ПризначеннÑ, що ви вказали, не Ñ” повною назвою поÑÐ¸Ð»Ð°Ð½Ð½Ñ (такою,\n" +"що починаєтьÑÑ Ð· \"refs/\"). Ми Ñпробували вгадати, що ви мали на увазі " +"через:\n" +"\n" +"- Пошук поÑиланнÑ, Ñке відповідає '%s' на віддаленій Ñтороні.\n" +"- Перевірку, чи Ñ” <джерело> надÑиланнÑ, ('%s')\n" +" поÑиланнÑм у \"refs/{heads,tags}/\". Якщо так, то ми додаємо відповідний\n" +" refs/{heads,tags}/ Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ Ð½Ð° віддаленій Ñтороні.\n" +"\n" +"ÐÑ– те, ні інше не Ñпрацювало, тому ми здалиÑÑ. Ви повинні повніÑÑ‚ÑŽ " +"кваліфікувати поÑиланнÑ." + +#, c-format +msgid "" +"The <src> part of the refspec is a commit object.\n" +"Did you mean to create a new branch by pushing to\n" +"'%s:refs/heads/%s'?" +msgstr "" +"ЧаÑтина <джерело> визаначника поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ” об’єктом коміту.\n" +"Ви хотіли Ñтворити нову гілку, надіÑлавши зміни до\n" +"'%s:refs/heads/%s'?" + +#, c-format +msgid "" +"The <src> part of the refspec is a tag object.\n" +"Did you mean to create a new tag by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"ЧаÑтина <джерело> визаначника поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ” об’єктом тегу.\n" +"Ви хотіли Ñтворити новий тег, надіÑлавши зміни до\n" +"'%s:refs/tags/%s'?" + +#, c-format +msgid "" +"The <src> part of the refspec is a tree object.\n" +"Did you mean to tag a new tree by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"ЧаÑтина <джерело> визаначника поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ” об’єктом дерева.\n" +"Ви хотіли позначити нове дерево, надіÑлавши зміни до\n" +"'%s:refs/tags/%s'?" + +#, c-format +msgid "" +"The <src> part of the refspec is a blob object.\n" +"Did you mean to tag a new blob by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"ЧаÑтина <джерело> визаначника поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ” об’єктом blob.\n" +"Ви хотіли позначити новий blob, надіÑлавши зміни до\n" +"'%s:refs/tags/%s'?" + +#, c-format +msgid "%s cannot be resolved to branch" +msgstr "%s неможливо розвʼÑзати в гілку" + +#, c-format +msgid "unable to delete '%s': remote ref does not exist" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ '%s': віддалене поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ Ñ–Ñнує" + +#, c-format +msgid "dst refspec %s matches more than one" +msgstr "визаначник поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s збігаєтьÑÑ Ð· більш ніж одним" + +#, c-format +msgid "dst ref %s receives from more than one src" +msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s отримує з більш ніж одного src" + +msgid "HEAD does not point to a branch" +msgstr "HEAD не вказує на гілку" + +#, c-format +msgid "no such branch: '%s'" +msgstr "немає такої гілки: '%s'" + +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "першоджерельне Ñховище не налаштовано Ð´Ð»Ñ Ð³Ñ–Ð»ÐºÐ¸ '%s'" + +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "" +"гілка '%s' першоджерельного Ñховища не збережена Ñк віддалено відÑтежувана " +"гілка" + +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "" +"шлÑÑ… Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ '%s' на віддаленому '%s' не має гілки локального " +"відÑтежуваннÑ" + +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "гілка '%s' не має віддаленого Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð½Ð°Ð´ÑиланнÑ" + +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "надіÑлані визначники поÑилань Ð´Ð»Ñ \"%s\" не включають \"%s\"" + +msgid "push has no destination (push.default is 'nothing')" +msgstr "надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ має Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ (push.default дорівнює 'nothing')" + +msgid "cannot resolve 'simple' push to a single destination" +msgstr "" +"неможливо розвʼÑзати \"simple\" надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð¾ одного пункту призначеннÑ" + +#, c-format +msgid "couldn't find remote ref %s" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ віддалене поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "* Ignoring funny ref '%s' locally" +msgstr "* Ð†Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÑƒÐ¼ÐµÐ´Ð½Ð¸Ñ… рефів '%s' локально" + +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "Ваша гілка базуєтьÑÑ Ð½Ð° '%s', але першоджерельне Ñховище зникло.\n" + +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr "" +" (викориÑтовуйте команду \"git branch --unset-upstream\", щоб виправити)\n" + +#, c-format +msgid "Your branch is up to date with '%s'.\n" +msgstr "Ваша гілка не відрізнÑєтьÑÑ Ð²Ñ–Ð´ '%s'.\n" + +#, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "Ваша гілка та гілка '%s' поÑилаютьÑÑ Ð´Ð¾ різних комітів.\n" + +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr " (викориÑтовуйте \"%s\" Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ð¾Ñ— інформації)\n" + +#, c-format +msgid "Your branch is ahead of '%s' by %d commit.\n" +msgid_plural "Your branch is ahead of '%s' by %d commits.\n" +msgstr[0] "Ваша гілка випереджає '%s' на %d коміт.\n" +msgstr[1] "Ваша гілка випереджає '%s' на %d коміти.\n" +msgstr[2] "Ваша гілка випереджає '%s' на %d комітів.\n" + +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (викориÑтовуйте \"git push\" Ð´Ð»Ñ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ— локальних комітів)\n" + +#, c-format +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +"Ваша гілка відÑтає від \"%s\" на %d коміт, Ñ– Ñ—Ñ— можна перемотати вперед.\n" +msgstr[1] "" +"Ваша гілка відÑтає від \"%s\" на %d коміти, Ñ– Ñ—Ñ— можна перемотати вперед.\n" +msgstr[2] "" +"Ваша гілка відÑтає від гілки '%s' на %d комітів, Ñ– Ñ—Ñ— можна перемотати " +"вперед.\n" + +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " (викориÑтовуйте \"git pull\", щоб оновити вашу локальну гілку)\n" + +#, c-format +msgid "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" +msgid_plural "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commits each, respectively.\n" +msgstr[0] "" +"Ваша гілка Ñ– гілка '%s' розійшлиÑÑ,\n" +"Ñ– мають %d Ñ– %d різний коміт відповідно.\n" +msgstr[1] "" +"Ваша гілка Ñ– гілка '%s' розійшлиÑÑ,\n" +"Ñ– мають %d Ñ– %d різних коміта відповідно.\n" +msgstr[2] "" +"Ваша гілка Ñ– гілка '%s' розійшлиÑÑ,\n" +"Ñ– мають %d Ñ– %d різних комітів відповідно.\n" + +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " (викориÑтовуйте \"git pull\", щоб злити віддалену гілку з вашою)\n" + +#, c-format +msgid "cannot parse expected object name '%s'" +msgstr "неможливо розібрати очікувану назву обʼєкту \"%s\"" + +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "неможливо вилучити один компонент з url '%s'" + +#, c-format +msgid "bad replace ref name: %s" +msgstr "неприпуÑтима назва змінного поÑиланнÑ: %s" + +#, c-format +msgid "duplicate replace ref: %s" +msgstr "дубльована заміна поÑиланнÑ: %s" + +#, c-format +msgid "replace depth too high for object %s" +msgstr "глибина заміни занадто виÑока Ð´Ð»Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ð° %s" + +msgid "corrupt MERGE_RR" +msgstr "пошкоджений MERGE_RR" + +msgid "unable to write rerere record" +msgstr "неможливо зробити rerere запиÑ" + +#, c-format +msgid "there were errors while writing '%s' (%s)" +msgstr "виникли помилки під Ñ‡Ð°Ñ Ð·Ð°Ð¿Ð¸Ñу \"%s\" (%s)" + +#, c-format +msgid "could not parse conflict hunks in '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ конфліктні шматки в \"%s\"" + +#, c-format +msgid "failed utime() on '%s'" +msgstr "невдалий utime() на \"%s\"" + +#, c-format +msgid "writing '%s' failed" +msgstr "Ð·Ð°Ð¿Ð¸Ñ \"%s\" завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "Staged '%s' using previous resolution." +msgstr "ІндекÑовано \"%s\" з викориÑтаннÑм попереднього розвʼÑзаннÑ." + +#, c-format +msgid "Recorded resolution for '%s'." +msgstr "ЗапиÑано розвʼÑÐ·Ð°Ð½Ð½Ñ Ð´Ð»Ñ \"%s\"." + +#, c-format +msgid "Resolved '%s' using previous resolution." +msgstr "РозвʼÑзано \"%s\" з викориÑтаннÑм попереднього розвʼÑзаннÑ." + +#, c-format +msgid "cannot unlink stray '%s'" +msgstr "неможливо відʼєднати блукаючий \"%s\"" + +#, c-format +msgid "Recorded preimage for '%s'" +msgstr "ЗапиÑано попереднє Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "failed to update conflicted state in '%s'" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ конфліктний Ñтан у \"%s\"" + +#, c-format +msgid "no remembered resolution for '%s'" +msgstr "немає запиÑаного Ð²Ð¸Ñ€Ñ–ÑˆÐµÐ½Ð½Ñ Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "Updated preimage for '%s'" +msgstr "Оновлено попереднє Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "Forgot resolution for '%s'\n" +msgstr "Забуто розвʼÑÐ·Ð°Ð½Ð½Ñ Ð´Ð»Ñ \"%s\"\n" + +msgid "unable to open rr-cache directory" +msgstr "неможливо відкрити rr-cache директорію" + +msgid "update the index with reused conflict resolution if possible" +msgstr "" +"оновити Ñ–Ð½Ð´ÐµÐºÑ Ð· повторним викориÑтаннÑм розвʼÑÐ·Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ð»Ñ–ÐºÑ‚Ñ–Ð², Ñкщо це " +"можливо" + +msgid "could not determine HEAD revision" +msgstr "не вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ ревізію HEAD" + +#, c-format +msgid "failed to find tree of %s" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ дерево %s" + +#, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "непідтримувана ÑÐµÐºÑ†Ñ–Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¸Ñ… поÑилань: %s" + +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= передано більше одного разу" + +#, c-format +msgid "resolve-undo records `%s` which is missing" +msgstr "" + +#, c-format +msgid "could not get commit for ancestry-path argument %s" +msgstr "" + +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<файл пакунка> більше не підтримуєтьÑÑ" + +msgid "your current branch appears to be broken" +msgstr "ваша поточна гілка виглÑдає зламаною" + +#, c-format +msgid "your current branch '%s' does not have any commits yet" +msgstr "ваша поточна гілка \"%s\" ще не має жодних комітів" + +msgid "object filtering requires --objects" +msgstr "Ð´Ð»Ñ Ñ„Ñ–Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ñ–Ñ— обʼєктів потрібен параметр --objects" + +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "-L поки що не підтримує diff формати, окрім -p та -s" + +#, c-format +msgid "cannot create async thread: %s" +msgstr "неможливо Ñтворити аÑинхронний потік: %s" + +#, c-format +msgid "'%s' does not exist" +msgstr "\"%s\" не Ñ–Ñнує" + +#, c-format +msgid "could not switch to '%s'" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ÑÑ Ð½Ð° \"%s\"" + +msgid "need a working directory" +msgstr "потрібна робоча директоріÑ" + +msgid "Scalar enlistments require a worktree" +msgstr "" + +#, c-format +msgid "could not configure %s=%s" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ %s=%s" + +msgid "could not configure log.excludeDecoration" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ log.excludeDecoration" + +msgid "could not add enlistment" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ кореневу директорію проекту" + +msgid "could not set recommended config" +msgstr "не вдалоÑÑ Ð²Ñтановити рекомендовану конфігурацію" + +msgid "could not turn on maintenance" +msgstr "не вдалоÑÑ Ð²Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ технічне обÑлуговуваннÑ" + +msgid "could not start the FSMonitor daemon" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити FSMonitor демон" + +msgid "could not turn off maintenance" +msgstr "не вдалоÑÑ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ технічне обÑлуговуваннÑ" + +msgid "could not remove enlistment" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ директорію верхнього рівнÑ" + +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "віддалений HEAD не Ñ” гілкою: \"%.*s\"" + +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ назву гілки за замовчуваннÑм з віддаленого Ñховища; " +"викориÑтано локальне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм" + +msgid "failed to get default branch name" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ назву гілки за замовчуваннÑм" + +msgid "failed to unregister repository" +msgstr "не вдалоÑÑ ÑкаÑувати реєÑтрацію Ñховища" + +msgid "failed to stop the FSMonitor daemon" +msgstr "не вдалоÑÑ Ð·ÑƒÐ¿Ð¸Ð½Ð¸Ñ‚Ð¸ FSMonitor демон" + +msgid "failed to delete enlistment directory" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ директорію верхнього рівнÑ" + +msgid "branch to checkout after clone" +msgstr "гілка, на Ñку перейти піÑÐ»Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ" + +msgid "when cloning, create full working directory" +msgstr "при клонуванні Ñтворювати повну робочу директорію" + +msgid "only download metadata for the branch that will be checked out" +msgstr "" +"завантажити метадані тільки Ð´Ð»Ñ Ð³Ñ–Ð»ÐºÐ¸, на Ñку буде здійÑнюватиÑÑ Ð¿ÐµÑ€ÐµÑ…Ñ–Ð´" + +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "ÑкалÑрний клон [<опції>] [--] <Ñховище> [<директоріÑ>]" + +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "неможливо вивеÑти назву робочого дерева з \"%s\"" + +#, c-format +msgid "directory '%s' exists already" +msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ \"%s\" вже Ñ–Ñнує" + +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ гілку за замовчуваннÑм Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "could not configure remote in '%s'" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ віддалене Ñховище в \"%s\"" + +#, c-format +msgid "could not configure '%s'" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\"" + +msgid "partial clone failed; attempting full clone" +msgstr "не вдалоÑÑ Ð·Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ чаÑтковий клон; Ñпроба зробити повний клон" + +msgid "could not configure for full clone" +msgstr "не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð»Ñ Ð¿Ð¾Ð²Ð½Ð¾Ð³Ð¾ клона" + +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<коренева-директоріÑ-проекту>]" + +msgid "`scalar list` does not take arguments" +msgstr "\"scalar list\" не приймає аргументів" + +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<коренева-директоріÑ-проекту>]" + +msgid "reconfigure all registered enlistments" +msgstr "переналаштувати вÑÑ– зареєÑтровані кореневі директорії проекту" + +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <коренева-директоріÑ-проекту>]" + +msgid "--all or <enlistment>, but not both" +msgstr "--all або <коренева-директоріÑ-проекту>, але не обидва" + +#, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "неможливо видалити заÑтаріле scalar.repo \"%s\"" + +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ñтарілого scalar.repo \"%s\"" + +#, c-format +msgid "git repository gone in '%s'" +msgstr "git Ñховище зникло у \"%s\"" + +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <завданнÑ> [<коренева-директоріÑ-проекту>]\n" +"ЗавданнÑ:\n" + +#, c-format +msgid "no such task: '%s'" +msgstr "немає такого завданнÑ: \"%s\"" + +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<коренева-директоріÑ-проекту>]" + +msgid "scalar delete <enlistment>" +msgstr "scalar delete <коренева-директоріÑ-проекту>" + +msgid "refusing to delete current working directory" +msgstr "відмова Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— робочої директорії" + +msgid "include Git version" +msgstr "включити верÑÑ–ÑŽ Git" + +msgid "include Git's build options" +msgstr "включити опції збірки Git" + +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "" + +msgid "-C requires a <directory>" +msgstr "-C потребує наÑвноÑÑ‚Ñ– <директорії>" + +#, c-format +msgid "could not change to '%s'" +msgstr "не вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ на \"%s\"" + +msgid "-c requires a <key>=<value> argument" +msgstr "-c потребує <ключ>=<значеннÑ> аргумент" + +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <директоріÑ>] [-c <ключ>=<значеннÑ>] <команда> [<опції>]\n" +"\n" +"Команди:\n" + +msgid "unexpected flush packet while reading remote unpack status" +msgstr "" +"неÑподіваний flush пакет під Ñ‡Ð°Ñ Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑтатуÑу віддаленого розпакуваннÑ" + +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ Ñтан Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ Ñховища: %s" + +#, c-format +msgid "remote unpack failed: %s" +msgstr "віддалене Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ вдалоÑÑ: %s" + +msgid "failed to sign the push certificate" +msgstr "не вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати Ñертифікат надÑиланнÑ" + +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "send-pack: не вдалоÑÑ Ñ€Ð¾Ð·Ð³Ð°Ð»ÑƒÐ¶Ð¸Ñ‚Ð¸ Ð¿Ñ–Ð´Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ" + +msgid "push negotiation failed; proceeding anyway with push" +msgstr "переговори з надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ вдалиÑÑ; вÑе одно продовжуємо надÑиланнÑ" + +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "отримуюча Ñторона не підтримує хеш-алгоритм цього Ñховища" + +msgid "the receiving end does not support --signed push" +msgstr "отримуюча Ñторона не підтримує --signed push" + +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "" +"Ñертифікат надÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ відправлено, оÑкільки отримуюча Ñторона не " +"підтримує --signed push" + +msgid "the receiving end does not support --atomic push" +msgstr "отримуюча Ñторона не підтримує --atomic push" + +msgid "the receiving end does not support push options" +msgstr "отримуюча Ñторона не підтримує опції push" + +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "неприпуÑтимий режим Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð´Ð¾Ð¿Ð¸Ñів до коміту \"%s\"" + +#, c-format +msgid "could not delete '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\"" + +msgid "revert" +msgstr "вивертаннÑ" + +msgid "cherry-pick" +msgstr "виÑмикуваннÑ" + +msgid "rebase" +msgstr "перебазуваннÑ" + +#, c-format +msgid "unknown action: %d" +msgstr "невідома діÑ: %d" + +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"піÑÐ»Ñ Ñ€Ð¾Ð·Ð²Ê¼ÑÐ·Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ð»Ñ–ÐºÑ‚Ñ–Ð² позначте виправлені шлÑхи\n" +"за допомогою \"git add <шлÑхи>\" або \"git rm <шлÑхи>\"" + +msgid "" +"After resolving the conflicts, mark them with\n" +"\"git add/rm <pathspec>\", then run\n" +"\"git cherry-pick --continue\".\n" +"You can instead skip this commit with \"git cherry-pick --skip\".\n" +"To abort and get back to the state before \"git cherry-pick\",\n" +"run \"git cherry-pick --abort\"." +msgstr "" +"ПіÑÐ»Ñ Ñ€Ð¾Ð·Ð²Ê¼ÑÐ·Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ð»Ñ–ÐºÑ‚Ñ–Ð² позначте Ñ—Ñ… за допомогою\n" +"\"git add/rm <визначник шлÑху>\", а потім виконайте\n" +"\"git cherry-pick --continue\".\n" +"ЗаміÑÑ‚ÑŒ цього ви можете пропуÑтити цей комміт за допомогою \"git cherry-pick " +"--skip\".\n" +"Щоб перервати Ð¿Ñ€Ð¾Ñ†ÐµÑ Ñ– повернутиÑÑ Ð´Ð¾ Ñтану перед \"git cherry-pick\",\n" +"виконайте \"git cherry-pick --abort\"." + +msgid "" +"After resolving the conflicts, mark them with\n" +"\"git add/rm <pathspec>\", then run\n" +"\"git revert --continue\".\n" +"You can instead skip this commit with \"git revert --skip\".\n" +"To abort and get back to the state before \"git revert\",\n" +"run \"git revert --abort\"." +msgstr "" +"ПіÑÐ»Ñ Ñ€Ð¾Ð·Ð²Ê¼ÑÐ·Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ð»Ñ–ÐºÑ‚Ñ–Ð² позначте Ñ—Ñ… за допомогою\n" +"\"git add/rm <визначник шлÑху>\", а потім виконайте\n" +"\"git revert --continue\".\n" +"ЗаміÑÑ‚ÑŒ цього ви можете пропуÑтити цей коміт за допомогою \"git revert --" +"skip\".\n" +"Щоб перервати Ñ– повернутиÑÑ Ð´Ð¾ Ñтану перед \"git revert\",\n" +"виконайте \"git revert --abort\"." + +#, c-format +msgid "could not lock '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ñ„Ñ–ÐºÑувати \"%s\"" + +#, c-format +msgid "could not write eol to '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати eol в \"%s\"" + +#, c-format +msgid "failed to finalize '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "ваші локальні зміни будуть перезапиÑані %s." + +msgid "commit your changes or stash them to proceed." +msgstr "зробіть коміт або додайте ваші зміни до Ñхову, щоб продовжити." + +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. "rebase". +#. + +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати новий індекÑний файл" + +msgid "unable to update cache tree" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ дерево кешу" + +msgid "could not resolve HEAD commit" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ HEAD коміт" + +#, c-format +msgid "no key present in '%.*s'" +msgstr "немає ключа у \"%.*s\"" + +#, c-format +msgid "unable to dequote value of '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ лапки зі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\"" + +msgid "'GIT_AUTHOR_NAME' already given" +msgstr "\"GIT_AUTHOR_NAME\" вже надано" + +msgid "'GIT_AUTHOR_EMAIL' already given" +msgstr "\"GIT_AUTHOR_EMAIL\" вже надано" + +msgid "'GIT_AUTHOR_DATE' already given" +msgstr "\"GIT_AUTHOR_DATE\" вже надано" + +#, c-format +msgid "unknown variable '%s'" +msgstr "невідома змінна \"%s\"" + +msgid "missing 'GIT_AUTHOR_NAME'" +msgstr "бракує \"GIT_AUTHOR_NAME\"" + +msgid "missing 'GIT_AUTHOR_EMAIL'" +msgstr "бракує \"GIT_AUTHOR_EMAIL\"" + +msgid "missing 'GIT_AUTHOR_DATE'" +msgstr "бракує \"GIT_AUTHOR_DATE\"" + +#, c-format +msgid "" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"ви маєте індекÑовані зміни у вашому робочому дереві\n" +"Якщо ці зміни мають бути ÑтиÑнуті у попередній коміт, запуÑÑ‚Ñ–Ñ‚ÑŒ:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Якщо вони мають потрапити до нового коміту, виконайте:\n" +"\n" +" git commit %s\n" +"\n" +"Ð’ обох випадках, Ñк тільки ви закінчите, продовжуйте за допомогою:\n" +"\n" +" git rebase --continue\n" + +msgid "'prepare-commit-msg' hook failed" +msgstr "\"prepare-commit-msg\" гачок завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Ваше Ñ–Ð¼Ê¼Ñ Ñ‚Ð° адреÑа електронної пошти були налаштовані автоматично на " +"оÑнові\n" +"вашого імені кориÑтувача та назви хоÑту. Будь лаÑка, перевірте Ñ—Ñ… " +"правильніÑÑ‚ÑŒ.\n" +"Ви можете приховати це повідомленнÑ, вÑтановивши Ñ—Ñ… Ñвно. ЗапуÑÑ‚Ñ–Ñ‚ÑŒ\n" +"наÑтупну команду Ñ– дотримуйтеÑÑŒ інÑтрукцій у вашому редакторі, щоб " +"відредагувати\n" +"ваш конфігураційний файл:\n" +"\n" +" git config --global --edit\n" +"\n" +"ПіÑÐ»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ви можете виправити оÑобиÑÑ‚Ñ–ÑÑ‚ÑŒ автора, викориÑтану Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ " +"коміту, за допомогою\n" +"\n" +" git commit --amend --reset-author\n" + +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Ваше Ñ–Ð¼Ê¼Ñ Ñ‚Ð° адреÑа електронної пошти були налаштовані автоматично на " +"оÑнові\n" +"вашого імені кориÑтувача та назви хоÑту. Будь лаÑка, перевірте Ñ—Ñ… " +"правильніÑÑ‚ÑŒ.\n" +"Ви можете приховати це повідомленнÑ, вказавши Ñ—Ñ… Ñвно:\n" +"\n" +" git config --global user.name \"Ваше імʼÑ\"\n" +" git config --global user.email you@example.com\n" +"\n" +"ПіÑÐ»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ви можете виправити оÑобиÑÑ‚Ñ–ÑÑ‚ÑŒ автора, викориÑтану Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ " +"коміту, за допомогою\n" +"\n" +" git commit --amend --reset-author\n" + +msgid "couldn't look up newly created commit" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ новоÑтворений коміт" + +msgid "could not parse newly created commit" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ новоÑтворений коміт" + +msgid "unable to resolve HEAD after creating commit" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð²Ê¼Ñзати HEAD піÑÐ»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ" + +msgid "detached HEAD" +msgstr "відʼєднаний HEAD" + +msgid " (root-commit)" +msgstr " (кореневий комміт)" + +msgid "could not parse HEAD" +msgstr "неможливо розібрати HEAD" + +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "HEAD %s не Ñ” комітом!" + +msgid "unable to parse commit author" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ автора коміту" + +#, c-format +msgid "unable to read commit message from '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта від \"%s\"" + +#, c-format +msgid "invalid author identity '%s'" +msgstr "неприпуÑтима ідентичніÑÑ‚ÑŒ автора \"%s\"" + +msgid "corrupt author: missing date information" +msgstr "пошкоджені дані про автора: відÑÑƒÑ‚Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ дату" + +#, c-format +msgid "could not update %s" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ %s" + +#, c-format +msgid "could not parse commit %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ коміт %s" + +#, c-format +msgid "could not parse parent commit %s" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ джерельний коміт %s" + +#, c-format +msgid "unknown command: %d" +msgstr "невідома команда: %d" + +msgid "This is the 1st commit message:" +msgstr "Це перший Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта:" + +#, c-format +msgid "This is the commit message #%d:" +msgstr "Це Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта #%d:" + +msgid "The 1st commit message will be skipped:" +msgstr "Перший Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта буде пропущено:" + +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта #%d буде пропущено:" + +#, c-format +msgid "This is a combination of %d commits." +msgstr "Це ÐºÐ¾Ð¼Ð±Ñ–Ð½Ð°Ñ†Ñ–Ñ %d комітів." + +#, c-format +msgid "cannot write '%s'" +msgstr "неможливо запиÑати \"%s\"" + +msgid "need a HEAD to fixup" +msgstr "потрібен HEAD, щоб виправити" + +msgid "could not read HEAD" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ HEAD" + +msgid "could not read HEAD's commit message" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта HEAD" + +#, c-format +msgid "could not read commit message of %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта %s" + +msgid "your index file is unmerged." +msgstr "ваш індекÑний файл не злитий." + +msgid "cannot fixup root commit" +msgstr "не вдалоÑÑ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ кореневий коміт" + +#, c-format +msgid "commit %s is a merge but no -m option was given." +msgstr "коміт %s - це злиттÑ, але Ð¾Ð¿Ñ†Ñ–Ñ -m не була вказана." + +#, c-format +msgid "commit %s does not have parent %d" +msgstr "коміт %s не має джерела %d" + +#, c-format +msgid "cannot get commit message for %s" +msgstr "неможливо отримати Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта Ð´Ð»Ñ %s" + +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. + +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ джерельний коміт %s" + +#, c-format +msgid "could not rename '%s' to '%s'" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\" на \"%s\"" + +#, c-format +msgid "could not revert %s... %s" +msgstr "не вдалоÑÑ Ð·Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ %s... %s" + +#, c-format +msgid "could not apply %s... %s" +msgstr "не вдалоÑÑ Ð·Ð°ÑтоÑувати %s... %s" + +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "" +"ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ %s %s -- вміÑÑ‚ латки вже знаходитьÑÑ Ñƒ першоджерельному Ñховищі\n" + +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ індекÑ" + +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ індекÑ" + +#, c-format +msgid "'%s' is not a valid label" +msgstr "\"%s\" не Ñ” припуÑтимою міткою" + +#, c-format +msgid "'%s' is not a valid refname" +msgstr "\"%s\" не Ñ” припуÑтимою назвою поÑиланнÑ" + +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "update-ref потребує повної назви поÑиланнÑ, наприклад, refs/heads/%s" + +#, c-format +msgid "invalid command '%.*s'" +msgstr "неприпуÑтима команда \"%.*s\"" + +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "%s не приймає аргументи: \"%s\"" + +#, c-format +msgid "missing arguments for %s" +msgstr "відÑутні аргументи Ð´Ð»Ñ %s" + +#, c-format +msgid "could not parse '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ \"%s\"" + +#, c-format +msgid "invalid line %d: %.*s" +msgstr "невірний Ñ€Ñдок %d: %.*s" + +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "неможливо зробити \"%s\" без попереднього коміту" + +msgid "cancelling a cherry picking in progress" +msgstr "ÑкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ виÑмикуваннÑ" + +msgid "cancelling a revert in progress" +msgstr "наразі йде ÑкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ" + +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "будь лаÑка, виправте це за допомогою \"git rebase --edit-todo\"." + +#, c-format +msgid "unusable instruction sheet: '%s'" +msgstr "непридатна інÑтрукціÑ: \"%s\"" + +msgid "no commits parsed." +msgstr "не розібрано жодного коміту." + +msgid "cannot cherry-pick during a revert." +msgstr "неможливо зробити виÑÐ¼Ð¸ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ." + +msgid "cannot revert during a cherry-pick." +msgstr "неможливо зробити Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ð¸ÑмикуваннÑ." + +msgid "unusable squash-onto" +msgstr "непридатний squash-onto" + +#, c-format +msgid "malformed options sheet: '%s'" +msgstr "невірно Ñформований ÑпиÑок опцій: \"%s\"" + +msgid "empty commit set passed" +msgstr "передано порожній набір комітів" + +msgid "revert is already in progress" +msgstr "наразі виконуєтьÑÑ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ" + +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "Ñпробуйте \"git revert (--continue | %s--abort | --quit)\"" + +msgid "cherry-pick is already in progress" +msgstr "наразі вже триває виÑмикуваннÑ" + +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "Ñпробуйте \"git cherry-pick (--continue | %s--abort | --quit)\"" + +#, c-format +msgid "could not create sequencer directory '%s'" +msgstr "не вдалоÑÑ Ñтворити директорію ÑеквенÑора \"%s\"" + +msgid "no cherry-pick or revert in progress" +msgstr "наразі не триває ні ÑкаÑуваннÑ, ні виÑмикуваннÑ" + +msgid "cannot resolve HEAD" +msgstr "неможливо розпізнати HEAD" + +msgid "cannot abort from a branch yet to be born" +msgstr "неможливо перервати з гілки, Ñка ще не народилаÑÑ" + +#, c-format +msgid "cannot read '%s': %s" +msgstr "неможливо прочитати \"%s\": %s" + +msgid "unexpected end of file" +msgstr "неÑподіваний кінець файлу" + +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "збережений pre-cherry-pick HEAD файл \"%s\" пошкоджено" + +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "" +"ЗдаєтьÑÑ, ви переÑунули HEAD. ÐŸÐµÑ€ÐµÐ¼Ð¾Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ виконуєтьÑÑ, перевірте Ñвій " +"HEAD!" + +msgid "no revert in progress" +msgstr "наразі Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ðµ виконуєтьÑÑ" + +msgid "no cherry-pick in progress" +msgstr "наразі виÑÐ¼Ð¸ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ виконуєтьÑÑ" + +msgid "failed to skip the commit" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ð¿ÑƒÑтити коміт" + +msgid "there is nothing to skip" +msgstr "немає чого пропуÑкати" + +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"ви вже зробили коміт?\n" +"Ñпробуйте \"git %s --continue\"" + +msgid "cannot read HEAD" +msgstr "неможливо прочитати HEAD" + +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "не вдалоÑÑ Ñкопіювати \"%s\" в \"%s\"" + +#, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Ви можете внеÑти зміни до коміту зараз за допомогою\n" +"\n" +" git commit --amend %s\n" +"\n" +"ПіÑÐ»Ñ Ñ‚Ð¾Ð³Ð¾, Ñк ви будете задоволені Ñвоїми змінами, виконайте\n" +"\n" +" git rebase --continue\n" + +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "Ðе вдалоÑÑ Ð·Ð°ÑтоÑувати %s... %.*s" + +#, c-format +msgid "Could not merge %.*s" +msgstr "Ðе вдалоÑÑ Ð·Ð»Ð¸Ñ‚Ð¸ %.*s" + +#, c-format +msgid "Executing: %s\n" +msgstr "ВиконаннÑ: %s\n" + +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ : %s\n" +"%sВи можете виправити проблему, а потім виконати\n" +"\n" +" git rebase --continue\n" + +msgid "and made changes to the index and/or the working tree.\n" +msgstr "та внеÑли зміни до індекÑу та/або робочого дерева\n" + +#, c-format +msgid "" +"execution succeeded: %s\n" +"but left changes to the index and/or the working tree.\n" +"Commit or stash your changes, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ð¹ÑˆÐ»Ð¾ уÑпішно: %s\n" +"але залишило зміни в індекÑÑ– та/або робочому дереві.\n" +"Зробіть коміт або додайте зміни до Ñхову, а потім запуÑÑ‚Ñ–Ñ‚ÑŒ\n" +"\n" +" git rebase --continue\n" +"\n" + +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "неприпуÑтима назва мітки: \"%.*s\"" + +#, c-format +msgid "could not resolve '%s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ \"%s\"" + +msgid "writing fake root commit" +msgstr "напиÑÐ°Ð½Ð½Ñ Ð¿Ñ–Ð´Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¾Ð³Ð¾ кореневого коміту" + +msgid "writing squash-onto" +msgstr "Ð·Ð°Ð¿Ð¸Ñ squash-onto" + +msgid "cannot merge without a current revision" +msgstr "неможливо злити без поточної ревізії" + +#, c-format +msgid "unable to parse '%.*s'" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ \"%.*s\"" + +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "нічого зливати: \"%.*s\"" + +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "octopus Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ виконати поверх [new root]" + +#, c-format +msgid "could not get commit message of '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ коміта \"%s\"" + +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "не вдалоÑÑ Ð½Ð°Ð²Ñ–Ñ‚ÑŒ Ñпробувати злити \"%.*s\"" + +msgid "merge: Unable to write new index file" +msgstr "злиттÑ: Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати новий файл індекÑу" + +#, c-format +msgid "" +"another 'rebase' process appears to be running; '%s.lock' already exists" +msgstr "здаєтьÑÑ, запущено інший Ð¿Ñ€Ð¾Ñ†ÐµÑ \"rebase\"; \"%s.lock\" вже Ñ–Ñнує" + +#, c-format +msgid "" +"Updated the following refs with %s:\n" +"%s" +msgstr "" +"Оновлені наÑтупні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· %s:\n" +"%s" + +#, c-format +msgid "" +"Failed to update the following refs with %s:\n" +"%s" +msgstr "" +"Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ наÑтупні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· %s:\n" +"%s" + +msgid "Cannot autostash" +msgstr "Ðеможливо зробити автоÑхов" + +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "Ðеочікувана відповідь Ñхову: \"%s\"" + +#, c-format +msgid "Could not create directory for '%s'" +msgstr "Ðе вдалоÑÑ Ñтворити директорію Ð´Ð»Ñ \"%s\"" + +#, c-format +msgid "Created autostash: %s\n" +msgstr "Створено автоÑхов: %s\n" + +msgid "could not reset --hard" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð· --hard" + +#, c-format +msgid "Applied autostash.\n" +msgstr "ЗаÑтоÑовано автоÑхов.\n" + +#, c-format +msgid "cannot store %s" +msgstr "неможливо зберегти %s" + +#, c-format +msgid "" +"%s\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"%s\n" +"Ваші зміни в безпеці у Ñхову.\n" +"Ви можете запуÑтити \"git stash pop\" або \"git stash drop\" у будь-Ñкий " +"чаÑ.\n" + +msgid "Applying autostash resulted in conflicts." +msgstr "ЗаÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð²Ñ‚Ð¾Ñхову призвело до конфліктів." + +msgid "Autostash exists; creating a new stash entry." +msgstr "ÐвтоÑхов Ñ–Ñнує; ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ запиÑу Ñхову." + +msgid "could not detach HEAD" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸ HEAD" + +#, c-format +msgid "Stopped at HEAD\n" +msgstr "Зупинено на HEAD\n" + +#, c-format +msgid "Stopped at %s\n" +msgstr "Зупинено на %s\n" + +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" +"Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ команду todo\n" +"\n" +" %.*s\n" +"Її було перенеÑено; Щоб відредагувати команду перед продовженнÑм, будь " +"лаÑка\n" +"Ñпочатку відредагуйте ÑпиÑок Ñправ:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" + +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "ÐŸÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ (%d/%d)%s" + +#, c-format +msgid "Stopped at %s... %.*s\n" +msgstr "Зупинено на %s... %.*s\n" + +#, c-format +msgid "unknown command %d" +msgstr "невідома команда %d" + +msgid "could not read orig-head" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ orig-head" + +msgid "could not read 'onto'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ \"onto\"" + +#, c-format +msgid "could not update HEAD to %s" +msgstr "не вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ HEAD до %s" + +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "УÑпішно перебазовано та оновлено %s.\n" + +msgid "cannot rebase: You have unstaged changes." +msgstr "неможливо перебазувати: у Ð²Ð°Ñ Ñ” неіндекÑовані зміни." + +msgid "cannot amend non-existing commit" +msgstr "неможливо виправити неіÑнуючий коміт" + +#, c-format +msgid "invalid file: '%s'" +msgstr "неприпуÑтимий файл: \"%s\"" + +#, c-format +msgid "invalid contents: '%s'" +msgstr "неприпуÑтимий вміÑÑ‚: \"%s\"" + +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"У Ð²Ð°Ñ Ñ” незакомічені зміни у вашому робочому дереві. Будь лаÑка, Ñпочатку " +"зробіть коміт,\n" +"а потім знову виконайте \"git rebase --continue\"." + +#, c-format +msgid "could not write file: '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл: \"%s\"" + +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ CHERRY_PICK_HEAD" + +msgid "could not commit staged changes." +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати індекÑовані зміни." + +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s: неможливо зробити виÑÐ¼Ð¸ÐºÑƒÐ²Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "%s: bad revision" +msgstr "%s: невірна ревізіÑ" + +msgid "can't revert as initial commit" +msgstr "неможливо зробити Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ñк початковий коміт" + +#, c-format +msgid "skipped previously applied commit %s" +msgstr "пропущено попередньо заÑтоÑований коміт %s" + +msgid "use --reapply-cherry-picks to include skipped commits" +msgstr "викориÑтовуйте --reapply-cherry-picks, щоб включити пропущені коміти" + +msgid "make_script: unhandled options" +msgstr "make_script: необроблені опції" + +msgid "make_script: error preparing revisions" +msgstr "make_script: помилка при підготовці ревізій" + +msgid "nothing to do" +msgstr "нічого робити" + +msgid "could not skip unnecessary pick commands" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ð¿ÑƒÑтити непотрібні команди вибору" + +msgid "the script was already rearranged." +msgstr "Ñкрипт вже був перероблений." + +#, c-format +msgid "update-refs file at '%s' is invalid" +msgstr "файл update-refs за адреÑою \"%s\" Ñ” неприпуÑтимим" + +#, c-format +msgid "'%s' is outside repository at '%s'" +msgstr "\"%s\" зовнішнє Ñховище в \"%s\"" + +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git <command> -- <path>...' to specify paths that do not exist locally." +msgstr "" +"%s: немає такого шлÑху у робочому дереві.\n" +"ВикориÑтовуйте \"git <команда> -- <шлÑÑ…>...\", щоб вказати шлÑхи, Ñкі не " +"Ñ–Ñнують локально." + +#, c-format +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"неоднозначний аргумент \"%s\": невідома Ñ€ÐµÐ²Ñ–Ð·Ñ–Ñ Ð°Ð±Ð¾ шлÑÑ… не у робочому " +"дереві.\n" +"ВикориÑтовуйте \"--\", щоб відокремити шлÑÑ… від ревізій, наприклад, так:\n" +"\"git <команда> [<ревізіÑ>...] -- [<файл>...]\"" + +#, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "Ð¾Ð¿Ñ†Ñ–Ñ \"%s\" повинна ÑтоÑти перед аргументами без опцій" + +#, c-format +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"неоднозначний аргумент \"%s\": Ñ– ревізіÑ, Ñ– назва файлу\n" +"ВикориÑтовуйте \"--\", щоб відокремити шлÑхи від ревізій, наприклад, так:\n" +"\"git <команда> [<ревізіÑ>...] -- [<файл>...]\"" + +msgid "unable to set up work tree using invalid config" +msgstr "" +"не вдалоÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ робоче дерево, викориÑтовуючи неприпуÑтиму " +"конфігурацію" + +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "ОчікувалоÑÑŒ git Ñховищe верÑÑ–Ñ— <= %d, знайдено %d" + +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "знайдено невідомих розширень Ñховища:" +msgstr[1] "знайдено невідомих розширень Ñховища:" +msgstr[2] "знайдено невідомих розширень Ñховища:" + +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "верÑÑ–Ñ Ñховища дорівнює 0, але знайдено v1-only розширень:" +msgstr[1] "верÑÑ–Ñ Ñховища дорівнює 0, але знайдено v1-only розширень:" +msgstr[2] "верÑÑ–Ñ Ñховища дорівнює 0, але знайдено v1-only розширень:" + +#, c-format +msgid "error opening '%s'" +msgstr "помилка при відкритті \"%s\"" + +#, c-format +msgid "too large to be a .git file: '%s'" +msgstr "занадто великий Ð´Ð»Ñ .git-файлу: \"%s\"" + +#, c-format +msgid "error reading %s" +msgstr "помилка Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "invalid gitfile format: %s" +msgstr "неприпуÑтимий формат git файлу: %s" + +#, c-format +msgid "no path in gitfile: %s" +msgstr "немає шлÑху в gitfile: %s" + +#, c-format +msgid "not a git repository: %s" +msgstr "не Ñ” git Ñховищем: %s" + +#, c-format +msgid "'$%s' too big" +msgstr "\"$%s\" занадто великий" + +#, c-format +msgid "not a git repository: '%s'" +msgstr "не Ñ” git Ñховищем: \"%s\"" + +#, c-format +msgid "cannot chdir to '%s'" +msgstr "неможливо змінити директорію на \"%s\"" + +msgid "cannot come back to cwd" +msgstr "неможливо повернутиÑÑ Ð´Ð¾ поточної робочої директорії" + +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати \"%*s%s%s\"" + +msgid "Unable to read current working directory" +msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ поточну робочу директорію" + +#, c-format +msgid "cannot change to '%s'" +msgstr "неможливо змінити на \"%s\"" + +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "не Ñ” git Ñховищем (Ñк Ñ– жодна з батьківÑьких директорій): %s" + +#, c-format +msgid "" +"not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgstr "" +"не Ñ” git Ñховищем (Ñк Ñ– жодна з батьківÑьких директорій до міÑÑ†Ñ Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ " +"%s)\n" +"Зупинка на межі файлової ÑиÑтеми (GIT_DISCOVERY_ACROSS_FILESYSTEM не " +"вÑтановлено)." + +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"виÑвлено Ñумнівне право влаÑноÑÑ‚Ñ– у Ñховищі за адреÑою \"%s\"\n" +"%sЩоб додати винÑток Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— директорії, виконайте:\n" +"\n" +"\tgit config --global --add safe.directory %s" + +#, c-format +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" +msgstr "" +"неможливо викориÑтати порожнє Ñховище \"%s\" (safe.bareRepository " +"вÑтановлено в \"%s\")" + +#, c-format +msgid "" +"problem with core.sharedRepository filemode value (0%.3o).\n" +"The owner of files must always have read and write permissions." +msgstr "" +"проблема зі значеннÑм файлового режиму core.sharedRepository (0%.3o).\n" +"ВлаÑник файлів завжди повинен мати права на Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ‚Ð° запиÑ." + +msgid "fork failed" +msgstr "fork завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +msgid "setsid failed" +msgstr "setsid завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "index entry is a directory, but not sparse (%08x)" +msgstr "індекÑний Ð·Ð°Ð¿Ð¸Ñ Ñ” директорією, але не Ñ” чаÑтковим (%08x)" + +msgid "cannot use split index with a sparse index" +msgstr "не можна викориÑтовувати розділений Ñ–Ð½Ð´ÐµÐºÑ Ð· чаÑтковим індекÑом" + +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u ГіБ" + +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u ГіБ/Ñ" + +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u МіБ" + +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u МіБ/Ñ" + +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u КіБ" + +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u КіБ/Ñ" + +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u байт" +msgstr[1] "%u байти" +msgstr[2] "%u байтів" + +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u байт/s" +msgstr[1] "%u байти/s" +msgstr[2] "%u байтів/s" + +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¾Ð·Ñ€Ñ–Ð»Ð¾Ñ— назви підмодулÑ: %s" + +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "негативні Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ дозволені Ð´Ð»Ñ submodule.fetchJobs" + +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "" +"Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ \"%s\", Ñкий може бути інтерпретований Ñк параметр командного " +"Ñ€Ñдка: %s" + +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ %s у .gitmodules" + +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "" +"Ðеможливо змінити незлиті .gitmodules, Ñпочатку розвʼÑжіть конфлікти злиттÑ" + +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ розділ у .gitmodules де path=%s" + +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ .gitmodules Ð´Ð»Ñ %s" + +msgid "staging updated .gitmodules failed" +msgstr "індекÑÐ°Ñ†Ñ–Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾Ð³Ð¾ .gitmodules завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "у незаповненому підмодулі \"%s\"" + +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Визначник шлÑху \"%s\" знаходитьÑÑ Ñƒ підмодулі \"%.*s\"" + +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "невірний --ignore-submodules аргумент: %s" + +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"Підмодуль у коміті %s за шлÑхом \"%s\" зіткнувÑÑ Ð· підмодулем з такою Ñамою " +"назвою. ПропуÑкаємо його." + +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "Ð·Ð°Ð¿Ð¸Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\" (%s) Ñ” %s, а не комітом" + +#, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "" +"Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ команду \"git rev-list <коміти> --not --remotes -n 1\" у " +"підмодулі %s" + +#, c-format +msgid "process for submodule '%s' failed" +msgstr "Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\" завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "ÐадÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"\n" + +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "Ðе вдалоÑÑ Ð½Ð°Ð´Ñ–Ñлати підмодуль \"%s\"\n" + +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s%s\n" + +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"\n" + +#, c-format +msgid "Could not access submodule '%s' at commit %s\n" +msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\" Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ð° %s\n" + +#, c-format +msgid "Fetching submodule %s%s at commit %s\n" +msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s%s Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ð° %s\n" + +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Помилки під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ:\n" +"%s" + +#, c-format +msgid "'%s' not recognized as a git repository" +msgstr "\"%s\" не розпізнано Ñк git Ñховище" + +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "" +"Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ команду \"git status --porcelain=2\" у підмодулі %s" + +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "\"git status --porcelain=2\" завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾ у підмодулі %s" + +#, c-format +msgid "could not start 'git status' in submodule '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити \"git status\" у підмодулі \"%s\"" + +#, c-format +msgid "could not run 'git status' in submodule '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити \"git status\" у підмодулі \"%s\"" + +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "Ðе вдалоÑÑ Ñкинути Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ core.worktree у підмодулі \"%s\"" + +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "не вдалоÑÑ Ñ€ÐµÐºÑƒÑ€Ñивно перейти в підмодуль \"%s\"" + +msgid "could not reset submodule index" +msgstr "не вдалоÑÑ Ñкинути Ñ–Ð½Ð´ÐµÐºÑ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ" + +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "підмодуль \"%s\" має брудний індекÑ" + +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ підмодуль \"%s\"." + +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "підмодуль git dir \"%s\" знаходитьÑÑ Ð²Ñередині git директорії \"%.*s\"" + +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" +"relocate_gitdir Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\" з більш ніж одним робочим деревом не " +"підтримуєтьÑÑ" + +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ назву Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"" + +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "відмова Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ \"%s\" до Ñ–Ñнуючої git директорії" + +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"ÐœÑ–Ð³Ñ€Ð°Ñ†Ñ–Ñ git-директорії \"%s%s\" з\n" +"\"%s\" до\n" +"\"%s\"\n" + +msgid "could not start ls-files in .." +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити ls-файли в .." + +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree повернув неочікуваний код Ð¿Ð¾Ð²ÐµÑ€Ð½ÐµÐ½Ð½Ñ %d" + +#, c-format +msgid "failed to lstat '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ lstat Ð´Ð»Ñ \"%s\"" + +msgid "no remote configured to get bundle URIs from" +msgstr "" +"немає налаштованого віддаленого Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ URI пакунків з " +"нього" + +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "віддалений \"%s\" не має налаштованої URL-адреÑи" + +msgid "could not get the bundle-uri list" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ÑпиÑок bundle-uri" + +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <опції> (control|prime|update)" + +msgid "clear the cache tree before each iteration" +msgstr "очищати дерево кешу перед кожною ітерацією" + +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "" +"кількіÑÑ‚ÑŒ запиÑів у дереві кешу, Ñкі потрібно анулювати (за замовчуваннÑм 0)" + +msgid "unhandled options" +msgstr "необроблені опції" + +msgid "error preparing revisions" +msgstr "помилка при підготовці ревізій" + +#, c-format +msgid "commit %s is not marked reachable" +msgstr "коміт %s не позначений Ñк доÑÑжний" + +msgid "too many commits marked reachable" +msgstr "забагато комітів позначено Ñк доÑÑжні" + +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<опції>]" + +msgid "exit immediately after advertising capabilities" +msgstr "вихід відразу піÑÐ»Ñ Ð¿Ð¾ÐºÐ°Ð·Ñƒ здібноÑтей" + +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "test-helper simple-ipc is-active [<назва>] [<опції>]" + +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "test-helper simple-ipc run-daemon [<назва>] [<потоки>]" + +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "" +"test-helper simple-ipc start-daemon [<назва>] [<потоки>] [<макÑимальний Ñ‡Ð°Ñ " +"очікуваннÑ>]" + +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "" +"test-helper simple-ipc stop-daemon [<назва>] [<макÑимальний Ñ‡Ð°Ñ Ð¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ>]" + +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "test-helper simple-ipc send [<назва>] [<токен>]" + +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "" +"test-helper simple-ipc sendbytes [<назва>] [<кількіÑÑ‚ÑŒ байт>] [<байт>]" + +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" +"test-helper simple-ipc multiple [<назва>] [<потоки>] [<кількіÑÑ‚ÑŒ байт>] " +"[<розмір пакетів>]" + +msgid "name or pathname of unix domain socket" +msgstr "назва або назва шлÑху Ñокета домену unix" + +msgid "named-pipe name" +msgstr "" + +msgid "number of threads in server thread pool" +msgstr "кількіÑÑ‚ÑŒ потоків у пулі потоків Ñервера" + +msgid "seconds to wait for daemon to start or stop" +msgstr "Ñекунд чекати на запуÑк або зупинку демона" + +msgid "number of bytes" +msgstr "кількіÑÑ‚ÑŒ байтів" + +msgid "number of requests per thread" +msgstr "кількіÑÑ‚ÑŒ запитів на потік" + +msgid "byte" +msgstr "байт" + +msgid "ballast character" +msgstr "балаÑтний Ñимвол" + +msgid "token" +msgstr "токен" + +msgid "command token to send to the server" +msgstr "токен команди Ð´Ð»Ñ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²ÐºÐ¸ на Ñервер" + +#, c-format +msgid "running trailer command '%s' failed" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ команду трейлера \"%s\"" + +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "невідоме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%s\" Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° \"%s\"" + +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "порожній токен трейлера в трейлері \"%.*s\"" + +#, c-format +msgid "could not read input file '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ вхідний файл \"%s\"" + +#, c-format +msgid "could not stat %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ %s" + +#, c-format +msgid "file %s is not a regular file" +msgstr "файл %s не Ñ” звичайним файлом" + +#, c-format +msgid "file %s is not writable by user" +msgstr "файл %s не доÑтупний Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу кориÑтувачем" + +msgid "could not open temporary file" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ тимчаÑовий файл" + +#, c-format +msgid "could not rename temporary file to %s" +msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ тимчаÑовий файл на %s" + +msgid "full write to remote helper failed" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ повний Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ віддаленого помічника" + +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ віддаленого помічника Ð´Ð»Ñ \"%s\"" + +msgid "can't dup helper output fd" +msgstr "неможливо зробити копію деÑкриптора файла виводу помічника" + +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" +"невідома обовʼÑзкова здібніÑÑ‚ÑŒ %s; цей віддалений помічник напевно потребує " +"новішої верÑÑ–Ñ— Git" + +msgid "this remote helper should implement refspec capability" +msgstr "цей віддалений помічник має реалізовувати здібніÑÑ‚ÑŒ refspec" + +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "%s неÑподівано Ñказав: \"%s\"" + +#, c-format +msgid "%s also locked %s" +msgstr "%s також заблокувало %s" + +msgid "couldn't run fast-import" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити fast-import" + +msgid "error while running fast-import" +msgstr "помилка під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾Ð³Ð¾ імпорту" + +#, c-format +msgid "could not read ref %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s" + +#, c-format +msgid "unknown response to connect: %s" +msgstr "невідома відповідь на зʼєднаннÑ: %s" + +msgid "setting remote service path not supported by protocol" +msgstr "вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑˆÐ»Ñху до віддаленого ÑервіÑу не підтримуєтьÑÑ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¾Ð¼" + +msgid "invalid remote service path" +msgstr "неприпуÑтимий шлÑÑ… до віддаленої Ñлужби" + +msgid "operation not supported by protocol" +msgstr "Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð½Ðµ підтримуєтьÑÑ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¾Ð¼" + +#, c-format +msgid "can't connect to subservice %s" +msgstr "неможливо підключитиÑÑ Ð´Ð¾ підÑервіÑу %s" + +msgid "--negotiate-only requires protocol v2" +msgstr "--negotiate-only потребує протоколу v2" + +msgid "'option' without a matching 'ok/error' directive" +msgstr "\"option\" без відповідної директиви \"ok/error\"" + +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "очікувалоÑÑ ok/error, помічник Ñказав \"%s\"" + +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "helper повідомив про неочікуваний ÑÑ‚Ð°Ñ‚ÑƒÑ %s" + +#, c-format +msgid "helper %s does not support dry-run" +msgstr "помічник %s не підтримує dry-run" + +#, c-format +msgid "helper %s does not support --signed" +msgstr "помічник %s не підтримує --signed" + +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "помічник %s не підтримує --signed=if-asked" + +#, c-format +msgid "helper %s does not support --atomic" +msgstr "помічник %s не підтримує --atomic" + +#, c-format +msgid "helper %s does not support --%s" +msgstr "помічник %s не підтримує --%s" + +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "помічник %s не підтримує \"push-option\"" + +msgid "remote-helper doesn't support push; refspec needed" +msgstr "remote-helper не підтримує push; потрібен refspec" + +#, c-format +msgid "helper %s does not support 'force'" +msgstr "помічник %s не підтримує \"force\"" + +msgid "couldn't run fast-export" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿ÑƒÑтити fast-export" + +msgid "error while running fast-export" +msgstr "помилка під Ñ‡Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾Ð³Ð¾ екÑпорту" + +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch.\n" +msgstr "" +"Ðемає Ñпільних поÑилань Ñ– жодного не вказано; нічого не робитьÑÑ.\n" +"Можливо, вам Ñлід вказати гілку.\n" + +#, c-format +msgid "unsupported object format '%s'" +msgstr "непідтримуваний обʼєкт формата \"%s\"" + +#, c-format +msgid "malformed response in ref list: %s" +msgstr "неправильно Ñформована відповідь у ÑпиÑку поÑилань: %s" + +#, c-format +msgid "read(%s) failed" +msgstr "read(%s) завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "write(%s) failed" +msgstr "write(%s) завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "%s thread failed" +msgstr "%s потік завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +#, c-format +msgid "%s thread failed to join: %s" +msgstr "%s потік не зміг приєднатиÑÑŒ: %s" + +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "неможливо запуÑтити потік Ð´Ð»Ñ ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…: %s" + +#, c-format +msgid "%s process failed to wait" +msgstr "%s Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ðµ зміг дочекатиÑÑ" + +#, c-format +msgid "%s process failed" +msgstr "%s Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" + +msgid "can't start thread for copying data" +msgstr "неможливо запуÑтити потік Ð´Ð»Ñ ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…" + +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Ð’Ñтановить першоджерельне Ñховище Ð´Ð»Ñ \"%s\" на \"%s\" в \"%s\"\n" + +#, c-format +msgid "could not read bundle '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ пакет \"%s\"" + +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: неприпуÑтимий параметр глибини \"%s\"" + +msgid "see protocol.version in 'git help config' for more details" +msgstr "" +"дивітьÑÑ protocol.version у \"git help config\" Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ детальної " +"інформації" + +msgid "server options require protocol version 2 or later" +msgstr "опції Ñервера вимагають протокол верÑÑ–Ñ— 2 або пізнішої" + +msgid "server does not support wait-for-done" +msgstr "Ñервер не підтримує wait-for-done" + +msgid "could not parse transport.color.* config" +msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ конфігурацію transport.color.*" + +msgid "support for protocol v2 not implemented yet" +msgstr "підтримка протоколу v2 ще не запроваджена" + +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "невідоме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— \"%s\": %s" + +#, c-format +msgid "transport '%s' not allowed" +msgstr "заÑіб передачі \"%s\" не дозволений" + +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync більше не підтримуєтьÑÑ" + +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"ÐаÑтупні шлÑхи до підмодулів міÑÑ‚ÑÑ‚ÑŒ зміни, Ñкі неможливо\n" +"знайти в жодному віддаленому призначенні:\n" + +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" +"\n" +"Будь лаÑка, Ñпробуйте\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"або перейдіть до директорії та викориÑтайте\n" +"\n" +"\tgit push\n" +"\n" +"щоб надіÑлати Ñ—Ñ… до віддаленого призначеннÑ.\n" + +msgid "Aborting." +msgstr "Відміна." + +msgid "failed to push all needed submodules" +msgstr "не вдалоÑÑ Ð½Ð°Ð´Ñ–Ñлати вÑÑ– необхідні підмодулі" + +msgid "bundle-uri operation not supported by protocol" +msgstr "bundle-uri Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð½Ðµ підтримуєтьÑÑ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¾Ð¼" + +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ÑпиÑок Ð°Ð´Ñ€ÐµÑ Ð¿Ð°ÐºÐµÑ‚Ñ–Ð², оголошений Ñервером" + +msgid "too-short tree object" +msgstr "занадто короткий обʼєкт дерева" + +msgid "malformed mode in tree entry" +msgstr "невірно визначений режим у запиÑÑ– дерева" + +msgid "empty filename in tree entry" +msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ Ð½Ð°Ð·Ð²Ð° файлу у запиÑÑ– дерева" + +msgid "too-short tree file" +msgstr "занадто короткий файл дерева" + +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you switch branches." +msgstr "" +"Ваші локальні зміни в наÑтупних файлах будуть перезапиÑані при переключенні " +"Ñтану:\n" +"%%sБудь лаÑка, зробіть коміт або додайте Ñ—Ñ… до Ñхову перед переходом до " +"іншої гілки." + +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Ваші локальні зміни в наÑтупних файлах будуть перезапиÑані при переключенні " +"Ñтану:\n" +"%%s" + +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you merge." +msgstr "" +"Ваші локальні зміни у наÑтупних файлах будуть перезапиÑані під Ñ‡Ð°Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ:\n" +"%%sБудь лаÑка, зробіть коміт або додайте Ñ—Ñ… до Ñхову перед злиттÑм." + +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Ваші локальні зміни у наÑтупних файлах будуть перезапиÑані під Ñ‡Ð°Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ:\n" +"%%s" + +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you %s." +msgstr "" +"Ваші локальні зміни у наÑтупних файлах будуть перезапиÑані %s:\n" +"%%sБудь лаÑка, зробіть коміт або додайте Ñ—Ñ… до Ñхову перед %s." + +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Ваші локальні зміни у наÑтупних файлах будуть перезапиÑані %s:\n" +"%%s" + +#, c-format +msgid "" +"Updating the following directories would lose untracked files in them:\n" +"%s" +msgstr "" +"ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ñтупних директорій призведе до втрати невідÑтежуваних файлів у " +"цих директоріÑÑ…:\n" +"%s" + +#, c-format +msgid "" +"Refusing to remove the current working directory:\n" +"%s" +msgstr "" +"Відмова Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— робочої директорії:\n" +"%s" + +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you switch branches." +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть видалені під Ñ‡Ð°Ñ " +"переключеннÑ:\n" +"%%sБудь лаÑка, переміÑÑ‚Ñ–Ñ‚ÑŒ або видаліть Ñ—Ñ… перед переходом до іншої гілки." + +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть видалені під Ñ‡Ð°Ñ " +"переключеннÑ:\n" +"%%s" + +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть видалені при виконанні " +"злиттÑ:\n" +"%%sБудь лаÑка, переміÑÑ‚Ñ–Ñ‚ÑŒ або видаліть Ñ—Ñ… перед злиттÑм." + +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть видалені при виконанні " +"злиттÑ:\n" +"%%s" + +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть видалені при виконанні " +"%s:\n" +"%%sБудь лаÑка, переміÑÑ‚Ñ–Ñ‚ÑŒ або видаліть Ñ—Ñ… перед %s." + +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть видалені при виконанні " +"%s:\n" +"%%s" + +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you switch branches." +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть перезапиÑані при " +"переключенні Ñтану\n" +"%%sБудь лаÑка, переміÑÑ‚Ñ–Ñ‚ÑŒ або видаліть Ñ—Ñ… перед переходом до іншої гілки." + +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть перезапиÑані при " +"переключенні Ñтану:\n" +"%%s" + +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть перезапиÑані при " +"злитті:\n" +"%%sБудь лаÑка, переміÑÑ‚Ñ–Ñ‚ÑŒ або видаліть Ñ—Ñ… перед злиттÑм." + +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть перезапиÑані при " +"виконанні злиттÑ:\n" +"%%s" + +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть перезапиÑані %s:\n" +"%%sБудь лаÑка, переміÑÑ‚Ñ–Ñ‚ÑŒ або видаліть Ñ—Ñ… перед %s." + +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"ÐаÑтупні невідÑтежувані файли робочого дерева будуть перезапиÑані %s:\n" +"%%s" + +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "Ð—Ð°Ð¿Ð¸Ñ \"%s\" перетинаєтьÑÑ Ð· \"%s\". Ðеможливо звʼÑзати." + +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ підмодуль:\n" +"%s" + +#, c-format +msgid "" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" +"%s" +msgstr "" +"ÐаÑтупні шлÑхи не Ñ” актуальними Ñ– були залишені, незважаючи на чаÑткові " +"шаблони:\n" +"%s" + +#, c-format +msgid "" +"The following paths are unmerged and were left despite sparse patterns:\n" +"%s" +msgstr "" +"ÐаÑтупні шлÑхи не злиті Ñ– були залишені, незважаючи на чаÑткові шаблони:\n" +"%s" + +#, c-format +msgid "" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" +"%s" +msgstr "" +"ÐаÑтупні шлÑхи вже Ñ–Ñнували Ñ– тому не були оновлені, незважаючи на чаÑткові " +"шаблони:\n" +"%s" + +#, c-format +msgid "Aborting\n" +msgstr "ПерериваннÑ\n" + +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"ПіÑÐ»Ñ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ñ… вище шлÑхів можливо ви забажаєте виконати \"git " +"sparse-checkout reapply\".\n" + +msgid "Updating files" +msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²" + +msgid "" +"the following paths have collided (e.g. case-sensitive paths\n" +"on a case-insensitive filesystem) and only one from the same\n" +"colliding group is in the working tree:\n" +msgstr "" +"зіткнулиÑÑ Ð½Ð°Ñтупні шлÑхи (наприклад, шлÑхи, чутливі до регіÑтру\n" +"у файловій ÑиÑтемі, не чутливій до регіÑтру) Ñ– лише один шлÑÑ… з тієї \n" +"групи, що зіткнулиÑÑ, знаходитьÑÑ Ñƒ робочому дереві:\n" + +msgid "Updating index flags" +msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð°Ð¿Ð¾Ñ€Ñ†Ñ–Ð² індекÑу" + +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "робоче дерево та невідÑтежуваний коміт мають дубльовані запиÑи: %s" + +msgid "expected flush after fetch arguments" +msgstr "очікувалоÑÑŒ flush піÑÐ»Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² отриманнÑ" + +msgid "invalid URL scheme name or missing '://' suffix" +msgstr "неприпуÑтима назва Ñхеми URL-адреÑи або відÑутній \"://\" ÑуфікÑ" + +#, c-format +msgid "invalid %XX escape sequence" +msgstr "неприпуÑтима %XX екрануюча поÑлідовніÑÑ‚ÑŒ" + +msgid "missing host and scheme is not 'file:'" +msgstr "відÑутній хоÑÑ‚ Ñ– Ñхема не \"file:\"" + +msgid "a 'file:' URL may not have a port number" +msgstr "\"file:\" URL-адреÑа не може мати номера порту" + +msgid "invalid characters in host name" +msgstr "неприпуÑтимі Ñимволи в назві хоÑта" + +msgid "invalid port number" +msgstr "неприпуÑтимий номер порту" + +msgid "invalid '..' path segment" +msgstr "неприпуÑтимий \"..\" Ñегмент шлÑху" + +msgid "usage: " +msgstr "викориÑтаннÑ: " + +msgid "fatal: " +msgstr "збій: " + +msgid "error: " +msgstr "помилка: " + +msgid "warning: " +msgstr "попередженнÑ: " + +msgid "Fetching objects" +msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¾Ð±Ê¼Ñ”ÐºÑ‚Ñ–Ð²" + +#, c-format +msgid "'%s' at main working tree is not the repository directory" +msgstr "\"%s\" у головному робочому дереві не Ñ” директорією Ñховища" + +#, c-format +msgid "'%s' file does not contain absolute path to the working tree location" +msgstr "" +"\"%s\" файл не міÑтить абÑолютного шлÑху до Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¾Ð³Ð¾ дерева" + +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "\"%s\" не Ñ” .git-файлом, код помилки %d" + +#, c-format +msgid "'%s' does not point back to '%s'" +msgstr "\"%s\" не вказує назад на \"%s\"" + +msgid "not a directory" +msgstr "не Ñ” директорією" + +msgid ".git is not a file" +msgstr ".git не Ñ” файлом" + +msgid ".git file broken" +msgstr ".git файл пошкоджено" + +msgid ".git file incorrect" +msgstr "Ðеправильний файл .git" + +msgid "not a valid path" +msgstr "неприпуÑтимий шлÑÑ…" + +msgid "unable to locate repository; .git is not a file" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñховище; .git не Ñ” файлом" + +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñховище; .git-файл не поÑилаєтьÑÑ Ð½Ð° Ñховище" + +msgid "unable to locate repository; .git file broken" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñховище; файл .git пошкоджено" + +msgid "gitdir unreadable" +msgstr "git-Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ð½ÐµÑ‡Ð¸Ñ‚Ð°Ð±ÐµÐ»ÑŒÐ½Ð°" + +msgid "gitdir incorrect" +msgstr "git-Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°" + +msgid "not a valid directory" +msgstr "неприпуÑтима директоріÑ" + +msgid "gitdir file does not exist" +msgstr "файл git директорії не Ñ–Ñнує" + +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл git директорії (%s)" + +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "" +"помилка при зчитуванні (очікувалоÑÑŒ %<PRIuMAX> байтів, прочитано %<PRIuMAX>)" + +msgid "invalid gitdir file" +msgstr "неприпуÑтимий файл git-директорії" + +msgid "gitdir file points to non-existent location" +msgstr "файл git-директорії вказує на неіÑнуюче розташуваннÑ" + +#, c-format +msgid "unable to set %s in '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð´Ð°Ñ‚Ð¸ %s в \"%s\"" + +#, c-format +msgid "unable to unset %s in '%s'" +msgstr "не вдалоÑÑ Ñкинути %s в \"%s\"" + +msgid "failed to set extensions.worktreeConfig setting" +msgstr "не вдалоÑÑ Ð²Ñтановити extensions.worktreeConfig параметр" + +#, c-format +msgid "could not setenv '%s'" +msgstr "не вдалоÑÑ Ð²Ñтановити Ð¾Ñ‚Ð¾Ñ‡ÐµÐ½Ð½Ñ \"%s\"" + +#, c-format +msgid "unable to create '%s'" +msgstr "не вдалоÑÑ Ñтворити \"%s\"" + +#, c-format +msgid "could not open '%s' for reading and writing" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\" Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ‚Ð° запиÑу" + +#, c-format +msgid "unable to access '%s'" +msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ доÑтуп до \"%s\"" + +msgid "unable to get current working directory" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ поточну робочу директорію" + +msgid "Unmerged paths:" +msgstr "Ðе злиті шлÑхи:" + +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr "" +" (викориÑтовуйте \"git restore --staged <файл>...\", щоб вилучити з індекÑу)" + +#, c-format +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" +msgstr "" +" (викориÑтовуйте \"git restore --source=%s --staged <file>...\", щоб " +"видалити з індекÑу)" + +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr "" +" (викориÑтовуйте \"git rm --cached <file>...\", щоб вилучити з індекÑу)" + +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " (викориÑтовуйте \"git add <файл>...\", щоб позначити Ñк вирішене)" + +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr "" +" (викориÑтовуйте \"git add/rm <файл>...\" за потребою, щоб позначити Ñк " +"вирішене)" + +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " (викориÑтовуйте \"git rm <файл>...\", щоб позначити Ñк вирішене)" + +msgid "Changes to be committed:" +msgstr "Зміни, що будуть додані до коміту:" + +msgid "Changes not staged for commit:" +msgstr "Зміни, що не будуть додані до коміту:" + +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr "" +" (викориÑтовуйте \"git add <файл>...\", Ð´Ð»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð¾Ð³Ð¾, що буде " +"закомічено)" + +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" +" (викориÑтовуйте \"git add/rm <файл>...\" Ð´Ð»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð¾Ð³Ð¾, що буде " +"закомічено)" + +msgid "" +" (use \"git restore <file>...\" to discard changes in working directory)" +msgstr "" +" (викориÑтовуйте \"git restore <файл>...\", щоб ÑкаÑувати зміни в робочій " +"директорії)" + +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" +" (зробіть коміт або ÑкаÑуйте невідÑтежуваний або змінений контент у " +"підмодулÑÑ…)" + +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" +" (викориÑтовуйте \"git %s <файл>...\" Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾ того, що буде " +"закомічено)" + +msgid "both deleted:" +msgstr "видалено обома:" + +msgid "added by us:" +msgstr "додано нами:" + +msgid "deleted by them:" +msgstr "видалено ними:" + +msgid "added by them:" +msgstr "додано ними:" + +msgid "deleted by us:" +msgstr "видалено нами:" + +msgid "both added:" +msgstr "додано обома:" + +msgid "both modified:" +msgstr "змінено обома:" + +msgid "new file:" +msgstr "новий файл:" + +msgid "copied:" +msgstr "Ñкопійовано:" + +msgid "deleted:" +msgstr "видалено:" + +msgid "modified:" +msgstr "змінено:" + +msgid "renamed:" +msgstr "перейменовано:" + +msgid "typechange:" +msgstr "змінено тип:" + +msgid "unknown:" +msgstr "невідомо:" + +msgid "unmerged:" +msgstr "не злито:" + +msgid "new commits, " +msgstr "нові коміти, " + +msgid "modified content, " +msgstr "змінений контент, " + +msgid "untracked content, " +msgstr "невідÑтежуваний контент, " + +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "У вашій Ñхованці наразі Ñ” %d запиÑ" +msgstr[1] "У вашій Ñхованці наразі Ñ” %d запиÑи" +msgstr[2] "У вашій Ñхованці наразі Ñ” %d запиÑів" + +msgid "Submodules changed but not updated:" +msgstr "Підмодулі змінено, але не оновлено:" + +msgid "Submodule changes to be committed:" +msgstr "Зміни в підмодулі, Ñкі будуть закомічені:" + +msgid "" +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." +msgstr "" +"Ðе змінюйте та не видалÑйте Ñ€Ñдок вище.\n" +"Ð’Ñе, що нижче, буде проігноровано." + +#, c-format +msgid "" +"\n" +"It took %.2f seconds to compute the branch ahead/behind values.\n" +"You can use '--no-ahead-behind' to avoid this.\n" +msgstr "" +"\n" +"ОбчиÑÐ»ÐµÐ½Ð½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ попереду/позаду Ð´Ð»Ñ Ð³Ñ–Ð»ÐºÐ¸ зайнÑло %.2f Ñекунд.\n" +"Ви можете викориÑтати параметр '--no-ahead-behind', щоб уникнути цього.\n" + +msgid "You have unmerged paths." +msgstr "У Ð²Ð°Ñ Ñ” не злиті шлÑхи." + +msgid " (fix conflicts and run \"git commit\")" +msgstr " (виправте конфлікти та виконайте \"git commit\")" + +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr "" +" (викориÑтовуйте команду \"git merge --abort\", щоб перервати злиттÑ)." + +msgid "All conflicts fixed but you are still merging." +msgstr "УÑÑ– конфлікти виправлено, але ви вÑе ще продовжуєте злиттÑ." + +msgid " (use \"git commit\" to conclude merge)" +msgstr " (викориÑтовуйте \"git commit\" Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ)" + +msgid "You are in the middle of an am session." +msgstr "Ви вÑередині am ÑеанÑу." + +msgid "The current patch is empty." +msgstr "Поточна латка порожнÑ." + +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " (виправте конфлікти, а потім виконайте \"git am --continue\")" + +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (викориÑтовуйте команду \"git am --skip\", щоб пропуÑтити цю латку)" + +msgid "" +" (use \"git am --allow-empty\" to record this patch as an empty commit)" +msgstr "" +" (викориÑтовуйте \"git am --allow-empty\", щоб запиÑати цю латку Ñк " +"порожній коміт)" + +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " (викориÑтовуйте \"git am --abort\", щоб відновити початкову гілку)" + +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo відÑутній." + +msgid "No commands done." +msgstr "Ðе виконано жодної команди." + +#, c-format +msgid "Last command done (%<PRIuMAX> command done):" +msgid_plural "Last commands done (%<PRIuMAX> commands done):" +msgstr[0] "ОÑтанню команду виконано (%<PRIuMAX> команду виконано):" +msgstr[1] "ОÑтанні команди виконано (%<PRIuMAX> команди виконано):" +msgstr[2] "ОÑтанніх команд виконано (%<PRIuMAX> команд виконано):" + +#, c-format +msgid " (see more in file %s)" +msgstr " (дивітьÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ у файлі %s)" + +msgid "No commands remaining." +msgstr "Ðе залишилоÑÑŒ команд." + +#, c-format +msgid "Next command to do (%<PRIuMAX> remaining command):" +msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):" +msgstr[0] "ÐаÑтупна команда Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ (залишилаÑÑŒ %<PRIuMAX> команда):" +msgstr[1] "ÐаÑтупні команди Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ (залишилоÑÑŒ %<PRIuMAX> команди):" +msgstr[2] "ÐаÑтупні команди Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ (залишилоÑÑŒ %<PRIuMAX> команд):" + +msgid " (use \"git rebase --edit-todo\" to view and edit)" +msgstr "" +" (викориÑтовуйте \"git rebase --edit-todo\" Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду та редагуваннÑ)" + +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Ðаразі ви перебазовуєте гілку '%s' на '%s'." + +msgid "You are currently rebasing." +msgstr "Ðаразі йде перебазуваннÑ." + +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " (виправте конфлікти, а потім виконайте \"git rebase --continue\")" + +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (викориÑтовуйте \"git rebase --skip\", щоб пропуÑтити цю латку)" + +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr "" +" (викориÑтовуйте \"git rebase --abort\", щоб перейти до початкової гілки)" + +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " (уÑÑ– конфлікти виправлено: виконайте \"git rebase --continue\")" + +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Ðаразі виконуєтьÑÑ Ñ€Ð¾Ð·Ð´Ñ–Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ñ–Ð»ÐºÐ¸ \"%s\" на " +"\"%s\"." + +msgid "You are currently splitting a commit during a rebase." +msgstr "Ви розбиваєте коміт під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ." + +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr "" +" (ПіÑÐ»Ñ Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¾Ñ— директорії виконайте \"git rebase --continue\")" + +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "Ви редагуєте комміт під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ Ð³Ñ–Ð»ÐºÐ¸ '%s' на '%s'." + +msgid "You are currently editing a commit during a rebase." +msgstr "Ви редагуєте коміт під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ." + +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr "" +" (викориÑтовуйте \"git commit --amend\" Ð´Ð»Ñ Ð²Ð½ÐµÑÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½ до поточного " +"коміту)" + +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" +" (ÑкориÑтайтеÑÑŒ командою \"git rebase --continue\", коли ви будете " +"задоволені Ñвоїми змінами)" + +msgid "Cherry-pick currently in progress." +msgstr "Ðаразі триває виÑмикуваннÑ." + +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "Ðаразі ви виÑмикуєте коміт %s." + +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " (виправте конфлікти Ñ– виконайте \"git cherry-pick --continue\")" + +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (виконайте \"git cherry-pick --continue\", щоб продовжити)" + +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr " (уÑÑ– конфлікти виправлено: виконайте \"git cherry-pick --continue\")" + +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr "" +" (ÑкориÑтайтеÑÑŒ командою \"git cherry-pick --skip\", щоб пропуÑтити цю " +"латку)" + +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr "" +" (ÑкориÑтайтеÑÑŒ командою \"git cherry-pick --abort\", щоб ÑкаÑувати операцію " +"виÑмикуваннÑ)" + +msgid "Revert currently in progress." +msgstr "Ðаразі виконуєтьÑÑ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð²Ð¸Ð²ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ." + +#, c-format +msgid "You are currently reverting commit %s." +msgstr "Ðаразі ви вивертаєте коміт %s." + +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " (виправте конфлікти Ñ– виконайте \"git revert --continue\")" + +msgid " (run \"git revert --continue\" to continue)" +msgstr " (виконайте \"git revert --continue\", щоб продовжити)" + +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " (уÑÑ– конфлікти виправлено: виконайте \"git revert --continue\")" + +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (викориÑтовуйте \"git revert --skip\", щоб пропуÑтити цю латку)" + +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr "" +" (викориÑтовуйте \"git revert --abort\", щоб ÑкаÑувати операцію поверненнÑ)" + +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "Ðаразі ви робите біÑекцію, починаючи з гілки '%s'." + +msgid "You are currently bisecting." +msgstr "Ðаразі ви робите біÑекцію." + +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr "" +" (викориÑтовуйте \"git bisect reset\", щоб повернутиÑÑŒ до початкової гілки)" + +msgid "You are in a sparse checkout." +msgstr "Ви перебуваєте в чаÑтковому переході до гілки." + +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" +"Ви перебуваєте в чаÑтковому переході до гілки з %d%% відÑтежуваних файлів." + +msgid "On branch " +msgstr "Ðа гілці " + +msgid "interactive rebase in progress; onto " +msgstr "інтерактивне Ð¿ÐµÑ€ÐµÐ±Ð°Ð·Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð² процеÑÑ–; на " + +msgid "rebase in progress; onto " +msgstr "Ð¿ÐµÑ€ÐµÐ±Ð°Ð·Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð² процеÑÑ–; на " + +msgid "HEAD detached at " +msgstr "HEAD відʼєднано на " + +msgid "HEAD detached from " +msgstr "HEAD відʼєднано від " + +msgid "Not currently on any branch." +msgstr "Ðаразі не знаходитеÑÑŒ в жодній гілці." + +msgid "Initial commit" +msgstr "Початковий коміт" + +msgid "No commits yet" +msgstr "Поки що немає комітів" + +msgid "Untracked files" +msgstr "ÐевідÑтежувані файли" + +msgid "Ignored files" +msgstr "Ігноровані файли" + +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." +msgstr "" +"Ðа Ð¿ÐµÑ€ÐµÑ€Ð°Ñ…ÑƒÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ²Ñ–Ð´Ñтежуваних файлів пішло %.2f Ñекунд,\n" +"але результат було додано у кеш, тому наÑтупні запуÑки можуть бути швидшими." + +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "Ðа Ð¿ÐµÑ€ÐµÑ€Ð°Ñ…ÑƒÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ²Ñ–Ð´Ñтежуваних файлів пішло %.2f Ñекунд." + +msgid "See 'git help status' for information on how to improve this." +msgstr "ДивітьÑÑ 'git help status' Ð´Ð»Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ– з того, Ñк це покращити." + +#, c-format +msgid "Untracked files not listed%s" +msgstr "ÐевідÑтежувані файли не вказано%s" + +msgid " (use -u option to show untracked files)" +msgstr " (викориÑтовуйте опцію -u Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð½ÐµÐ²Ñ–Ð´Ñтежуваних файлів)" + +msgid "No changes" +msgstr "Ðемає змін" + +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "" +"не додано жодних змін до коміту (викориÑтовуйте \"git add\" та/або \"git " +"commit -a\")\n" + +#, c-format +msgid "no changes added to commit\n" +msgstr "нічого не додано до коміту\n" + +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"нічого не додано до коміту, але приÑутні невідÑтежувані файли (ÑкориÑтайтеÑÑŒ " +"\"git add\" щоб почати відÑтежувати)\n" + +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "нічого не додано до коміту, але приÑутні невідÑтежувані файли\n" + +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "" +"нічого комітити (Ñтворіть/Ñкопіюйте файли та ÑкориÑтайтеÑÑŒ \"git add\" Ð´Ð»Ñ " +"відÑтежуваннÑ)\n" + +#, c-format +msgid "nothing to commit\n" +msgstr "нічого комітити\n" + +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "" +"нічого комітити (ÑкориÑтайтеÑÑŒ -u щоб подивитиÑÑŒ невідÑтежувані файли)\n" + +#, c-format +msgid "nothing to commit, working tree clean\n" +msgstr "нічого комітити, робоче дерево чиÑте\n" + +msgid "No commits yet on " +msgstr "Ðаразі немає комітів на " + +msgid "HEAD (no branch)" +msgstr "HEAD (немає гілки)" + +msgid "different" +msgstr "різнитьÑÑ" + +msgid "behind " +msgstr "позаду " + +msgid "ahead " +msgstr "попереду " + +#. TRANSLATORS: the action is e.g. "pull with rebase" + +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "не можливо %s: У Ð²Ð°Ñ Ñ” не індекÑовані зміни." + +msgid "additionally, your index contains uncommitted changes." +msgstr "крім того, ваш Ñ–Ð½Ð´ÐµÐºÑ Ð¼Ñ–Ñтить не закомічені зміни." + +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "не можливо %s: Ваш Ñ–Ð½Ð´ÐµÐºÑ Ð¼Ñ–Ñтить не закомічені зміни." + +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "" +"Помилка: Ваші локальні зміни в наÑтупних файлах буде перезапиÑано під Ñ‡Ð°Ñ " +"злиттÑ" + +msgid "Automated merge did not work." +msgstr "Ðвтоматичне Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ Ñпрацювало." + +msgid "Should not be doing an octopus." +msgstr "Ðе варто робити octopus злиттÑ." + +#, sh-format +msgid "Unable to find common commit with $pretty_name" +msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñпільний коміт з $pretty_name" + +#, sh-format +msgid "Already up to date with $pretty_name" +msgstr "Вже в актуальному Ñтані з $pretty_name" + +#, sh-format +msgid "Fast-forwarding to: $pretty_name" +msgstr "ÐŸÐµÑ€ÐµÐ¼Ð¾Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¿ÐµÑ€ÐµÐ´ до: $pretty_name" + +#, sh-format +msgid "Trying simple merge with $pretty_name" +msgstr "Спроба проÑтого Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð· $pretty_name" + +msgid "Simple merge did not work, trying automatic merge." +msgstr "ПроÑте Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ Ñпрацювало, Ñпроба автоматичного злиттÑ." + +#, sh-format +msgid "usage: $dashless $USAGE" +msgstr "викориÑтаннÑ: $dashless $USAGE" + +#, sh-format +msgid "Cannot chdir to $cdup, the toplevel of the working tree" +msgstr "Ðеможливо chdir до $cdup, верхнього Ñ€Ñ–Ð²Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¾Ð³Ð¾ дерева" + +#, sh-format +msgid "fatal: $program_name cannot be used without a working tree." +msgstr "збій: $program_name неможливо викориÑтовувати без робочого дерева." + +msgid "Cannot rewrite branches: You have unstaged changes." +msgstr "Ðеможливо перепиÑати гілку: у Ð²Ð°Ñ Ñ” неіндекÑовані зміни." + +#, sh-format +msgid "Cannot $action: You have unstaged changes." +msgstr "Ðеможливо $action: у Ð²Ð°Ñ Ñ” неіндекÑовані зміни." + +#, sh-format +msgid "Cannot $action: Your index contains uncommitted changes." +msgstr "Ðеможливо $action: ваш Ñ–Ð½Ð´ÐµÐºÑ Ð¼Ñ–Ñтить незакомічені зміни." + +msgid "Additionally, your index contains uncommitted changes." +msgstr "Крім того, ваш Ñ–Ð½Ð´ÐµÐºÑ Ð¼Ñ–Ñтить незакомічені зміни." + +msgid "You need to run this command from the toplevel of the working tree." +msgstr "Цю команду потрібно запуÑкати з верхнього Ñ€Ñ–Ð²Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¾Ð³Ð¾ дерева." + +msgid "Unable to determine absolute path of git directory" +msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ абÑолютний шлÑÑ… git директорії" + +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "міÑцева зона відрізнÑєтьÑÑ Ð²Ñ–Ð´ GMT на нехвилинний інтервал\n" + +msgid "local time offset greater than or equal to 24 hours\n" +msgstr "Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¼Ñ–Ñцевого чаÑу більше або дорівнює 24 годинам\n" + +#, perl-format +msgid "fatal: command '%s' died with exit code %d" +msgstr "збій: команда \"%s\" завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾ з кодом виходу %d" + +msgid "the editor exited uncleanly, aborting everything" +msgstr "редактор вийшов неналежним чином, перервано вÑÑ– процеÑи" + +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "\"%s\" міÑтить проміжну верÑÑ–ÑŽ лиÑта, Ñкий ви Ñтворювали.\n" + +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "\"%s.final\" міÑтить Ñтворений лиÑÑ‚.\n" + +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-aliases неÑуміÑна з іншими опціÑми\n" + +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"збій: знайдено опції конфігурації Ð´Ð»Ñ \"sendmail\"\n" +"git-send-email налаштовано з параметрами sendemail.* options - зверніть " +"увагу на \"e\".\n" +"Ð’Ñтановіть sendemail.forbidSendmailVariables у false, щоб вимкнути цю " +"перевірку.\n" + +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "Ðеможливо запуÑтити git format-patch за межами Ñховища\n" + +msgid "" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" +msgstr "" +"\"batch-size\" Ñ– \"relogin\" повинні бути вказані разом (через командний " +"Ñ€Ñдок або опції конфігурації)\n" + +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "Ðевідоме --suppress-cc поле: \"%s\"\n" + +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Ðевідомий --confirm параметр: \"%s\"\n" + +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "попередженнÑ: sendmail Ð°Ð»Ñ–Ð°Ñ Ñƒ лапках не підтримуєтьÑÑ: %s\n" + +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "попередженнÑ: \":include:\" не підтримуєтьÑÑ: %s\n" + +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "" +"попередженнÑ: \"/file\" або \"|pipe\" Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ підтримуютьÑÑ: %s\n" + +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "попередженнÑ: Ñ€Ñдок sendmail не розпізнано: %s\n" + +#, perl-format +msgid "" +"File '%s' exists but it could also be the range of commits\n" +"to produce patches for. Please disambiguate by...\n" +"\n" +" * Saying \"./%s\" if you mean a file; or\n" +" * Giving --format-patch option if you mean a range.\n" +msgstr "" +"Файл \"%s\" Ñ–Ñнує, але це також може бути діапазон комітів\n" +"Ð´Ð»Ñ Ñких випуÑкаютьÑÑ Ð»Ð°Ñ‚ÐºÐ¸. Будь лаÑка, розтлумачте...\n" +"\n" +" * Вказавши \"./%s\", Ñкщо на увазі маєтьÑÑ Ñ„Ð°Ð¹Ð» або\n" +" * Додавши --format-patch, Ñкщо на увазі маєтьÑÑ Ð´Ñ–Ð°Ð¿Ð°Ð·Ð¾Ð½.\n" + +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ директорію %s: %s" + +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"Файли латок не вказано!\n" +"\n" + +#, perl-format +msgid "No subject line in %s?" +msgstr "Ðемає Ñ€Ñдка теми в %s?" + +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу %s: %s" + +msgid "" +"Lines beginning in \"GIT:\" will be removed.\n" +"Consider including an overall diffstat or table of contents\n" +"for the patch you are writing.\n" +"\n" +"Clear the body content if you don't wish to send a summary.\n" +msgstr "" +"Ð Ñдки, що починаютьÑÑ Ð· \"GIT:\", будуть вилучені.\n" +"Подумайте про те, щоб додати загальний diffstat або зміÑÑ‚\n" +"Ð´Ð»Ñ Ð»Ð°Ñ‚ÐºÐ¸, Ñку ви пишете.\n" +"\n" +"ОчиÑÑ‚Ñ–Ñ‚ÑŒ вміÑÑ‚ тіла, Ñкщо ви не бажаєте надÑилати підÑумок.\n" + +#, perl-format +msgid "Failed to open %s: %s" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s" + +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s.final: %s" + +msgid "Summary email is empty, skipping it\n" +msgstr "ПідÑумковий лиÑÑ‚ порожній, переÑкочено\n" + +#. TRANSLATORS: please keep [y/N] as is. + +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "Ви впевнені, що хочете викориÑтати <%s> [y/N]? " + +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" + +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "Яке 8-бітне ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñлід оголоÑити [UTF-8]? " + +#, perl-format +msgid "" +"Refusing to send because the patch\n" +"\t%s\n" +"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " +"want to send.\n" +msgstr "" +"Відмова у надÑиланні, тому що латка\n" +"\t%s\n" +"має шаблонну тему \"*** SUBJECT HERE ***\". Додайте --force, Ñкщо ви дійÑно " +"хочете відправити.\n" + +msgid "To whom should the emails be sent (if anyone)?" +msgstr "Кому Ñлід надÑилати електронні лиÑти (Ñкщо комуÑÑŒ)?" + +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "збій: Ð°Ð»Ñ–Ð°Ñ \"%s\" розгортаєтьÑÑ Ð½Ð° Ñамого Ñебе\n" + +msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " +msgstr "" + +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +msgstr "помилка: не вдалоÑÑ Ð²Ð¸Ñ‚Ñгти дійÑну адреÑу з: %s\n" + +#. TRANSLATORS: Make sure to include [q] [d] [e] in your +#. translation. The program will only accept English input +#. at this point. + +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "Що робити з цією адреÑою? ([q]uit|[d]rop|[e]dit): " + +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "ШлÑÑ… до ЦВС \"%s\" не Ñ–Ñнує" + +msgid "" +" The Cc list above has been expanded by additional\n" +" addresses found in the patch commit message. By default\n" +" send-email prompts before sending whenever this occurs.\n" +" This behavior is controlled by the sendemail.confirm\n" +" configuration setting.\n" +"\n" +" For additional information, run 'git send-email --help'.\n" +" To retain the current behavior, but squelch this message,\n" +" run 'git config --global sendemail.confirm auto'.\n" +"\n" +msgstr "" +" Ðаведений вище ÑпиÑок копій було розширено додатковими\n" +" адреÑами, знайденими у повідомленні коміта латки. Зазвичай\n" +" send-email запитує перед надÑиланнÑм, коли це траплÑєтьÑÑ.\n" +" Цю поведінку можна контролювати за допомогою параметра sendemail." +"confirm\n" +" Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—.\n" +"\n" +" Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації виконайте команду \"git send-email --" +"help\".\n" +"Ð”Ð»Ñ ÑƒÑ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ñ— поведінки, але без цього повідомленнÑ,\n" +" виконайте \"git config --global sendemail.confirm auto\".\n" + +#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your +#. translation. The program will only accept English input +#. at this point. + +msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " +msgstr "ÐадіÑлати цей лиÑÑ‚? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " + +msgid "Send this email reply required" +msgstr "" + +msgid "The required SMTP server is not properly defined." +msgstr "Потрібний SMTP-Ñервер не визначено належним чином." + +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "Сервер не підтримує STARTTLS! %s" + +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "" + +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "" +"Ðе вдалоÑÑ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ ініціалізувати SMTP. Перевірте конфігурацію Ñ– " +"ÑкориÑтайтеÑÑ --smtp-debug." + +#, perl-format +msgid "Failed to send %s\n" +msgstr "Ðе вдалоÑÑ Ð½Ð°Ð´Ñ–Ñлати %s\n" + +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "Пробно відправлено %s\n" + +#, perl-format +msgid "Sent %s\n" +msgstr "Відправлено %s\n" + +msgid "Dry-OK. Log says:\n" +msgstr "" + +msgid "OK. Log says:\n" +msgstr "ОК. Лог каже:\n" + +msgid "Result: " +msgstr "Результат: " + +msgid "Result: OK\n" +msgstr "Результат: OK\n" + +#, perl-format +msgid "can't open file %s" +msgstr "неможливо відкрити файл %s" + +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "(mbox) Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ cc: %s з Ñ€Ñдка \"%s\"\n" + +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "(mbox) Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð´Ð¾: %s з Ñ€Ñдка \"%s\"\n" + +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "(non-mbox) Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ cc: %s з Ñ€Ñдка \"%s\"\n" + +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "(тіло) Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ cc: %s з Ñ€Ñдка \"%s\"\n" + +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ \"%s\"" + +#, perl-format +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) Ðевірно Ñформований Ñ€Ñдок виводу з \"%s\"." + +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) не вдалоÑÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ канал до \"%s\"" + +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ %s: %s з: \"%s\"\n" + +msgid "cannot send message as 7bit" +msgstr "неможливо надіÑлати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñк 7bit" + +msgid "invalid transfer encoding" +msgstr "неприпуÑтиме ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ñ–" + +#, perl-format +msgid "" +"fatal: %s: rejected by %s hook\n" +"%s\n" +"warning: no patches were sent\n" +msgstr "" +"збій: %s: відхилено %s хуком\n" +"%s\n" +"попередженнÑ: не було надіÑлано жодних латок\n" + +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s\n" + +#, perl-format +msgid "" +"fatal: %s:%d is longer than 998 characters\n" +"warning: no patches were sent\n" +msgstr "" +"збій: %s:%d довше ніж 998 Ñимволів\n" +"попередженнÑ: не було надіÑлано жодних латок\n" + +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "ПропуÑк %s з резервним ÑуфікÑом \"%s\".\n" + +#. TRANSLATORS: please keep "[y|N]" as is. + +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "Ви дійÑно хочете відправити %s? [y|N]: " diff --git a/po/zh_CN.po b/po/zh_CN.po index 2b88f9b781..aa25e9a159 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -22,11 +22,13 @@ # 3-way merge | 三方åˆå¹¶ # abbreviate | 简写（的 SHA-1 值） # alternate object database | 备用对象库 +# attribute source | 属性æ¥æº # amend | 修补 # ancestor | 祖先，祖先æ交 # annotated tag | é™„æ³¨æ ‡ç¾ # bare repository | 纯仓库 # bisect | 二分查找 +# bitmap | ä½å›¾ # blob object | æ•°æ®å¯¹è±¡ # bloom filter | 布隆过滤器 # branch | 分支 @@ -102,6 +104,7 @@ # rebase | å˜åŸº # ref | 引用 # reflog | 引用日志 +# refmap | å¼•ç”¨æ˜ å°„ # refspec | å¼•ç”¨è§„æ ¼ # remote | 远程，远程仓库 # remote-tracking branch | 远程跟踪分支 @@ -145,10 +148,10 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-03-07 23:37+0000\n" -"PO-Revision-Date: 2023-03-07 23:40+0000\n" -"Last-Translator: Fangyi Zhou <me@fangyi.io>\n" -"Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n" +"POT-Creation-Date: 2023-05-20 12:27+0800\n" +"PO-Revision-Date: 2023-05-20 12:38+0800\n" +"Last-Translator: Teng Long <dyroneteng@gmail.com>\n" +"Language-Team: GitHub <https://github.com/dyrone/git/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -917,6 +920,24 @@ msgid "Exiting because of unfinished merge." msgstr "å› ä¸ºå˜åœ¨æœªå®Œæˆçš„åˆå¹¶è€Œé€€å‡ºã€‚" #: advice.c +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"æ— æ³•åœ¨å离的分支上进行快进æ“作，您需è¦:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"或者：\n" +"\n" +"\tgit rebase\n" + +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "æ— æ³•å¿«è¿›ï¼Œç»ˆæ¢ã€‚" @@ -1444,6 +1465,11 @@ msgstr "æˆªçŸ .rej 文件å为 %.*s.rej" msgid "cannot open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" +#: apply.c rerere.c +#, c-format +msgid "cannot unlink '%s'" +msgstr "ä¸èƒ½åˆ 除 '%s'" + #: apply.c #, c-format msgid "Hunk #%d applied cleanly." @@ -1681,6 +1707,11 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list" msgid "cannot read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" +#: archive.c +#, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "è·¯å¾„è§„æ ¼ '%s' 匹é…了当å‰ç›®å½•å¤–的文件'" + #: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" @@ -1702,10 +1733,6 @@ msgid "not a tree object: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæ ‘对象：%s" #: archive.c -msgid "current working directory is untracked" -msgstr "当å‰å·¥ä½œç›®å½•æœªè¢«è·Ÿè¸ª" - -#: archive.c #, c-format msgid "File not found: %s" msgstr "文件未找到：%s" @@ -1873,6 +1900,10 @@ msgstr "忽略过大的 gitattributes 文件 '%s'" msgid "ignoring overly large gitattributes blob '%s'" msgstr "忽略过大的 gitattributes æ•°æ®å¯¹è±¡ '%s'" +#: attr.c +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1997,16 +2028,12 @@ msgid "--contents and --reverse do not blend well." msgstr "--contents å’Œ --reverse ä¸èƒ½æ··ç”¨ã€‚" #: blame.c -msgid "cannot use --contents with final commit object name" -msgstr "ä¸èƒ½å°† --contents 和最终的æ交对象å共用" - -#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse å’Œ --first-parent 共用，需è¦æŒ‡å®šæœ€æ–°çš„æ交" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c ref-filter.c -#: remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c +#: sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本é历åˆå§‹åŒ–失败" @@ -2200,11 +2227,6 @@ msgstr "å模组 '%s'：ä¸èƒ½åˆ›å»ºåˆ†æ”¯ '%s'" msgid "'%s' is already checked out at '%s'" msgstr "'%s' å·²ç»æ£€å‡ºåˆ° '%s'" -#: branch.c -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "工作区 %s çš„ HEAD 指å‘没有被更新" - #: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<选项>] [--] <è·¯å¾„è§„æ ¼>..." @@ -2472,7 +2494,7 @@ msgstr "fseek 失败" msgid "could not open '%s' for reading" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行读å–" -#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入" @@ -3496,6 +3518,15 @@ msgstr "未能找到远程跟踪分支 '%s'。" #: builtin/branch.c #, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"分支 '%s' 未找到。\n" +"是å¦å¿˜è®°æŒ‡å®š --remote 选项？" + +#: builtin/branch.c +#, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未å‘现。" @@ -3534,6 +3565,11 @@ msgstr "分支 %s æ£è¢«äºŒåˆ†æŸ¥æ‰¾äºŽ %s" #: builtin/branch.c #, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "工作区 %s çš„ HEAD 指å‘没有被更新" + +#: builtin/branch.c +#, c-format msgid "Invalid branch name: '%s'" msgstr "æ— æ•ˆçš„åˆ†æ”¯å：'%s'" @@ -3661,6 +3697,10 @@ msgstr "移动/é‡å‘½å一个分支，以åŠå®ƒçš„引用日志" msgid "move/rename a branch, even if target exists" msgstr "移动/é‡å‘½å一个分支，å³ä½¿ç›®æ ‡å·²å˜åœ¨" +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +msgid "do not output a newline after empty formatted refs" +msgstr "åœ¨æ ¼å¼åŒ–引用结果为空之åŽï¼Œä¸è¾“出æ¢è¡Œç¬¦" + #: builtin/branch.c msgid "copy a branch and its reflog" msgstr "æ‹·è´ä¸€ä¸ªåˆ†æ”¯å’Œå®ƒçš„引用日志" @@ -3928,12 +3968,10 @@ msgstr "在 '%s' 创建了新报告。\n" #: builtin/bundle.c msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<版本>] <文件> <git-rev-list-å‚æ•°>" #: builtin/bundle.c @@ -3960,13 +3998,13 @@ msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨" msgid "show progress meter" msgstr "显示进度表" -#: builtin/bundle.c builtin/pack-objects.c -msgid "show progress meter during object writing phase" -msgstr "在对象写入阶段显示进度表" +#: builtin/bundle.c +msgid "historical; same as --progress" +msgstr "è€çš„å‚æ•°ï¼›ç‰åŒäºŽ --progress" -#: builtin/bundle.c builtin/pack-objects.c -msgid "similar to --all-progress when progress meter is shown" -msgstr "当进度表显示时类似于 --all-progress" +#: builtin/bundle.c +msgid "historical; does nothing" +msgstr "è€çš„å‚æ•°ï¼›æ— ä½œç”¨" #: builtin/bundle.c msgid "specify bundle format version" @@ -5216,6 +5254,11 @@ msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªç›®å½•" #: builtin/clone.c #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "'%s' 为符å·é“¾æŽ¥ï¼Œæ‹’ç»ç”¨ --local 克隆" + +#: builtin/clone.c +#, c-format msgid "failed to start iterator over '%s'" msgstr "æ— æ³•åœ¨ '%s' 上å¯åŠ¨è¿ä»£å™¨" @@ -6001,7 +6044,7 @@ msgstr "计算完整的领先/è½åŽå€¼" msgid "version" msgstr "版本" -#: builtin/commit.c builtin/push.c builtin/worktree.c +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "机器å¯è¯»çš„输出" @@ -7076,147 +7119,17 @@ msgstr "git fetch --all [<选项>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel ä¸èƒ½ä¸ºè´Ÿæ•°" -#: builtin/fetch.c builtin/pull.c -msgid "fetch from all remotes" -msgstr "从所有的远程抓å–" - -#: builtin/fetch.c builtin/pull.c -msgid "set upstream for git pull/fetch" -msgstr "为 git pull/fetch 设置上游" - -#: builtin/fetch.c builtin/pull.c -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它" - -#: builtin/fetch.c -msgid "use atomic transaction to update references" -msgstr "使用原å事务更新引用" - -#: builtin/fetch.c builtin/pull.c -msgid "path to upload pack on remote end" -msgstr "ä¸Šä¼ åŒ…åˆ°è¿œç¨‹çš„è·¯å¾„" - -#: builtin/fetch.c -msgid "force overwrite of local reference" -msgstr "强制覆盖本地引用" - -#: builtin/fetch.c -msgid "fetch from multiple remotes" -msgstr "从多个远程抓å–" - -#: builtin/fetch.c builtin/pull.c -msgid "fetch all tags and associated objects" -msgstr "抓å–æ‰€æœ‰çš„æ ‡ç¾å’Œå…³è”对象" - -#: builtin/fetch.c -msgid "do not fetch all tags (--no-tags)" -msgstr "ä¸æŠ“å–ä»»ä½•æ ‡ç¾(--no-tags)" - -#: builtin/fetch.c -msgid "number of submodules fetched in parallel" -msgstr "å模组获å–的并å‘æ•°" - -#: builtin/fetch.c -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "ä¿®æ”¹å¼•ç”¨è§„æ ¼ä»¥å°†æ‰€æœ‰å¼•ç”¨æ”¾å…¥ refs/prefetch/" - -#: builtin/fetch.c builtin/pull.c -msgid "prune remote-tracking branches no longer on remote" -msgstr "清除远程已ç»ä¸å˜åœ¨çš„分支的跟踪分支" - -#: builtin/fetch.c -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "清除远程ä¸å˜åœ¨çš„æœ¬åœ°æ ‡ç¾ï¼Œå¹¶ä¸”替æ¢å˜æ›´æ ‡ç¾" - -# 译者：å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘ -#: builtin/fetch.c builtin/pull.c -msgid "on-demand" -msgstr "on-demand" - -#: builtin/fetch.c -msgid "control recursive fetching of submodules" -msgstr "控制å模组的递归抓å–" - -#: builtin/fetch.c -msgid "write fetched references to the FETCH_HEAD file" -msgstr "将获å–到的引用写入 FETCH_HEAD 文件" - -#: builtin/fetch.c builtin/pull.c -msgid "keep downloaded pack" -msgstr "ä¿æŒä¸‹è½½åŒ…" - -#: builtin/fetch.c -msgid "allow updating of HEAD ref" -msgstr "å…许更新 HEAD 引用" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow clone" -msgstr "深化浅克隆的历å²" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow repository based on time" -msgstr "基于时间æ¥æ·±åŒ–浅克隆的历å²" - -#: builtin/fetch.c builtin/pull.c -msgid "convert to a complete repository" -msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„仓库" - -#: builtin/fetch.c -msgid "re-fetch without negotiating common commits" -msgstr "ä¸å商共有æ交é‡æ–°èŽ·å–" - -#: builtin/fetch.c -msgid "prepend this to submodule path output" -msgstr "在å模组路径输出的å‰é¢åŠ 上æ¤ç›®å½•" - -#: builtin/fetch.c -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "递归获å–å模组的缺çœå€¼ï¼ˆæ¯”é…置文件优先级低）" - -#: builtin/fetch.c builtin/pull.c -msgid "accept refs that update .git/shallow" -msgstr "接å—æ›´æ–° .git/shallow 的引用" - -#: builtin/fetch.c builtin/pull.c -msgid "refmap" -msgstr "å¼•ç”¨æ˜ å°„" - -#: builtin/fetch.c builtin/pull.c -msgid "specify fetch refmap" -msgstr "指定获å–æ“ä½œçš„å¼•ç”¨æ˜ å°„" - -#: builtin/fetch.c builtin/pull.c -msgid "report that we have only objects reachable from this object" -msgstr "报告我们åªæ‹¥æœ‰ä»Žè¯¥å¯¹è±¡å¼€å§‹å¯è¾¾çš„对象" - -#: builtin/fetch.c -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "ä¸èŽ·å–包文件；而是打å°å商的祖先æ交" - -#: builtin/fetch.c -msgid "run 'maintenance --auto' after fetching" -msgstr "获å–åŽæ‰§è¡Œ 'maintenance --auto'" - -#: builtin/fetch.c builtin/pull.c -msgid "check for forced-updates on all updated branches" -msgstr "在所有更新分支上检查强制更新" - -#: builtin/fetch.c -msgid "write the commit-graph after fetching" -msgstr "抓å–åŽå†™æ交图" - -#: builtin/fetch.c -msgid "accept refspecs from stdin" -msgstr "ä»Žæ ‡å‡†è¾“å…¥èŽ·å–å¼•ç”¨è§„æ ¼" - #: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "æ— æ³•å‘现远程 HEAD 引用" #: builtin/fetch.c #, c-format +msgid "From %.*s\n" +msgstr "æ¥è‡ª %.*s\n" + +#: builtin/fetch.c +#, c-format msgid "object %s not found" msgstr "对象 %s 未å‘现" @@ -7302,11 +7215,6 @@ msgstr "æ‹’ç» %s å› ä¸ºæµ…å…‹éš†çš„æ ¹ä¸å…许被更新" #: builtin/fetch.c #, c-format -msgid "From %.*s\n" -msgstr "æ¥è‡ª %.*s\n" - -#: builtin/fetch.c -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -7415,6 +7323,141 @@ msgstr "未指定远程仓库；请指定一个用于获å–新版本的 URL 或è msgid "you need to specify a tag name" msgstr "您需è¦æŒ‡å®šä¸€ä¸ªæ ‡ç¾å称" +#: builtin/fetch.c builtin/pull.c +msgid "fetch from all remotes" +msgstr "从所有远程抓å–" + +#: builtin/fetch.c builtin/pull.c +msgid "set upstream for git pull/fetch" +msgstr "为 git pull/fetch 设置上游" + +#: builtin/fetch.c builtin/pull.c +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它" + +#: builtin/fetch.c +msgid "use atomic transaction to update references" +msgstr "使用原å事务更新引用" + +#: builtin/fetch.c builtin/pull.c +msgid "path to upload pack on remote end" +msgstr "ä¸Šä¼ åŒ…åˆ°è¿œç¨‹çš„è·¯å¾„" + +#: builtin/fetch.c +msgid "force overwrite of local reference" +msgstr "强制覆盖本地引用" + +#: builtin/fetch.c +msgid "fetch from multiple remotes" +msgstr "从多个远程抓å–" + +#: builtin/fetch.c builtin/pull.c +msgid "fetch all tags and associated objects" +msgstr "抓å–æ‰€æœ‰çš„æ ‡ç¾å’Œå…³è”对象" + +#: builtin/fetch.c +msgid "do not fetch all tags (--no-tags)" +msgstr "ä¸æŠ“å–ä»»ä½•æ ‡ç¾ï¼ˆ--no-tags）" + +#: builtin/fetch.c +msgid "number of submodules fetched in parallel" +msgstr "获å–å模组的并å‘æ•°" + +#: builtin/fetch.c +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "ä¿®æ”¹å¼•ç”¨è§„æ ¼ä»¥å°†æ‰€æœ‰å¼•ç”¨æ”¾å…¥ refs/prefetch/" + +#: builtin/fetch.c builtin/pull.c +msgid "prune remote-tracking branches no longer on remote" +msgstr "清除远程已ç»ä¸å˜åœ¨çš„分支的跟踪分支" + +#: builtin/fetch.c +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "清除远程ä¸å˜åœ¨çš„æœ¬åœ°æ ‡ç¾ï¼Œå¹¶ä¸”替æ¢å˜æ›´æ ‡ç¾" + +# 译者：å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘ +#: builtin/fetch.c builtin/pull.c +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c +msgid "control recursive fetching of submodules" +msgstr "控制å模组的递归抓å–" + +#: builtin/fetch.c +msgid "write fetched references to the FETCH_HEAD file" +msgstr "将获å–到的引用写入 FETCH_HEAD 文件" + +#: builtin/fetch.c builtin/pull.c +msgid "keep downloaded pack" +msgstr "ä¿æŒå·²ä¸‹è½½çš„包" + +#: builtin/fetch.c +msgid "allow updating of HEAD ref" +msgstr "å…许更新 HEAD 引用" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow clone" +msgstr "深化浅克隆的历å²" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow repository based on time" +msgstr "基于时间æ¥æ·±åŒ–浅克隆的历å²" + +#: builtin/fetch.c builtin/pull.c +msgid "convert to a complete repository" +msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„仓库" + +#: builtin/fetch.c +msgid "re-fetch without negotiating common commits" +msgstr "é‡æ–°èŽ·å–而ä¸å商共åŒæ交" + +#: builtin/fetch.c +msgid "prepend this to submodule path output" +msgstr "在å模组路径输出的å‰é¢åŠ 上æ¤ç›®å½•" + +#: builtin/fetch.c +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "递归获å–å模组的缺çœå€¼ï¼ˆæ¯”é…置文件优先级低）" + +#: builtin/fetch.c builtin/pull.c +msgid "accept refs that update .git/shallow" +msgstr "接å—æ›´æ–° .git/shallow 的引用" + +#: builtin/fetch.c builtin/pull.c +msgid "refmap" +msgstr "å¼•ç”¨æ˜ å°„" + +#: builtin/fetch.c builtin/pull.c +msgid "specify fetch refmap" +msgstr "指定获å–æ“ä½œçš„å¼•ç”¨æ˜ å°„" + +#: builtin/fetch.c builtin/pull.c +msgid "report that we have only objects reachable from this object" +msgstr "报告我们åªæ‹¥æœ‰ä»Žè¯¥å¯¹è±¡å¼€å§‹å¯è¾¾çš„对象" + +#: builtin/fetch.c +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "ä¸èŽ·å–包文件；而是打å°å商的祖先æ交" + +#: builtin/fetch.c +msgid "run 'maintenance --auto' after fetching" +msgstr "获å–åŽæ‰§è¡Œ 'maintenance --auto'" + +#: builtin/fetch.c builtin/pull.c +msgid "check for forced-updates on all updated branches" +msgstr "在所有更新分支上检查强制更新" + +#: builtin/fetch.c +msgid "write the commit-graph after fetching" +msgstr "抓å–åŽå†™æ交图" + +#: builtin/fetch.c +msgid "accept refspecs from stdin" +msgstr "ä»Žæ ‡å‡†è¾“å…¥èŽ·å–å¼•ç”¨è§„æ ¼" + #: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only 需è¦ä¸€ä¸ªæˆ–多个 --negotiation-tip=*" @@ -7560,6 +7603,14 @@ msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的引用" msgid "print only refs which don't contain the commit" msgstr "åªæ‰“å°ä¸åŒ…å«è¯¥æ交的引用" +#: builtin/for-each-ref.c +msgid "read reference patterns from stdin" +msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–引用的模å¼" + +#: builtin/for-each-ref.c +msgid "unknown arguments supplied with --stdin" +msgstr "为 --stdin æ供了未知的命令å‚æ•°" + #: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<é…ç½®> [--] <命令å‚æ•°>" @@ -7576,6 +7627,11 @@ msgstr "å˜å‚¨ç€ä»“库路径列表的é…置项键å" msgid "missing --config=<config>" msgstr "缺少 --config=<é…ç½®>" +#: builtin/for-each-repo.c +#, c-format +msgid "got bad config --config=%s" +msgstr "å‘现错误的é…置行 --config=%s" + #: builtin/fsck.c msgid "unknown" msgstr "未知" @@ -7761,13 +7817,14 @@ msgid "notice: %s points to an unborn branch (%s)" msgstr "注æ„：%s 指å‘一个尚未诞生的分支（%s）" #: builtin/fsck.c -msgid "Checking cache tree" -msgstr "æ£åœ¨æ£€æŸ¥ç¼“å˜æ ‘" +#, c-format +msgid "Checking cache tree of %s" +msgstr "æ£åœ¨æ£€æŸ¥ç¼“å˜æ ‘ %s" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s：cache-tree ä¸æ— 效的 sha1 指针" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s：cache-tree %s ä¸å˜åœ¨æ— 效的 sha1 指针" #: builtin/fsck.c msgid "non-tree in cache-tree" @@ -7775,8 +7832,18 @@ msgstr "cache-tree ä¸éžæ ‘对象" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s：resolve-undo ä¸æ— 效的 sha1 指针" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s：resolve-undo %s ä¸å˜åœ¨æ— 效的 sha1 指针" + +#: builtin/fsck.c +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "æ— æ³•ä¸ºåŒ…æ–‡ä»¶ %s åŠ è½½åå‘索引" + +#: builtin/fsck.c +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "包文件 '%s' çš„åå‘ç´¢å¼•æ–‡ä»¶æ— æ•ˆ" #: builtin/fsck.c msgid "" @@ -10371,7 +10438,7 @@ msgstr "对于 %s 没有æ¥è‡ª %s 的远程跟踪分支" msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' ä¸å˜åœ¨åçš„å–值 '%1$s'" -#: builtin/merge.c read-cache.c strbuf.c wrapper.c +#: builtin/merge.c editor.c read-cache.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "ä¸èƒ½å…³é— '%s'" @@ -11204,7 +11271,7 @@ msgstr "æ— æ³•å†™å…¥ä½å›¾ç´¢å¼•" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/repack.c msgid "disabling bitmap writing, as some objects are not being packed" msgstr "ç¦ç”¨ bitmap å†™å…¥ï¼Œå› ä¸ºä¸€äº›å¯¹è±¡å°†ä¸ä¼šè¢«æ‰“包" @@ -11371,6 +11438,14 @@ msgid "bad index version '%s'" msgstr "å的索引版本 '%s'" #: builtin/pack-objects.c +msgid "show progress meter during object writing phase" +msgstr "在对象写入阶段显示进度表" + +#: builtin/pack-objects.c +msgid "similar to --all-progress when progress meter is shown" +msgstr "当进度表显示时类似于 --all-progress" + +#: builtin/pack-objects.c msgid "<version>[,<offset>]" msgstr "<版本>[,<å移>]" @@ -11611,6 +11686,10 @@ msgstr "" "并通过å‘é€é‚®ä»¶åˆ° <git@vger.kernel.org> 让我们知é“您ä»æ—§\n" "使用它。 谢谢。\n" +#: builtin/pack-redundant.c +msgid "refusing to run without --i-still-use-this" +msgstr "æ‹’ç»åœ¨æœªæŒ‡å®š --i-still-use-this 选项时è¿è¡Œ" + #: builtin/pack-refs.c msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -11812,9 +11891,9 @@ msgstr "更新尚未诞生的分支，å˜æ›´æ·»åŠ 至索引。" msgid "pull with rebase" msgstr "å˜åŸºå¼æ‹‰å–" -#: builtin/pull.c -msgid "please commit or stash them." -msgstr "请æ交或贮è—它们。" +#: builtin/pull.c builtin/rebase.c +msgid "Please commit or stash them." +msgstr "请æ交或贮è—修改。" #: builtin/pull.c #, c-format @@ -12061,9 +12140,9 @@ msgstr "'%s' çš„å€¼æ— æ•ˆ" msgid "repository" msgstr "仓库" -#: builtin/push.c builtin/send-pack.c -msgid "push all refs" -msgstr "推é€æ‰€æœ‰å¼•ç”¨" +#: builtin/push.c +msgid "push all branches" +msgstr "推é€æ‰€æœ‰åˆ†æ”¯" #: builtin/push.c builtin/send-pack.c msgid "mirror all refs" @@ -12074,8 +12153,8 @@ msgid "delete refs" msgstr "åˆ é™¤å¼•ç”¨" #: builtin/push.c -msgid "push tags (can't be used with --all or --mirror)" -msgstr "推é€æ ‡ç¾ï¼ˆä¸èƒ½ä½¿ç”¨ --all or --mirror）" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "推é€æ ‡ç¾ï¼ˆä¸èƒ½ä½¿ç”¨ --all or --branches or --mirror）" #: builtin/push.c builtin/send-pack.c msgid "force updates" @@ -12399,6 +12478,11 @@ msgstr "" #: builtin/rebase.c #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "未知的å˜åŸºåˆå¹¶æ¨¡å¼ï¼š%s" + +#: builtin/rebase.c +#, c-format msgid "could not switch to %s" msgstr "æ— æ³•åˆ‡æ¢åˆ° %s" @@ -12414,6 +12498,16 @@ msgid "" msgstr "æ— æ³•è¯†åˆ«çš„ç©ºç±»åž‹ '%s'；有效值有 \"drop\"ã€\"keep\" å’Œ \"ask\"。" #: builtin/rebase.c +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"为 --rebase-merges 指定空值å‚æ•°çš„æ–¹å¼å·²ç»è¢«åºŸå¼ƒå¹¶ä¸”在 Git 未æ¥\n" +"的版本ä¸å°†ä¸å†æ”¯æŒã€‚ 支æŒä½¿ç”¨æ— å‚æ•° --rebase-merges çš„æ–¹å¼è¿›è¡Œæ›¿\n" +"代，它们具有相åŒçš„作用。" + +#: builtin/rebase.c #, c-format msgid "" "%s\n" @@ -12676,19 +12770,20 @@ msgid "switch `C' expects a numerical value" msgstr "开关 `C' 期望一个数å—值" #: builtin/rebase.c -#, c-format -msgid "Unknown mode: %s" -msgstr "未知模å¼ï¼š%s" - -#: builtin/rebase.c msgid "--strategy requires --merge or --interactive" msgstr "--strategy éœ€è¦ --merge 或 --interactive" #: builtin/rebase.c msgid "" -"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" "autosquash" -msgstr "应用的选项与 rebase.autosquash ä¸å…¼å®¹ã€‚è€ƒè™‘åŠ ä¸Š --no-autosquash" +msgstr "应用的选项与 rebase.autoSquash ä¸å…¼å®¹ã€‚è€ƒè™‘åŠ ä¸Š --no-autosquash" + +#: builtin/rebase.c +msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "应用的选项与 rebase.rebaseMerges ä¸å…¼å®¹ã€‚è€ƒè™‘åŠ ä¸Š --no-rebase-merges" #: builtin/rebase.c msgid "" @@ -12744,10 +12839,6 @@ msgid "Does not point to a valid commit '%s'" msgstr "没有指å‘一个有效的æ交 '%s'" #: builtin/rebase.c -msgid "Please commit or stash them." -msgstr "请æ交或贮è—修改。" - -#: builtin/rebase.c msgid "HEAD is up to date." msgstr "HEAD 是最新的。" @@ -13549,8 +13640,8 @@ msgid "approxidate" msgstr "近似日期" #: builtin/repack.c -msgid "with -C, expire objects older than this" -msgstr "使用 -C，使早于给定时间的对象过期" +msgid "with --cruft, expire objects older than this" +msgstr "使用 --cruft，使早于给定时间的对象过期" #: builtin/repack.c msgid "remove redundant packs, and run git-prune-packed" @@ -14382,6 +14473,10 @@ msgid "remote name" msgstr "远程å称" #: builtin/send-pack.c +msgid "push all refs" +msgstr "推é€æ‰€æœ‰å¼•ç”¨" + +#: builtin/send-pack.c msgid "use stateless RPC protocol" msgstr "ä½¿ç”¨æ— çŠ¶æ€çš„ RPC åè®®" @@ -14638,9 +14733,11 @@ msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å…¥çš„ä¸åœ¨æœ¬åœ°ä»“库ä¸çš„引用" #: builtin/sparse-checkout.c msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<选项>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check\n" +"-rules) [<选项>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -14780,6 +14877,26 @@ msgstr "必须在稀ç–检出ä¸é‡åº”用稀ç–模å¼" msgid "error while refreshing working directory" msgstr "刷新工作目录时出错" +#: builtin/sparse-checkout.c +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <文件>]" + +#: builtin/sparse-checkout.c +msgid "terminate input and output files by a NUL character" +msgstr "输入和输出的文件使用 NUL å—符终结" + +#: builtin/sparse-checkout.c +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "通过 --rules-file é€‰é¡¹ä¼ é€’çš„æ¨¡åž‹å°†è¢«ä½œä¸ºé”¥å½¢ï¼ˆç¨€ç–检出模型）进行解æž" + +#: builtin/sparse-checkout.c +msgid "use patterns in <file> instead of the current ones." +msgstr "从 <文件> å‚æ•°ä¸è¯»å–模å¼ï¼Œè€Œä¸æ˜¯ä»Žæ ‡å‡†è¾“å…¥" + #: builtin/stash.c msgid "git stash list [<log-options>]" msgstr "git stash list [<日志选项>]" @@ -18313,8 +18430,8 @@ msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c -msgid "core.commentChar should only be one character" -msgstr "core.commentChar 应该是一个å—符" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar 应该是一个 ASCII ç¼–ç çš„å—符" #: config.c #, c-format @@ -18454,6 +18571,11 @@ msgstr "æ— æ•ˆçš„å°èŠ‚å称：%s" #: config.c #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "æ‹’ç»æ”¯æŒå†…容过长的行，ä½äºŽæ–‡ä»¶ '%s' ä¸çš„第 %<PRIuMAX> è¡Œ" + +#: config.c +#, c-format msgid "missing value for '%s'" msgstr "%s çš„å–值缺失" @@ -19263,6 +19385,10 @@ msgid "do not show any source or destination prefix" msgstr "ä¸æ˜¾ç¤ºä»»ä½•æºå’Œç›®æ ‡å‰ç¼€" #: diff.c +msgid "use default prefixes a/ and b/" +msgstr "使用 a/ å’Œ b/ 作为默认å‰ç¼€" + +#: diff.c msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异å—间的上下文" @@ -19631,6 +19757,16 @@ msgstr "ä¸èƒ½ä»Ž '%s' è¿ç§» git 目录到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "æ示：ç‰å¾…您的编辑器关é—文件...%c" +#: editor.c sequencer.c wrapper.c +#, c-format +msgid "could not write to '%s'" +msgstr "ä¸èƒ½å†™å…¥ '%s'" + +#: editor.c +#, c-format +msgid "could not edit '%s'" +msgstr "ä¸èƒ½ç¼–辑 '%s'" + #: entry.c msgid "Filtering content" msgstr "过滤内容" @@ -19999,6 +20135,11 @@ msgstr "没有为 --config-env æä¾›é…ç½®å称\n" #: git.c #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "没有为 --attr-source æ供属性æ¥æº\n" + +#: git.c +#, c-format msgid "unknown option: %s\n" msgstr "未知选项：%s\n" @@ -21978,6 +22119,11 @@ msgstr "æ— æ³•åœ¨åŒ… '%2$s' å移 %3$<PRIuMAX> ä¸æ‰¾åˆ° '%1$s'" msgid "unable to get disk usage of '%s'" msgstr "æ— æ³•å¾—åˆ° '%s' çš„ç£ç›˜ä½¿ç”¨é‡" +#: pack-bitmap.c +#, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "ä½å›¾æ–‡ä»¶ '%s' æœ‰æ— æ•ˆçš„æ ¡éªŒç " + #: pack-mtimes.c #, c-format msgid "mtimes file %s is too small" @@ -22028,6 +22174,15 @@ msgstr "åå‘索引文件 %s ä¸æ”¯æŒçš„版本 %<PRIu32>" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "åå‘索引文件 %s 有ä¸æ”¯æŒçš„哈希 ID %<PRIu32>" +#: pack-revindex.c +msgid "invalid checksum" +msgstr "æ— æ•ˆçš„æ ¡éªŒç %s" + +#: pack-revindex.c +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "ä½äºŽ %<PRIu64> çš„æ— æ•ˆçš„åå‘索引：%<PRIu32> != %<PRIu32>" + #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "æ— æ³•åŒæ—¶å†™å…¥å’Œæ ¡éªŒåå‘索引" @@ -22884,6 +23039,11 @@ msgstr "å…ƒç´ %%(align) 需è¦ä¸€ä¸ªæ£æ•°çš„宽度" #: ref-filter.c #, c-format +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(ahead-behind:<æ交å·>)" + +#: ref-filter.c +#, c-format msgid "malformed field name: %.*s" msgstr "æ ¼å¼é”™è¯¯çš„å—段å：%.*s" @@ -23637,11 +23797,6 @@ msgstr "没有为 '%s' 记忆的解决方案" #: rerere.c #, c-format -msgid "cannot unlink '%s'" -msgstr "ä¸èƒ½åˆ 除 '%s'" - -#: rerere.c -#, c-format msgid "Updated preimage for '%s'" msgstr "已为 '%s' æ›´æ–° preimage" @@ -24052,11 +24207,6 @@ msgstr "" msgid "could not lock '%s'" msgstr "ä¸èƒ½é”定 '%s'" -#: sequencer.c strbuf.c wrapper.c -#, c-format -msgid "could not write to '%s'" -msgstr "ä¸èƒ½å†™å…¥ '%s'" - #: sequencer.c #, c-format msgid "could not write eol to '%s'" @@ -24495,10 +24645,6 @@ msgid "could not create sequencer directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 '%s'" #: sequencer.c -msgid "could not lock HEAD" -msgstr "ä¸èƒ½é”定 HEAD" - -#: sequencer.c msgid "no cherry-pick or revert in progress" msgstr "拣选或还原æ“作并未进行" @@ -24612,21 +24758,21 @@ msgstr "" "\n" #: sequencer.c -msgid "and made changes to the index and/or the working tree\n" -msgstr "并且修改索引和/或工作区\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "并且修改索引和/或工作区。\n" #: sequencer.c #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "执行æˆåŠŸï¼š%s\n" -"但是在索引和/或工作区ä¸å˜åœ¨å˜æ›´\n" +"但是在索引和/或工作区ä¸å˜åœ¨å˜æ›´ã€‚\n" "æ交或贮è—修改，然åŽè¿è¡Œ\n" "\n" " git rebase --continue\n" @@ -25148,11 +25294,6 @@ msgid_plural "%u bytes/s" msgstr[0] "%u å—节/秒" msgstr[1] "%u å—节/秒" -#: strbuf.c -#, c-format -msgid "could not edit '%s'" -msgstr "ä¸èƒ½ç¼–辑 '%s'" - #: submodule-config.c #, c-format msgid "ignoring suspicious submodule name: %s" @@ -27244,8 +27385,8 @@ msgstr "(%s) ä¸èƒ½æ‰§è¡Œ '%s'" #: git-send-email.perl #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) æ·»åŠ %s: %s 自：'%s'\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) éžæ³•çš„输出信æ¯ï¼Œæ¥è‡ªäºŽ: '%s'" #: git-send-email.perl #, perl-format @@ -27253,6 +27394,11 @@ msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) æ— æ³•å…³é—管é“至 '%s'" #: git-send-email.perl +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) æ·»åŠ %s: %s 自：'%s'\n" + +#: git-send-email.perl msgid "cannot send message as 7bit" msgstr "ä¸èƒ½ä»¥ 7bit å½¢å¼å‘é€ä¿¡æ¯" diff --git a/po/zh_TW.po b/po/zh_TW.po index aa59a8e933..1c549b868f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -19,14 +19,14 @@ # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> # -# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022. +# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023. # Kaiyang Wu <self@origincode.me>, 2022. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-12-11 00:28+0800\n" -"PO-Revision-Date: 2022-12-10 17:12+0000\n" +"POT-Creation-Date: 2023-05-19 19:57+0000\n" +"PO-Revision-Date: 2023-05-31 23:41+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" "po/git-cli/zh_Hant/>\n" @@ -35,7 +35,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.14.2\n" +"X-Generator: Poedit 3.3.1\n" "X-ZhConverter: ç¹åŒ–姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -48,19 +48,19 @@ msgstr "嗯（%s）？" msgid "could not read index" msgstr "無法讀å–索引" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "binary" msgstr "二進ä½" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "nothing" msgstr "ç„¡" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "unchanged" msgstr "未變更" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Update" msgstr "æ›´æ–°" @@ -73,14 +73,14 @@ msgstr "ç„¡æ³•æš«å˜ â€œ%sâ€" msgid "could not write index" msgstr "無法寫入索引" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "已更新 %d 個路徑\n" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "note: %s is untracked now.\n" msgstr "註：ç¾å·²ä¸å†è¿½è¹¤ %s。\n" @@ -89,7 +89,7 @@ msgstr "註：ç¾å·²ä¸å†è¿½è¹¤ %s。\n" msgid "make_cache_entry failed for path '%s'" msgstr "å° â€œ%s†路徑執行 make_cache_entry 失敗" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Revert" msgstr "還原" @@ -97,23 +97,23 @@ msgstr "還原" msgid "Could not parse HEAD^{tree}" msgstr "ç„¡æ³•è§£æž HEAD^{tree}" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "已還原 %d 個路徑\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c #, c-format msgid "No untracked files.\n" msgstr "沒有未追蹤的檔案。\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Add untracked" msgstr "åŠ å…¥æœªè¿½è¹¤é …ç›®" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "å·²åŠ å…¥ %d 個路徑\n" @@ -123,21 +123,21 @@ msgstr[0] "å·²åŠ å…¥ %d 個路徑\n" msgid "ignoring unmerged: %s" msgstr "忽略未åˆä½µé …目：%s" -#: add-interactive.c add-patch.c git-add--interactive.perl +#: add-interactive.c add-patch.c #, c-format msgid "Only binary files changed.\n" msgstr "åªè®Šæ›´äºŒé€²ä½æª”案。\n" -#: add-interactive.c add-patch.c git-add--interactive.perl +#: add-interactive.c add-patch.c #, c-format msgid "No changes.\n" msgstr "沒有更動。\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Patch update" msgstr "修補檔更新" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Review diff" msgstr "檢閱差異" @@ -205,25 +205,25 @@ msgstr "é¸å–編號éŽçš„é …ç›®" msgid "(empty) select nothing" msgstr "（空）全部ä¸é¸å–" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c msgid "What now" msgstr "è«‹é¸æ“‡" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "staged" msgstr "已暫å˜" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "unstaged" msgstr "未暫å˜" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c -#: builtin/submodule--helper.c git-add--interactive.perl +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c +#: builtin/pull.c builtin/submodule--helper.c msgid "path" msgstr "路徑" @@ -231,28 +231,28 @@ msgstr "路徑" msgid "could not refresh index" msgstr "無法é‡æ–°æ•´ç†ç´¢å¼•" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c #, c-format msgid "Bye.\n" msgstr "å†è¦‹ã€‚\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "æš«å˜æ¨¡å¼æ›´å‹• [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "æš«å˜åˆªé™¤å‹•ä½œ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "æš«å˜åŠ 入動作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "æš«å˜æ¤å€å¡Š [y,n,q,a,d%s,?]? " @@ -276,23 +276,23 @@ msgstr "" "a - æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" "d - ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "貯å˜æ¨¡å¼æ›´å‹• [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "貯å˜åˆªé™¤å‹•ä½œ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "貯å˜åŠ 入動作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "貯å˜æ¤å€å¡Š [y,n,q,a,d%s,?]? " @@ -316,23 +316,23 @@ msgstr "" "a - 貯å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" "d - ä¸è²¯å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "å–消暫å˜æ¨¡å¼æ›´å‹• [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "å–消暫å˜åˆªé™¤å‹•ä½œ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "å–消暫å˜åŠ 入動作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "å–消暫å˜æ¤å€å¡Š [y,n,q,a,d%s,?]? " @@ -356,23 +356,23 @@ msgstr "" "a - ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" "d - ä¸è¦ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "將模å¼æ›´å‹•å¥—用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "將刪除動作套用至索引 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "å°‡åŠ å…¥å‹•ä½œå¥—ç”¨è‡³ç´¢å¼• [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "å°‡æ¤å€å¡Šå¥—用到索引 [y,n,q,a,d%s,?]? " @@ -396,23 +396,23 @@ msgstr "" "a - 套用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" "d - ä¸è¦å¥—用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "從工作å€æ¨æ£„模å¼æ›´å‹• [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "從工作å€æ¨æ£„刪除動作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "從工作å€æ¨æ£„åŠ å…¥å‹•ä½œ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "從工作å€æ¨æ£„æ¤å€å¡Š [y,n,q,a,d%s,?]? " @@ -436,23 +436,23 @@ msgstr "" "a - æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" "d - ä¸è¦æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作å€æ¨æ£„模å¼æ›´å‹• [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作å€æ¨æ£„刪除 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作å€æ¨æ£„åŠ å…¥å‹•ä½œ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作å€æ¨æ£„æ¤å€å¡Š [y,n,q,a,d%s,?]? " @@ -470,23 +470,23 @@ msgstr "" "a - æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" "d - ä¸è¦æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "將模å¼æ›´å‹•å¥—ç”¨åˆ°ç´¢å¼•å’Œå·¥ä½œå€ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "å°‡åˆªé™¤å‹•ä½œå¥—ç”¨åˆ°ç´¢å¼•å’Œå·¥ä½œå€ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "å°‡åŠ å…¥å‹•ä½œå¥—ç”¨åˆ°ç´¢å¼•å’Œå·¥ä½œå€ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "å°‡æ¤å€å¡Šå¥—ç”¨åˆ°ç´¢å¼•å’Œå·¥ä½œå€ [y,n,q,a,d%s,?]? " @@ -504,23 +504,23 @@ msgstr "" "a - 套用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" "d - ä¸è¦å¥—用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "將模å¼æ›´å‹•å¥—ç”¨åˆ°å·¥ä½œå€ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "å°‡åˆªé™¤å‹•ä½œå¥—ç”¨åˆ°å·¥ä½œå€ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "å°‡åŠ å…¥å‹•ä½œå¥—ç”¨åˆ°å·¥ä½œå€ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "å°‡æ¤å€å¡Šå¥—ç”¨åˆ°å·¥ä½œå€ [y,n,q,a,d%s,?]? " @@ -590,7 +590,7 @@ msgstr "" "\tçµå°¾ä¸æ˜¯ï¼š\n" "%.*s" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手動å€å¡Šç·¨è¼¯æ¨¡å¼â€”—檢視底部的快速指引。\n" @@ -607,9 +607,7 @@ msgstr "" "è¦åˆªé™¤ “%c†開é 的列，請直接刪除。\n" "é–‹é 是 %c 的列將會被移除。\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -627,21 +625,13 @@ msgstr "無法解æžå€å¡Šæ¨™é " msgid "'git apply --cached' failed" msgstr "“git apply --cached†失敗" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "未套用您編輯的å€å¡Šã€‚是å¦é‡æ–°ç·¨è¼¯ï¼ˆè¼¸å…¥ “no†æ¨æ£„ï¼ï¼‰ [y/n]? " @@ -650,11 +640,11 @@ msgstr "未套用您編輯的å€å¡Šã€‚是å¦é‡æ–°ç·¨è¼¯ï¼ˆè¼¸å…¥ “no†æ¨æ£ msgid "The selected hunks do not apply to the index!" msgstr "é¸å–çš„å€å¡Šç„¡æ³•å¥—用至索引ï¼" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Apply them to the worktree anyway? " msgstr "無論如何都è¦å¥—用到工作å€å—Ž? " -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Nothing was applied.\n" msgstr "未套用。\n" @@ -692,11 +682,11 @@ msgstr "沒有下一個å€å¡Š" msgid "No other hunks to goto" msgstr "沒有其它å¯ä»¥è·³è½‰çš„å€å¡Š" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "go to which hunk (<ret> to see more)? " msgstr "è¦è·³è½‰åˆ°å“ªå€‹å€å¡Šï¼ˆ<ret> 檢視更多）? " -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "go to which hunk? " msgstr "跳轉到哪個å€å¡Š? " @@ -715,7 +705,7 @@ msgstr[0] "å°ä¸èµ·ï¼Œåªæœ‰ %d 個å¯ç”¨å€å¡Šã€‚" msgid "No other hunks to search" msgstr "沒有其它å¯ä»¥å°‹æ‰¾çš„å€å¡Š" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "search for regex? " msgstr "使用常è¦è¡¨ç¤ºå¼æœå°‹? " @@ -809,6 +799,24 @@ msgid "Exiting because of unfinished merge." msgstr "å˜åœ¨æœªå®Œæˆçš„åˆä½µï¼Œé›¢é–‹ã€‚" #: advice.c +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" +"岔開的分支ä¸èƒ½å¿«è½‰ï¼Œæ‚¨å¾—執行：\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"或者：\n" +"\n" +"\tgit rebase\n" + +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，ä¸æ¢ã€‚" @@ -1295,7 +1303,7 @@ msgstr "無法å°å‰›å»ºç«‹çš„檔案 %s 建立後端儲å˜" msgid "unable to add cache entry for %s" msgstr "無法為 %s åŠ å…¥å¿«å–é …ç›®" -#: apply.c builtin/bisect--helper.c builtin/gc.c +#: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "無法寫入 “%sâ€" @@ -1335,6 +1343,11 @@ msgstr "æ£åœ¨å°‡ .rej 檔案å稱截çŸç‚º %.*s.rej" msgid "cannot open %s" msgstr "無法開啟 %s" +#: apply.c rerere.c +#, c-format +msgid "cannot unlink '%s'" +msgstr "無法刪除 “%sâ€" + #: apply.c #, c-format msgid "Hunk #%d applied cleanly." @@ -1569,6 +1582,11 @@ msgstr "git archive --remote <repo> [--exec <cmd>] --list" msgid "cannot read '%s'" msgstr "ç„¡æ³•è®€å– â€œ%sâ€" +#: archive.c +#, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "符åˆè·¯å¾‘è¦æ ¼ã€Œ%sã€çš„檔案在目å‰ç›®éŒ„之外" + #: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" @@ -1590,10 +1608,6 @@ msgid "not a tree object: %s" msgstr "éžæ¨¹ç‹€ç‰©ä»¶ï¼š%s" #: archive.c -msgid "current working directory is untracked" -msgstr "尚未追蹤目å‰çš„工作目錄" - -#: archive.c #, c-format msgid "File not found: %s" msgstr "找ä¸åˆ°æª”案：%s" @@ -1626,7 +1640,7 @@ msgstr "fmt" msgid "archive format" msgstr "å°å˜æ ¼å¼" -#: archive.c builtin/log.c +#: archive.c builtin/log.c parse-options.h msgid "prefix" msgstr "å‰ç¶´" @@ -1660,6 +1674,15 @@ msgstr "讀å–工作目錄ä¸çš„ .gitattributes" msgid "report archived files on stderr" msgstr "在 stderr ä¸Šå›žå ±å°å˜çš„檔案" +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c +msgid "time" +msgstr "time" + +#: archive.c +msgid "set modification time of archive entries" +msgstr "è¨å®šå°å˜é …目的修改時間" + #: archive.c msgid "set compression level" msgstr "è¨å®šå£“縮級別" @@ -1716,6 +1739,15 @@ msgid "%.*s is not a valid attribute name" msgstr "%.*s ä¸æ˜¯æœ‰æ•ˆçš„屬性å稱" #: attr.c +msgid "unable to add additional attribute" +msgstr "ç„¡æ³•åŠ å…¥å…¶ä»–å±¬æ€§" + +#: attr.c +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "忽略éŽé•·çš„屬性列 (第 %d 列)" + +#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "ä¸å…許 %s：%s:%d" @@ -1728,6 +1760,25 @@ msgstr "" "git attributes 會忽略åå‘模å¼\n" "當å—串確定è¦ä»¥é©šå˜†è™Ÿé–‹å§‹æ™‚，請使用 “\\!â€ã€‚" +#: attr.c +#, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "無法 fstat gitattributes 檔案 “%sâ€" + +#: attr.c +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "忽略éŽå¤§çš„ gitattributes 檔案 “%sâ€" + +#: attr.c +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "忽略éŽå¤§çš„ gitattributes 資料物件 “%sâ€" + +#: attr.c +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1850,16 +1901,12 @@ msgid "--contents and --reverse do not blend well." msgstr "--contents å’Œ --reverse ä¸èƒ½æ··ç”¨ã€‚" #: blame.c -msgid "cannot use --contents with final commit object name" -msgstr "無法將 --contents 與最終的æ交物件å稱共用" - -#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse å’Œ --first-parent 共用，需è¦æŒ‡å®šæœ€æ–°çš„æ交" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c -#: ref-filter.c remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c +#: sequencer.c submodule.c msgid "revision walk setup failed" msgstr "修訂版éæ·è¨å®šå¤±æ•—" @@ -1934,12 +1981,10 @@ msgid "not tracking: ambiguous information for ref '%s'" msgstr "未追蹤：“%s†引用有æ§ç¾©" # è¯è€…：為ä¿è‰åœ¨è¼¸å‡ºä¸å°é½Šï¼Œæ³¨æ„調整å¥ä¸ç©ºæ ¼ï¼ -#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. -#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space @@ -2040,11 +2085,11 @@ msgstr "“%s†å模組：找ä¸åˆ°å模組" #: branch.c #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" -"您å¯ä»¥å˜—試使用 “git checkout %s && git submodule update --init†命令，更新å" -"模組" +"您å¯ä»¥ä½¿ç”¨ “git checkout --no-recurse-submodules %s && git submodule update " +"--init†命令嘗試更新å模組" #: branch.c #, c-format @@ -2056,11 +2101,6 @@ msgstr "“%s†å模組：無法建立 “%s†分支" msgid "'%s' is already checked out at '%s'" msgstr "“%s†已在 “%s†點簽出" -#: branch.c -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "%s 工作å€çš„ HEAD 指é‡æœªè¢«æ›´æ–°" - #: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <pathspec>..." @@ -2088,6 +2128,14 @@ msgstr "移除 “%sâ€\n" msgid "Unstaged changes after refreshing the index:" msgstr "é‡æ–°æ•´ç†ç´¢å¼•ä¹‹å¾Œï¼Œå°šæœªè¢«æš«å˜çš„更動：" +#: builtin/add.c +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"add.interactive.useBuiltin è¨å®šå·²è¢«ç§»é™¤ï¼\n" +"深入了解請åƒé–± “git help config†ä¸çš„å°æ‡‰æ¢ç›®ã€‚" + #: builtin/add.c builtin/rev-parse.c msgid "Could not read the index" msgstr "無法讀å–索引" @@ -2323,7 +2371,7 @@ msgstr "fseek 失敗" msgid "could not open '%s' for reading" msgstr "無法開啟 “%s†進行讀å–" -#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟 “%s†進行寫入" @@ -2545,7 +2593,7 @@ msgstr "" "您似乎在上一次 “am†失敗後移動了 HEAD。\n" "未倒轉回 ORIG_HEAD" -#: builtin/am.c builtin/bisect--helper.c worktree.c +#: builtin/am.c builtin/bisect.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "ç„¡æ³•è®€å– â€œ%sâ€" @@ -2568,6 +2616,10 @@ msgid "run interactively" msgstr "互動å¼åŸ·è¡Œ" #: builtin/am.c +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "ç¹žéŽ pre-applypatch å’Œ applypatch-msg 掛鉤" + +#: builtin/am.c msgid "historical option -- no-op" msgstr "æ·å²éºç•™é¸é …——無作用" @@ -2586,7 +2638,7 @@ msgstr "在æ交說明çµå°¾è™•åŠ å…¥ Signed-off-by" #: builtin/am.c msgid "recode into utf8 (default)" -msgstr "使用 utf8 å—元集（é è¨ï¼‰" +msgstr "使用 utf8 å—元集（é è¨å€¼ï¼‰" #: builtin/am.c msgid "pass -k flag to git-mailinfo" @@ -2756,111 +2808,105 @@ msgstr "git archive：通訊å”定錯誤" msgid "git archive: expected a flush" msgstr "git archive：é 期收到 flush å°åŒ…" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<commit>]" - -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" +#: builtin/bisect.c +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<rev>...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]" +#: builtin/bisect.c +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<rev>|<range>)...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <filename>" +#: builtin/bisect.c +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<commit>]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]" +#: builtin/bisect.c +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <logfile>" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <cmd>..." +#: builtin/bisect.c +msgid "git bisect run <cmd>..." +msgstr "git bisect run <cmd>..." -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "無法以 “%2$s†模å¼é–‹å•Ÿ “%1$s†檔案" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "could not write to file '%s'" msgstr "無法寫入 “%s†檔案" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" msgstr "無法開啟 “%s†檔案進行讀å–" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆè¡“語" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "ä¸èƒ½å°‡å…§å»ºå‘½ä»¤ “%s†當作術語使用" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" msgstr "ä¸èƒ½è®Šæ›´è¡“語 “%s†的å«ç¾©" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "please use two different terms" msgstr "請使用兩個ä¸åŒçš„術語" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "We are not bisecting.\n" msgstr "我們沒有在二分æœå°‹ã€‚\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid commit" msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆçš„æ交" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "ä¸èƒ½ç°½å‡ºåŽŸå§‹ HEAD “%sâ€ã€‚請嘗試 “git bisect reset <commit>â€ã€‚" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad bisect_write argument: %s" msgstr "bisect_write 引數無效：%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "無法å–得修訂版 “%s†的物件 ID" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "couldn't open the file '%s'" msgstr "無法開啟檔案 “%sâ€" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "命令無效：您目å‰æ£è™•æ–¼äºŒåˆ†æœå°‹ %s/%s 的狀態" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -2869,7 +2915,7 @@ msgstr "" "需指定至少一個 %s 和一個 %s 修訂版。\n" "為æ¤æ‚¨å¯ä»¥ç”¨ “git bisect %s†和 “git bisect %sâ€ã€‚" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -2880,7 +2926,7 @@ msgstr "" "接著æ供至少一個 %s 和一個 %s 修訂版。\n" "為æ¤æ‚¨å¯ä»¥ç”¨ “git bisect %s†和 “git bisect %sâ€ã€‚" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "bisecting only with a %s commit" msgstr "在åªæœ‰ä¸€å€‹ %s æ交的情æ³ä¸‹äºŒåˆ†æœå°‹" @@ -2890,29 +2936,29 @@ msgstr "在åªæœ‰ä¸€å€‹ %s æ交的情æ³ä¸‹äºŒåˆ†æœå°‹" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Are you sure [Y/n]? " msgstr "是å¦ç¢ºå®š [Y/n]? " -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "status: waiting for both good and bad commits\n" msgstr "狀態：æ£åœ¨ç‰å¾…好和壞的æ交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" msgstr[0] "狀態：æ£åœ¨ç‰å¾…壞的æ交，已知有 %d 個好的æ交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "status: waiting for good commit(s), bad commit known\n" msgstr "狀態：æ£åœ¨ç‰å¾…好的æ交，已知有壞的æ交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "no terms defined" msgstr "未定義術語" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -2921,7 +2967,7 @@ msgstr "" "您目å‰é‡å°èˆŠç‹€æ…‹çš„術語是 %sï¼›\n" "å°æ–°ç‹€æ…‹çš„術語是 %s。\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -2930,52 +2976,48 @@ msgstr "" "傳入 “git bisect terms†的 %s 引數無效。\n" "支æ´çš„é¸é …有：--term-good|--term-old å’Œ --term-bad|--term-new。" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "revision walk setup failed\n" msgstr "修訂版éæ·è¨å®šå¤±æ•—\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "could not open '%s' for appending" msgstr "無法開啟 “%sâ€ é€²è¡Œé™„åŠ " -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "'' is not a valid term" msgstr "“ †ä¸æ˜¯æœ‰æ•ˆè¡“語" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "unrecognized option: '%s'" msgstr "無法è˜åˆ¥é¸é …：“%sâ€" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "“%s†似乎ä¸æ˜¯æœ‰æ•ˆä¿®è¨‚版" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bad HEAD - I need a HEAD" msgstr "HEAD 無效 — 需è¦ä¸€å€‹ HEAD" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "簽出 “%s†失敗。請嘗試 “git bisect start <valid-branch>â€ã€‚" -#: builtin/bisect--helper.c -msgid "won't bisect on cg-seek'ed tree" -msgstr "ä¸æœƒåœ¨åšäº† cg-seek 的樹狀物件上進行二分æœå°‹" - -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bad HEAD - strange symbolic ref" msgstr "HEAD 無效 — 異常符號引用" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "invalid ref: '%s'" msgstr "引用無效：“%sâ€" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "You need to start by \"git bisect start\"\n" msgstr "è¦é–‹å§‹ï¼Œè«‹åŸ·è¡Œ “git bisect startâ€\n" @@ -2984,151 +3026,159 @@ msgstr "è¦é–‹å§‹ï¼Œè«‹åŸ·è¡Œ “git bisect startâ€\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Do you want me to do it for you [Y/n]? " msgstr "是å¦è¦é€™éº¼åš [Y/n]? " -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Please call `--bisect-state` with at least one argument" msgstr "è¦å‘¼å« `--bisect-state`，請傳入一個以上的引數" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'git bisect %s' can take only one argument." msgstr "“git bisect %s†åªå–一個引數。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "rev è¼¸å…¥æ ¼å¼éŒ¯èª¤ï¼š%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad rev input (not a commit): %s" msgstr "rev 輸入有誤（ä¸æ˜¯æ交）：%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "We are not bisecting." msgstr "我們沒有在二分æœå°‹ã€‚" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s'?? what are you talking about?" msgstr "「%sã€ï¼Ÿï¼Ÿæ‚¨åœ¨èªªä»€éº¼ï¼Ÿ" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot read file '%s' for replaying" msgstr "無法讀å–「%sã€æª”案進行é‡æ”¾" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "running %s\n" msgstr "æ£åœ¨åŸ·è¡Œ %s\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bisect run failed: no command provided." msgstr "二分æœå°‹åŸ·è¡Œå¤±æ•—：沒有æ供命令。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "unable to verify '%s' on good revision" -msgstr "ç„¡æ³•åœ¨å¥½çš„ä¿®è¨‚ç‰ˆä¸Šé©—è‰ â€œ%sâ€" +msgid "unable to verify %s on good revision" +msgstr "ç„¡æ³•åœ¨å¥½çš„ä¿®è¨‚ç‰ˆä¸Šé©—è‰ %s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "bogus exit code %d for good revision" msgstr "好的修訂版回傳å½é€ 的錯誤碼 %d" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" -msgstr "二分æœå°‹åŸ·è¡Œå¤±æ•—：“%2$s†回傳的離開碼 %1$d å°æ–¼ 0 或 >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" +msgstr "二分æœå°‹åŸ·è¡Œå¤±æ•—：%2$s 回傳的離開碼 %1$d å°æ–¼ 0 或大於 128" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for writing" msgstr "無法開啟 “%s†檔案進行寫入" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bisect run cannot continue any more" msgstr "二分æœå°‹ä¸èƒ½ç¹¼çºŒåŸ·è¡Œ" -#: builtin/bisect--helper.c -#, c-format +#: builtin/bisect.c msgid "bisect run success" msgstr "二分æœå°‹åŸ·è¡ŒæˆåŠŸ" -#: builtin/bisect--helper.c -#, c-format +#: builtin/bisect.c msgid "bisect found first bad commit" msgstr "二分æœå°‹ç™¼ç¾åˆ°ç¬¬ä¸€å€‹æœ‰å•é¡Œçš„æ交" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" -msgstr "" -"二分æœå°‹åŸ·è¡Œå¤±æ•—：“git bisect--helper --bisect-state %s†以錯誤碼 %d 離開" - -#: builtin/bisect--helper.c -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset å¯ä»¥ä¸éœ€è¦å¼•æ•¸ï¼Œæˆ–者得傳入一個æ交" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" +msgstr "二分æœå°‹åŸ·è¡Œå¤±æ•—：“git bisect %s†以錯誤碼 %d 離開" -#: builtin/bisect--helper.c -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms éœ€è¦ 0 或 1 個引數" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "“%s†ä¸éœ€è¦å¼•æ•¸ï¼Œæˆ–者得傳入一個æ交" -#: builtin/bisect--helper.c -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next éœ€è¦ 0 個引數" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "“%sâ€ éœ€è¦ 0 或 1 個引數" -#: builtin/bisect--helper.c -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log éœ€è¦ 0 個引數" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "“%s†ä¸éœ€å¼•æ•¸" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "no logfile given" msgstr "未æ供日誌檔案" +#: builtin/bisect.c +#, c-format +msgid "'%s' failed: no command provided." +msgstr "“%s†失敗：沒有æ供命令。" + +#: builtin/bisect.c +msgid "need a command" +msgstr "需è¦æ供命令" + +#: builtin/bisect.c builtin/cat-file.c +#, c-format +msgid "unknown command: '%s'" +msgstr "未知命令：“%sâ€" + #: builtin/blame.c msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "git blame [<é¸é …>] [<版本é¸é …>] [<版本>] [--] <檔案>" +msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" #: builtin/blame.c msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "git annotate [<é¸é …>] [<版本é¸é …>] [<版本>] [--] <檔案>" +msgstr "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" #: builtin/blame.c msgid "<rev-opts> are documented in git-rev-list(1)" -msgstr "<版本é¸é …> 的檔案記錄在 git-rev-list(1) ä¸" +msgstr "<rev-opts> 的文件在 git-rev-list(1)" #: builtin/blame.c #, c-format msgid "expecting a color: %s" -msgstr "期望一個é¡è‰²ï¼š%s" +msgstr "é 期是個é¡è‰²ï¼š%s" #: builtin/blame.c msgid "must end with a color" -msgstr "å¿…é ˆä»¥ä¸€å€‹é¡è‰²çµå°¾" +msgstr "çµå°¾å¿…é ˆæ˜¯ä¸€å€‹é¡è‰²" #: builtin/blame.c #, c-format msgid "cannot find revision %s to ignore" -msgstr "ä¸èƒ½æ‰¾åˆ°è¦å¿½ç•¥çš„版本 %s" +msgstr "ä¸èƒ½æ‰¾åˆ°è¦å¿½ç•¥çš„ %s 修訂版" #: builtin/blame.c msgid "show blame entries as we find them, incrementally" -msgstr "增é‡å¼é¡¯ç¤ºç™¼ç¾çš„ blame æ¢ç›®" +msgstr "漸進å¼é¡¯ç¤ºç™¼ç¾çš„溯æºé …ç›®" #: builtin/blame.c msgid "do not show object names of boundary commits (Default: off)" -msgstr "ä¸è¦é¡¯ç¤ºé‚Šç•Œæ交的物件å稱（é è¨å€¼: off）" +msgstr "ä¸è¦é¡¯ç¤ºé‚Šç•Œæ交的物件å稱（é è¨å€¼ï¼šoff）" #: builtin/blame.c msgid "do not treat root commits as boundaries (Default: off)" -msgstr "ä¸å°‡æ ¹æ交看作邊界（é è¨å€¼ï¼šoff）" +msgstr "ä¸æŠŠæ ¹æ交當作邊界（é è¨å€¼ï¼šoff）" #: builtin/blame.c msgid "show work cost statistics" @@ -3142,7 +3192,7 @@ msgstr "å¼·åˆ¶é¡¯ç¤ºé€²åº¦å ±å‘Š" #: builtin/blame.c msgid "show output score for blame entries" -msgstr "顯示判斷 blame æ¢ç›®ä½ç§»çš„得分診斷訊æ¯" +msgstr "顯示溯æºé …目的輸出得分" #: builtin/blame.c msgid "show original filename (Default: auto)" @@ -3150,7 +3200,7 @@ msgstr "顯示原始檔案å稱（é è¨å€¼ï¼šauto）" #: builtin/blame.c msgid "show original linenumber (Default: off)" -msgstr "顯示原始檔案å稱（é è¨å€¼ï¼šoff）" +msgstr "顯示原始列碼（é è¨å€¼ï¼šoff）" #: builtin/blame.c msgid "show in a format designed for machine consumption" @@ -3158,7 +3208,7 @@ msgstr "顯示æˆé©åˆæ©Ÿå™¨è®€å–çš„æ ¼å¼" #: builtin/blame.c msgid "show porcelain format with per-line commit information" -msgstr "顯示æ¯ä¸€åˆ—é©åˆæ©Ÿå™¨çš„æ交說明" +msgstr "顯示包å«æ¯ä¸€åˆ—æ交資訊，é©åˆæ©Ÿå™¨è®€å–çš„æ ¼å¼" #: builtin/blame.c msgid "use the same output mode as git-annotate (Default: off)" @@ -3186,15 +3236,15 @@ msgstr "忽略空白差異" #: builtin/blame.c builtin/log.c msgid "rev" -msgstr "版本" +msgstr "rev" #: builtin/blame.c msgid "ignore <rev> when blaming" -msgstr "在執行 blame 動作時忽略 <修訂版>" +msgstr "在執行溯æºå‹•ä½œæ™‚忽略 <rev>" #: builtin/blame.c msgid "ignore revisions from <file>" -msgstr "忽略 <檔案> ä¸çš„修訂版" +msgstr "忽略 <file> ä¸çš„修訂版" #: builtin/blame.c msgid "color redundant metadata from previous line differently" @@ -3202,31 +3252,31 @@ msgstr "使用é¡è‰²é–“隔輸出與å‰ä¸€è¡Œä¸åŒçš„é‡è¤‡ä¸ä»‹è³‡æ–™" #: builtin/blame.c msgid "color lines by age" -msgstr "ä¾æ“šæ™‚間著色" +msgstr "æ ¹æ“šæ™‚é–“è‘—è‰²" #: builtin/blame.c msgid "spend extra cycles to find better match" -msgstr "循環更多次以找到更佳符åˆ" +msgstr "循環更多次來找到更佳符åˆé …ç›®" #: builtin/blame.c msgid "use revisions from <file> instead of calling git-rev-list" -msgstr "使用來自 <檔案> 的修訂集而ä¸æ˜¯å‘¼å« git-rev-list" +msgstr "使用來自 <file> 的修訂集而ä¸æ˜¯å‘¼å« git-rev-list" #: builtin/blame.c msgid "use <file>'s contents as the final image" -msgstr "å°‡ <檔案> 的內容當æˆæ˜¯æœ€çµ‚ image" +msgstr "å°‡ <file> 的內容當æˆæ˜¯æœ€çµ‚å°è±¡" #: builtin/blame.c msgid "score" -msgstr "得分" +msgstr "score" #: builtin/blame.c msgid "find line copies within and across files" -msgstr "找到檔案內åŠè·¨æª”案的複製列" +msgstr "找到檔案內åŠè·¨æª”案的列拷è²å‹•ä½œ" #: builtin/blame.c msgid "find line movements within and across files" -msgstr "找到檔案內åŠè·¨æª”案的移動列" +msgstr "找到檔案內åŠè·¨æª”案的列移動動作" #: builtin/blame.c msgid "range" @@ -3256,45 +3306,47 @@ msgstr "4 å¹´ 11 個月å‰" #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" -msgstr[0] "檔案 %s åªæœ‰ %lu è¡Œ" +msgstr[0] "檔案 %s åªæœ‰ %lu 列" #: builtin/blame.c msgid "Blaming lines" -msgstr "追蹤程å¼ç¢¼è¡Œ" +msgstr "溯æºæ–‡å—列" #: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" -msgstr "git branch [<é¸é …>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<options>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c msgid "" "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" "point>]" -msgstr "git branch [<é¸é …>] [-f] [--recurse-submodules] <分支å> [<起始點>]" +msgstr "" +"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" +"point>]" #: builtin/branch.c msgid "git branch [<options>] [-l] [<pattern>...]" -msgstr "git branch [<é¸é …>] [-l] [<模å¼>...]" +msgstr "git branch [<options>] [-l] [<pattern>...]" #: builtin/branch.c msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." -msgstr "git branch [<é¸é …>] [-r] (-d | -D) <分支å>..." +msgstr "git branch [<options>] [-r] (-d | -D) <branch-name>..." #: builtin/branch.c msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" -msgstr "git branch [<é¸é …>] (-m | -M) [<舊分支>] <新分支>" +msgstr "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" #: builtin/branch.c msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" -msgstr "git branch [<é¸é …>] (-c | -C) [<è€åˆ†æ”¯>] <新分支>" +msgstr "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" #: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--points-at]" -msgstr "git branch [<é¸é …>] [-r | -a] [--points-at]" +msgstr "git branch [<options>] [-r | -a] [--points-at]" #: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--format]" -msgstr "git branch [<é¸é …>] [-r | -a] [--format]" +msgstr "git branch [<options>] [-r | -a] [--format]" # è¯è€…：ä¿æŒåŽŸæ›è¡Œæ ¼å¼ï¼Œåœ¨è¼¸å‡ºæ™‚ %s 的替代內容會讓å—串變長 #: builtin/branch.c @@ -3303,8 +3355,8 @@ msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -"å°‡è¦åˆªé™¤çš„分支 '%s' 已經被åˆä½µåˆ°\n" -" '%s'，但未åˆä½µåˆ° HEAD。" +"å°‡è¦åˆªé™¤çš„ “%s†分支已經被åˆä½µåˆ°\n" +" “%sâ€ï¼Œä½†å°šæœªåˆä½µåˆ° HEAD。" # è¯è€…：ä¿æŒåŽŸæ›è¡Œæ ¼å¼ï¼Œåœ¨è¼¸å‡ºæ™‚ %s 的替代內容會讓å—串變長 #: builtin/branch.c @@ -3313,13 +3365,13 @@ msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"並未刪除分支 '%s'， 雖然它已經åˆä½µåˆ° HEAD，\n" -" 然而å»å°šæœªè¢«åˆä½µåˆ°åˆ†æ”¯ '%s' 。" +"並未刪除分支 “%sâ€ï¼Œ 雖然已經åˆä½µåˆ° HEAD，\n" +" å»å°šæœªè¢«åˆä½µè‡³ “%s†分支。" #: builtin/branch.c #, c-format msgid "Couldn't look up commit object for '%s'" -msgstr "無法查詢 '%s' 指å‘çš„æ交物件" +msgstr "無法查詢 “%s†指å‘çš„æ交物件" #: builtin/branch.c #, c-format @@ -3327,12 +3379,12 @@ 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'。" +"分支 “%s†沒有完全åˆä½µã€‚\n" +"如果確定è¦åˆªé™¤å®ƒï¼Œè«‹åŸ·è¡Œ “git branch -D %sâ€ã€‚" #: builtin/branch.c msgid "Update of config-file failed" -msgstr "æ›´æ–°è¨å®šæª”案失敗" +msgstr "更新組態檔案失敗" #: builtin/branch.c msgid "cannot use -a with -d" @@ -3341,17 +3393,26 @@ msgstr "ä¸èƒ½å°‡ -a å’Œ -d åŒæ™‚使用" #: builtin/branch.c #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "無法刪除在「%2$sã€ç°½å‡ºçš„「%1$sã€åˆ†æ”¯" +msgstr "無法刪除在 “%2$s†簽出的 “%1$s†分支" #: builtin/branch.c #, c-format msgid "remote-tracking branch '%s' not found." -msgstr "未能找到é 端追蹤分支 '%s'。" +msgstr "找ä¸åˆ° “%s†é 端追蹤分支。" + +#: builtin/branch.c +#, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" +"找ä¸åˆ° “%s†分支。\n" +"您å¯èƒ½è¦åŠ 上 --remote？" #: builtin/branch.c #, c-format msgid "branch '%s' not found." -msgstr "分支 '%s' 未發ç¾ã€‚" +msgstr "找ä¸åˆ° “%s†分支。" #: builtin/branch.c #, c-format @@ -3365,41 +3426,46 @@ msgstr "已刪除分支 %s（曾為 %s）。\n" #: builtin/branch.c builtin/tag.c msgid "unable to parse format string" -msgstr "ä¸èƒ½è§£æžæ ¼å¼åŒ–å—串" +msgstr "無法解æžæ ¼å¼åŒ–å—串" #: builtin/branch.c msgid "could not resolve HEAD" -msgstr "ä¸èƒ½è§£æž HEAD æ交" +msgstr "ç„¡æ³•è§£æž HEAD 指é‡" #: builtin/branch.c #, c-format msgid "HEAD (%s) points outside of refs/heads/" -msgstr "HEAD (%s) æŒ‡å‘ refs/heads/ 之外" +msgstr "HEAD æŒ‡é‡ (%s) æŒ‡å‘ refs/heads/ 之外" #: builtin/branch.c #, c-format msgid "Branch %s is being rebased at %s" -msgstr "分支 %s æ£è¢«é‡å®šåŸºåº•åˆ° %s" +msgstr "%s 分支æ£åœ¨é‡å®šåŸºåº•è‡³ %s" #: builtin/branch.c #, c-format msgid "Branch %s is being bisected at %s" -msgstr "分支 %s æ£è¢«äºŒåˆ†æœå°‹æ–¼ %s" +msgstr "%s 分支æ£æ–¼ %s 進行二分æœå°‹" + +#: builtin/branch.c +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "%s 工作å€çš„ HEAD 指é‡æœªè¢«æ›´æ–°" #: builtin/branch.c #, c-format msgid "Invalid branch name: '%s'" -msgstr "無效的分支å：'%s'" +msgstr "分支å稱無效：“%sâ€" #: builtin/branch.c #, c-format msgid "No commit on branch '%s' yet." -msgstr "分支 '%s' å°šç„¡æ交。" +msgstr "分支 “%s†尚無æ交。" #: builtin/branch.c #, c-format msgid "No branch named '%s'." -msgstr "沒有分支 '%s'。" +msgstr "沒有å為 “%s†的分支。" #: builtin/branch.c msgid "Branch rename failed" @@ -3407,30 +3473,30 @@ msgstr "分支é‡æ–°å‘½å失敗" #: builtin/branch.c msgid "Branch copy failed" -msgstr "分支複製失敗" +msgstr "分支拷è²å¤±æ•—" #: builtin/branch.c #, c-format msgid "Created a copy of a misnamed branch '%s'" -msgstr "已為錯誤命å的分支 '%s' 建立了一個副本" +msgstr "已為誤命åçš„ “%s†分支建立拷è²" #: builtin/branch.c #, c-format msgid "Renamed a misnamed branch '%s' away" -msgstr "已將錯誤命å的分支 '%s' é‡æ–°å‘½å" +msgstr "已更改誤命åçš„ “%s†分支的å稱" #: builtin/branch.c #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "分支é‡æ–°å‘½å為 %s，但 HEAD 沒有更新ï¼" +msgstr "分支已é‡æ–°å‘½å為 %s，但 HEAD 指é‡å°šæœªæ›´æ–°ï¼" #: builtin/branch.c msgid "Branch is renamed, but update of config-file failed" -msgstr "分支被é‡æ–°å‘½å，但更新è¨å®šæª”案失敗" +msgstr "分支已é‡æ–°å‘½å，但無法更新組態檔案" #: builtin/branch.c msgid "Branch is copied, but update of config-file failed" -msgstr "分支已複製，但更新è¨å®šæª”案失敗" +msgstr "分支已拷è²ï¼Œä½†ç„¡æ³•æ›´æ–°çµ„態檔案" #: builtin/branch.c #, c-format @@ -3439,41 +3505,41 @@ msgid "" " %s\n" "Lines starting with '%c' will be stripped.\n" msgstr "" -"請編輯分支的æè¿°\n" +"請編輯下述分支的æè¿°\n" " %s\n" -"以 '%c' é–‹é 的行將被éŽæ¿¾ã€‚\n" +"é–‹é 是 “%c†的列將被刪除。\n" #: builtin/branch.c msgid "Generic options" -msgstr "通用é¸é …" +msgstr "一般性é¸é …" #: builtin/branch.c msgid "show hash and subject, give twice for upstream branch" -msgstr "顯示雜湊值和主題，若åƒæ•¸å‡ºç¾å…©æ¬¡å‰‡é¡¯ç¤ºä¸Šæ¸¸åˆ†æ”¯" +msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支" #: builtin/branch.c msgid "suppress informational messages" -msgstr "ä¸é¡¯ç¤ºè¨Šæ¯" +msgstr "ä¸é¡¯ç¤ºè³‡è¨Šè¨Šæ¯" #: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c msgid "set branch tracking configuration" -msgstr "è¨å®šåˆ†æ”¯è¿½è¹¤è¨å®š" +msgstr "è¨å®šåˆ†æ”¯è¿½è¹¤çµ„æ…‹" #: builtin/branch.c msgid "do not use" -msgstr "ä¸è¦ä½¿ç”¨" +msgstr "請勿使用" #: builtin/branch.c msgid "upstream" -msgstr "上游" +msgstr "upstream" #: builtin/branch.c msgid "change the upstream info" -msgstr "改變上游訊æ¯" +msgstr "變更上游資訊" #: builtin/branch.c msgid "unset the upstream info" -msgstr "å–消上游資訊è¨å®š" +msgstr "å–消è¨å®šä¸Šæ¸¸è³‡è¨Š" #: builtin/branch.c msgid "use colored output" @@ -3485,19 +3551,19 @@ msgstr "作用於é 端追蹤分支" #: builtin/branch.c msgid "print only branches that contain the commit" -msgstr "åªåˆ—å°åŒ…å«è©²æ交的分支" +msgstr "åªè¼¸å‡ºåŒ…å«æ¤æ交的分支" #: builtin/branch.c msgid "print only branches that don't contain the commit" -msgstr "åªåˆ—å°ä¸åŒ…å«è©²æ交的分支" +msgstr "åªè¼¸å‡ºä¸åŒ…å«æ¤æ交的分支" #: builtin/branch.c msgid "Specific git-branch actions:" -msgstr "具體的 git-branch 動作：" +msgstr "特定的 git-branch 動作：" #: builtin/branch.c msgid "list both remote-tracking and local branches" -msgstr "列出é 端追蹤åŠæœ¬æ©Ÿåˆ†æ”¯" +msgstr "列出é 端追蹤和本機分支" #: builtin/branch.c msgid "delete fully merged branch" @@ -3505,31 +3571,35 @@ msgstr "刪除完全åˆä½µçš„分支" #: builtin/branch.c msgid "delete branch (even if not merged)" -msgstr "刪除分支（å³ä½¿æ²’有åˆä½µï¼‰" +msgstr "刪除分支（å³ä½¿å°šæœªåˆä½µï¼‰" #: builtin/branch.c msgid "move/rename a branch and its reflog" -msgstr "移動/é‡æ–°å‘½å一個分支，以åŠå®ƒçš„引用日誌" +msgstr "移動或é‡æ–°å‘½å分支åŠå…¶å¼•ç”¨æ—¥èªŒ" #: builtin/branch.c msgid "move/rename a branch, even if target exists" -msgstr "移動/é‡æ–°å‘½å一個分支，å³ä½¿ç›®æ¨™å·²å˜åœ¨" +msgstr "å³ä½¿ç›®æ¨™å·²å˜åœ¨ï¼Œä»ç§»å‹•æˆ–é‡æ–°å‘½å分支" + +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +msgid "do not output a newline after empty formatted refs" +msgstr "åœ¨æ ¼å¼åŒ–引用çµæžœç‚ºç©ºä¹‹å¾Œï¼Œä¸è¦è¼¸å‡ºæ›åˆ—符號" #: builtin/branch.c msgid "copy a branch and its reflog" -msgstr "複製分支åŠå…¶å¼•ç”¨æ—¥èªŒ" +msgstr "æ‹·è²åˆ†æ”¯åŠå…¶å¼•ç”¨æ—¥èªŒ" #: builtin/branch.c msgid "copy a branch, even if target exists" -msgstr "複製一個分支，å³ä½¿ç›®æ¨™å·²å˜åœ¨" +msgstr "å³ä½¿ç›®æ¨™å·²å˜åœ¨ä»æ‹·è²åˆ†æ”¯" #: builtin/branch.c msgid "list branch names" -msgstr "列出分支å" +msgstr "列出分支å稱" #: builtin/branch.c msgid "show current branch name" -msgstr "顯示目å‰åˆ†æ”¯å" +msgstr "顯示目å‰åˆ†æ”¯å稱" #: builtin/branch.c builtin/submodule--helper.c msgid "create the branch's reflog" @@ -3537,7 +3607,7 @@ msgstr "建立分支的引用日誌" #: builtin/branch.c msgid "edit the description for the branch" -msgstr "標記分支的æè¿°" +msgstr "編輯分支的æè¿°" #: builtin/branch.c msgid "force creation, move/rename, deletion" @@ -3545,27 +3615,27 @@ msgstr "強制建立ã€ç§»å‹•/é‡æ–°å‘½åã€åˆªé™¤" #: builtin/branch.c msgid "print only branches that are merged" -msgstr "åªåˆ—å°å·²ç¶“åˆä½µçš„分支" +msgstr "åªè¼¸å‡ºå·²ç¶“åˆä½µçš„分支" #: builtin/branch.c msgid "print only branches that are not merged" -msgstr "åªåˆ—å°å°šæœªåˆä½µçš„分支" +msgstr "åªè¼¸å‡ºå°šæœªåˆä½µçš„分支" #: builtin/branch.c msgid "list branches in columns" -msgstr "以列的方å¼é¡¯ç¤ºåˆ†æ”¯" +msgstr "以行的形å¼åˆ—出分支" #: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c msgid "object" -msgstr "物件" +msgstr "object" #: builtin/branch.c msgid "print only branches of the object" -msgstr "åªåˆ—å°æŒ‡å‘該物件的分支" +msgstr "åªè¼¸å‡ºæŒ‡å‘æ¤ç‰©ä»¶çš„分支" #: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "sorting and filtering are case insensitive" -msgstr "排åºå’ŒéŽæ¿¾å±¬æ–¼å¤§å°å¯«ä¸æ•æ„Ÿ" +msgstr "排åºå’ŒéŽæ¿¾ä¸å€åˆ†å¤§å°å¯«" #: builtin/branch.c builtin/ls-files.c msgid "recurse through submodules" @@ -3582,14 +3652,14 @@ msgstr "無法將 HEAD 解æžç‚ºæœ‰æ•ˆå¼•ç”¨ã€‚" #: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" -msgstr "HEAD 沒有ä½æ–¼ /refs/heads 之下ï¼" +msgstr "HEAD 指é‡ä¸åœ¨ /refs/heads ä¸ï¼" #: builtin/branch.c msgid "" "branch with --recurse-submodules can only be used if submodule." "propagateBranches is enabled" msgstr "" -"有 --recurse-submodules 的分支åªèƒ½åœ¨å•Ÿç”¨ submodule.propagateBranches 時使用" +"有 --recurse-submodules 的分支，åªèƒ½åœ¨å•Ÿç”¨ submodule.propagateBranches 時使用" #: builtin/branch.c msgid "--recurse-submodules can only be used to create branches" @@ -3597,79 +3667,79 @@ msgstr "--recurse-submodules åªèƒ½ç”¨ä¾†å»ºç«‹åˆ†æ”¯" #: builtin/branch.c msgid "branch name required" -msgstr "å¿…é ˆæ供分支å" +msgstr "å¿…é ˆæ供分支å稱" #: builtin/branch.c msgid "Cannot give description to detached HEAD" -msgstr "ä¸èƒ½å‘分離開é 指標æä¾›æè¿°" +msgstr "無法å‘分離 HEAD 指é‡æä¾›æè¿°" #: builtin/branch.c msgid "cannot edit description of more than one branch" -msgstr "ä¸èƒ½ç‚ºä¸€å€‹ä»¥ä¸Šçš„分支編輯æè¿°" +msgstr "無法編輯超éŽä¸€å€‹åˆ†æ”¯çš„æè¿°" #: builtin/branch.c msgid "cannot copy the current branch while not on any." -msgstr "無法複製目å‰åˆ†æ”¯å› 為ä¸è™•æ–¼ä»»ä½•åˆ†æ”¯ä¸Šã€‚" +msgstr "ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šï¼Œç„¡æ³•æ‹·è²ç›®å‰åˆ†æ”¯ã€‚" #: builtin/branch.c msgid "cannot rename the current branch while not on any." -msgstr "無法é‡æ–°å‘½åç›®å‰åˆ†æ”¯å› 為ä¸è™•æ–¼ä»»ä½•åˆ†æ”¯ä¸Šã€‚" +msgstr "ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šï¼Œç„¡æ³•é‡æ–°å‘½åç›®å‰åˆ†æ”¯ã€‚" #: builtin/branch.c msgid "too many branches for a copy operation" -msgstr "為複製動作æ供了太多的分支å" +msgstr "è¦é€²è¡Œæ‹·è²å‹•ä½œçš„分支太多" #: builtin/branch.c msgid "too many arguments for a rename operation" -msgstr "為é‡æ–°å‘½å動作æ供了太多的åƒæ•¸" +msgstr "傳入é‡æ–°å‘½å動作的引數太多" #: builtin/branch.c msgid "too many arguments to set new upstream" -msgstr "為è¨å®šæ–°ä¸Šæ¸¸æ供了太多的åƒæ•¸" +msgstr "è¦è¨å®šæ–°ä¸Šæ¸¸çš„引數太多" #: builtin/branch.c #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "無法è¨å®š HEAD 的上游為 %sï¼Œå› ç‚º HEAD 沒有指å‘任何分支。" +msgstr "無法將 HEAD 的上游è¨ç‚º %s：其未指å‘任何分支。" #: builtin/branch.c #, c-format msgid "no such branch '%s'" -msgstr "沒有æ¤åˆ†æ”¯ '%s'" +msgstr "ç„¡ “%s†分支" #: builtin/branch.c #, c-format msgid "branch '%s' does not exist" -msgstr "分支 '%s' ä¸å˜åœ¨" +msgstr "沒有 “%s†分支" #: builtin/branch.c msgid "too many arguments to unset upstream" -msgstr "為å–消上游è¨å®šå‹•ä½œæ供了太多的åƒæ•¸" +msgstr "è¦å–消è¨å®šä¸Šæ¸¸çš„引數太多" #: builtin/branch.c msgid "could not unset upstream of HEAD when it does not point to any branch." -msgstr "在 HEAD 的上游未指å‘任何分支時無法å–消è¨å®šã€‚" +msgstr "無法å–消è¨å®š HEAD 的上游：其未指å‘任何分支。" #: builtin/branch.c #, c-format msgid "Branch '%s' has no upstream information" -msgstr "分支 '%s' 沒有上游訊æ¯" +msgstr "分支 “%s†沒有上游資訊" #: builtin/branch.c msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" -"'git branch' çš„ -a å’Œ -r é¸é …ä¸å¸¶ä¸€å€‹åˆ†æ”¯å。\n" -"您是å¦æƒ³è¦ä½¿ç”¨ï¼š-a|-r --list <模å¼>？" +"“git branch†的 -a å’Œ -r é¸é …ä¸å–分支å稱。\n" +"您是想使用：-a|-r --list <pattern> 嗎？" #: builtin/branch.c msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -"ä¸å†æ”¯æ´é¸é … '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。" +"ä¸å†æ”¯æ´é¸é … “--set-upstreamâ€ã€‚請改用 “--track†或 “--set-upstream-toâ€ã€‚" #: builtin/bugreport.c msgid "git version:\n" @@ -3678,7 +3748,7 @@ msgstr "git 版本：\n" #: builtin/bugreport.c #, c-format msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() 失敗，錯誤：「%sã€(%d)\n" +msgstr "uname() 失敗，錯誤：“%s†(%d)\n" #: builtin/bugreport.c msgid "compiler info: " @@ -3690,7 +3760,7 @@ msgstr "libc 資訊： " #: builtin/bugreport.c msgid "not run from a git repository - no hooks to show\n" -msgstr "ä¸æ˜¯å¾ž git 版本庫執行 - 沒有å¯é¡¯ç¤ºçš„掛鉤\n" +msgstr "ä¸æ˜¯åœ¨ git 版本庫執行 — 沒有å¯é¡¯ç¤ºçš„掛鉤\n" #: builtin/bugreport.c msgid "" @@ -3719,15 +3789,15 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" "æ„Ÿè¬æ‚¨å¡«å¯« Git è‡èŸ²å ±å‘Šï¼\n" -"請回ç”下列å•é¡Œï¼Œä»¥è®“æˆ‘å€‘èƒ½å¤ äº†è§£æ‚¨çš„å•é¡Œã€‚\n" +"請回ç”下列詢å•ï¼Œå”助我們了解您的å•é¡Œã€‚\n" "\n" "è‡èŸ²ç™¼ç”Ÿå‰ï¼Œæ‚¨åšäº†ä»€éº¼ï¼Ÿï¼ˆé‡ç¾å•é¡Œçš„æ¥é©Ÿï¼‰\n" "\n" -"ä½ åŽŸæœ¬æœŸæœ›ç™¼ç”Ÿä»€éº¼ï¼Ÿï¼ˆæœŸæœ›è¡Œç‚ºï¼‰\n" +"原本您é 期發生什麼？（é 期行為）\n" "\n" "那實際上發生了什麼？（實際行為）\n" "\n" -"期望行為跟實際發生的行為有什麼ä¸åŒï¼Ÿ\n" +"é 期發生的行為，跟實際發生的行為有什麼ä¸åŒï¼Ÿ\n" "\n" "å…¶ä»–æ‚¨æƒ³åŠ å…¥çš„ï¼š\n" "\n" @@ -3737,25 +3807,25 @@ msgstr "" #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c #: parse-options.h msgid "mode" -msgstr "模å¼" +msgstr "mode" #: builtin/bugreport.c msgid "" "create an additional zip archive of detailed diagnostics (default 'stats')" -msgstr "建立詳細診斷資訊的é¡å¤– zip å°å˜æª”案（é è¨å€¼æ˜¯ “statsâ€ï¼‰" +msgstr "å¦å¤–建立有詳細診斷資訊的 ZIP å°å˜æª”（é è¨å€¼ “statsâ€ï¼‰" #: builtin/bugreport.c msgid "specify a destination for the bugreport file(s)" -msgstr "請指定è‡èŸ²å ±å‘Šæª”案的目的地" +msgstr "指定è‡èŸ²å ±å‘Šæª”案的目的地" #: builtin/bugreport.c msgid "specify a strftime format suffix for the filename(s)" -msgstr "指定檔å，strftime æ ¼å¼çš„後綴" +msgstr "指定用於檔åçš„ strftime æ ¼å¼å¾Œç¶´" #: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" -msgstr "無法建立 '%s' çš„å‰ç½®ç›®éŒ„" +msgstr "無法建立 “%s†的å‰ç½®ç›®éŒ„" #: builtin/bugreport.c builtin/diagnose.c #, c-format @@ -3778,16 +3848,14 @@ msgstr "無法寫入 %s" #: builtin/bugreport.c #, c-format msgid "Created new report at '%s'.\n" -msgstr "已在「%sã€å»ºç«‹æ–°å ±å‘Šã€‚\n" +msgstr "已在 “%sâ€ å»ºç«‹æ–°å ±å‘Šã€‚\n" #: builtin/bundle.c msgid "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" msgstr "" -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" -"progress-implied]\n" +"git bundle create [-q | --quiet | --progress]\n" " [--version=<version>] <file> <git-rev-list-args>" #: builtin/bundle.c @@ -3796,27 +3864,31 @@ msgstr "git bundle verify [-q | --quiet] <file>" #: builtin/bundle.c msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <檔案> [<引用å稱>...]" +msgstr "git bundle list-heads <file> [<refname>...]" #: builtin/bundle.c msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] <file> [<refname>...]" +#: builtin/bundle.c +msgid "need a <file> argument" +msgstr "需è¦æä¾› <file> 引數" + #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" -msgstr "ä¸é¡¯ç¤ºé€²åº¦è¡¨" +msgstr "ä¸é¡¯ç¤ºé€²åº¦åˆ—" #: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" -msgstr "顯示進度表" +msgstr "顯示進度列" -#: builtin/bundle.c builtin/pack-objects.c -msgid "show progress meter during object writing phase" -msgstr "在物件寫入階段顯示進度表" +#: builtin/bundle.c +msgid "historical; same as --progress" +msgstr "æ·å²éºç•™é¸é …；和 --progress 相åŒ" -#: builtin/bundle.c builtin/pack-objects.c -msgid "similar to --all-progress when progress meter is shown" -msgstr "當進度表顯示時類似於 --all-progress" +#: builtin/bundle.c +msgid "historical; does nothing" +msgstr "æ·å²éºç•™é¸é …；沒有作用" #: builtin/bundle.c msgid "specify bundle format version" @@ -3841,12 +3913,12 @@ msgstr "需è¦ç‰ˆæœ¬åº«æ‰èƒ½æ‹†åˆ†å¥—件包。" #: builtin/bundle.c msgid "Unbundling objects" -msgstr "æ£åœ¨è§£åŒ…物件" +msgstr "æ£åœ¨æ‹†åˆ†ç‰©ä»¶" #: builtin/cat-file.c merge-recursive.c #, c-format msgid "cannot read object %s '%s'" -msgstr "ä¸èƒ½è®€å–物件 %s '%s'" +msgstr "無法讀å–物件 %s “%sâ€" #: builtin/cat-file.c msgid "flush is only for --buffer mode" @@ -3859,7 +3931,7 @@ msgstr "輸入ä¸æ²’有命令" #: builtin/cat-file.c #, c-format msgid "whitespace before command: '%s'" -msgstr "命令å‰ç©ºæ ¼ï¼šã€Œ%sã€" +msgstr "命令å‰æœ‰ç©ºæ ¼ï¼šâ€œ%sâ€" #: builtin/cat-file.c #, c-format @@ -3872,11 +3944,6 @@ msgid "%s takes no arguments" msgstr "%s ä¸å–引數" #: builtin/cat-file.c -#, c-format -msgid "unknown command: '%s'" -msgstr "未知命令：「%sã€" - -#: builtin/cat-file.c msgid "only one batch option may be specified" msgstr "åªèƒ½æŒ‡å®šä¸€å€‹æ‰¹æ¬¡è™•ç†é¸é …" @@ -3926,7 +3993,7 @@ msgstr "美化輸出 <object> 的內容" #: builtin/cat-file.c msgid "Emit [broken] object attributes" -msgstr "輸出 [æ壞的] 物件屬性" +msgstr "輸出 [æ壞的] ([broken]) 物件屬性" #: builtin/cat-file.c msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" @@ -3958,15 +4025,15 @@ msgstr "é¡žä¼¼ --batch 但ä¸è¼¸å‡º <contents>" #: builtin/cat-file.c msgid "stdin is NUL-terminated" -msgstr "標準輸入以 NUL å—元終æ¢" +msgstr "stdin 以 NUL å—元終æ¢" #: builtin/cat-file.c msgid "read commands from stdin" -msgstr "從標準輸入讀å–命令" +msgstr "從 stdin 讀å–命令" #: builtin/cat-file.c msgid "with --batch[-check]: ignores stdin, batches all known objects" -msgstr "傳入 --batch[-check]：忽略標準輸入，批次處ç†æ‰€æœ‰å·²çŸ¥ç‰©ä»¶" +msgstr "傳入 --batch[-check]：忽略 stdin，批次處ç†æ‰€æœ‰å·²çŸ¥ç‰©ä»¶" #: builtin/cat-file.c msgid "Change or optimize batch output" @@ -3978,21 +4045,21 @@ msgstr "ç·©è¡ --batch 的輸出" #: builtin/cat-file.c msgid "follow in-tree symlinks" -msgstr "追蹤樹ä¸çš„符號連çµ" +msgstr "追蹤樹狀物件ä¸çš„符號連çµ" #: builtin/cat-file.c msgid "do not order objects before emitting them" -msgstr "ä¸è¦åœ¨è¼¸å‡ºç‰©ä»¶å‰æŽ’åº" +msgstr "ä¸è¦åœ¨è¼¸å‡ºå‰æŽ’åºç‰©ä»¶" #: builtin/cat-file.c msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" -msgstr "轉æ›æˆ–éŽæ¿¾å¾Œè¼¸å‡ºç‰©ä»¶ï¼ˆblob 或樹）（單ç¨æˆ–批次處ç†ï¼‰" +msgstr "轉æ›æˆ–éŽæ¿¾å¾Œè¼¸å‡ºç‰©ä»¶ (blob 或 tree)（單ç¨æˆ–批次處ç†ï¼‰" #: builtin/cat-file.c msgid "run textconv on object's content" -msgstr "在物件內容執行 textconv" +msgstr "å°ç‰©ä»¶å…§å®¹é€²è¡Œæ–‡å—è½‰æ› (textconv)" #: builtin/cat-file.c msgid "run filters on object's content" @@ -4009,7 +4076,7 @@ msgstr "請在 (--textconv | --filters) 使用 <path>ï¼Œè€Œéž â€œbatchâ€" #: builtin/cat-file.c #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" -msgstr "「%s=<%s>ã€éœ€è¦ã€Œ%sã€æˆ–「%sã€" +msgstr "“%s=<%s>â€ éœ€è¦ â€œ%s†或 “%sâ€" #: builtin/cat-file.c msgid "path|tree-ish" @@ -4018,12 +4085,12 @@ msgstr "path|tree-ish" #: builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" -msgstr "「%sã€éœ€è¦æ‰¹æ¬¡è™•ç†æ¨¡å¼" +msgstr "“%s†需è¦æ‰¹æ¬¡è™•ç†æ¨¡å¼" #: builtin/cat-file.c #, c-format msgid "'-%c' is incompatible with batch mode" -msgstr "「-%cã€èˆ‡æ‰¹æ¬¡è™•ç†æ¨¡å¼ä¸ç›¸å®¹" +msgstr "“-%c†與批次處ç†æ¨¡å¼ä¸ç›¸å®¹" #: builtin/cat-file.c msgid "batch modes take no arguments" @@ -4032,12 +4099,12 @@ msgstr "批次處ç†æ¨¡å¼ä¸å–引數" #: builtin/cat-file.c #, c-format msgid "<rev> required with '%s'" -msgstr "<rev> 需è¦æé…「%sã€" +msgstr "“%sâ€ éœ€è¦ <rev>" #: builtin/cat-file.c #, c-format msgid "<object> required with '-%c'" -msgstr "<object> 需è¦æé…「-%cã€" +msgstr "“-%câ€ éœ€è¦ <object>" #: builtin/cat-file.c #, c-format @@ -4045,16 +4112,22 @@ msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "åªå…許在 <type> <object> 模å¼å‚³å…¥å…©å€‹å¼•æ•¸ï¼Œä½†å‚³äº† %d 個" #: builtin/check-attr.c -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑å>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." #: builtin/check-attr.c -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" #: builtin/check-attr.c msgid "report all attributes set on file" -msgstr "å ±å‘Šè¨å®šåœ¨æª”案上的所有屬性" +msgstr "å›žå ±è¨å®šåœ¨æª”案上的所有屬性" #: builtin/check-attr.c msgid "use .gitattributes only from the index" @@ -4062,11 +4135,19 @@ msgstr "åªä½¿ç”¨ç´¢å¼•ä¸çš„ .gitattributes" #: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c msgid "read file names from stdin" -msgstr "從標準輸入讀出檔案å" +msgstr "從 stdin 讀出檔案å稱" #: builtin/check-attr.c builtin/check-ignore.c msgid "terminate input and output records by a NUL character" -msgstr "輸入和輸出的紀錄使用 NUL å—元終çµ" +msgstr "輸入和輸出的紀錄使用 NUL å—元終æ¢" + +#: builtin/check-attr.c +msgid "<tree-ish>" +msgstr "<tree-ish>" + +#: builtin/check-attr.c +msgid "which tree-ish to check attributes at" +msgstr "è¦ç”¨å“ªä¸€å€‹æ¨¹ç‹€ç‰©ä»¶æª¢æŸ¥å±¬æ€§" #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" @@ -4074,7 +4155,7 @@ msgstr "ä¸é¡¯ç¤ºé€²åº¦å ±å‘Š" #: builtin/check-ignore.c msgid "show non-matching input paths" -msgstr "顯示未符åˆçš„輸入路徑" +msgstr "顯示ä¸ç¬¦åˆçš„輸入路徑" #: builtin/check-ignore.c msgid "ignore index when checking" @@ -4082,11 +4163,11 @@ msgstr "檢查時忽略索引" #: builtin/check-ignore.c msgid "cannot specify pathnames with --stdin" -msgstr "ä¸èƒ½åŒæ™‚æŒ‡å®šè·¯å¾‘åŠ --stdin åƒæ•¸" +msgstr "無法åŒæ™‚指定路徑åç¨±åŠ --stdin" #: builtin/check-ignore.c msgid "-z only makes sense with --stdin" -msgstr "-z 需è¦å’Œ --stdin åƒæ•¸å…±ç”¨æ‰æœ‰æ„義" +msgstr "-z 需è¦å’Œ --stdin åŒæ™‚使用æ‰æœ‰æ„義" #: builtin/check-ignore.c msgid "no path specified" @@ -4094,11 +4175,11 @@ msgstr "未指定路徑" #: builtin/check-ignore.c msgid "--quiet is only valid with a single pathname" -msgstr "åƒæ•¸ --quiet åªåœ¨æ供一個路徑å時有效" +msgstr "引數 --quiet åªåœ¨æ供一個路徑å稱時有效" #: builtin/check-ignore.c msgid "cannot have both --quiet and --verbose" -msgstr "ä¸èƒ½åŒæ™‚æä¾› --quiet å’Œ --verbose åƒæ•¸" +msgstr "無法åŒæ™‚傳入 --quiet å’Œ --verbose" #: builtin/check-ignore.c msgid "--non-matching is only valid with --verbose" @@ -4106,41 +4187,41 @@ msgstr "--non-matching é¸é …åªåœ¨ä½¿ç”¨ --verbose 時有效" #: builtin/check-mailmap.c msgid "git check-mailmap [<options>] <contact>..." -msgstr "git check-mailmap [<é¸é …>] <è¯ç¹«ä½å€>..." +msgstr "git check-mailmap [<options>] <contact>..." #: builtin/check-mailmap.c msgid "also read contacts from stdin" -msgstr "還從標準輸入讀å–è¯ç¹«ä½å€" +msgstr "亦從 stdin 讀å–è¯çµ¡åœ°å€" #: builtin/check-mailmap.c #, c-format msgid "unable to parse contact: %s" -msgstr "ä¸èƒ½è§£æžè¯ç¹«ä½å€ï¼š%s" +msgstr "無法解æžè¯çµ¡åœ°å€ï¼š%s" #: builtin/check-mailmap.c msgid "no contacts specified" -msgstr "未指定è¯ç¹«ä½å€" +msgstr "未指定è¯çµ¡åœ°å€" #: builtin/checkout--worker.c msgid "git checkout--worker [<options>]" -msgstr "git checkout--worker [<é¸é …>]" +msgstr "git checkout--worker [<options>]" #: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c #: builtin/submodule--helper.c builtin/worktree.c msgid "string" -msgstr "å—串" +msgstr "string" #: builtin/checkout--worker.c builtin/checkout-index.c msgid "when creating files, prepend <string>" -msgstr "在建立檔案時，在å‰é¢åŠ 上 <å—串>" +msgstr "建立檔案時，在å‰é¢åŠ 上 <string>" #: builtin/checkout-index.c msgid "git checkout-index [<options>] [--] [<file>...]" -msgstr "git checkout-index [<é¸é …>] [--] [<檔案>...]" +msgstr "git checkout-index [<options>] [--] [<file>...]" #: builtin/checkout-index.c msgid "stage should be between 1 and 3 or all" -msgstr "索引值應該å–值 1 到 3 或者 all" +msgstr "stage 應該是 1 到 3 的值，或者是 all" #: builtin/checkout-index.c msgid "check out all files in the index" @@ -4164,11 +4245,11 @@ msgstr "ä¸ç°½å‡ºæ–°æª”案" #: builtin/checkout-index.c msgid "update stat information in the index file" -msgstr "更新索引ä¸æª”案的狀態訊æ¯" +msgstr "更新索引檔案的狀態訊æ¯" #: builtin/checkout-index.c msgid "read list of paths from the standard input" -msgstr "從標準輸入讀å–路徑列表" +msgstr "從標準輸入讀å–路徑清單" #: builtin/checkout-index.c msgid "write the content to temporary files" @@ -4180,49 +4261,49 @@ msgstr "從指定暫å˜å€ä¸æ‹·å‡ºæª”案" #: builtin/checkout.c msgid "git checkout [<options>] <branch>" -msgstr "git checkout [<é¸é …>] <分支>" +msgstr "git checkout [<options>] <branch>" #: builtin/checkout.c msgid "git checkout [<options>] [<branch>] -- <file>..." -msgstr "git checkout [<é¸é …>] [<分支>] -- <檔案>..." +msgstr "git checkout [<options>] [<branch>] -- <file>..." #: builtin/checkout.c msgid "git switch [<options>] [<branch>]" -msgstr "git switch [<é¸é …>] [<分支>]" +msgstr "git switch [<options>] [<branch>]" #: builtin/checkout.c msgid "git restore [<options>] [--source=<branch>] <file>..." -msgstr "git restore [<é¸é …>] [--source=<分支>] <檔案>..." +msgstr "git restore [<options>] [--source=<branch>] <file>..." #: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" -msgstr "路徑 '%s' 沒有我們的版本" +msgstr "“%s†路徑沒有我們的版本" #: builtin/checkout.c #, c-format msgid "path '%s' does not have their version" -msgstr "路徑 '%s' 沒有他們的版本" +msgstr "“%s†路徑沒有他們的版本" #: builtin/checkout.c #, c-format msgid "path '%s' does not have all necessary versions" -msgstr "路徑 '%s' 沒有全部必需的版本" +msgstr "“%sâ€ è·¯å¾‘æ²’æœ‰æ‰€æœ‰å¿…é ˆçš„ç‰ˆæœ¬" #: builtin/checkout.c #, c-format msgid "path '%s' does not have necessary versions" -msgstr "路徑 '%s' 沒有必需的版本" +msgstr "“%sâ€ è·¯å¾‘æ²’æœ‰å¿…é ˆçš„ç‰ˆæœ¬" #: builtin/checkout.c #, c-format msgid "path '%s': cannot merge" -msgstr "path '%s'：無法åˆä½µ" +msgstr "path “%sâ€ï¼šç„¡æ³•åˆä½µ" #: builtin/checkout.c #, c-format msgid "Unable to add merge result for '%s'" -msgstr "無法為 '%s' 新增åˆä½µçµæžœ" +msgstr "無法為 “%sâ€ åŠ ä¸Šåˆä½µçµæžœ" #: builtin/checkout.c #, c-format @@ -4240,41 +4321,41 @@ msgstr[0] "從 %2$s 更新了 %1$d 個路徑" #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" -msgstr[0] "從索引å€æ›´æ–°äº† %d 個路徑" +msgstr[0] "已從索引å€æ›´æ–° %d 個路徑" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" -msgstr "'%s' ä¸èƒ½åœ¨æ›´æ–°è·¯å¾‘時使用" +msgstr "無法在更新路徑時使用 “%sâ€" #: builtin/checkout.c #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "ä¸èƒ½åŒæ™‚更新路徑並切æ›åˆ°åˆ†æ”¯'%s'。" +msgstr "無法åŒæ™‚更新路徑和切æ›è‡³ “%s†分支。" #: builtin/checkout.c #, c-format msgid "neither '%s' or '%s' is specified" -msgstr "'%s' 或 '%s' 都沒有指定" +msgstr "“%s†或 “%s†皆未指定" #: builtin/checkout.c #, c-format msgid "'%s' must be used when '%s' is not specified" -msgstr "未指定 '%2$s' æ™‚ï¼Œå¿…é ˆä½¿ç”¨ '%1$s'" +msgstr "未指定 “%2$sâ€ æ™‚ï¼Œå¿…é ˆä½¿ç”¨ “%1$sâ€" #: builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" -msgstr "'%s' 或 '%s' ä¸èƒ½å’Œ %s 一起使用" +msgstr "“%s†或 “%s†無法與 %s 一起使用" #: builtin/checkout.c #, c-format msgid "path '%s' is unmerged" -msgstr "路徑 '%s' 未åˆä½µ" +msgstr "路徑 “%s†未åˆä½µ" #: builtin/checkout.c msgid "you need to resolve your current index first" -msgstr "您需è¦å…ˆè§£æ±ºç›®å‰ç´¢å¼•çš„è¡çª" +msgstr "您需è¦å…ˆè§£æ±ºç›®å‰ç´¢å¼•å€çš„è¡çª" #: builtin/checkout.c #, c-format @@ -4282,13 +4363,13 @@ msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -"ä¸èƒ½ç¹¼çºŒï¼Œä¸‹åˆ—檔案有暫å˜çš„修改：\n" +"無法繼續，下列檔案有暫å˜çš„更動：\n" "%s" #: builtin/checkout.c #, c-format msgid "Can not do reflog for '%s': %s\n" -msgstr "ä¸èƒ½å° '%s' 執行 reflog 動作：%s\n" +msgstr "ç„¡æ³•å° â€œ%s†執行 reflog 動作：%s\n" #: builtin/checkout.c msgid "HEAD is now at" @@ -4296,38 +4377,38 @@ msgstr "HEAD ç›®å‰ä½æ–¼" #: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c msgid "unable to update HEAD" -msgstr "ä¸èƒ½æ›´æ–° HEAD" +msgstr "無法更新 HEAD" #: builtin/checkout.c #, c-format msgid "Reset branch '%s'\n" -msgstr "é‡è¨åˆ†æ”¯ '%s'\n" +msgstr "é‡è¨åˆ†æ”¯ “%sâ€\n" #: builtin/checkout.c #, c-format msgid "Already on '%s'\n" -msgstr "已經ä½æ–¼ '%s'\n" +msgstr "已經ä½æ–¼ “%sâ€\n" #: builtin/checkout.c #, c-format msgid "Switched to and reset branch '%s'\n" -msgstr "切æ›ä¸¦é‡è¨åˆ†æ”¯ '%s'\n" +msgstr "已切æ›ä¸¦é‡è¨åˆ†æ”¯ “%sâ€\n" #: builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" -msgstr "切æ›åˆ°ä¸€å€‹æ–°åˆ†æ”¯ '%s'\n" +msgstr "已切æ›è‡³æ–°åˆ†æ”¯ “%sâ€\n" #: builtin/checkout.c #, c-format msgid "Switched to branch '%s'\n" -msgstr "切æ›åˆ°åˆ†æ”¯ '%s'\n" +msgstr "已切æ›è‡³åˆ†æ”¯ “%sâ€\n" # è¯è€…：請ç¶æŒå‰å°Žç©ºæ ¼ #: builtin/checkout.c #, c-format msgid " ... and %d more.\n" -msgstr " ... åŠå…¶å®ƒ %d 個。\n" +msgstr " …… åŠå…¶å®ƒ %d 個。\n" #: builtin/checkout.c #, c-format @@ -4342,7 +4423,8 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"è¦å‘Šï¼šæ‚¨æ£ä¸Ÿä¸‹ %d 個æ交，未和任何分支關è¯ï¼š\n" +"è¦å‘Šï¼šæ‚¨æ£ä¸Ÿä¸‹ %d 個\n" +"未和任何分支關è¯çš„æ交：\n" "\n" "%s\n" @@ -4361,23 +4443,23 @@ msgid_plural "" " git branch <new-branch-name> %s\n" "\n" msgstr[0] "" -"如果您想è¦é€éŽå»ºç«‹æ–°åˆ†æ”¯å„²å˜å®ƒï¼Œé€™å¯èƒ½æ˜¯ä¸€å€‹å¥½æ™‚候。\n" -"如下動作：\n" +"如果您想è¦é€éŽå»ºç«‹æ–°åˆ†æ”¯ç•™ä¸‹é€™äº›æ交，\n" +"ç¾åœ¨å¾ˆé©åˆåŸ·è¡Œï¼š\n" "\n" -" git branch <新分支å> %s\n" +" git branch <新分支å稱> %s\n" "\n" #: builtin/checkout.c msgid "internal error in revision walk" -msgstr "在版本éæ·æ™‚é‡åˆ°å…§éƒ¨éŒ¯èª¤" +msgstr "在修訂版éæ·æ™‚é‡åˆ°å…§éƒ¨éŒ¯èª¤" #: builtin/checkout.c msgid "Previous HEAD position was" -msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯" +msgstr "之å‰çš„ HEAD 指é‡ä½ç½®åœ¨" #: builtin/checkout.c msgid "You are on a branch yet to be born" -msgstr "您ä½æ–¼ä¸€å€‹å°šæœªåˆå§‹åŒ–的分支" +msgstr "您æ£ä½æ–¼ä¸€å€‹å°šæœªåˆå§‹åŒ–的分支" #: builtin/checkout.c #, c-format @@ -4385,7 +4467,7 @@ msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -"'%s' æ—¢å¯ä»¥æ˜¯ä¸€å€‹æœ¬æ©Ÿæª”案，也å¯ä»¥æ˜¯ä¸€å€‹è¿½è¹¤åˆ†æ”¯ã€‚\n" +"“%s†既å¯ä»¥æ˜¯æœ¬æ©Ÿæª”案，也å¯ä»¥æ˜¯è¿½è¹¤åˆ†æ”¯ã€‚\n" "請使用 --（和å¯é¸çš„ --no-guess）來消除æ§ç¾©" #: builtin/checkout.c @@ -4399,18 +4481,19 @@ msgid "" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" -"如果您想è¦ç°½å‡ºä¸€å€‹é 端追蹤分支，例如 'origin'，您å¯ä»¥\n" -"使用 --track é¸é …寫出全å：\n" +"如果您想è¦ç°½å‡ºé 端追蹤分支，例如 “originâ€ï¼Œ\n" +"您å¯ä»¥ä½¿ç”¨ --track é¸é …寫出全å：\n" "\n" " git checkout --track origin/<name>\n" "\n" -"如果您總是喜æ¡ä½¿ç”¨æ¨¡ç³Šçš„ç°¡çŸåˆ†æ”¯å <name>，而ä¸å–œæ¡å¦‚ 'origin' çš„é 端\n" -"版本庫å，å¯ä»¥åœ¨è¨å®šä¸è¨å®š checkout.defaultRemote=origin。" +"如果您平時比較想è¦ä½¿ç”¨æ¨¡ç³Šçš„ç°¡çŸåˆ†æ”¯å稱 <name>，\n" +"而ä¸å¤ªæƒ³å¯«å¦‚ “origin†的é 端版本庫å稱，\n" +"å¯ä»¥åœ¨çµ„æ…‹ä¸è¨å®š checkout.defaultRemote=origin。" #: builtin/checkout.c #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' 符åˆå¤šå€‹ (%d) é 端追蹤分支" +msgstr "“%s†符åˆå¤šå€‹ (%d) é 端追蹤分支" #: builtin/checkout.c msgid "only one reference expected" @@ -4419,7 +4502,7 @@ msgstr "é 期åªæœ‰ä¸€å€‹å¼•ç”¨" #: builtin/checkout.c #, c-format msgid "only one reference expected, %d given." -msgstr "應åªæœ‰ä¸€å€‹å¼•ç”¨ï¼Œå»æ供了 %d 個。" +msgstr "é 期åªæœ‰ä¸€å€‹å¼•ç”¨ï¼Œå»æ供了 %d 個。" #: builtin/checkout.c builtin/worktree.c #, c-format @@ -4429,112 +4512,112 @@ msgstr "無效引用：%s" #: builtin/checkout.c #, c-format msgid "reference is not a tree: %s" -msgstr "引用ä¸æ˜¯ä¸€å€‹æ¨¹ï¼š%s" +msgstr "引用ä¸æ˜¯æ¨¹ç‹€ç‰©ä»¶ï¼š%s" #: builtin/checkout.c #, c-format msgid "a branch is expected, got tag '%s'" -msgstr "期望一個分支，得到標籤 '%s'" +msgstr "é 期收到分支，å»æ”¶åˆ°æ¨™ç±¤ “%sâ€" #: builtin/checkout.c #, c-format msgid "a branch is expected, got remote branch '%s'" -msgstr "期望一個分支，得到é 端分支 '%s'" +msgstr "é 期收到分支，å»æ”¶åˆ°é 端分支 “%sâ€" #: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" -msgstr "期望一個分支，得到 '%s'" +msgstr "é 期收到分支，å»æ”¶åˆ° “%sâ€" #: builtin/checkout.c #, c-format msgid "a branch is expected, got commit '%s'" -msgstr "期望一個分支，得到æ交 '%s'" +msgstr "é 期收到分支，å»æ”¶åˆ°æ交 “%sâ€" #: builtin/checkout.c msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." -msgstr "若您想è¦åˆ†é›¢æ交的 HEAD，請傳入 --detach é¸é …é‡è©¦ã€‚" +msgstr "若您想è¦åœ¨æ¤æ交分離 HEAD 指é‡ï¼Œè«‹å‚³å…¥ --detach é¸é …é‡è©¦ã€‚" #: builtin/checkout.c msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -"ä¸èƒ½åœ¨åˆä½µæ™‚切æ›åˆ†æ”¯\n" -"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" +"無法在åˆä½µæ™‚切æ›åˆ†æ”¯\n" +"請試試 “git merge --quit†或 “git worktree addâ€ã€‚" #: builtin/checkout.c msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -"ä¸èƒ½åœ¨ am 工作階段期間切æ›åˆ†æ”¯\n" -"考慮使用 \"git am --quit\" 或 \"git worktree add\"。" +"無法在 am 工作階段期間時切æ›åˆ†æ”¯\n" +"請試試 “git am --quit†或 “git worktree addâ€ã€‚" #: builtin/checkout.c msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -"ä¸èƒ½åœ¨é‡å®šåŸºåº•æ™‚切æ›åˆ†æ”¯\n" -"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" +"無法在é‡å®šåŸºåº•æ™‚切æ›åˆ†æ”¯\n" +"請試試 “git rebase --quit†或 “git worktree addâ€ã€‚" #: builtin/checkout.c msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -"ä¸èƒ½åœ¨æ€é¸æ™‚切æ›åˆ†æ”¯\n" -"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" +"無法在æ€é¸æ™‚切æ›åˆ†æ”¯\n" +"請試試 “git cherry-pick --quit†或 “git worktree addâ€ã€‚" #: builtin/checkout.c msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -"ä¸èƒ½åœ¨é‚„原時切æ›åˆ†æ”¯\n" -"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" +"無法在還原時切æ›åˆ†æ”¯\n" +"請試試 “git revert --quit†或 “git worktree addâ€ã€‚" #: builtin/checkout.c msgid "you are switching branch while bisecting" -msgstr "您在執行二分æœå°‹æ™‚切æ›åˆ†æ”¯" +msgstr "您在進行二分æœå°‹æ™‚切æ›åˆ†æ”¯" #: builtin/checkout.c msgid "paths cannot be used with switching branches" -msgstr "路徑ä¸èƒ½å’Œåˆ‡æ›åˆ†æ”¯åŒæ™‚使用" +msgstr "路徑ä¸èƒ½èˆ‡åˆ‡æ›åˆ†æ”¯åŒæ™‚使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" -msgstr "'%s' ä¸èƒ½å’Œåˆ‡æ›åˆ†æ”¯åŒæ™‚使用" +msgstr "“%s†ä¸èƒ½èˆ‡åˆ‡æ›åˆ†æ”¯åŒæ™‚使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" -msgstr "'%s' ä¸èƒ½å’Œ '%s' åŒæ™‚使用" +msgstr "“%s†ä¸èƒ½èˆ‡ “%s†åŒæ™‚使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot take <start-point>" -msgstr "'%s' ä¸å¸¶ <起始點>" +msgstr "“%s†ä¸å– <start-point>" #: builtin/checkout.c #, c-format msgid "Cannot switch branch to a non-commit '%s'" -msgstr "ä¸èƒ½åˆ‡æ›åˆ†æ”¯åˆ°ä¸€å€‹éžæ交 '%s'" +msgstr "無法將分支切æ›è‡³éžæäº¤é …ç›® “%sâ€" #: builtin/checkout.c msgid "missing branch or commit argument" -msgstr "缺少分支或æ交åƒæ•¸" +msgstr "缺少分支或æ交引數" #: builtin/checkout.c msgid "perform a 3-way merge with the new branch" -msgstr "和新的分支執行三方åˆä½µ" +msgstr "和新分支進行三方åˆä½µ" #: builtin/checkout.c builtin/log.c parse-options.h msgid "style" -msgstr "é¢¨æ ¼" +msgstr "style" #: builtin/checkout.c msgid "conflict style (merge, diff3, or zdiff3)" @@ -4542,7 +4625,7 @@ msgstr "è¡çªè¼¸å‡ºé¢¨æ ¼ï¼ˆmergeã€diff3 或 zdiff3）" #: builtin/checkout.c builtin/worktree.c msgid "detach HEAD at named commit" -msgstr "HEAD 從指定的æ交分離" +msgstr "自指定æ交分離 HEAD 指é‡" #: builtin/checkout.c msgid "force checkout (throw away local modifications)" @@ -4550,19 +4633,19 @@ msgstr "強制簽出（æ¨æ£„本機修改）" #: builtin/checkout.c msgid "new-branch" -msgstr "新分支" +msgstr "new-branch" #: builtin/checkout.c msgid "new unparented branch" -msgstr "新的沒有父æ交的分支" +msgstr "新的，沒有父æ交的分支" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" -msgstr "更新忽略的檔案（é è¨ï¼‰" +msgstr "更新忽略的檔案（é è¨å€¼ï¼‰" #: builtin/checkout.c msgid "do not check if another worktree is holding the given ref" -msgstr "ä¸æª¢æŸ¥æŒ‡å®šçš„引用是å¦è¢«å…¶ä»–工作å€æ‰€å 用" +msgstr "ä¸æª¢æŸ¥å…¶ä»–工作å€æ˜¯å¦æ£åœ¨ä½”用指定的引用" #: builtin/checkout.c msgid "checkout our version for unmerged files" @@ -4574,16 +4657,16 @@ msgstr "å°å°šæœªåˆä½µçš„檔案簽出他們的版本" #: builtin/checkout.c msgid "do not limit pathspecs to sparse entries only" -msgstr "å°è·¯å¾‘ä¸åšç¨€ç–簽出的é™åˆ¶" +msgstr "å°è·¯å¾‘è¦æ ¼ä¸åšç¨€ç–簽出的é™åˆ¶" #: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" -msgstr "「-%cã€ã€ã€Œ-%cã€å’Œã€Œ%sã€é¸é …ä¸å¾—åŒæ™‚使用" +msgstr "“-%câ€ã€â€œ-%c†和 “%s†é¸é …ä¸å¾—åŒæ™‚使用" #: builtin/checkout.c msgid "--track needs a branch name" -msgstr "--track 需è¦ä¸€å€‹åˆ†æ”¯å" +msgstr "--track 需è¦åˆ†æ”¯å稱" #: builtin/checkout.c #, c-format @@ -4602,60 +4685,61 @@ msgstr "無效的路徑è¦æ ¼" #: builtin/checkout.c #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "'%s' ä¸æ˜¯ä¸€å€‹æ交，ä¸èƒ½åŸºæ–¼å®ƒå»ºç«‹åˆ†æ”¯ '%s'" +msgstr "“%s†ä¸æ˜¯æäº¤ï¼Œå› æ¤ä¸èƒ½ä»¥é€™ç‚ºåŸºç¤Žå»ºç«‹ “%s†分支" #: builtin/checkout.c #, c-format msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout：--detach ä¸èƒ½æŽ¥æ”¶è·¯å¾‘åƒæ•¸ '%s'" +msgstr "git checkout：--detach ä¸å–路徑引數 “%sâ€" #: builtin/checkout.c msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -"git checkout：在從索引簽出時，--ours/--theirsã€--force å’Œ --merge ä¸ç›¸å®¹ã€‚" +"git checkout：在從索引簽出時，--ours/--theirsã€--force\n" +"å’Œ --merge ä¸ç›¸å®¹ã€‚" #: builtin/checkout.c msgid "you must specify path(s) to restore" -msgstr "æ‚¨å¿…é ˆæŒ‡å®šä¸€å€‹è¦å¾©åŽŸçš„路徑" +msgstr "æ‚¨å¿…é ˆæŒ‡å®šè¦é‚„原的路徑" #: builtin/checkout.c builtin/clone.c builtin/remote.c #: builtin/submodule--helper.c builtin/worktree.c msgid "branch" -msgstr "分支" +msgstr "branch" #: builtin/checkout.c msgid "create and checkout a new branch" -msgstr "建立並簽出一個新的分支" +msgstr "建立並簽出新分支" #: builtin/checkout.c msgid "create/reset and checkout a branch" -msgstr "建立/é‡è¨ä¸¦ç°½å‡ºä¸€å€‹åˆ†æ”¯" +msgstr "建立/é‡è¨ä¸¦ç°½å‡ºåˆ†æ”¯" #: builtin/checkout.c msgid "create reflog for new branch" -msgstr "為新的分支建立引用日誌" +msgstr "為新分支建立引用日誌" #: builtin/checkout.c msgid "second guess 'git checkout <no-such-branch>' (default)" -msgstr "二次猜測 'git checkout <ç„¡æ¤åˆ†æ”¯>'（é è¨ï¼‰" +msgstr "二次猜測 “git checkout <ç„¡æ¤åˆ†æ”¯>â€ï¼ˆé è¨å€¼ï¼‰" #: builtin/checkout.c msgid "use overlay mode (default)" -msgstr "ä½¿ç”¨ç–ŠåŠ æ¨¡å¼ï¼ˆé è¨ï¼‰" +msgstr "ä½¿ç”¨ç–ŠåŠ æ¨¡å¼ï¼ˆé è¨å€¼ï¼‰" #: builtin/checkout.c msgid "create and switch to a new branch" -msgstr "建立並切æ›ä¸€å€‹æ–°åˆ†æ”¯" +msgstr "建立並切æ›è‡³æ–°åˆ†æ”¯" #: builtin/checkout.c msgid "create/reset and switch to a branch" -msgstr "建立/é‡è¨ä¸¦åˆ‡æ›ä¸€å€‹åˆ†æ”¯" +msgstr "建立/é‡è¨ä¸¦åˆ‡æ›è‡³æŒ‡å®šåˆ†æ”¯" #: builtin/checkout.c msgid "second guess 'git switch <no-such-branch>'" -msgstr "二次猜測 'git switch <ç„¡æ¤åˆ†æ”¯>'" +msgstr "二次猜測 “git switch <ç„¡æ¤åˆ†æ”¯>â€" #: builtin/checkout.c msgid "throw away local modifications" @@ -4663,19 +4747,19 @@ msgstr "æ¨æ£„本機修改" #: builtin/checkout.c msgid "which tree-ish to checkout from" -msgstr "è¦ç°½å‡ºå“ªä¸€å€‹æ¨¹" +msgstr "è¦è‡ªå“ªä¸€å€‹æ¨¹ç‹€ç‰©ä»¶æŒ‡ç¤ºå…ƒç°½å‡º" #: builtin/checkout.c msgid "restore the index" -msgstr "復原索引" +msgstr "還原索引" #: builtin/checkout.c msgid "restore the working tree (default)" -msgstr "復原工作å€ï¼ˆé è¨ï¼‰" +msgstr "還原工作å€ï¼ˆé è¨å€¼ï¼‰" #: builtin/checkout.c msgid "ignore unmerged entries" -msgstr "忽略未åˆä½µæ¢ç›®" +msgstr "忽略未åˆä½µé …ç›®" #: builtin/checkout.c msgid "use overlay mode" @@ -4686,17 +4770,18 @@ msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " "[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模å¼>] [-x | -X] [--] [<路徑è¦æ ¼>...]" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" #: builtin/clean.c #, c-format msgid "Removing %s\n" -msgstr "æ£åˆªé™¤ %s\n" +msgstr "æ£åœ¨åˆªé™¤ %s\n" #: builtin/clean.c #, c-format msgid "Would remove %s\n" -msgstr "將刪除 %s\n" +msgstr "將會刪除 %s\n" #: builtin/clean.c #, c-format @@ -4711,12 +4796,12 @@ msgstr "將忽略版本庫 %s\n" #: builtin/clean.c midx.c #, c-format msgid "failed to remove %s" -msgstr "刪除 %s 失敗" +msgstr "無法移除 %s" #: builtin/clean.c #, c-format msgid "could not lstat %s\n" -msgstr "ä¸èƒ½å° %s å‘¼å« lstat\n" +msgstr "ä¸èƒ½å° %s 進行 lstat\n" #: builtin/clean.c msgid "Refusing to remove current working directory\n" @@ -4726,7 +4811,7 @@ msgstr "拒絕移除目å‰å·¥ä½œç›®éŒ„\n" msgid "Would refuse to remove current working directory\n" msgstr "會拒絕移除目å‰çš„工作目錄\n" -#: builtin/clean.c git-add--interactive.perl +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -4734,12 +4819,12 @@ msgid "" "foo - select item based on unique prefix\n" " - (empty) select nothing\n" msgstr "" -"å”助：\n" -"1 - é€éŽç·¨è™Ÿé¸æ“‡ä¸€å€‹é¸é …\n" -"foo - é€éŽå”¯ä¸€å‰ç¶´é¸æ“‡ä¸€å€‹é¸é …\n" +"æ示說明：\n" +"1 - é€éŽç·¨è™Ÿé¸æ“‡é …ç›®\n" +"foo - æ ¹æ“šç¨ç‰¹å‰ç¶´é¸æ“‡é …ç›®\n" " - （空）什麼也ä¸é¸æ“‡\n" -#: builtin/clean.c git-add--interactive.perl +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -4751,39 +4836,39 @@ msgid "" "* - choose all items\n" " - (empty) finish selecting\n" msgstr "" -"å”助：\n" -"1 - é¸æ“‡ä¸€å€‹é¸é …\n" -"3-5 - é¸æ“‡ä¸€å€‹ç¯„åœå…§çš„所有é¸é …\n" -"2-3,6-9 - é¸æ“‡å¤šå€‹ç¯„åœå…§çš„所有é¸é …\n" -"foo - é€éŽå”¯ä¸€å‰ç¶´é¸æ“‡ä¸€å€‹é¸é …\n" -"-... - åé¸ç‰¹å®šçš„é¸é …\n" -"* - é¸æ“‡æ‰€æœ‰é¸é …\n" -" - （空）çµæŸé¸æ“‡\n" - -#: builtin/clean.c git-add--interactive.perl -#, c-format, perl-format +"æ示說明：\n" +"1 - é¸æ“‡ä¸€å€‹é …ç›®\n" +"3-5 - é¸æ“‡ä¸€å€‹é …目範åœ\n" +"2-3,6-9 - é¸æ“‡å¤šå€‹é …目範åœ\n" +"foo - æ ¹æ“šç¨ç‰¹å‰ç¶´é¸æ“‡é …ç›®\n" +"-... - å–消é¸å–æŒ‡å®šé …ç›®\n" +"* - é¸æ“‡æ‰€æœ‰é …ç›®\n" +" - （空）完æˆé¸æ“‡\n" + +#: builtin/clean.c +#, c-format msgid "Huh (%s)?\n" -msgstr "嗯（%s）？\n" +msgstr "嗯（%s）?\n" #: builtin/clean.c #, c-format msgid "Input ignore patterns>> " -msgstr "輸入範本以排除æ¢ç›®>> " +msgstr "輸入è¦å¿½ç•¥çš„模å¼é …ç›®>> " #: builtin/clean.c #, c-format msgid "WARNING: Cannot find items matched by: %s" -msgstr "è¦å‘Šï¼šç„¡æ³•æ‰¾åˆ°å’Œ %s 符åˆçš„æ¢ç›®" +msgstr "è¦å‘Šï¼šç„¡æ³•æ‰¾åˆ°å’Œ %s 符åˆçš„é …ç›®" #: builtin/clean.c msgid "Select items to delete" -msgstr "é¸æ“‡è¦åˆªé™¤çš„æ¢ç›®" +msgstr "é¸æ“‡è¦åˆªé™¤çš„é …ç›®" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c #, c-format msgid "Remove %s [y/N]? " -msgstr "移除 %s [y/N]？ " +msgstr "移除 %s [y/N]? " #: builtin/clean.c msgid "" @@ -4798,15 +4883,15 @@ msgstr "" "clean - 開始清ç†\n" "filter by pattern - é€éŽç¯„本排除è¦åˆªé™¤çš„æ¢ç›®\n" "select by numbers - é€éŽæ•¸å—é¸æ“‡è¦åˆªé™¤çš„æ¢ç›®\n" -"ask each - é‡å°åˆªé™¤é€ä¸€è©¢å•ï¼ˆå°±åƒ \"rm -i\"）\n" +"ask each - é‡å°åˆªé™¤é€ä¸€è©¢å•ï¼ˆå°±åƒ “rm -iâ€ï¼‰\n" "quit - åœæ¢åˆªé™¤ä¸¦é›¢é–‹\n" -"help - 顯示本å”助\n" -"? - 顯示如何在æ示符下é¸æ“‡çš„å”助" +"help - 顯示本輔助說明\n" +"? - 顯示如何在æ示下é¸æ“‡çš„å”助" #: builtin/clean.c msgid "Would remove the following item:" msgid_plural "Would remove the following items:" -msgstr[0] "將刪除如下æ¢ç›®ï¼š" +msgstr[0] "å°‡ç§»é™¤ä»¥ä¸‹é …ç›®ï¼š" #: builtin/clean.c msgid "No more files to clean, exiting." @@ -4814,11 +4899,11 @@ msgstr "沒有è¦æ¸…ç†çš„檔案，離開。" #: builtin/clean.c msgid "do not print names of files removed" -msgstr "ä¸åˆ—å°åˆªé™¤æª”案的å稱" +msgstr "ä¸è¼¸å‡ºç§»é™¤çš„檔案的å稱" #: builtin/clean.c msgid "force" -msgstr "強制" +msgstr "force" #: builtin/clean.c msgid "interactive cleaning" @@ -4826,24 +4911,24 @@ msgstr "互動å¼æ¸…除" #: builtin/clean.c msgid "remove whole directories" -msgstr "刪除整個目錄" +msgstr "移除整個目錄" #: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c #: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c msgid "pattern" -msgstr "模å¼" +msgstr "pattern" #: builtin/clean.c msgid "add <pattern> to ignore rules" -msgstr "新增 <模å¼> 到忽略è¦å‰‡" +msgstr "å°‡ <pattern> åŠ åˆ°å¿½ç•¥è¦å‰‡" #: builtin/clean.c msgid "remove ignored files, too" -msgstr "也刪除忽略的檔案" +msgstr "亦移除忽略的檔案" #: builtin/clean.c msgid "remove only ignored files" -msgstr "åªåˆªé™¤å¿½ç•¥çš„檔案" +msgstr "åªç§»é™¤å¿½ç•¥çš„檔案" #: builtin/clean.c msgid "" @@ -4865,23 +4950,23 @@ msgstr "-x å’Œ -X ä¸èƒ½åŒæ™‚使用" #: builtin/clone.c msgid "git clone [<options>] [--] <repo> [<dir>]" -msgstr "git clone [<é¸é …>] [--] <版本庫> [<路徑>]" +msgstr "git clone [<options>] [--] <repo> [<dir>]" #: builtin/clone.c msgid "don't clone shallow repository" -msgstr "ä¸è¦è¤‡è£½æ·ºç‰ˆæœ¬åº«" +msgstr "ä¸è¦è¤‡è£½æ·ºå±¤ç‰ˆæœ¬åº«" #: builtin/clone.c msgid "don't create a checkout" -msgstr "ä¸å»ºç«‹ä¸€å€‹ç°½å‡º" +msgstr "ä¸è¦å»ºç«‹ç°½å‡º" #: builtin/clone.c builtin/init-db.c msgid "create a bare repository" -msgstr "建立一個純版本庫" +msgstr "建立裸版本庫" #: builtin/clone.c msgid "create a mirror repository (implies bare)" -msgstr "建立一個é¡åƒç‰ˆæœ¬åº«ï¼ˆä¹Ÿæ˜¯ç´”版本庫）" +msgstr "建立é¡åƒç‰ˆæœ¬åº«ï¼ˆäº¦å³è£¸ç‰ˆæœ¬åº«ï¼‰" #: builtin/clone.c msgid "to clone from a local repository" @@ -4889,7 +4974,7 @@ msgstr "從本機版本庫複製" #: builtin/clone.c msgid "don't use local hardlinks, always copy" -msgstr "ä¸ä½¿ç”¨æœ¬æ©Ÿç¡¬é€£çµï¼Œå§‹çµ‚複製" +msgstr "ä¸ä½¿ç”¨æœ¬æ©Ÿç¡¬é€£çµï¼Œå§‹çµ‚æ‹·è²" #: builtin/clone.c msgid "setup as shared repository" @@ -4905,15 +4990,15 @@ msgstr "在複製時åˆå§‹åŒ–å模組" #: builtin/clone.c msgid "number of submodules cloned in parallel" -msgstr "並行複製的å模組數" +msgstr "平行複製的å模組數é‡" #: builtin/clone.c builtin/init-db.c msgid "template-directory" -msgstr "範本目錄" +msgstr "模æ¿ç›®éŒ„" #: builtin/clone.c builtin/init-db.c msgid "directory from which templates will be used" -msgstr "範本目錄將被使用" +msgstr "將被使用的模æ¿ç›®éŒ„" #: builtin/clone.c builtin/submodule--helper.c msgid "reference repository" @@ -4921,21 +5006,21 @@ msgstr "引用版本庫" #: builtin/clone.c builtin/submodule--helper.c msgid "use --reference only while cloning" -msgstr "僅在複製時åƒè€ƒ --reference 指å‘的本機版本庫" +msgstr "僅在複製時使用 --reference" #: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c #: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c #: builtin/submodule--helper.c t/helper/test-simple-ipc.c msgid "name" -msgstr "å稱" +msgstr "name" #: builtin/clone.c msgid "use <name> instead of 'origin' to track upstream" -msgstr "使用 <å稱> 而ä¸æ˜¯ 'origin' 去追蹤上游" +msgstr "使用 <name> 而ä¸æ˜¯ “origin†追蹤上游" #: builtin/clone.c msgid "checkout <branch> instead of the remote's HEAD" -msgstr "簽出 <分支> 而ä¸æ˜¯é 端 HEAD" +msgstr "簽出 <branch> 而ä¸æ˜¯é 端 HEAD" #: builtin/clone.c msgid "path to git-upload-pack on the remote" @@ -4943,27 +5028,23 @@ msgstr "é 端 git-upload-pack 路徑" #: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c msgid "depth" -msgstr "深度" +msgstr "depth" #: builtin/clone.c msgid "create a shallow clone of that depth" -msgstr "建立一個指定深度的淺複製" - -#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c -msgid "time" -msgstr "時間" +msgstr "建立指定深度的淺層複製" #: builtin/clone.c msgid "create a shallow clone since a specific time" -msgstr "建立從指定時間到ç¾åœ¨çš„淺複製" +msgstr "建立從指定時間到ç¾åœ¨çš„淺層複製" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c msgid "revision" -msgstr "修訂版" +msgstr "revision" #: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone, excluding rev" -msgstr "å–得更多淺複製的éŽåŽ»æ·å²è¨˜éŒ„，除了特定版本" +msgstr "å–得更多淺層複製的éŽåŽ»æ·å²è¨˜éŒ„，除了特定修訂版" #: builtin/clone.c builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" @@ -4979,11 +5060,11 @@ msgstr "å模組將以淺下載模å¼è¤‡è£½" #: builtin/clone.c builtin/init-db.c msgid "gitdir" -msgstr "git目錄" +msgstr "gitdir" #: builtin/clone.c builtin/init-db.c msgid "separate git dir from working tree" -msgstr "git目錄和工作å€åˆ†é›¢" +msgstr "git 目錄和工作å€åˆ†é›¢" #: builtin/clone.c msgid "key=value" @@ -5048,6 +5129,11 @@ msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€å€‹ç›®éŒ„" #: builtin/clone.c #, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "“%s†是個符號連çµï¼Œæ•…ä¸èƒ½ä½¿ç”¨ --local 複製" + +#: builtin/clone.c +#, c-format msgid "failed to start iterator over '%s'" msgstr "無法在 '%s' 上啟動疊代器" @@ -5059,7 +5145,7 @@ msgstr "「%sã€ç¬¦è™Ÿé€£çµå·²å˜åœ¨ï¼Œæ‹’絕使用 --local 複製" #: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" -msgstr "刪除 '%s' 失敗" +msgstr "無法刪除 “%sâ€" #: builtin/clone.c #, c-format @@ -5127,7 +5213,7 @@ msgstr "無法執行 repack 來清ç†" #: builtin/clone.c msgid "cannot unlink temporary alternates file" -msgstr "無法刪除暫時的 alternates 檔案" +msgstr "ç„¡æ³•åˆªé™¤æš«å˜ alternates 檔案" #: builtin/clone.c msgid "Too many arguments." @@ -5241,6 +5327,10 @@ msgid "failed to fetch objects from bundle URI '%s'" msgstr "無法從套件包 URL “%s†抓å–物件" #: builtin/clone.c +msgid "failed to fetch advertised bundles" +msgstr "無法抓å–公佈的套件包" + +#: builtin/clone.c msgid "remote transport reported error" msgstr "é ç«¯å‚³è¼¸å›žå ±éŒ¯èª¤" @@ -5609,7 +5699,7 @@ msgid "" "in the current commit message" msgstr "無法é¸æ“‡ä¸€å€‹æœªè¢«ç›®å‰æ交說明使用的備註å—å…ƒ" -#: builtin/commit.c +#: builtin/commit.c builtin/merge-tree.c #, c-format msgid "could not lookup commit %s" msgstr "ä¸èƒ½æŸ¥è©¢æ交 %s" @@ -5834,13 +5924,13 @@ msgstr "è¨ˆç®—å®Œæ•´çš„é ˜å…ˆ/è½å¾Œå€¼" msgid "version" msgstr "版本" -#: builtin/commit.c builtin/push.c builtin/worktree.c +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "機器å¯è®€çš„輸出" #: builtin/commit.c msgid "show status in long format (default)" -msgstr "ä»¥é•·æ ¼å¼é¡¯ç¤ºç‹€æ…‹ï¼ˆé è¨ï¼‰" +msgstr "ä»¥é•·æ ¼å¼é¡¯ç¤ºç‹€æ…‹ï¼ˆé è¨å€¼ï¼‰" #: builtin/commit.c msgid "terminate entries with NUL" @@ -5917,7 +6007,7 @@ msgstr "日期" msgid "override date for commit" msgstr "æ交時覆蓋日期" -#: builtin/commit.c parse-options.h ref-filter.h +#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h msgid "commit" msgstr "æ交" @@ -6068,7 +6158,7 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<é¸é …>]" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c #, c-format msgid "unrecognized --type argument, %s" msgstr "無法è˜åˆ¥çš„ --type åƒæ•¸ï¼Œ%s" @@ -6167,7 +6257,7 @@ msgstr "開啟一個編輯器" #: builtin/config.c msgid "find the color configured: slot [default]" -msgstr "ç²å¾—è¨å®šçš„é¡è‰²ï¼šè¨å®š [é è¨]" +msgstr "ç²å¾—è¨å®šçš„é¡è‰²ï¼šè¨å®š [é è¨å€¼]" #: builtin/config.c msgid "find the color setting: slot [stdout-is-tty]" @@ -6177,11 +6267,11 @@ msgstr "ç²å¾—é¡è‰²è¨å®šï¼šè¨å®š [stdout-is-tty]" msgid "Type" msgstr "é¡žåž‹" -#: builtin/config.c builtin/env--helper.c builtin/hash-object.c +#: builtin/config.c builtin/hash-object.c msgid "type" msgstr "é¡žåž‹" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c msgid "value is given this type" msgstr "å–值為該類型" @@ -6235,7 +6325,7 @@ msgstr "" "顯示è¨å®šæª”的作用域 (å·¥ä½œå€ worktreeã€æœ¬æ©Ÿ localã€å…¨åŸŸ globalã€ç³»çµ± systemã€æŒ‡" "令 command)" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c msgid "value" msgstr "å–值" @@ -6770,30 +6860,6 @@ msgstr "沒有為 --tool=<工具> åƒæ•¸æä¾› <工具>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "沒有為 --extcmd=<命令> åƒæ•¸æä¾› <命令>" -#: builtin/env--helper.c -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <é¸é …> <環境變數>" - -#: builtin/env--helper.c -msgid "default for git_env_*(...) to fall back on" -msgstr "git_env_*(...) çš„é è¨å€¼" - -#: builtin/env--helper.c -msgid "be quiet only use git_env_*() value as exit code" -msgstr "安éœæ¨¡å¼ï¼Œåªä½¿ç”¨ git_env_*() 的值作為離開碼" - -#: builtin/env--helper.c -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "é¸é …「--defaultã€é 期收到「--type=boolã€çš„布林值，而éžã€Œ%sã€" - -#: builtin/env--helper.c -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" -msgstr "é¸é …「--defaultã€é 期收到「--type=ulongã€çš„無號 long 數值，而éžã€Œ%sã€" - #: builtin/fast-export.c msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-opts>]" @@ -6936,147 +7002,17 @@ msgstr "git fetch --all [<é¸é …>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel ä¸èƒ½ç‚ºè² 數" -#: builtin/fetch.c builtin/pull.c -msgid "fetch from all remotes" -msgstr "從所有的é 端抓å–" - -#: builtin/fetch.c builtin/pull.c -msgid "set upstream for git pull/fetch" -msgstr "為 git pull/fetch è¨å®šä¸Šæ¸¸" - -#: builtin/fetch.c builtin/pull.c -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†è“‹å®ƒ" - -#: builtin/fetch.c -msgid "use atomic transaction to update references" -msgstr "使用 atomic 事務更新引用" - -#: builtin/fetch.c builtin/pull.c -msgid "path to upload pack on remote end" -msgstr "上傳包到é 端的路徑" - -#: builtin/fetch.c -msgid "force overwrite of local reference" -msgstr "強制覆蓋本機引用" - -#: builtin/fetch.c -msgid "fetch from multiple remotes" -msgstr "從多個é 端抓å–" - -#: builtin/fetch.c builtin/pull.c -msgid "fetch all tags and associated objects" -msgstr "抓å–所有的標籤和關è¯ç‰©ä»¶" - -#: builtin/fetch.c -msgid "do not fetch all tags (--no-tags)" -msgstr "ä¸æŠ“å–任何標籤(--no-tags)" - -#: builtin/fetch.c -msgid "number of submodules fetched in parallel" -msgstr "並行å–å¾—çš„å模組數é‡" - -#: builtin/fetch.c -msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "修改引用è¦æ ¼ (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ ä¸" - -#: builtin/fetch.c builtin/pull.c -msgid "prune remote-tracking branches no longer on remote" -msgstr "清除é 端已經ä¸å˜åœ¨çš„分支的追蹤分支" - -#: builtin/fetch.c -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "清除é 端ä¸å˜åœ¨çš„本機標籤，並且å–代變更標籤" - -# è¯è€…：å¯é¸å€¼ï¼Œä¸èƒ½ç¿»è¯ -#: builtin/fetch.c builtin/pull.c -msgid "on-demand" -msgstr "on-demand" - -#: builtin/fetch.c -msgid "control recursive fetching of submodules" -msgstr "控制å模組的éžè¿´æŠ“å–" - -#: builtin/fetch.c -msgid "write fetched references to the FETCH_HEAD file" -msgstr "å°‡å–得的引用寫入 FETCH_HEAD 檔案" - -#: builtin/fetch.c builtin/pull.c -msgid "keep downloaded pack" -msgstr "ä¿æŒä¸‹è¼‰åŒ…" - -#: builtin/fetch.c -msgid "allow updating of HEAD ref" -msgstr "å…許更新 HEAD 引用" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow clone" -msgstr "å–得淺複製的更多éŽåŽ»æ·å²è¨˜éŒ„" - -#: builtin/fetch.c builtin/pull.c -msgid "deepen history of shallow repository based on time" -msgstr "基於時間來深化淺複製的æ·å²" - -#: builtin/fetch.c builtin/pull.c -msgid "convert to a complete repository" -msgstr "轉æ›ç‚ºä¸€å€‹å®Œæ•´çš„版本庫" - -#: builtin/fetch.c -msgid "re-fetch without negotiating common commits" -msgstr "é‡æ–°æŠ“å–而ä¸å”商共åŒæ交" - -#: builtin/fetch.c -msgid "prepend this to submodule path output" -msgstr "在å模組路徑輸出的å‰é¢åŠ 上æ¤ç›®éŒ„" - -#: builtin/fetch.c -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "éžè¿´å–å¾—å模組的é è¨å€¼ï¼ˆæ¯”è¨å®šæª”案優先度低）" - -#: builtin/fetch.c builtin/pull.c -msgid "accept refs that update .git/shallow" -msgstr "接å—æ›´æ–° .git/shallow 的引用" - -#: builtin/fetch.c builtin/pull.c -msgid "refmap" -msgstr "å¼•ç”¨æ˜ å°„" - -#: builtin/fetch.c builtin/pull.c -msgid "specify fetch refmap" -msgstr "指定å–å¾—å‹•ä½œçš„å¼•ç”¨æ˜ å°„" - -#: builtin/fetch.c builtin/pull.c -msgid "report that we have only objects reachable from this object" -msgstr "å ±å‘Šæˆ‘å€‘åªæ“有從該物件開始å¯ä»¥å–得的物件" - -#: builtin/fetch.c -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "ä¸å–å¾— packfile，而是輸出å”商的祖先æ交" - -#: builtin/fetch.c -msgid "run 'maintenance --auto' after fetching" -msgstr "å–å¾— (fetch) 後執行 'maintenance --auto'" - -#: builtin/fetch.c builtin/pull.c -msgid "check for forced-updates on all updated branches" -msgstr "在所有更新分支上檢查強制更新" - -#: builtin/fetch.c -msgid "write the commit-graph after fetching" -msgstr "抓å–後寫入分支圖" - -#: builtin/fetch.c -msgid "accept refspecs from stdin" -msgstr "從標準輸入ä¸æŽ¥å—引用è¦æ ¼" - #: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "找ä¸åˆ°é 端 HEAD 引用" #: builtin/fetch.c #, c-format +msgid "From %.*s\n" +msgstr "來自 %.*s\n" + +#: builtin/fetch.c +#, c-format msgid "object %s not found" msgstr "物件 %s 未發ç¾" @@ -7162,11 +7098,6 @@ msgstr "已拒絕 %s，ä¸å…許更新淺複製" #: builtin/fetch.c #, c-format -msgid "From %.*s\n" -msgstr "來自 %.*s\n" - -#: builtin/fetch.c -#, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" @@ -7278,6 +7209,141 @@ msgstr "" msgid "you need to specify a tag name" msgstr "您需è¦æŒ‡å®šæ¨™ç±¤å稱" +#: builtin/fetch.c builtin/pull.c +msgid "fetch from all remotes" +msgstr "從所有的é 端抓å–" + +#: builtin/fetch.c builtin/pull.c +msgid "set upstream for git pull/fetch" +msgstr "為 git pull/fetch è¨å®šä¸Šæ¸¸" + +#: builtin/fetch.c builtin/pull.c +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†è“‹å®ƒ" + +#: builtin/fetch.c +msgid "use atomic transaction to update references" +msgstr "使用 atomic 事務更新引用" + +#: builtin/fetch.c builtin/pull.c +msgid "path to upload pack on remote end" +msgstr "上傳包到é 端的路徑" + +#: builtin/fetch.c +msgid "force overwrite of local reference" +msgstr "強制覆蓋本機引用" + +#: builtin/fetch.c +msgid "fetch from multiple remotes" +msgstr "從多個é 端抓å–" + +#: builtin/fetch.c builtin/pull.c +msgid "fetch all tags and associated objects" +msgstr "抓å–所有的標籤和關è¯ç‰©ä»¶" + +#: builtin/fetch.c +msgid "do not fetch all tags (--no-tags)" +msgstr "ä¸æŠ“å–任何標籤(--no-tags)" + +#: builtin/fetch.c +msgid "number of submodules fetched in parallel" +msgstr "並行å–å¾—çš„å模組數é‡" + +#: builtin/fetch.c +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "修改引用è¦æ ¼ (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ ä¸" + +#: builtin/fetch.c builtin/pull.c +msgid "prune remote-tracking branches no longer on remote" +msgstr "清除é 端已經ä¸å˜åœ¨çš„分支的追蹤分支" + +#: builtin/fetch.c +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "清除é 端ä¸å˜åœ¨çš„本機標籤，並且å–代變更標籤" + +# è¯è€…：å¯é¸å€¼ï¼Œä¸èƒ½ç¿»è¯ +#: builtin/fetch.c builtin/pull.c +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c +msgid "control recursive fetching of submodules" +msgstr "控制å模組的éžè¿´æŠ“å–" + +#: builtin/fetch.c +msgid "write fetched references to the FETCH_HEAD file" +msgstr "å°‡å–得的引用寫入 FETCH_HEAD 檔案" + +#: builtin/fetch.c builtin/pull.c +msgid "keep downloaded pack" +msgstr "ä¿æŒä¸‹è¼‰åŒ…" + +#: builtin/fetch.c +msgid "allow updating of HEAD ref" +msgstr "å…許更新 HEAD 引用" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow clone" +msgstr "å–得淺複製的更多éŽåŽ»æ·å²è¨˜éŒ„" + +#: builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow repository based on time" +msgstr "基於時間來深化淺複製的æ·å²" + +#: builtin/fetch.c builtin/pull.c +msgid "convert to a complete repository" +msgstr "轉æ›ç‚ºä¸€å€‹å®Œæ•´çš„版本庫" + +#: builtin/fetch.c +msgid "re-fetch without negotiating common commits" +msgstr "é‡æ–°æŠ“å–而ä¸å”商共åŒæ交" + +#: builtin/fetch.c +msgid "prepend this to submodule path output" +msgstr "在å模組路徑輸出的å‰é¢åŠ 上æ¤ç›®éŒ„" + +#: builtin/fetch.c +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "éžè¿´å–å¾—å模組的é è¨å€¼ï¼ˆæ¯”è¨å®šæª”案優先度低）" + +#: builtin/fetch.c builtin/pull.c +msgid "accept refs that update .git/shallow" +msgstr "接å—æ›´æ–° .git/shallow 的引用" + +#: builtin/fetch.c builtin/pull.c +msgid "refmap" +msgstr "å¼•ç”¨æ˜ å°„" + +#: builtin/fetch.c builtin/pull.c +msgid "specify fetch refmap" +msgstr "指定å–å¾—å‹•ä½œçš„å¼•ç”¨æ˜ å°„" + +#: builtin/fetch.c builtin/pull.c +msgid "report that we have only objects reachable from this object" +msgstr "å ±å‘Šæˆ‘å€‘åªæ“有從該物件開始å¯ä»¥å–得的物件" + +#: builtin/fetch.c +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "ä¸å–å¾— packfile，而是輸出å”商的祖先æ交" + +#: builtin/fetch.c +msgid "run 'maintenance --auto' after fetching" +msgstr "å–å¾— (fetch) 後執行 'maintenance --auto'" + +#: builtin/fetch.c builtin/pull.c +msgid "check for forced-updates on all updated branches" +msgstr "在所有更新分支上檢查強制更新" + +#: builtin/fetch.c +msgid "write the commit-graph after fetching" +msgstr "抓å–後寫入分支圖" + +#: builtin/fetch.c +msgid "accept refspecs from stdin" +msgstr "從標準輸入ä¸æŽ¥å—引用è¦æ ¼" + #: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only 需è¦ä¸€æˆ–多個 --negotiation-tip=*" @@ -7291,6 +7357,11 @@ msgid "--unshallow on a complete repository does not make sense" msgstr "å°æ–¼ä¸€å€‹å®Œæ•´çš„版本庫，åƒæ•¸ --unshallow 沒有æ„義" #: builtin/fetch.c +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "無法自「%sã€æŠ“å–套件包" + +#: builtin/fetch.c msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸èƒ½å¸¶ä¸€å€‹ç‰ˆæœ¬åº«åƒæ•¸" @@ -7418,6 +7489,14 @@ msgstr "åªåˆ—å°åŒ…å«è©²æ交的引用" msgid "print only refs which don't contain the commit" msgstr "åªåˆ—å°ä¸åŒ…å«è©²æ交的引用" +#: builtin/for-each-ref.c +msgid "read reference patterns from stdin" +msgstr "從 stdin 讀å–引用模å¼" + +#: builtin/for-each-ref.c +msgid "unknown arguments supplied with --stdin" +msgstr "為 --stdin æ供的引數未知" + #: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> [--] <arguments>" msgstr "git for-each-repo --config=<config> [--] <arguments>" @@ -7434,6 +7513,11 @@ msgstr "儲å˜ç‰ˆæœ¬åº«è·¯å¾‘清單的è¨å®šéµ" msgid "missing --config=<config>" msgstr "缺少 --config=<è¨å®š>" +#: builtin/for-each-repo.c +#, c-format +msgid "got bad config --config=%s" +msgstr "收到無效的組態 --config=%s" + #: builtin/fsck.c msgid "unknown" msgstr "未知" @@ -7619,13 +7703,14 @@ msgid "notice: %s points to an unborn branch (%s)" msgstr "注æ„：%s 指å‘一個尚未誕生的分支（%s）" #: builtin/fsck.c -msgid "Checking cache tree" -msgstr "æ£åœ¨æª¢æŸ¥å¿«å–樹" +#, c-format +msgid "Checking cache tree of %s" +msgstr "æ£åœ¨æª¢æŸ¥ %s çš„å¿«å–樹" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s：cache-tree ä¸ç„¡æ•ˆçš„ sha1 指標" +msgid "%s: invalid sha1 pointer in cache-tree of %s" +msgstr "%s：%s çš„ cache-tree ä¸çš„ sha1 指標無效" #: builtin/fsck.c msgid "non-tree in cache-tree" @@ -7633,8 +7718,18 @@ msgstr "cache-tree ä¸éžæ¨¹ç‹€ç‰©ä»¶" #: builtin/fsck.c #, c-format -msgid "%s: invalid sha1 pointer in resolve-undo" -msgstr "%s：resolve-undo çš„ sha1 指é‡ç„¡æ•ˆ" +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "%s：%s çš„ resolve-undo ä¸çš„ sha1 指標無效" + +#: builtin/fsck.c +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "ç„¡æ³•è®€å– â€œ%s†å°è£çš„修訂版索引 (rev-index)" + +#: builtin/fsck.c +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "“%s†å°è£çš„修訂版索引 (rev-index) 無效" #: builtin/fsck.c msgid "" @@ -7670,7 +7765,7 @@ msgstr "將索引亦作為檢查的é 節點" #: builtin/fsck.c msgid "make reflogs head nodes (default)" -msgstr "將引用日誌作為檢查的 HEAD 節點（é è¨ï¼‰" +msgstr "將引用日誌作為檢查的 HEAD 節點（é è¨å€¼ï¼‰" #: builtin/fsck.c msgid "also consider packs and alternate objects" @@ -8152,7 +8247,6 @@ msgstr "grep：無法建立執行緒：%s" msgid "invalid number of threads specified (%d) for %s" msgstr "為 %2$s è¨å®šçš„執行緒數 (%1$d) 無效" -#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads @@ -8224,7 +8318,7 @@ msgstr "用 textconv éŽæ¿¾å™¨è™•ç†äºŒé€²ä½æª”案" #: builtin/grep.c msgid "search in subdirectories (default)" -msgstr "在å目錄ä¸å°‹æ‰¾ï¼ˆé è¨ï¼‰" +msgstr "在å目錄ä¸å°‹æ‰¾ï¼ˆé è¨å€¼ï¼‰" #: builtin/grep.c msgid "descend at most <depth> levels" @@ -8236,7 +8330,7 @@ msgstr "使用延伸的 POSIX 常è¦è¡¨ç¤ºå¼" #: builtin/grep.c msgid "use basic POSIX regular expressions (default)" -msgstr "使用基本的 POSIX 常è¦è¡¨ç¤ºå¼ï¼ˆé è¨ï¼‰" +msgstr "使用基本的 POSIX 常è¦è¡¨ç¤ºå¼ï¼ˆé è¨å€¼ï¼‰" #: builtin/grep.c msgid "interpret patterns as fixed strings" @@ -8581,13 +8675,21 @@ msgid "'git help config' for more information" msgstr "'git help config' å–得更多訊æ¯" #: builtin/hook.c -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" #: builtin/hook.c msgid "silently ignore missing requested <hook-name>" msgstr "éœé»˜å¿½ç•¥ä¸å˜åœ¨è€Œè«‹æ±‚çš„ <hook-name>" +#: builtin/hook.c +msgid "file to read into hooks' stdin" +msgstr "è¦è®€é€²æŽ›é‰¤ stdin 的檔案" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -9314,7 +9416,7 @@ msgstr "ä¸åŒ…å«å·²åœ¨ä¸Šæ¸¸æ交ä¸çš„修補檔" #: builtin/log.c msgid "show patch format instead of default (patch + stat)" -msgstr "é¡¯ç¤ºç´”ä¿®è£œæª”æ ¼å¼è€Œéžé è¨çš„（修補檔+狀態）" +msgstr "é¡¯ç¤ºç´”ä¿®è£œæª”æ ¼å¼è€Œéžé è¨å€¼ï¼ˆä¿®è£œæª”+狀態）" #: builtin/log.c msgid "Messaging" @@ -9330,7 +9432,7 @@ msgstr "新增信件é " #: builtin/log.c msgid "email" -msgstr "信件ä½å€" +msgstr "ä¿¡ç®±" #: builtin/log.c msgid "add To: header" @@ -9528,7 +9630,7 @@ msgstr "使用å°å¯«å—æ¯è¡¨ç¤º 'fsmonitor clean' 檔案" #: builtin/ls-files.c msgid "show cached files in the output (default)" -msgstr "顯示快å–的檔案（é è¨ï¼‰" +msgstr "顯示快å–的檔案（é è¨å€¼ï¼‰" #: builtin/ls-files.c msgid "show deleted files in the output" @@ -9629,11 +9731,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" #: builtin/ls-remote.c msgid "do not print remote URL" @@ -9952,9 +10054,17 @@ msgid "perform multiple merges, one per line of input" msgstr "執行多次åˆä½µï¼Œä¸€æ¬¡åŸ·è¡Œè¼¸å…¥ä¸€åˆ—" #: builtin/merge-tree.c +msgid "specify a merge-base for the merge" +msgstr "指定用來åˆä½µçš„åˆä½µåŸºåº•" + +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 和其他所有é¸é …都ä¸ç›¸å®¹" +#: builtin/merge-tree.c +msgid "--merge-base is incompatible with --stdin" +msgstr "--merge-base 與 --stdin ä¸ç›¸å®¹" + #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." @@ -10015,7 +10125,7 @@ msgstr "建立一個單ç¨çš„æ交而ä¸æ˜¯åšä¸€æ¬¡åˆä½µ" #: builtin/merge.c builtin/pull.c msgid "perform a commit if the merge succeeds (default)" -msgstr "如果åˆä½µæˆåŠŸï¼ŒåŸ·è¡Œä¸€æ¬¡æ交（é è¨ï¼‰" +msgstr "如果åˆä½µæˆåŠŸï¼ŒåŸ·è¡Œä¸€æ¬¡æ交（é è¨å€¼ï¼‰" #: builtin/merge.c builtin/pull.c msgid "edit message before committing" @@ -10023,7 +10133,7 @@ msgstr "在æ交å‰ç·¨è¼¯æ交說明" #: builtin/merge.c msgid "allow fast-forward (default)" -msgstr "å…許快轉（é è¨ï¼‰" +msgstr "å…許快轉（é è¨å€¼ï¼‰" #: builtin/merge.c builtin/pull.c msgid "abort if fast-forward is not possible" @@ -10206,7 +10316,7 @@ msgstr "å°æ–¼ %s 沒有來自 %s çš„é 端追蹤分支" msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' ä¸å˜åœ¨å£žçš„å–值 '%1$s'" -#: builtin/merge.c read-cache.c strbuf.c wrapper.c +#: builtin/merge.c editor.c read-cache.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "ä¸èƒ½é—œé–‰ '%s'" @@ -10585,7 +10695,7 @@ msgstr "註解從標準輸入收到的文å—" #: builtin/name-rev.c msgid "allow to print `undefined` names (default)" -msgstr "å…è¨±åˆ—å° `未定義` çš„å稱（é è¨ï¼‰" +msgstr "å…è¨±åˆ—å° `未定義` çš„å稱（é è¨å€¼ï¼‰" #: builtin/name-rev.c msgid "dereference tags in the input (internal use)" @@ -11039,7 +11149,7 @@ msgstr "無法寫入ä½åœ–索引" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "寫入 %<PRIu32> 個物件而é 期 %<PRIu32> 個" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/repack.c msgid "disabling bitmap writing, as some objects are not being packed" msgstr "åœç”¨ bitmap å¯«å…¥ï¼Œå› ç‚ºä¸€äº›ç‰©ä»¶å°‡ä¸æœƒè¢«æ‰“包" @@ -11206,6 +11316,14 @@ msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" #: builtin/pack-objects.c +msgid "show progress meter during object writing phase" +msgstr "在物件寫入階段顯示進度列" + +#: builtin/pack-objects.c +msgid "similar to --all-progress when progress meter is shown" +msgstr "顯示進度列時類似 --all-progress" + +#: builtin/pack-objects.c msgid "<version>[,<offset>]" msgstr "<版本>[,<ä½ç§»>]" @@ -11447,6 +11565,10 @@ msgstr "" "<git@vger.kernel.org> 讓我們知é“您還在使用。\n" "æ„Ÿè¬ã€‚\n" +#: builtin/pack-redundant.c +msgid "refusing to run without --i-still-use-this" +msgstr "傳入 --i-still-use-this å‰æ‹’絕執行" + #: builtin/pack-refs.c msgid "git pack-refs [--all] [--no-prune]" msgstr "git pack-refs [--all] [--no-prune]" @@ -11457,7 +11579,7 @@ msgstr "打包一切" #: builtin/pack-refs.c msgid "prune loose refs (default)" -msgstr "剪除鬆散引用（é è¨ï¼‰" +msgstr "剪除鬆散引用（é è¨å€¼ï¼‰" #: builtin/patch-id.c msgid "git patch-id [--stable | --unstable | --verbatim]" @@ -11650,9 +11772,9 @@ msgstr "更新尚未誕生的分支，變更新增至索引。" msgid "pull with rebase" msgstr "é‡å®šåŸºåº•å¼æ‹‰å–" -#: builtin/pull.c -msgid "please commit or stash them." -msgstr "è«‹æ交或貯å˜å®ƒå€‘。" +#: builtin/pull.c builtin/rebase.c +msgid "Please commit or stash them." +msgstr "è«‹æ交或貯å˜ä¿®æ”¹ã€‚" #: builtin/pull.c #, c-format @@ -11900,9 +12022,9 @@ msgstr "「%sã€çš„值無效" msgid "repository" msgstr "版本庫" -#: builtin/push.c builtin/send-pack.c -msgid "push all refs" -msgstr "推é€æ‰€æœ‰å¼•ç”¨" +#: builtin/push.c +msgid "push all branches" +msgstr "推é€æ‰€æœ‰åˆ†æ”¯" #: builtin/push.c builtin/send-pack.c msgid "mirror all refs" @@ -11913,8 +12035,8 @@ msgid "delete refs" msgstr "刪除引用" #: builtin/push.c -msgid "push tags (can't be used with --all or --mirror)" -msgstr "推é€æ¨™ç±¤ï¼ˆä¸èƒ½ä½¿ç”¨ --all or --mirror）" +msgid "push tags (can't be used with --all or --branches or --mirror)" +msgstr "推é€æ¨™ç±¤ï¼ˆä¸èƒ½å’Œ --allã€--branches 或 --mirror 一起使用）" #: builtin/push.c builtin/send-pack.c msgid "force updates" @@ -11972,7 +12094,7 @@ msgstr "需è¦é ç«¯æ”¯æ´ atomic 事務" msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用沒有æ„義" -#: builtin/push.c +#: builtin/push.c t/helper/test-bundle-uri.c #, c-format msgid "bad repository '%s'" msgstr "壞的版本庫 '%s'" @@ -12239,10 +12361,19 @@ msgstr "" #: builtin/rebase.c #, c-format +msgid "Unknown rebase-merges mode: %s" +msgstr "未知的 rebase-merges 模å¼ï¼š%s" + +#: builtin/rebase.c +#, c-format msgid "could not switch to %s" msgstr "無法切æ›åˆ° %s" #: builtin/rebase.c +msgid "apply options and merge options cannot be used together" +msgstr "套用é¸é …與åˆä½µé¸é …ä¸å¾—åŒæ™‚使用" + +#: builtin/rebase.c #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -12250,6 +12381,15 @@ msgid "" msgstr "無法è˜åˆ¥çš„ '%s' 空類型；有效的數值有 \"drop\"ã€\"keep\" è·Ÿ \"ask\"。" #: builtin/rebase.c +msgid "" +"--rebase-merges with an empty string argument is deprecated and will stop " +"working in a future version of Git. Use --rebase-merges without an argument " +"instead, which does the same thing." +msgstr "" +"有å—串引數的 --rebase-merges 已被棄用，而且會在未來的 Git 版本åœæ¢é‹ä½œã€‚請改" +"用無引數的 --rebase-merges，功能相åŒã€‚" + +#: builtin/rebase.c #, c-format msgid "" "%s\n" @@ -12513,17 +12653,26 @@ msgid "switch `C' expects a numerical value" msgstr "é–‹é—œ `C' 期望一個數å—值" #: builtin/rebase.c -#, c-format -msgid "Unknown mode: %s" -msgstr "未知模å¼ï¼š%s" - -#: builtin/rebase.c msgid "--strategy requires --merge or --interactive" msgstr "--strategy éœ€è¦ --merge 或 --interactive" #: builtin/rebase.c -msgid "apply options and merge options cannot be used together" -msgstr "套用é¸é …與åˆä½µé¸é …ä¸å¾—åŒæ™‚使用" +msgid "" +"apply options are incompatible with rebase.autoSquash. Consider adding --no-" +"autosquash" +msgstr "apply é¸é …與 rebase.autoSquash ä¸ç›¸å®¹ã€‚è«‹è€ƒæ…®åŠ ä¸Š --no-autosquash" + +#: builtin/rebase.c +msgid "" +"apply options are incompatible with rebase.rebaseMerges. Consider adding --" +"no-rebase-merges" +msgstr "apply é¸é …與 rebase.rebaseMerges ä¸ç›¸å®¹ã€‚è«‹è€ƒæ…®åŠ ä¸Š --no-rebase-merges" + +#: builtin/rebase.c +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "apply é¸é …與 rebase.updateRefs ä¸ç›¸å®¹ã€‚è«‹è€ƒæ…®åŠ ä¸Š --no-update-refs" #: builtin/rebase.c #, c-format @@ -12573,10 +12722,6 @@ msgid "Does not point to a valid commit '%s'" msgstr "沒有指å‘一個有效的æ交 '%s'" #: builtin/rebase.c -msgid "Please commit or stash them." -msgstr "è«‹æ交或貯å˜ä¿®æ”¹ã€‚" - -#: builtin/rebase.c msgid "HEAD is up to date." msgstr "HEAD 是最新的。" @@ -13375,8 +13520,8 @@ msgid "approxidate" msgstr "近似日期" #: builtin/repack.c -msgid "with -C, expire objects older than this" -msgstr "æé… -C 會將早於æ¤çš„物件è¨ç‚ºéŽæœŸ" +msgid "with --cruft, expire objects older than this" +msgstr "æé… --cruft 會將早於æ¤çš„物件標為éŽæœŸ" #: builtin/repack.c msgid "remove redundant packs, and run git-prune-packed" @@ -13484,7 +13629,7 @@ msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入 “%1$s†檔案" #: builtin/repack.c sequencer.c #, c-format msgid "could not unlink: %s" -msgstr "無法å–消連çµï¼š%s" +msgstr "無法刪除：%s" #: builtin/replace.c msgid "git replace [-f] <object> <replacement>" @@ -14209,6 +14354,10 @@ msgid "remote name" msgstr "é 端å稱" #: builtin/send-pack.c +msgid "push all refs" +msgstr "推é€æ‰€æœ‰å¼•ç”¨" + +#: builtin/send-pack.c msgid "use stateless RPC protocol" msgstr "使用無狀態的 RPC å”定" @@ -14462,9 +14611,11 @@ msgstr "顯示從標準輸入ä¸è®€å…¥çš„ä¸åœ¨æœ¬æ©Ÿç‰ˆæœ¬åº«ä¸çš„引用" #: builtin/sparse-checkout.c msgid "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" msgstr "" -"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +"git sparse-checkout (init | list | set | add | reapply | disable | check-" +"rules) [<options>]" #: builtin/sparse-checkout.c msgid "this worktree is not sparse" @@ -14605,6 +14756,27 @@ msgstr "å¿…é ˆåœ¨ç¨€ç–æ交æ‰èƒ½é‡æ–°å¥—用稀ç–æ¨£å¼ (sparsity pattern)" msgid "error while refreshing working directory" msgstr "é‡æ–°æ•´ç†å·¥ä½œç›®éŒ„時發生錯誤" +#: builtin/sparse-checkout.c +msgid "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" +msgstr "" +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-" +"file <file>]" + +#: builtin/sparse-checkout.c +msgid "terminate input and output files by a NUL character" +msgstr "使用 NUL å—元終æ¢è¼¸å…¥å’Œè¼¸å‡ºæª”案" + +#: builtin/sparse-checkout.c +msgid "when used with --rules-file interpret patterns as cone mode patterns" +msgstr "" +"與 --rules-file æé…使用時，將 patterns (模å¼) 解釋為 cone 模å¼çš„ patterns" + +#: builtin/sparse-checkout.c +msgid "use patterns in <file> instead of the current ones." +msgstr "使用 <file> ä¸çš„（而éžç›®å‰ä½¿ç”¨çš„）模å¼ã€‚" + #: builtin/stash.c msgid "git stash list [<log-options>]" msgstr "git stash list [<log-options>]" @@ -15562,11 +15734,6 @@ msgstr "「%sã€ä¸æ˜¯æœ‰æ•ˆçš„å模組å稱" msgid "git submodule--helper <command>" msgstr "git submodule--helper <command>" -#: builtin/submodule--helper.c git.c -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s ä¸æ”¯æ´ --super-prefix" - #: builtin/symbolic-ref.c msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <reason>] <name> <ref>" @@ -16470,6 +16637,11 @@ msgstr "core.fsyncMethod = batch ä¸æ”¯æ´æœ¬å¹³å°" #: bundle-uri.c #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "無法解æžå¥—ä»¶åŒ…æ¸…å–®éµ %s 的值 “%sâ€" + +#: bundle-uri.c +#, c-format msgid "bundle list at '%s' has no mode" msgstr "ä½æ–¼ “%s†的套件包清單沒有模å¼" @@ -16483,6 +16655,15 @@ msgstr "功能ä¸è¶³" #: bundle-uri.c #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "從 “%s†下載的檔案ä¸æ˜¯å¥—件包" + +#: bundle-uri.c +msgid "failed to store maximum creation token" +msgstr "無法儲å˜æœ€å¤§çš„建立權æ–" + +#: bundle-uri.c +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "無法è˜åˆ¥å¾ž URI “%s†å–回的套件包模å¼" @@ -16502,6 +16683,15 @@ msgid "file at URI '%s' is not a bundle or bundle list" msgstr "ä½æ–¼ URI “%s†的檔案ä¸æ˜¯å¥—件包或套件包清單" #: bundle-uri.c +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: éžé 期的引數：“%sâ€" + +#: bundle-uri.c +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: 引數後應該有一個 flush 包" + +#: bundle-uri.c msgid "bundle-uri: got an empty line" msgstr "bundle-uri: 收到空白列" @@ -16542,6 +16732,12 @@ msgid "need a repository to verify a bundle" msgstr "需è¦ç‰ˆæœ¬åº«é©—è‰å¥—件包" #: bundle.c +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "一些å‰ææ交å˜åœ¨æ–¼ç‰©ä»¶å„²å˜å€ï¼Œä½†æœªé€£æŽ¥åˆ°ç‰ˆæœ¬åº«çš„æ·å²è¨˜éŒ„" + +#: bundle.c #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -16739,7 +16935,7 @@ msgstr "å–å¾—å’Œè¨å®šç‰ˆæœ¬åº«æˆ–者全域é¸é …" #: command-list.h msgid "Count unpacked number of objects and their disk consumption" -msgstr "計算未打包物件的數é‡å’Œç£ç¢Ÿç©ºé–“å 用" +msgstr "計算未打包物件的數é‡å’Œç£ç¢Ÿç©ºé–“佔用" #: command-list.h msgid "Retrieve and store user credentials" @@ -18108,8 +18304,8 @@ msgid "bad zlib compression level %d" msgstr "錯誤的 zlib 壓縮級別 %d" #: config.c -msgid "core.commentChar should only be one character" -msgstr "core.commentChar 應該是一個å—å…ƒ" +msgid "core.commentChar should only be one ASCII character" +msgstr "core.commentChar 應該是一個 ASCII å—å…ƒ" #: config.c #, c-format @@ -18249,6 +18445,11 @@ msgstr "無效的å°ç¯€å稱：%s" #: config.c #, c-format +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" +msgstr "å› ç‚ºç¬¬ %2$<PRIuMAX> åˆ—ä¸ â€œ%1$s†的文å—列太長，故拒絕é‹ä½œ" + +#: config.c +#, c-format msgid "missing value for '%s'" msgstr "%s çš„å–值缺少" @@ -18315,12 +18516,12 @@ msgstr "伺æœå™¨æŒ‡å®šçš„「%sã€ç‰©ä»¶æ ¼å¼ç„¡æ•ˆ" #: connect.c #, c-format -msgid "invalid ls-refs response: %s" -msgstr "無效的 ls-refs 回應：%s" +msgid "error on bundle-uri response line %d: %s" +msgstr "在 bundle-uri 回應的第 %d 列發ç¾éŒ¯èª¤ï¼š%s" #: connect.c -msgid "expected flush after ref listing" -msgstr "在引用列表之後應該有一個 flush 包" +msgid "expected flush after bundle-uri listing" +msgstr "在 bundle-uri 清單後應該有一個 flush 包" #: connect.c msgid "expected response end packet after ref listing" @@ -18328,6 +18529,15 @@ msgstr "在引用列表後é 期è¦æœ‰å›žæ‡‰çµæŸå°åŒ…" #: connect.c #, c-format +msgid "invalid ls-refs response: %s" +msgstr "無效的 ls-refs 回應：%s" + +#: connect.c +msgid "expected flush after ref listing" +msgstr "在引用列表之後應該有一個 flush 包" + +#: connect.c +#, c-format msgid "protocol '%s' is not supported" msgstr "ä¸æ”¯æ´ '%s' å”定" @@ -18926,7 +19136,7 @@ msgstr "<åƒæ•¸1,åƒæ•¸2>..." #: diff.c msgid "" "output the distribution of relative amount of changes for each sub-directory" -msgstr "輸出æ¯å€‹å目錄相å°è®Šæ›´çš„分布" +msgstr "輸出æ¯å€‹å目錄相å°è®Šæ›´çš„分佈" #: diff.c msgid "synonym for --dirstat=cumulative" @@ -19039,6 +19249,10 @@ msgid "do not show any source or destination prefix" msgstr "ä¸é¡¯ç¤ºä»»ä½•ä¾†æºå’Œç›®çš„地å‰ç¶´" #: diff.c +msgid "use default prefixes a/ and b/" +msgstr "使用é è¨çš„å‰ç½®å稱 a/ å’Œ b/" + +#: diff.c msgid "show context between diff hunks up to the specified number of lines" msgstr "顯示指定行數的差異å€å¡Šé–“的上下文" @@ -19407,6 +19621,16 @@ msgstr "ä¸èƒ½å¾ž '%s' é·ç§» git 目錄到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "æ示：ç‰å¾…您的編輯器關閉檔案...%c" +#: editor.c sequencer.c wrapper.c +#, c-format +msgid "could not write to '%s'" +msgstr "ä¸èƒ½å¯«å…¥ '%s'" + +#: editor.c +#, c-format +msgid "could not edit '%s'" +msgstr "無法編輯 '%s'" + #: entry.c msgid "Filtering content" msgstr "éŽæ¿¾å…§å®¹" @@ -19727,16 +19951,14 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" #: git.c msgid "" @@ -19767,11 +19989,6 @@ msgstr "沒有為 --namespace æ供命å空間\n" #: git.c #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "沒有為 --super-prefix æä¾›å‰ç¶´\n" - -#: git.c -#, c-format msgid "-c expects a configuration string\n" msgstr "應為 -c æ供一個è¨å®šå—串\n" @@ -19782,6 +19999,11 @@ msgstr "未傳入è¨å®šéµè‡³ --config-env\n" #: git.c #, c-format +msgid "no attribute source given for --attr-source\n" +msgstr "沒有為 --attr-source æ供屬性來æº\n" + +#: git.c +#, c-format msgid "unknown option: %s\n" msgstr "未知é¸é …：%s\n" @@ -19904,8 +20126,13 @@ msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s" #: gpg-interface.c -msgid "gpg failed to sign the data" -msgstr "gpg 無法為資料簽å" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg 無法簽å資料：\n" +"%s" #: gpg-interface.c msgid "user.signingKey needs to be set for ssh signing" @@ -20566,7 +20793,7 @@ msgstr "" #. conflict in a submodule. The first argument is the submodule #. name, and the second argument is the abbreviated id of the #. commit that needs to be merged. For example: -#. - go to submodule (mysubmodule), and either merge commit abc1234" +#. - go to submodule (mysubmodule), and either merge commit abc1234" #. #: merge-ort.c #, c-format @@ -20755,7 +20982,7 @@ msgstr "é‡æ–°å‘½å" #: merge-recursive.c msgid "renamed" -msgstr "é‡æ–°å‘½å" +msgstr "å·²é‡æ–°å‘½å" #: merge-recursive.c #, c-format @@ -21250,6 +21477,11 @@ msgstr "鬆散物件 '%s' 後é¢æœ‰åžƒåœ¾è³‡æ–™" #: object-file.c #, c-format +msgid "unable to open loose object %s" +msgstr "無法打開鬆散物件 %s" + +#: object-file.c +#, c-format msgid "unable to parse %s header" msgstr "ç„¡æ³•è§£æž %s é 部" @@ -21269,8 +21501,8 @@ msgstr "%s 的標é éŽé•·ï¼Œè¶…出 %d ä½å…ƒçµ„" #: object-file.c #, c-format -msgid "failed to read object %s" -msgstr "讀å–物件 %s 失敗" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "鬆散物件 %s（儲å˜åœ¨ %s）已æ壞" #: object-file.c #, c-format @@ -21279,11 +21511,6 @@ msgstr "找ä¸åˆ° %2$s 的替代 %1$s" #: object-file.c #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "鬆散物件 %s（儲å˜åœ¨ %s）已æ壞" - -#: object-file.c -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包物件 %s（儲å˜åœ¨ %s）已æ壞" @@ -21298,10 +21525,6 @@ msgid "unable to set permission to '%s'" msgstr "無法為 '%s' è¨å®šæ¬Šé™" #: object-file.c -msgid "file write error" -msgstr "檔案寫錯誤" - -#: object-file.c msgid "error when closing loose object file" msgstr "關閉鬆散物件檔案時發生錯誤" @@ -21359,12 +21582,13 @@ msgid "cannot read object for %s" msgstr "ä¸èƒ½è®€å–物件 %s" #: object-file.c -msgid "corrupt commit" -msgstr "æ壞的æ交" +#, c-format +msgid "object fails fsck: %s" +msgstr "物件 fsck 失敗：%s" #: object-file.c -msgid "corrupt tag" -msgstr "æ壞的標籤" +msgid "refusing to create malformed object" +msgstr "æ‹’çµ•å»ºç«‹æ ¼å¼éŒ¯èª¤çš„物件" #: object-file.c #, c-format @@ -21433,7 +21657,7 @@ msgstr "%s [無效物件]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: #. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. "deadbeef commit 2021-01-01 - Some Commit Message" #. #: object-name.c #, c-format @@ -21443,7 +21667,7 @@ msgstr "%s æ交 %s - %s" #. TRANSLATORS: This is a line of ambiguous #. tag object output. E.g.: #. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. "deadbeef tag 2022-01-01 - Some Tag Message" #. * #. The second argument is the YYYY-MM-DD found #. in the tag. @@ -21460,7 +21684,7 @@ msgstr "%s 標籤 %s - %s" #. tag object output where we couldn't parse #. the tag itself. E.g.: #. * -#. "deadbeef [bad tag, could not parse it]" +#. "deadbeef [bad tag, could not parse it]" #. #: object-name.c #, c-format @@ -21676,11 +21900,6 @@ msgid "cannot fstat bitmap file" msgstr "無法 fstat ä½åœ–檔案" #: pack-bitmap.c -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "忽略多出來的ä½åœ–檔案：「%sã€" - -#: pack-bitmap.c msgid "checksum doesn't match in MIDX and bitmap" msgstr "總和檢查碼在 MIDX å’Œä½åœ–ä¸ç„¡ç¬¦åˆé …ç›®" @@ -21763,6 +21982,11 @@ msgstr "在「%2$sã€å°åŒ…，ä½ç§» %3$<PRIuMAX> 的地方找ä¸åˆ°ã€Œ%1$sã€" msgid "unable to get disk usage of '%s'" msgstr "無法å–得「%sã€çš„ç£ç¢Ÿç”¨é‡" +#: pack-bitmap.c +#, c-format +msgid "bitmap file '%s' has invalid checksum" +msgstr "“%s†ä½åœ–檔案的總和檢查碼無效" + #: pack-mtimes.c #, c-format msgid "mtimes file %s is too small" @@ -21813,6 +22037,15 @@ msgstr "倒排索引檔案 %s 有ä¸æ”¯æ´çš„版本 %<PRIu32>" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "倒排索引檔案 %s 有ä¸æ”¯æ´çš„雜湊 ID %<PRIu32>" +#: pack-revindex.c +msgid "invalid checksum" +msgstr "無效的總和檢查碼" + +#: pack-revindex.c +#, c-format +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>" +msgstr "%<PRIu64> ä½ç½®çš„修訂版索引 (rev-index) 無效：%<PRIu32> != %<PRIu32>" + #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "無法åŒæ™‚寫入和驗è‰å€’排索引" @@ -22007,6 +22240,10 @@ msgid "use <n> digits to display object names" msgstr "用 <n> ä½æ•¸å—顯示物件å稱" #: parse-options.h +msgid "prefixed path to initial superproject" +msgstr "åˆå§‹çˆ¶å°ˆæ¡ˆçš„å‰ç¶´è·¯å¾‘" + +#: parse-options.h msgid "how to strip spaces and #comments from message" msgstr "è¨å®šå¦‚何刪除æäº¤èªªæ˜Žè£¡çš„ç©ºæ ¼å’Œ #備註" @@ -22589,6 +22826,16 @@ msgstr "é ˜å…ˆ %d，è½å¾Œ %d" #: ref-filter.c #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) ä¸å–引數" + +#: ref-filter.c +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "無法è˜åˆ¥çš„ %%(%.*s) 引數：%s" + +#: ref-filter.c +#, c-format msgid "expected format: %%(color:<color>)" msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(color:<é¡è‰²>)" @@ -22609,26 +22856,6 @@ msgstr "期望整數值 refname:rstrip=%s" #: ref-filter.c #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "無法è˜åˆ¥çš„ %%(%s) åƒæ•¸ï¼š%s" - -#: ref-filter.c -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) ä¸å¸¶åƒæ•¸" - -#: ref-filter.c -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) ä¸å¸¶åƒæ•¸" - -#: ref-filter.c -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) ä¸å¸¶åƒæ•¸" - -#: ref-filter.c -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "é 期是 %%(trailers:key=<value>)" @@ -22649,11 +22876,6 @@ msgstr "%%(%2$s) ä¸çš„ '%1$s' é 期是æ£æ•¸å€¼" #: ref-filter.c #, c-format -msgid "unrecognized email option: %s" -msgstr "無法è˜åˆ¥çš„ email é¸é …：%s" - -#: ref-filter.c -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(align:<寬度>,<ä½ç½®>)" @@ -22669,13 +22891,18 @@ msgstr "無法è˜åˆ¥çš„寬度：%s" #: ref-filter.c #, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "無法è˜åˆ¥çš„ %%(%s) åƒæ•¸ï¼š%s" + +#: ref-filter.c +#, c-format msgid "positive width expected with the %%(align) atom" msgstr "å…ƒç´ %%(align) 需è¦ä¸€å€‹æ£æ•¸çš„寬度" #: ref-filter.c #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) 未å–引數" +msgid "expected format: %%(ahead-behind:<committish>)" +msgstr "é æœŸæ ¼å¼ï¼š%%(ahead-behind:<committish>)" #: ref-filter.c #, c-format @@ -23413,7 +23640,7 @@ msgstr "使用之å‰çš„解決方案解決 '%s'。" #: rerere.c #, c-format msgid "cannot unlink stray '%s'" -msgstr "ä¸èƒ½åˆªé™¤ stray '%s'" +msgstr "無法刪除失散檔案 “%sâ€" #: rerere.c #, c-format @@ -23432,11 +23659,6 @@ msgstr "沒有為 '%s' 記憶的解決方案" #: rerere.c #, c-format -msgid "cannot unlink '%s'" -msgstr "ä¸èƒ½åˆªé™¤ '%s'" - -#: rerere.c -#, c-format msgid "Updated preimage for '%s'" msgstr "已為 '%s' æ›´æ–° preimage" @@ -23851,11 +24073,6 @@ msgstr "" msgid "could not lock '%s'" msgstr "ä¸èƒ½éŽ–定 '%s'" -#: sequencer.c strbuf.c wrapper.c -#, c-format -msgid "could not write to '%s'" -msgstr "ä¸èƒ½å¯«å…¥ '%s'" - #: sequencer.c #, c-format msgid "could not write eol to '%s'" @@ -24185,6 +24402,26 @@ msgstr "git %s：無法é‡æ–°æ•´ç†ç´¢å¼•" #: sequencer.c #, c-format +msgid "'%s' is not a valid label" +msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆçš„標籤" + +#: sequencer.c +#, c-format +msgid "'%s' is not a valid refname" +msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆçš„引用å稱" + +#: sequencer.c +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "update-ref 需è¦å®Œå…¨é™å®šçš„引用å稱，比如：refs/heads/%s" + +#: sequencer.c +#, c-format +msgid "invalid command '%.*s'" +msgstr "無效的命令 “%.*sâ€" + +#: sequencer.c +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s ä¸æŽ¥å—åƒæ•¸ï¼š'%s'" @@ -24274,10 +24511,6 @@ msgid "could not create sequencer directory '%s'" msgstr "ä¸èƒ½å»ºç«‹åºåˆ—目錄 '%s'" #: sequencer.c -msgid "could not lock HEAD" -msgstr "ä¸èƒ½éŽ–定 HEAD" - -#: sequencer.c msgid "no cherry-pick or revert in progress" msgstr "æ€é¸æˆ–還原動作並未進行" @@ -24392,22 +24625,22 @@ msgstr "" "\n" #: sequencer.c -msgid "and made changes to the index and/or the working tree\n" -msgstr "並且修改索引和/或工作å€\n" +msgid "and made changes to the index and/or the working tree.\n" +msgstr "並且更改索引和（或）工作å€ã€‚\n" #: sequencer.c #, c-format msgid "" "execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" +"but left changes to the index and/or the working tree.\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "執行æˆåŠŸï¼š%s\n" -"但是在索引和/或工作å€ä¸å˜åœ¨è®Šæ›´\n" -"æ交或貯å˜ä¿®æ”¹ï¼Œç„¶å¾ŒåŸ·è¡Œ\n" +"但是在索引和（或）工作å€ä¸å˜åœ¨è®Šæ›´ã€‚\n" +"è«‹æ交或貯å˜ä¿®æ”¹ï¼Œç„¶å¾ŒåŸ·è¡Œ\n" "\n" " git rebase --continue\n" "\n" @@ -24924,11 +25157,6 @@ msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u ä½å…ƒçµ„/秒" -#: strbuf.c -#, c-format -msgid "could not edit '%s'" -msgstr "無法編輯 '%s'" - #: submodule-config.c #, c-format msgid "ignoring suspicious submodule name: %s" @@ -25139,6 +25367,19 @@ msgstr "ls-tree 返回未知返回值 %d" msgid "failed to lstat '%s'" msgstr "無法 lstat “%sâ€" +#: t/helper/test-bundle-uri.c +msgid "no remote configured to get bundle URIs from" +msgstr "沒有è¨å®šå¯ä»¥ç”¨ä¾†å–得套件包 URIs çš„é 端" + +#: t/helper/test-bundle-uri.c +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "“%s†é 端未è¨å®š URL" + +#: t/helper/test-bundle-uri.c +msgid "could not get the bundle-uri list" +msgstr "無法å–å¾— bundle-uri 清單" + #: t/helper/test-cache-tree.c msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <options> (control|prime|update)" @@ -25575,6 +25816,14 @@ msgstr "æ£åœ¨çµ‚æ¢ã€‚" msgid "failed to push all needed submodules" msgstr "ä¸èƒ½æŽ¨é€å…¨éƒ¨éœ€è¦çš„å模組" +#: transport.c +msgid "bundle-uri operation not supported by protocol" +msgstr "通訊å”定ä¸æ”¯æ´ bundle-uri 動作" + +#: transport.c +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "無法å–得伺æœå™¨å…¬ä½ˆçš„ bundle-uri 清單" + #: tree-walk.c msgid "too-short tree object" msgstr "太çŸçš„樹狀物件" @@ -26489,12 +26738,20 @@ msgstr "忽略的檔案" #: wt-status.c #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能æ高速度，\n" -"但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ–°å¢žæ–°æª”案（åƒè¦‹ 'git help status'）。" +"列舉未追蹤檔案花費 %.2f 秒，\n" +"ä¸éŽå·²ç¶“å¿«å–çµæžœï¼Œä¹‹å¾ŒåŸ·è¡Œçš„速度或許能比較快。" + +#: wt-status.c +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "列舉未追蹤檔案花費 %.2f 秒。" + +#: wt-status.c +msgid "See 'git help status' for information on how to improve this." +msgstr "è«‹åƒé–± “git help status†深入了解如何改善。" #: wt-status.c #, c-format @@ -26670,297 +26927,6 @@ msgstr "您需è¦åœ¨å·¥ä½œå€çš„é ‚ç´šç›®éŒ„ä¸åŸ·è¡Œé€™å€‹æŒ‡ä»¤ã€‚" msgid "Unable to determine absolute path of git directory" msgstr "ä¸èƒ½ç¢ºå®š git 目錄的絕å°è·¯å¾‘" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %12s %s" - -#: git-add--interactive.perl -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "建立了 %d 個路徑\n" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "如果修補檔能完全套用，編輯å€å¡Šå°‡ç«‹å³æ¨™è¨˜ç‚ºæš«å˜ã€‚" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "如果修補檔能完全套用，編輯å€å¡Šå°‡ç«‹å³æ¨™è¨˜ç‚ºè²¯å˜ã€‚" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "如果修補檔能完全套用，編輯å€å¡Šå°‡ç«‹å³æ¨™è¨˜ç‚ºæœªæš«å˜ã€‚" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "如果修補檔能完全套用，編輯å€å¡Šå°‡ç«‹å³æ¨™è¨˜ç‚ºå¥—用。" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "如果修補檔能完全套用，編輯塊將立å³æ¨™è¨˜ç‚ºæ¨æ£„。" - -#: git-add--interactive.perl -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "為寫入開啟å€å¡Šç·¨è¼¯æª”案失敗：%s" - -#: git-add--interactive.perl -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"è¦åˆªé™¤ '%s' 開始的行，使其æˆç‚º ' ' 開始的行（上下文）。\n" -"è¦åˆªé™¤ '%s' 開始的行，刪除它們。\n" -"以 %s 開始的行將被刪除。\n" - -#: git-add--interactive.perl -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "無法讀å–å€å¡Šç·¨è¼¯æª”案：%s" - -#: git-add--interactive.perl -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" -"y - æš«å˜æ¤å€å¡Š\n" -"n - ä¸è¦æš«å˜æ¤å€å¡Š\n" -"q - 離開。ä¸æš«å˜æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" -"a - æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -"d - ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" - -#: git-add--interactive.perl -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - 貯å˜æ¤å€å¡Š\n" -"n - ä¸è¦è²¯å˜æ¤å€å¡Š\n" -"q - 離開。ä¸è²¯å˜æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" -"a - 貯å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -"d - ä¸è²¯å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" - -#: git-add--interactive.perl -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" -"y - ä¸æš«å˜æ¤å€å¡Š\n" -"n - ä¸è¦ä¸æš«å˜æ¤å€å¡Š\n" -"q - 離開。ä¸è¦ä¸æš«å˜æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" -"a - ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -"d - ä¸è¦ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引ä¸å¥—用æ¤å€å¡Š\n" -"n - ä¸è¦åœ¨ç´¢å¼•ä¸å¥—用æ¤å€å¡Š\n" -"q - 離開。ä¸è¦å¥—用æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" -"a - 套用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -"d - ä¸è¦å¥—用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" - -#: git-add--interactive.perl -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - 在工作å€ä¸æ¨æ£„æ¤å€å¡Š\n" -"n - ä¸è¦åœ¨å·¥ä½œå€ä¸æ¨æ£„æ¤å€å¡Š\n" -"q - 離開。ä¸è¦æ¨æ£„æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" -"a - æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -"d - ä¸è¦æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" - -#: git-add--interactive.perl -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引和工作å€ä¸æ¨æ£„æ¤å€å¡Š\n" -"n - ä¸è¦åœ¨ç´¢å¼•å’Œå·¥ä½œå€ä¸æ¨æ£„æ¤å€å¡Š\n" -"q - 離開。ä¸è¦æ¨æ£„æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" -"a - æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -"d - ä¸è¦æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引和工作å€ä¸å¥—用æ¤å€å¡Š\n" -"n - ä¸è¦åœ¨ç´¢å¼•å’Œå·¥ä½œå€ä¸å¥—用æ¤å€å¡Š\n" -"q - 離開。ä¸è¦å¥—用æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" -"a - 套用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -"d - ä¸è¦å¥—用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在工作å€ä¸å¥—用æ¤å€å¡Š\n" -"n - ä¸è¦åœ¨å·¥ä½œå€ä¸å¥—用æ¤å€å¡Š\n" -"q - 離開。ä¸è¦å¥—用æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" -"a - 套用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" -"d - ä¸è¦å¥—用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" - -#: git-add--interactive.perl -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - é¸æ“‡è·³è½‰åˆ°ä¸€å€‹å€å¡Š\n" -"/ - 尋找和æ供常è¦è¡¨ç¤ºå¼ç¬¦åˆçš„å€å¡Š\n" -"j - ç¶æŒæ¤å€å¡Šæœªæ±ºç‹€æ…‹ï¼Œæª¢è¦–下一個未決定å€å¡Š\n" -"J - ç¶æŒæ¤å€å¡Šæœªæ±ºç‹€æ…‹ï¼Œæª¢è¦–下一個å€å¡Š\n" -"k - ç¶æŒæ¤å€å¡Šæœªæ±ºç‹€æ…‹ï¼Œæª¢è¦–上一個未決定å€å¡Š\n" -"K - ç¶æŒæ¤å€å¡Šæœªæ±ºç‹€æ…‹ï¼Œæª¢è¦–上一個å€å¡Š\n" -"s - 分割目å‰å€å¡Šç‚ºæ›´å°çš„å€å¡Š\n" -"e - 手動編輯目å‰å€å¡Š\n" -"? - 顯示說明\n" - -#: git-add--interactive.perl -msgid "The selected hunks do not apply to the index!\n" -msgstr "é¸å–å€å¡Šä¸èƒ½å¥—用到索引ï¼\n" - -#: git-add--interactive.perl -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "忽略未套用的：%s\n" - -#: git-add--interactive.perl -msgid "No other hunks to goto\n" -msgstr "沒有其它å¯ä¾›è·³è½‰çš„å€å¡Š\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "無效數å—：'%s'\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "å°ä¸èµ·ï¼Œåªæœ‰ %d 個å¯ç”¨å€å¡Šã€‚\n" - -#: git-add--interactive.perl -msgid "No other hunks to search\n" -msgstr "沒有其它å¯ä¾›å°‹æ‰¾çš„å€å¡Š\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "錯誤的常è¦è¡¨ç¤ºå¼ %s：%s\n" - -#: git-add--interactive.perl -msgid "No hunk matches the given pattern\n" -msgstr "沒有和æ供模å¼ç›¸ç¬¦åˆçš„å€å¡Š\n" - -#: git-add--interactive.perl -msgid "No previous hunk\n" -msgstr "沒有上一個å€å¡Š\n" - -#: git-add--interactive.perl -msgid "No next hunk\n" -msgstr "沒有下一個å€å¡Š\n" - -#: git-add--interactive.perl -msgid "Sorry, cannot split this hunk\n" -msgstr "å°ä¸èµ·ï¼Œä¸èƒ½åˆ†å‰²é€™å€‹å€å¡Š\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "分割為 %d 塊。\n" - -#: git-add--interactive.perl -msgid "Sorry, cannot edit this hunk\n" -msgstr "å°ä¸èµ·ï¼Œä¸èƒ½ç·¨è¼¯é€™å€‹å€å¡Š\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - 顯示å«è®Šæ›´çš„路徑\n" -"update - 新增工作å€ç‹€æ…‹è‡³æš«å˜åˆ—表\n" -"revert - 還原修改的暫å˜é›†è‡³ HEAD 版本\n" -"patch - 挑é¸å€å¡Šä¸¦ä¸”有é¸æ“‡åœ°æ›´æ–°\n" -"diff - 顯示 HEAD 和索引間差異\n" -"add untracked - 新增未追蹤檔案的內容至暫å˜åˆ—表\n" - -#: git-add--interactive.perl -msgid "missing --" -msgstr "缺少 --" - -#: git-add--interactive.perl -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "未知的 --patch 模å¼ï¼š%s" - -#: git-add--interactive.perl -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "無效的åƒæ•¸ %s，期望是 --" - #: git-send-email.perl msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本機時間和 GMT 有ä¸åˆ°ä¸€åˆ†é˜é–“éš”\n" @@ -27282,8 +27248,8 @@ msgstr "(%s) ä¸èƒ½åŸ·è¡Œ '%s'" #: git-send-email.perl #, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) 新增 %s: %s 自：'%s'\n" +msgid "(%s) Malformed output from '%s'" +msgstr "(%s) 從 “%sâ€ è®€åˆ°æ ¼å¼éŒ¯èª¤çš„輸出" #: git-send-email.perl #, perl-format @@ -27291,6 +27257,11 @@ msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 無法關閉管é“至 '%s'" #: git-send-email.perl +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) 新增 %s: %s 自：'%s'\n" + +#: git-send-email.perl msgid "cannot send message as 7bit" msgstr "ä¸èƒ½ä»¥ 7bit å½¢å¼å‚³é€è¨Šæ¯" @@ -27334,6 +27305,356 @@ msgstr "ç•¥éŽ %s å«å‚™ä»½å¾Œç¶´ '%s'。\n" msgid "Do you really want to send %s? [y|N]: " msgstr "您真的è¦å‚³é€ %s？[y|N]： " +#~ msgid "current working directory is untracked" +#~ msgstr "尚未追蹤目å‰çš„工作目錄" + +#~ msgid "cannot use --contents with final commit object name" +#~ msgstr "無法將 --contents 與最終的æ交物件å稱共用" + +#~ msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +#~ msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" + +#~ msgid "won't bisect on cg-seek'ed tree" +#~ msgstr "ä¸æœƒåœ¨åšäº† cg-seek 的樹狀物件上進行二分æœå°‹" + +#~ msgid "--bisect-terms requires 0 or 1 argument" +#~ msgstr "--bisect-terms éœ€è¦ 0 或 1 個引數" + +#~ msgid "--bisect-next requires 0 arguments" +#~ msgstr "--bisect-next éœ€è¦ 0 個引數" + +#~ msgid "--bisect-log requires 0 arguments" +#~ msgstr "--bisect-log éœ€è¦ 0 個引數" + +#~ msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +#~ msgstr "git env--helper --type=[bool|ulong] <é¸é …> <環境變數>" + +#~ msgid "default for git_env_*(...) to fall back on" +#~ msgstr "git_env_*(...) çš„é è¨å€¼" + +#~ msgid "be quiet only use git_env_*() value as exit code" +#~ msgstr "安éœæ¨¡å¼ï¼Œåªä½¿ç”¨ git_env_*() 的值作為離開碼" + +#, c-format +#~ msgid "" +#~ "option `--default' expects a boolean value with `--type=bool`, not `%s`" +#~ msgstr "é¸é …「--defaultã€é 期收到「--type=boolã€çš„布林值，而éžã€Œ%sã€" + +#, c-format +#~ msgid "" +#~ "option `--default' expects an unsigned long value with `--type=ulong`, " +#~ "not `%s`" +#~ msgstr "" +#~ "é¸é …「--defaultã€é 期收到「--type=ulongã€çš„無號 long 數值，而éžã€Œ%sã€" + +#~ msgid "please commit or stash them." +#~ msgstr "è«‹æ交或貯å˜å®ƒå€‘。" + +#, c-format +#~ msgid "Unknown mode: %s" +#~ msgstr "未知模å¼ï¼š%s" + +#, c-format +#~ msgid "%s doesn't support --super-prefix" +#~ msgstr "%s ä¸æ”¯æ´ --super-prefix" + +#, c-format +#~ msgid "no prefix given for --super-prefix\n" +#~ msgstr "沒有為 --super-prefix æä¾›å‰ç¶´\n" + +#, c-format +#~ msgid "failed to read object %s" +#~ msgstr "讀å–物件 %s 失敗" + +#~ msgid "file write error" +#~ msgstr "檔案寫錯誤" + +#~ msgid "corrupt commit" +#~ msgstr "æ壞的æ交" + +#~ msgid "corrupt tag" +#~ msgstr "æ壞的標籤" + +#, c-format +#~ msgid "%%(objecttype) does not take arguments" +#~ msgstr "%%(objecttype) ä¸å¸¶åƒæ•¸" + +#, c-format +#~ msgid "%%(deltabase) does not take arguments" +#~ msgstr "%%(deltabase) ä¸å¸¶åƒæ•¸" + +#, c-format +#~ msgid "%%(body) does not take arguments" +#~ msgstr "%%(body) ä¸å¸¶åƒæ•¸" + +#, c-format +#~ msgid "unrecognized email option: %s" +#~ msgstr "無法è˜åˆ¥çš„ email é¸é …：%s" + +#~ msgid "could not lock HEAD" +#~ msgstr "ä¸èƒ½éŽ–定 HEAD" + +#, c-format +#~ msgid "" +#~ "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +#~ "may speed it up, but you have to be careful not to forget to add\n" +#~ "new files yourself (see 'git help status')." +#~ msgstr "" +#~ "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能æ高速度，\n" +#~ "但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ–°å¢žæ–°æª”案（åƒè¦‹ 'git help status'）。" + +#, perl-format +#~ msgid "%12s %12s %s" +#~ msgstr "%12s %12s %s" + +#, perl-format +#~ msgid "touched %d path\n" +#~ msgid_plural "touched %d paths\n" +#~ msgstr[0] "建立了 %d 個路徑\n" + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for staging." +#~ msgstr "如果修補檔能完全套用，編輯å€å¡Šå°‡ç«‹å³æ¨™è¨˜ç‚ºæš«å˜ã€‚" + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for stashing." +#~ msgstr "如果修補檔能完全套用，編輯å€å¡Šå°‡ç«‹å³æ¨™è¨˜ç‚ºè²¯å˜ã€‚" + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for unstaging." +#~ msgstr "如果修補檔能完全套用，編輯å€å¡Šå°‡ç«‹å³æ¨™è¨˜ç‚ºæœªæš«å˜ã€‚" + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for applying." +#~ msgstr "如果修補檔能完全套用，編輯å€å¡Šå°‡ç«‹å³æ¨™è¨˜ç‚ºå¥—用。" + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for discarding." +#~ msgstr "如果修補檔能完全套用，編輯塊將立å³æ¨™è¨˜ç‚ºæ¨æ£„。" + +#, perl-format +#~ msgid "failed to open hunk edit file for writing: %s" +#~ msgstr "為寫入開啟å€å¡Šç·¨è¼¯æª”案失敗：%s" + +#, perl-format +#~ msgid "" +#~ "---\n" +#~ "To remove '%s' lines, make them ' ' lines (context).\n" +#~ "To remove '%s' lines, delete them.\n" +#~ "Lines starting with %s will be removed.\n" +#~ msgstr "" +#~ "---\n" +#~ "è¦åˆªé™¤ '%s' 開始的行，使其æˆç‚º ' ' 開始的行（上下文）。\n" +#~ "è¦åˆªé™¤ '%s' 開始的行，刪除它們。\n" +#~ "以 %s 開始的行將被刪除。\n" + +#, perl-format +#~ msgid "failed to open hunk edit file for reading: %s" +#~ msgstr "無法讀å–å€å¡Šç·¨è¼¯æª”案：%s" + +#~ msgid "" +#~ "y - stage this hunk\n" +#~ "n - do not stage this hunk\n" +#~ "q - quit; do not stage this hunk or any of the remaining ones\n" +#~ "a - stage this hunk and all later hunks in the file\n" +#~ "d - do not stage this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - æš«å˜æ¤å€å¡Š\n" +#~ "n - ä¸è¦æš«å˜æ¤å€å¡Š\n" +#~ "q - 離開。ä¸æš«å˜æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" +#~ "a - æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" +#~ "d - ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" + +#~ msgid "" +#~ "y - stash this hunk\n" +#~ "n - do not stash this hunk\n" +#~ "q - quit; do not stash this hunk or any of the remaining ones\n" +#~ "a - stash this hunk and all later hunks in the file\n" +#~ "d - do not stash this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - 貯å˜æ¤å€å¡Š\n" +#~ "n - ä¸è¦è²¯å˜æ¤å€å¡Š\n" +#~ "q - 離開。ä¸è²¯å˜æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" +#~ "a - 貯å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" +#~ "d - ä¸è²¯å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" + +#~ msgid "" +#~ "y - unstage this hunk\n" +#~ "n - do not unstage this hunk\n" +#~ "q - quit; do not unstage this hunk or any of the remaining ones\n" +#~ "a - unstage this hunk and all later hunks in the file\n" +#~ "d - do not unstage this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - ä¸æš«å˜æ¤å€å¡Š\n" +#~ "n - ä¸è¦ä¸æš«å˜æ¤å€å¡Š\n" +#~ "q - 離開。ä¸è¦ä¸æš«å˜æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" +#~ "a - ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" +#~ "d - ä¸è¦ä¸æš«å˜æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" + +#~ msgid "" +#~ "y - apply this hunk to index\n" +#~ "n - do not apply this hunk to index\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - 在索引ä¸å¥—用æ¤å€å¡Š\n" +#~ "n - ä¸è¦åœ¨ç´¢å¼•ä¸å¥—用æ¤å€å¡Š\n" +#~ "q - 離開。ä¸è¦å¥—用æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" +#~ "a - 套用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" +#~ "d - ä¸è¦å¥—用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" + +#~ msgid "" +#~ "y - discard this hunk from worktree\n" +#~ "n - do not discard this hunk from worktree\n" +#~ "q - quit; do not discard this hunk or any of the remaining ones\n" +#~ "a - discard this hunk and all later hunks in the file\n" +#~ "d - do not discard this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - 在工作å€ä¸æ¨æ£„æ¤å€å¡Š\n" +#~ "n - ä¸è¦åœ¨å·¥ä½œå€ä¸æ¨æ£„æ¤å€å¡Š\n" +#~ "q - 離開。ä¸è¦æ¨æ£„æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" +#~ "a - æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" +#~ "d - ä¸è¦æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" + +#~ msgid "" +#~ "y - discard this hunk from index and worktree\n" +#~ "n - do not discard this hunk from index and worktree\n" +#~ "q - quit; do not discard this hunk or any of the remaining ones\n" +#~ "a - discard this hunk and all later hunks in the file\n" +#~ "d - do not discard this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - 在索引和工作å€ä¸æ¨æ£„æ¤å€å¡Š\n" +#~ "n - ä¸è¦åœ¨ç´¢å¼•å’Œå·¥ä½œå€ä¸æ¨æ£„æ¤å€å¡Š\n" +#~ "q - 離開。ä¸è¦æ¨æ£„æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" +#~ "a - æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" +#~ "d - ä¸è¦æ¨æ£„æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" + +#~ msgid "" +#~ "y - apply this hunk to index and worktree\n" +#~ "n - do not apply this hunk to index and worktree\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - 在索引和工作å€ä¸å¥—用æ¤å€å¡Š\n" +#~ "n - ä¸è¦åœ¨ç´¢å¼•å’Œå·¥ä½œå€ä¸å¥—用æ¤å€å¡Š\n" +#~ "q - 離開。ä¸è¦å¥—用æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" +#~ "a - 套用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" +#~ "d - ä¸è¦å¥—用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" + +#~ msgid "" +#~ "y - apply this hunk to worktree\n" +#~ "n - do not apply this hunk to worktree\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - 在工作å€ä¸å¥—用æ¤å€å¡Š\n" +#~ "n - ä¸è¦åœ¨å·¥ä½œå€ä¸å¥—用æ¤å€å¡Š\n" +#~ "q - 離開。ä¸è¦å¥—用æ¤å€å¡ŠåŠå¾Œé¢çš„全部å€å¡Š\n" +#~ "a - 套用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š\n" +#~ "d - ä¸è¦å¥—用æ¤å€å¡Šå’Œæœ¬æª”案ä¸å¾Œé¢çš„全部å€å¡Š" + +#~ msgid "" +#~ "g - select a hunk to go to\n" +#~ "/ - search for a hunk matching the given regex\n" +#~ "j - leave this hunk undecided, see next undecided hunk\n" +#~ "J - leave this hunk undecided, see next hunk\n" +#~ "k - leave this hunk undecided, see previous undecided hunk\n" +#~ "K - leave this hunk undecided, see previous hunk\n" +#~ "s - split the current hunk into smaller hunks\n" +#~ "e - manually edit the current hunk\n" +#~ "? - print help\n" +#~ msgstr "" +#~ "g - é¸æ“‡è·³è½‰åˆ°ä¸€å€‹å€å¡Š\n" +#~ "/ - 尋找和æ供常è¦è¡¨ç¤ºå¼ç¬¦åˆçš„å€å¡Š\n" +#~ "j - ç¶æŒæ¤å€å¡Šæœªæ±ºç‹€æ…‹ï¼Œæª¢è¦–下一個未決定å€å¡Š\n" +#~ "J - ç¶æŒæ¤å€å¡Šæœªæ±ºç‹€æ…‹ï¼Œæª¢è¦–下一個å€å¡Š\n" +#~ "k - ç¶æŒæ¤å€å¡Šæœªæ±ºç‹€æ…‹ï¼Œæª¢è¦–上一個未決定å€å¡Š\n" +#~ "K - ç¶æŒæ¤å€å¡Šæœªæ±ºç‹€æ…‹ï¼Œæª¢è¦–上一個å€å¡Š\n" +#~ "s - 分割目å‰å€å¡Šç‚ºæ›´å°çš„å€å¡Š\n" +#~ "e - 手動編輯目å‰å€å¡Š\n" +#~ "? - 顯示說明\n" + +#~ msgid "The selected hunks do not apply to the index!\n" +#~ msgstr "é¸å–å€å¡Šä¸èƒ½å¥—用到索引ï¼\n" + +#, perl-format +#~ msgid "ignoring unmerged: %s\n" +#~ msgstr "忽略未套用的：%s\n" + +#~ msgid "No other hunks to goto\n" +#~ msgstr "沒有其它å¯ä¾›è·³è½‰çš„å€å¡Š\n" + +#, perl-format +#~ msgid "Invalid number: '%s'\n" +#~ msgstr "無效數å—：'%s'\n" + +#, perl-format +#~ msgid "Sorry, only %d hunk available.\n" +#~ msgid_plural "Sorry, only %d hunks available.\n" +#~ msgstr[0] "å°ä¸èµ·ï¼Œåªæœ‰ %d 個å¯ç”¨å€å¡Šã€‚\n" + +#~ msgid "No other hunks to search\n" +#~ msgstr "沒有其它å¯ä¾›å°‹æ‰¾çš„å€å¡Š\n" + +#, perl-format +#~ msgid "Malformed search regexp %s: %s\n" +#~ msgstr "錯誤的常è¦è¡¨ç¤ºå¼ %s：%s\n" + +#~ msgid "No hunk matches the given pattern\n" +#~ msgstr "沒有和æ供模å¼ç›¸ç¬¦åˆçš„å€å¡Š\n" + +#~ msgid "No previous hunk\n" +#~ msgstr "沒有上一個å€å¡Š\n" + +#~ msgid "No next hunk\n" +#~ msgstr "沒有下一個å€å¡Š\n" + +#~ msgid "Sorry, cannot split this hunk\n" +#~ msgstr "å°ä¸èµ·ï¼Œä¸èƒ½åˆ†å‰²é€™å€‹å€å¡Š\n" + +#, perl-format +#~ msgid "Split into %d hunk.\n" +#~ msgid_plural "Split into %d hunks.\n" +#~ msgstr[0] "分割為 %d 塊。\n" + +#~ msgid "Sorry, cannot edit this hunk\n" +#~ msgstr "å°ä¸èµ·ï¼Œä¸èƒ½ç·¨è¼¯é€™å€‹å€å¡Š\n" + +#~ msgid "" +#~ "status - show paths with changes\n" +#~ "update - add working tree state to the staged set of changes\n" +#~ "revert - revert staged set of changes back to the HEAD version\n" +#~ "patch - pick hunks and update selectively\n" +#~ "diff - view diff between HEAD and index\n" +#~ "add untracked - add contents of untracked files to the staged set of " +#~ "changes\n" +#~ msgstr "" +#~ "status - 顯示å«è®Šæ›´çš„路徑\n" +#~ "update - 新增工作å€ç‹€æ…‹è‡³æš«å˜åˆ—表\n" +#~ "revert - 還原修改的暫å˜é›†è‡³ HEAD 版本\n" +#~ "patch - 挑é¸å€å¡Šä¸¦ä¸”有é¸æ“‡åœ°æ›´æ–°\n" +#~ "diff - 顯示 HEAD 和索引間差異\n" +#~ "add untracked - 新增未追蹤檔案的內容至暫å˜åˆ—表\n" + +#~ msgid "missing --" +#~ msgstr "缺少 --" + +#, perl-format +#~ msgid "unknown --patch mode: %s" +#~ msgstr "未知的 --patch 模å¼ï¼š%s" + +#, perl-format +#~ msgid "invalid argument %s, expecting --" +#~ msgstr "無效的åƒæ•¸ %s，期望是 --" + #, c-format #~ msgid "unable to normalize object directory: %s" #~ msgstr "無法è¦ç¯„化物件目錄: %s" diff --git a/run-command.c b/run-command.c index d4247d5fcc..60c9419866 100644 --- a/run-command.c +++ b/run-command.c @@ -16,6 +16,7 @@ #include "packfile.h" #include "hook.h" #include "compat/nonblock.h" +#include "alloc.h" void child_process_init(struct child_process *child) { diff --git a/sequencer.c b/sequencer.c index b553b49fbb..bceb6abcb6 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2477,7 +2477,6 @@ void todo_list_release(struct todo_list *todo_list) static struct todo_item *append_new_todo(struct todo_list *todo_list) { ALLOC_GROW(todo_list->items, todo_list->nr + 1, todo_list->alloc); - todo_list->total_nr++; return todo_list->items + todo_list->nr++; } @@ -2668,7 +2667,7 @@ int todo_list_parse_insn_buffer(struct repository *r, char *buf, char *p = buf, *next_p; int i, res = 0, fixup_okay = file_exists(rebase_path_done()); - todo_list->current = todo_list->nr = 0; + todo_list->current = todo_list->nr = todo_list->total_nr = 0; for (i = 1; *p; i++, p = next_p) { char *eol = strchrnul(p, '\n'); @@ -2689,6 +2688,9 @@ int todo_list_parse_insn_buffer(struct repository *r, char *buf, item->commit = NULL; } + if (item->command != TODO_COMMENT) + todo_list->total_nr++; + if (fixup_okay) ; /* do nothing */ else if (is_fixup(item->command)) @@ -4270,7 +4272,7 @@ void todo_list_filter_update_refs(struct repository *r, if (!is_null_oid(&rec->after)) continue; - for (j = 0; !found && j < todo_list->total_nr; j++) { + for (j = 0; !found && j < todo_list->nr; j++) { struct todo_item *item = &todo_list->items[j]; const char *arg = todo_list->buf.buf + item->arg_offset; @@ -4300,7 +4302,7 @@ void todo_list_filter_update_refs(struct repository *r, * For each todo_item, check if its ref is in the update_refs list. * If not, then add it as an un-updated ref. */ - for (i = 0; i < todo_list->total_nr; i++) { + for (i = 0; i < todo_list->nr; i++) { struct todo_item *item = &todo_list->items[i]; const char *arg = todo_list->buf.buf + item->arg_offset; int j, found = 0; @@ -6148,7 +6150,8 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla todo_list_to_strbuf(r, &new_todo, &buf2, -1, 0); strbuf_swap(&new_todo.buf, &buf2); strbuf_release(&buf2); - new_todo.total_nr -= new_todo.nr; + /* Nothing is done yet, and we're reparsing, so let's reset the count */ + new_todo.total_nr = 0; if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) < 0) BUG("invalid todo list after expanding IDs:\n%s", new_todo.buf.buf); @@ -1352,6 +1352,7 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir, } if (is_git_directory(dir->buf)) { + trace2_data_string("setup", NULL, "implicit-bare-repository", dir->buf); if (get_allowed_bare_repo() == ALLOWED_BARE_REPO_EXPLICIT) return GIT_DIR_DISALLOWED_BARE; if (!ensure_valid_ownership(NULL, NULL, dir->buf, report)) diff --git a/t/lib-diff-alternative.sh b/t/lib-diff-alternative.sh index a8f5d3274a..c4dc2d46dc 100644 --- a/t/lib-diff-alternative.sh +++ b/t/lib-diff-alternative.sh @@ -112,15 +112,36 @@ EOF STRATEGY=$1 - test_expect_success "$STRATEGY diff from attributes" ' + test_expect_success "setup attributes files for tests with $STRATEGY" ' + git checkout -b master && echo "file* diff=driver" >.gitattributes && - git config diff.driver.algorithm "$STRATEGY" && - test_must_fail git diff --no-index file1 file2 > output && - cat expect && - cat output && + git add file1 file2 .gitattributes && + git commit -m "adding files" && + git checkout -b branchA && + echo "file* diff=driverA" >.gitattributes && + git add .gitattributes && + git commit -m "adding driverA as diff driver" && + git checkout master && + git clone --bare --no-local . bare.git + ' + + test_expect_success "$STRATEGY diff from attributes" ' + test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output && test_cmp expect output ' + test_expect_success "diff from attributes with bare repo with source" ' + git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \ + -c diff.driverA.algorithm=$STRATEGY \ + diff HEAD:file1 HEAD:file2 >output && + test_cmp expect output + ' + + test_expect_success "diff from attributes with bare repo with invalid source" ' + test_must_fail git -C bare.git --attr-source=invalid-branch diff \ + HEAD:file1 HEAD:file2 + ' + test_expect_success "$STRATEGY diff from attributes has valid diffstat" ' echo "file* diff=driver" >.gitattributes && git config diff.driver.algorithm "$STRATEGY" && diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 6805229dcb..2fb1b2ae56 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -191,6 +191,20 @@ enable_http2 () { test_set_prereq HTTP2 } +enable_cgipassauth () { + # We are looking for 2.4.13 or more recent. Since we only support + # 2.4 and up, no need to check for older major/minor. + if test "$HTTPD_VERSION_MAJOR" = 2 && + test "$HTTPD_VERSION_MINOR" = 4 && + test "$(echo $HTTPD_VERSION | cut -d. -f3)" -lt 13 + then + echo >&4 "apache $HTTPD_VERSION too old for CGIPassAuth" + return + fi + HTTPD_PARA="$HTTPD_PARA -DUSE_CGIPASSAUTH" + test_set_prereq CGIPASSAUTH +} + start_httpd() { prepare_httpd >&3 2>&4 diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 9e6892970d..a22d138605 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -146,7 +146,9 @@ SetEnv PERL_PATH ${PERL_PATH} <LocationMatch /custom_auth/> SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} SetEnv GIT_HTTP_EXPORT_ALL + <IfDefine USE_CGIPASSAUTH> CGIPassAuth on + </IfDefine> </LocationMatch> ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/ ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/ diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index dee14992c5..9acb0d5d19 100644 --- a/t/lib-submodule-update.sh +++ b/t/lib-submodule-update.sh @@ -802,7 +802,7 @@ test_submodule_recursing_with_args_common () { git branch -t no_submodule origin/no_submodule && $command no_submodule && test_superproject_content origin/no_submodule && - ! test_path_is_dir sub1 && + test_path_is_missing sub1 && test_must_fail git config -f .git/modules/sub1/config core.worktree && test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree ) diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh index 60d1de0662..901cc493ef 100755 --- a/t/perf/p2000-sparse-operations.sh +++ b/t/perf/p2000-sparse-operations.sh @@ -129,5 +129,7 @@ test_perf_on_all git grep --cached bogus -- "f2/f1/f1/*" test_perf_on_all git write-tree test_perf_on_all git describe --dirty test_perf_on_all 'echo >>new && git describe --dirty' +test_perf_on_all git diff-files +test_perf_on_all git diff-files -- $SPARSE_CONE/a test_done diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 89b306cb11..26e082f05b 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -30,8 +30,17 @@ attr_check_quote () { attr_check_source () { path="$1" expect="$2" source="$3" git_opts="$4" && - git $git_opts check-attr --source $source test -- "$path" >actual 2>err && echo "$path: test: $expect" >expect && + + git $git_opts check-attr --source $source test -- "$path" >actual 2>err && + test_cmp expect actual && + test_must_be_empty err && + + git $git_opts --attr-source="$source" check-attr test -- "$path" >actual 2>err && + test_cmp expect actual && + test_must_be_empty err + + GIT_ATTR_SOURCE="$source" git $git_opts check-attr test -- "$path" >actual 2>err && test_cmp expect actual && test_must_be_empty err } diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index 35cc8c3b39..81946e87cc 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -125,7 +125,7 @@ test_expect_success 'update with autocrlf=input' ' munge_cr append dir/two && git update-index -- one dir/two && differs=$(git diff-index --cached HEAD) && - verbose test -z "$differs" + test -z "$differs" ' @@ -138,7 +138,7 @@ test_expect_success 'update with autocrlf=true' ' munge_cr append dir/two && git update-index -- one dir/two && differs=$(git diff-index --cached HEAD) && - verbose test -z "$differs" + test -z "$differs" ' @@ -153,7 +153,7 @@ test_expect_success 'checkout with autocrlf=true' ' test "$one" = $(git hash-object --stdin <one) && test "$two" = $(git hash-object --stdin <dir/two) && differs=$(git diff-index --cached HEAD) && - verbose test -z "$differs" + test -z "$differs" ' test_expect_success 'checkout with autocrlf=input' ' @@ -167,7 +167,7 @@ test_expect_success 'checkout with autocrlf=input' ' test "$one" = $(git hash-object --stdin <one) && test "$two" = $(git hash-object --stdin <dir/two) && differs=$(git diff-index --cached HEAD) && - verbose test -z "$differs" + test -z "$differs" ' test_expect_success 'apply patch (autocrlf=input)' ' @@ -177,7 +177,7 @@ test_expect_success 'apply patch (autocrlf=input)' ' git read-tree --reset -u HEAD && git apply patch.file && - verbose test "$patched" = "$(git hash-object --stdin <one)" + test "$patched" = "$(git hash-object --stdin <one)" ' test_expect_success 'apply patch --cached (autocrlf=input)' ' @@ -187,7 +187,7 @@ test_expect_success 'apply patch --cached (autocrlf=input)' ' git read-tree --reset -u HEAD && git apply --cached patch.file && - verbose test "$patched" = $(git rev-parse :one) + test "$patched" = $(git rev-parse :one) ' test_expect_success 'apply patch --index (autocrlf=input)' ' @@ -197,8 +197,8 @@ test_expect_success 'apply patch --index (autocrlf=input)' ' git read-tree --reset -u HEAD && git apply --index patch.file && - verbose test "$patched" = $(git rev-parse :one) && - verbose test "$patched" = $(git hash-object --stdin <one) + test "$patched" = $(git rev-parse :one) && + test "$patched" = $(git hash-object --stdin <one) ' test_expect_success 'apply patch (autocrlf=true)' ' @@ -208,7 +208,7 @@ test_expect_success 'apply patch (autocrlf=true)' ' git read-tree --reset -u HEAD && git apply patch.file && - verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)" + test "$patched" = "$(remove_cr <one | git hash-object --stdin)" ' test_expect_success 'apply patch --cached (autocrlf=true)' ' @@ -218,7 +218,7 @@ test_expect_success 'apply patch --cached (autocrlf=true)' ' git read-tree --reset -u HEAD && git apply --cached patch.file && - verbose test "$patched" = $(git rev-parse :one) + test "$patched" = $(git rev-parse :one) ' test_expect_success 'apply patch --index (autocrlf=true)' ' @@ -228,8 +228,8 @@ test_expect_success 'apply patch --index (autocrlf=true)' ' git read-tree --reset -u HEAD && git apply --index patch.file && - verbose test "$patched" = $(git rev-parse :one) && - verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)" + test "$patched" = $(git rev-parse :one) && + test "$patched" = "$(remove_cr <one | git hash-object --stdin)" ' test_expect_success '.gitattributes says two is binary' ' @@ -240,7 +240,7 @@ test_expect_success '.gitattributes says two is binary' ' git read-tree --reset -u HEAD && ! has_cr dir/two && - verbose has_cr one && + has_cr one && ! has_cr three ' @@ -259,8 +259,8 @@ test_expect_success '.gitattributes says two and three are text' ' echo "t* crlf" >.gitattributes && git read-tree --reset -u HEAD && - verbose has_cr dir/two && - verbose has_cr three + has_cr dir/two && + has_cr three ' test_expect_success 'in-tree .gitattributes (1)' ' @@ -273,7 +273,7 @@ test_expect_success 'in-tree .gitattributes (1)' ' git read-tree --reset -u HEAD && ! has_cr one && - verbose has_cr three + has_cr three ' test_expect_success 'in-tree .gitattributes (2)' ' @@ -283,7 +283,7 @@ test_expect_success 'in-tree .gitattributes (2)' ' git checkout-index -f -q -u -a && ! has_cr one && - verbose has_cr three + has_cr three ' test_expect_success 'in-tree .gitattributes (3)' ' @@ -294,7 +294,7 @@ test_expect_success 'in-tree .gitattributes (3)' ' git checkout-index -u one dir/two three && ! has_cr one && - verbose has_cr three + has_cr three ' test_expect_success 'in-tree .gitattributes (4)' ' @@ -305,7 +305,7 @@ test_expect_success 'in-tree .gitattributes (4)' ' git checkout-index -u .gitattributes && ! has_cr one && - verbose has_cr three + has_cr three ' test_expect_success 'checkout with existing .gitattributes' ' diff --git a/t/t0035-safe-bare-repository.sh b/t/t0035-safe-bare-repository.sh index 11c15a48aa..038b8b788d 100755 --- a/t/t0035-safe-bare-repository.sh +++ b/t/t0035-safe-bare-repository.sh @@ -7,13 +7,26 @@ TEST_PASSES_SANITIZE_LEAK=true pwd="$(pwd)" -expect_accepted () { - git "$@" rev-parse --git-dir +expect_accepted_implicit () { + test_when_finished 'rm "$pwd/trace.perf"' && + GIT_TRACE2_PERF="$pwd/trace.perf" git "$@" rev-parse --git-dir && + # Note: we're intentionally only checking that the bare repo has a + # directory *prefix* of $pwd + grep -F "implicit-bare-repository:$pwd" "$pwd/trace.perf" +} + +expect_accepted_explicit () { + test_when_finished 'rm "$pwd/trace.perf"' && + GIT_DIR="$1" GIT_TRACE2_PERF="$pwd/trace.perf" git rev-parse --git-dir && + ! grep -F "implicit-bare-repository:$pwd" "$pwd/trace.perf" } expect_rejected () { - test_must_fail git "$@" rev-parse --git-dir 2>err && - grep -F "cannot use bare repository" err + test_when_finished 'rm "$pwd/trace.perf"' && + test_env GIT_TRACE2_PERF="$pwd/trace.perf" \ + test_must_fail git "$@" rev-parse --git-dir 2>err && + grep -F "cannot use bare repository" err && + grep -F "implicit-bare-repository:$pwd" "$pwd/trace.perf" } test_expect_success 'setup bare repo in worktree' ' @@ -22,12 +35,13 @@ test_expect_success 'setup bare repo in worktree' ' ' test_expect_success 'safe.bareRepository unset' ' - expect_accepted -C outer-repo/bare-repo + test_unconfig --global safe.bareRepository && + expect_accepted_implicit -C outer-repo/bare-repo ' test_expect_success 'safe.bareRepository=all' ' test_config_global safe.bareRepository all && - expect_accepted -C outer-repo/bare-repo + expect_accepted_implicit -C outer-repo/bare-repo ' test_expect_success 'safe.bareRepository=explicit' ' @@ -47,7 +61,7 @@ test_expect_success 'safe.bareRepository in the repository' ' test_expect_success 'safe.bareRepository on the command line' ' test_config_global safe.bareRepository explicit && - expect_accepted -C outer-repo/bare-repo \ + expect_accepted_implicit -C outer-repo/bare-repo \ -c safe.bareRepository=all ' @@ -60,4 +74,8 @@ test_expect_success 'safe.bareRepository in included file' ' expect_rejected -C outer-repo/bare-repo ' +test_expect_success 'no trace when GIT_DIR is explicitly provided' ' + expect_accepted_explicit "$pwd/outer-repo/bare-repo" +' + test_done diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 0c784813f1..a63d0cc222 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -1377,7 +1377,7 @@ test_expect_success 'index.sparse disabled inline uses full index' ' ! test_region index ensure_full_index trace2.txt ' -ensure_not_expanded () { +run_sparse_index_trace2 () { rm -f trace2.txt && if test -z "$WITHOUT_UNTRACKED_TXT" then @@ -1397,7 +1397,16 @@ ensure_not_expanded () { git -C sparse-index "$@" \ >sparse-index-out \ 2>sparse-index-error || return 1 - fi && + fi +} + +ensure_expanded () { + run_sparse_index_trace2 "$@" && + test_region index ensure_full_index trace2.txt +} + +ensure_not_expanded () { + run_sparse_index_trace2 "$@" && test_region ! index ensure_full_index trace2.txt } @@ -2080,22 +2089,32 @@ test_expect_success 'grep sparse directory within submodules' ' test_cmp actual expect ' -test_expect_success 'write-tree on all' ' +test_expect_success 'write-tree' ' init_repos && + test_all_match git write-tree && + write_script edit-contents <<-\EOF && echo text >>"$1" EOF + # make a change inside the sparse cone run_on_all ../edit-contents deep/a && - run_on_all git update-index deep/a && + test_all_match git update-index deep/a && test_all_match git write-tree && + test_all_match git status --porcelain=v2 && + # make a change outside the sparse cone run_on_all mkdir -p folder1 && run_on_all cp a folder1/a && run_on_all ../edit-contents folder1/a && - run_on_all git update-index folder1/a && - test_all_match git write-tree + test_all_match git update-index folder1/a && + test_all_match git write-tree && + test_all_match git status --porcelain=v2 && + + # check that SKIP_WORKTREE files are not materialized + test_path_is_missing sparse-checkout/folder2/a && + test_path_is_missing sparse-index/folder2/a ' test_expect_success 'sparse-index is not expanded: write-tree' ' @@ -2108,4 +2127,57 @@ test_expect_success 'sparse-index is not expanded: write-tree' ' ensure_not_expanded write-tree ' +test_expect_success 'diff-files with pathspec inside sparse definition' ' + init_repos && + + write_script edit-contents <<-\EOF && + echo text >>"$1" + EOF + + run_on_all ../edit-contents deep/a && + + test_all_match git diff-files && + + test_all_match git diff-files -- deep/a && + + # test wildcard + test_all_match git diff-files -- "deep/*" +' + +test_expect_success 'diff-files with pathspec outside sparse definition' ' + init_repos && + + test_sparse_match git diff-files -- folder2/a && + + write_script edit-contents <<-\EOF && + echo text >>"$1" + EOF + + # The directory "folder1" is outside the cone of interest + # and will not exist in the sparse checkout repositories. + # Create it as needed, add file "folder1/a" there with + # contents that is different from the staged version. + run_on_all mkdir -p folder1 && + run_on_all cp a folder1/a && + + run_on_all ../edit-contents folder1/a && + test_all_match git diff-files && + test_all_match git diff-files -- folder1/a && + test_all_match git diff-files -- "folder*/a" +' + +test_expect_success 'sparse index is not expanded: diff-files' ' + init_repos && + + write_script edit-contents <<-\EOF && + echo text >>"$1" + EOF + + run_on_all ../edit-contents deep/a && + + ensure_not_expanded diff-files && + ensure_not_expanded diff-files -- deep/a && + ensure_not_expanded diff-files -- "deep/*" +' + test_done diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 34d30f3bc6..86bfbc2b36 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -98,6 +98,23 @@ test_expect_success 'subsections are not canonicalized by git-config' ' test_cmp_config two section.SubSection.key ' +test_missing_key () { + local key="$1" && + local title="$2" && + test_expect_success "value for $title is not printed" ' + test_must_fail git config "$key" >out 2>err && + test_must_be_empty out && + test_must_be_empty err + ' +} + +test_missing_key 'missingsection.missingkey' 'missing section and missing key' +test_missing_key 'missingsection.penguin' 'missing section and existing key' +test_missing_key 'section.missingkey' 'existing section and missing key' +test_missing_key 'section.MissingSubSection.missingkey' 'missing subsection and missing key' +test_missing_key 'section.SubSection.missingkey' 'existing subsection and missing key' +test_missing_key 'section.MissingSubSection.key' 'missing subsection and existing key' + cat > .git/config <<\EOF [alpha] bar = foo @@ -1488,35 +1505,29 @@ test_expect_success 'git config ignores pairs without count' ' test_must_be_empty error ' -test_expect_success 'git config ignores pairs with zero count' ' - test_must_fail env \ - GIT_CONFIG_COUNT=0 \ - GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \ - git config pair.one -' - test_expect_success 'git config ignores pairs exceeding count' ' GIT_CONFIG_COUNT=1 \ GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \ GIT_CONFIG_KEY_1="pair.two" GIT_CONFIG_VALUE_1="value" \ - git config --get-regexp "pair.*" >actual && + git config --get-regexp "pair.*" >actual 2>error && cat >expect <<-EOF && pair.one value EOF - test_cmp expect actual + test_cmp expect actual && + test_must_be_empty error ' test_expect_success 'git config ignores pairs with zero count' ' test_must_fail env \ GIT_CONFIG_COUNT=0 GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \ - git config pair.one >error && + git config pair.one 2>error && test_must_be_empty error ' test_expect_success 'git config ignores pairs with empty count' ' test_must_fail env \ GIT_CONFIG_COUNT= GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \ - git config pair.one >error && + git config pair.one 2>error && test_must_be_empty error ' diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index 1b6437ec07..ae5cd3f5a0 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -89,7 +89,7 @@ do rm -f .git/info/refs && git update-server-info && actual="$(test_modebits .git/info/refs)" && - verbose test "x$actual" = "x-$y" + test "x$actual" = "x-$y" ' @@ -99,7 +99,7 @@ do rm -f .git/info/refs && git update-server-info && actual="$(test_modebits .git/info/refs)" && - verbose test "x$actual" = "x-$x" + test "x$actual" = "x-$x" ' diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index d94c72c672..cb9ef7e329 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -97,7 +97,8 @@ test_expect_success 'my-side@{u} resolves to correct commit' ' commit_subject my-side >actual && test_cmp expect actual && echo 5 >expect && - commit_subject my-side@{u} >actual + commit_subject my-side@{u} >actual && + test_cmp expect actual ' test_expect_success 'not-tracking@{u} fails' ' diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh index 034f62c13c..ecfacf0f7f 100755 --- a/t/t2021-checkout-overwrite.sh +++ b/t/t2021-checkout-overwrite.sh @@ -77,7 +77,7 @@ test_expect_success 'checkout --overwrite-ignore should succeed if only ignored echo autogenerated information >some_dir/ignore && echo ignore >.git/info/exclude && git checkout --overwrite-ignore df_conflict && - ! test_path_is_dir some_dir + test_path_is_file some_dir ' test_done diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 5a8a48287c..98b6c8ac34 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -239,6 +239,21 @@ test_expect_success 'git branch -M baz bam should succeed when baz is checked ou git worktree prune ' +test_expect_success 'git branch -M fails if updating any linked working tree fails' ' + git worktree add -b baz bazdir1 && + git worktree add -f bazdir2 baz && + touch .git/worktrees/bazdir1/HEAD.lock && + test_must_fail git branch -M baz bam && + test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam && + git branch -M bam baz && + rm .git/worktrees/bazdir1/HEAD.lock && + touch .git/worktrees/bazdir2/HEAD.lock && + test_must_fail git branch -M baz bam && + test $(git -C bazdir1 rev-parse --abbrev-ref HEAD) = bam && + rm -rf bazdir1 bazdir2 && + git worktree prune +' + test_expect_success 'git branch -M baz bam should succeed within a worktree in which baz is checked out' ' git checkout -b baz && git worktree add -f bazdir baz && @@ -283,6 +298,20 @@ test_expect_success 'git branch -M and -C fail on detached HEAD' ' test_cmp expect err ' +test_expect_success 'git branch -m should work with orphan branches' ' + test_when_finished git checkout - && + test_when_finished git worktree remove -f wt && + git worktree add wt --detach && + # rename orphan in another worktreee + git -C wt checkout --orphan orphan-foo-wt && + git branch -m orphan-foo-wt orphan-bar-wt && + test orphan-bar-wt=$(git -C orphan-worktree branch --show-current) && + # rename orphan in the current worktree + git checkout --orphan orphan-foo && + git branch -m orphan-foo orphan-bar && + test orphan-bar=$(git branch --show-current) +' + test_expect_success 'git branch -d on orphan HEAD (merged)' ' test_when_finished git checkout main && git checkout --orphan orphan && diff --git a/t/t3202-show-branch.sh b/t/t3202-show-branch.sh index ea7cfd1951..be20ebe1d5 100755 --- a/t/t3202-show-branch.sh +++ b/t/t3202-show-branch.sh @@ -221,4 +221,22 @@ test_expect_success 'fatal descriptions on non-existent branch' ' test_cmp expect actual ' +test_expect_success 'error descriptions on orphan branch' ' + test_when_finished git worktree remove -f wt && + git worktree add wt --detach && + git -C wt checkout --orphan orphan-branch && + test_branch_op_in_wt() { + test_orphan_error() { + test_must_fail git $* 2>actual && + test_i18ngrep "No commit on branch .orphan-branch. yet.$" actual + } && + test_orphan_error -C wt branch $1 $2 && # implicit branch + test_orphan_error -C wt branch $1 orphan-branch $2 && # explicit branch + test_orphan_error branch $1 orphan-branch $2 # different worktree + } && + test_branch_op_in_wt --edit-description && + test_branch_op_in_wt --set-upstream-to=ne && + test_branch_op_in_wt -c new-branch +' + test_done diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh index 48b76f8232..1b3e97c875 100755 --- a/t/t3427-rebase-subtree.sh +++ b/t/t3427-rebase-subtree.sh @@ -74,9 +74,9 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' ' test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-main main && : first pick results in no changes && git rebase --skip && - verbose test "$(commit_message HEAD~2)" = "topic_4" && - verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" && - verbose test "$(commit_message HEAD)" = "Empty commit" + test "$(commit_message HEAD~2)" = "topic_4" && + test "$(commit_message HEAD~)" = "files_subtree/topic_5" && + test "$(commit_message HEAD)" = "Empty commit" ' test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' ' @@ -85,9 +85,9 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root && : first pick results in no changes && git rebase --skip && - verbose test "$(commit_message HEAD~2)" = "topic_4" && - verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" && - verbose test "$(commit_message HEAD)" = "Empty commit" + test "$(commit_message HEAD~2)" = "topic_4" && + test "$(commit_message HEAD~)" = "files_subtree/topic_5" && + test "$(commit_message HEAD)" = "Empty commit" ' test_done diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index f03599c63b..96ae0edf1e 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -578,4 +578,12 @@ test_expect_success '--rebase-merges with message matched with onto label' ' EOF ' +test_expect_success 'progress shows the correct total' ' + git checkout -b progress H && + git rebase --rebase-merges --force-rebase --verbose A 2> err && + # Expecting "Rebasing (N/14)" here, no bogus total number + grep "^Rebasing.*/14.$" err >progress && + test_line_count = 14 progress +' + test_done diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh index bfcaae390f..8d50331b8c 100755 --- a/t/t4000-diff-format.sh +++ b/t/t4000-diff-format.sh @@ -5,6 +5,9 @@ test_description='Test built-in diff output engine. +We happen to know that all diff plumbing and diff Porcelain share the +same command line parser, so testing one should be sufficient; pick +diff-files as a representative. ' TEST_PASSES_SANITIZE_LEAK=true @@ -16,9 +19,11 @@ Line 2 line 3' cat path0 >path1 chmod +x path1 +mkdir path2 +>path2/path3 test_expect_success 'update-index --add two files with and without +x.' ' - git update-index --add path0 path1 + git update-index --add path0 path1 path2/path3 ' mv path0 path0- @@ -91,4 +96,31 @@ test_expect_success 'git diff-files --patch --no-patch does not show the patch' test_must_be_empty err ' + +# Smudge path2/path3 so that dirstat has something to show +date >path2/path3 + +for format in stat raw numstat shortstat summary \ + dirstat cumulative dirstat-by-file \ + patch-with-raw patch-with-stat compact-summary +do + test_expect_success "--no-patch in 'git diff-files --no-patch --$format' is a no-op" ' + git diff-files --no-patch "--$format" >actual && + git diff-files "--$format" >expect && + test_cmp expect actual + ' + + test_expect_success "--no-patch clears all previous ones" ' + git diff-files --$format -s -p >actual && + git diff-files -p >expect && + test_cmp expect actual + ' + + test_expect_success "--no-patch in 'git diff --no-patch --$format' is a no-op" ' + git diff --no-patch "--$format" >actual && + git diff "--$format" >expect && + test_cmp expect actual + ' +done + test_done diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 42a2b9a13b..c8d555771d 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -63,6 +63,25 @@ do test_i18ngrep ! fatal msg && test_i18ngrep ! error msg ' + + test_expect_success "builtin $p pattern compiles on bare repo with --attr-source" ' + test_when_finished "rm -rf bare.git" && + git checkout -B master && + git add . && + echo "*.java diff=notexist" >.gitattributes && + git add .gitattributes && + git commit -am "changing gitattributes" && + git checkout -B branchA && + echo "*.java diff=$p" >.gitattributes && + git add .gitattributes && + git commit -am "changing gitattributes" && + git clone --bare --no-local . bare.git && + git -C bare.git symbolic-ref HEAD refs/heads/master && + test_expect_code 1 git -C bare.git --attr-source=branchA \ + diff --exit-code HEAD:A.java HEAD:B.java 2>msg && + test_i18ngrep ! fatal msg && + test_i18ngrep ! error msg + ' done test_expect_success 'last regexp must not be negated' ' diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh index 1c89050a97..6fed993ea0 100755 --- a/t/t4022-diff-rewrite.sh +++ b/t/t4022-diff-rewrite.sh @@ -24,7 +24,7 @@ test_expect_success setup ' test_expect_success 'detect rewrite' ' actual=$(git diff-files -B --summary test) && - verbose expr "$actual" : " rewrite test ([0-9]*%)$" + expr "$actual" : " rewrite test ([0-9]*%)$" ' diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh index 7fec2cb9cd..70224c3da1 100755 --- a/t/t4047-diff-dirstat.sh +++ b/t/t4047-diff-dirstat.sh @@ -1,6 +1,8 @@ #!/bin/sh test_description='diff --dirstat tests' + +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh # set up two commits where the second commit has these files diff --git a/t/t4062-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh index 9aaa068ed9..a90b46b678 100755 --- a/t/t4062-diff-pickaxe.sh +++ b/t/t4062-diff-pickaxe.sh @@ -24,7 +24,7 @@ test_expect_success '-G matches' ' test_expect_success '-S --pickaxe-regex' ' git diff --name-only -S0 --pickaxe-regex HEAD^ >out && - verbose test 4096-zeroes.txt = "$(cat out)" + test 4096-zeroes.txt = "$(cat out)" ' test_done diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh index f60f5cbd65..7af3a08862 100755 --- a/t/t4067-diff-partial-clone.sh +++ b/t/t4067-diff-partial-clone.sh @@ -151,7 +151,7 @@ test_expect_success 'diff does not fetch anything if inexact rename detection is # Ensure no fetches. GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD && - ! test_path_exists trace + test_path_is_missing trace ' test_expect_success 'diff --break-rewrites fetches only if necessary, and batches blobs if it does' ' @@ -171,7 +171,7 @@ test_expect_success 'diff --break-rewrites fetches only if necessary, and batche # Ensure no fetches. GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD && - ! test_path_exists trace && + test_path_is_missing trace && # But with --break-rewrites, ensure that there is exactly 1 negotiation # by checking that there is only 1 "done" line sent. ("done" marks the diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh index e95e6d4e7d..a22a90d552 100755 --- a/t/t4115-apply-symlink.sh +++ b/t/t4115-apply-symlink.sh @@ -74,7 +74,7 @@ test_expect_success SYMLINKS 'symlink escape when creating new files' ' error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link EOF test_cmp expected_stderr stderr && - ! test_path_exists .git/create-me + test_path_is_missing .git/create-me ' test_expect_success SYMLINKS 'symlink escape when modifying file' ' diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh index c52c8a21fa..57c4f26e46 100755 --- a/t/t4300-merge-tree.sh +++ b/t/t4300-merge-tree.sh @@ -334,4 +334,22 @@ test_expect_success 'turn tree to file' ' test_cmp expect actual ' +test_expect_success 'merge-tree respects core.useReplaceRefs=false' ' + test_commit merge-to && + test_commit valid base && + git reset --hard HEAD^ && + test_commit malicious base && + + test_when_finished "git replace -d $(git rev-parse valid^0)" && + git replace valid^0 malicious^0 && + + tree=$(git -c core.useReplaceRefs=true merge-tree --write-tree merge-to valid) && + merged=$(git cat-file -p $tree:base) && + test malicious = $merged && + + tree=$(git -c core.useReplaceRefs=false merge-tree --write-tree merge-to valid) && + merged=$(git cat-file -p $tree:base) && + test valid = $merged +' + test_done diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 662ae9b152..f367327441 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -16,7 +16,7 @@ add_blob() { before=$(git count-objects | sed "s/ .*//") && BLOB=$(echo aleph_0 | git hash-object -w --stdin) && BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") && - verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && + test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && test_path_is_file $BLOB_FILE && test-tool chmtime =+0 $BLOB_FILE } @@ -51,11 +51,11 @@ test_expect_success 'prune stale packs' ' test_expect_success 'prune --expire' ' add_blob && git prune --expire=1.hour.ago && - verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && + test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && test_path_is_file $BLOB_FILE && test-tool chmtime =-86500 $BLOB_FILE && git prune --expire 1.day && - verbose test $before = $(git count-objects | sed "s/ .*//") && + test $before = $(git count-objects | sed "s/ .*//") && test_path_is_missing $BLOB_FILE ' @@ -63,11 +63,11 @@ test_expect_success 'gc: implicit prune --expire' ' add_blob && test-tool chmtime =-$((2*$week-30)) $BLOB_FILE && git gc --no-cruft && - verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && + test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && test_path_is_file $BLOB_FILE && test-tool chmtime =-$((2*$week+1)) $BLOB_FILE && git gc --no-cruft && - verbose test $before = $(git count-objects | sed "s/ .*//") && + test $before = $(git count-objects | sed "s/ .*//") && test_path_is_missing $BLOB_FILE ' @@ -138,7 +138,7 @@ test_expect_success 'gc --no-prune' ' test-tool chmtime =-$((5001*$day)) $BLOB_FILE && git config gc.pruneExpire 2.days.ago && git gc --no-prune --no-cruft && - verbose test 1 = $(git count-objects | sed "s/ .*//") && + test 1 = $(git count-objects | sed "s/ .*//") && test_path_is_file $BLOB_FILE ' @@ -192,10 +192,10 @@ test_expect_success 'gc: prune old objects after local clone' ' git clone --no-hardlinks . aclone && ( cd aclone && - verbose test 1 = $(git count-objects | sed "s/ .*//") && + test 1 = $(git count-objects | sed "s/ .*//") && test_path_is_file $BLOB_FILE && git gc --prune --no-cruft && - verbose test 0 = $(git count-objects | sed "s/ .*//") && + test 0 = $(git count-objects | sed "s/ .*//") && test_path_is_missing $BLOB_FILE ) ' diff --git a/t/t5326-multi-pack-bitmaps.sh b/t/t5326-multi-pack-bitmaps.sh index 0882cbb6e4..f771c442d4 100755 --- a/t/t5326-multi-pack-bitmaps.sh +++ b/t/t5326-multi-pack-bitmaps.sh @@ -434,4 +434,48 @@ test_expect_success 'tagged commits are selected for bitmapping' ' ) ' +corrupt_file () { + chmod a+w "$1" && + printf "bogus" | dd of="$1" bs=1 seek="12" conv=notrunc +} + +test_expect_success 'git fsck correctly identifies good and bad bitmaps' ' + git init valid && + test_when_finished rm -rf valid && + + test_commit_bulk 20 && + git repack -adbf && + + # Move pack-bitmap aside so it is not deleted + # in next repack. + packbitmap=$(ls .git/objects/pack/pack-*.bitmap) && + mv "$packbitmap" "$packbitmap.bak" && + + test_commit_bulk 10 && + git repack -b --write-midx && + midxbitmap=$(ls .git/objects/pack/multi-pack-index-*.bitmap) && + + # Copy MIDX bitmap to backup. Copy pack bitmap from backup. + cp "$midxbitmap" "$midxbitmap.bak" && + cp "$packbitmap.bak" "$packbitmap" && + + # fsck works at first + git fsck 2>err && + test_must_be_empty err && + + corrupt_file "$packbitmap" && + test_must_fail git fsck 2>err && + grep "bitmap file '\''$packbitmap'\'' has invalid checksum" err && + + cp "$packbitmap.bak" "$packbitmap" && + corrupt_file "$midxbitmap" && + test_must_fail git fsck 2>err && + grep "bitmap file '\''$midxbitmap'\'' has invalid checksum" err && + + corrupt_file "$packbitmap" && + test_must_fail git fsck 2>err && + grep "bitmap file '\''$midxbitmap'\'' has invalid checksum" err && + grep "bitmap file '\''$packbitmap'\'' has invalid checksum" err +' + test_done diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index dc44da9c79..4f289063ce 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -1118,59 +1118,6 @@ test_expect_success 'fetching with auto-gc does not lock up' ' ) ' -test_expect_success 'fetch aligned output' ' - git clone . full-output && - test_commit looooooooooooong-tag && - ( - cd full-output && - git -c fetch.output=full fetch origin >actual 2>&1 && - grep -e "->" actual | cut -c 22- >../actual - ) && - cat >expect <<-\EOF && - main -> origin/main - looooooooooooong-tag -> looooooooooooong-tag - EOF - test_cmp expect actual -' - -test_expect_success 'fetch compact output' ' - git clone . compact && - test_commit extraaa && - ( - cd compact && - git -c fetch.output=compact fetch origin >actual 2>&1 && - grep -e "->" actual | cut -c 22- >../actual - ) && - cat >expect <<-\EOF && - main -> origin/* - extraaa -> * - EOF - test_cmp expect actual -' - -test_expect_success '--no-show-forced-updates' ' - mkdir forced-updates && - ( - cd forced-updates && - git init && - test_commit 1 && - test_commit 2 - ) && - git clone forced-updates forced-update-clone && - git clone forced-updates no-forced-update-clone && - git -C forced-updates reset --hard HEAD~1 && - ( - cd forced-update-clone && - git fetch --show-forced-updates origin 2>output && - test_i18ngrep "(forced update)" output - ) && - ( - cd no-forced-update-clone && - git fetch --no-show-forced-updates origin 2>output && - test_i18ngrep ! "(forced update)" output - ) -' - for section in fetch transfer do test_expect_success "$section.hideRefs affects connectivity check" ' diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh index c9acc07635..1b8d609879 100755 --- a/t/t5523-push-upstream.sh +++ b/t/t5523-push-upstream.sh @@ -61,12 +61,20 @@ test_expect_success 'push -u :topic_2' ' check_config topic_2 upstream refs/heads/other2 ' -test_expect_success 'push -u --all' ' +test_expect_success 'push -u --all(the same behavior with--branches)' ' git branch all1 && git branch all2 && git push -u --all && check_config all1 upstream refs/heads/all1 && - check_config all2 upstream refs/heads/all2 + check_config all2 upstream refs/heads/all2 && + git config --get-regexp branch.all* > expect && + git config --remove-section branch.all1 && + git config --remove-section branch.all2 && + git push -u --branches && + check_config all1 upstream refs/heads/all1 && + check_config all2 upstream refs/heads/all2 && + git config --get-regexp branch.all* > actual && + test_cmp expect actual ' test_expect_success 'push -u HEAD' ' diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index dcdbe26a08..26e933f93a 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -1180,4 +1180,17 @@ test_expect_success 'fetch --all with --recurse-submodules with multiple' ' test_line_count = 2 fetch-subs ' +test_expect_success "fetch --all with --no-recurse-submodules only fetches superproject" ' + test_when_finished "rm -rf src_clone" && + + git clone --recurse-submodules src src_clone && + ( + cd src_clone && + git remote add secondary ../src && + git config submodule.recurse true && + git fetch --all --no-recurse-submodules 2>../fetch-log + ) && + ! grep "Fetching submodule" fetch-log +' + test_done diff --git a/t/t5543-atomic-push.sh b/t/t5543-atomic-push.sh index 70431122a4..04b47ad84a 100755 --- a/t/t5543-atomic-push.sh +++ b/t/t5543-atomic-push.sh @@ -117,7 +117,10 @@ test_expect_success 'atomic push fails if one branch fails' ' test_commit five && git checkout main && test_commit six && - test_must_fail git push --atomic --all up + test_must_fail git push --atomic --all up >output-all 2>&1 && + # --all and --branches have the same behavior when be combined with --atomic + test_must_fail git push --atomic --branches up >output-branches 2>&1 && + test_cmp output-all output-branches ) && test_refs main HEAD@{7} && test_refs second HEAD@{4} diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index 0908534f25..21b7767cbd 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -611,6 +611,33 @@ test_expect_success 'client falls back from v2 to v0 to match server' ' grep symref=HEAD:refs/heads/ trace ' +test_expect_success 'create empty http-accessible SHA-256 repository' ' + mkdir "$HTTPD_DOCUMENT_ROOT_PATH/sha256.git" && + (cd "$HTTPD_DOCUMENT_ROOT_PATH/sha256.git" && + git --bare init --object-format=sha256 + ) +' + +test_expect_success 'clone empty SHA-256 repository with protocol v2' ' + rm -fr sha256 && + echo sha256 >expected && + git -c protocol.version=2 clone "$HTTPD_URL/smart/sha256.git" && + git -C sha256 rev-parse --show-object-format >actual && + test_cmp actual expected && + git ls-remote "$HTTPD_URL/smart/sha256.git" >actual && + test_must_be_empty actual +' + +test_expect_success 'clone empty SHA-256 repository with protocol v0' ' + rm -fr sha256 && + echo sha256 >expected && + GIT_TRACE=1 GIT_TRACE_PACKET=1 git -c protocol.version=0 clone "$HTTPD_URL/smart/sha256.git" && + git -C sha256 rev-parse --show-object-format >actual && + test_cmp actual expected && + git ls-remote "$HTTPD_URL/smart/sha256.git" >actual && + test_must_be_empty actual +' + test_expect_success 'passing hostname resolution information works' ' BOGUS_HOST=gitbogusexamplehost.invalid && BOGUS_HTTPD_URL=$HTTPD_PROTO://$BOGUS_HOST:$LIB_HTTPD_PORT && diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh index f45a43b4b5..ab8a721ccc 100755 --- a/t/t5563-simple-http-auth.sh +++ b/t/t5563-simple-http-auth.sh @@ -5,6 +5,12 @@ test_description='test http auth header and credential helper interop' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-httpd.sh +enable_cgipassauth +if ! test_have_prereq CGIPASSAUTH +then + skip_all="no CGIPassAuth support" + test_done +fi start_httpd test_expect_success 'setup_credential_helper' ' diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh index 09097eff3f..4e917bf87d 100755 --- a/t/t5572-pull-submodule.sh +++ b/t/t5572-pull-submodule.sh @@ -121,7 +121,7 @@ test_expect_success "fetch.recurseSubmodules option triggers recursive fetch (bu sub_oid=$(git -C child rev-parse HEAD) && git -C super/sub cat-file -e $sub_oid && # Check that the submodule worktree did not update - ! test_path_is_file super/sub/merge_strategy_5.t + test_path_is_missing super/sub/merge_strategy_5.t ' test_expect_success "fetch.recurseSubmodules takes precedence over submodule.recurse" ' @@ -134,7 +134,7 @@ test_expect_success "fetch.recurseSubmodules takes precedence over submodule.rec sub_oid=$(git -C child rev-parse HEAD) && git -C super/sub cat-file -e $sub_oid && # Check that the submodule worktree did not update - ! test_path_is_file super/sub/merge_strategy_6.t + test_path_is_missing super/sub/merge_strategy_6.t ' test_expect_success 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)' ' diff --git a/t/t5574-fetch-output.sh b/t/t5574-fetch-output.sh new file mode 100755 index 0000000000..90e6dcb9a7 --- /dev/null +++ b/t/t5574-fetch-output.sh @@ -0,0 +1,293 @@ +#!/bin/sh + +test_description='git fetch output format' + +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +test_expect_success 'fetch with invalid output format configuration' ' + test_when_finished "rm -rf clone" && + git clone . clone && + + test_must_fail git -C clone -c fetch.output fetch origin 2>actual.err && + cat >expect <<-EOF && + error: missing value for ${SQ}fetch.output${SQ} + fatal: unable to parse ${SQ}fetch.output${SQ} from command-line config + EOF + test_cmp expect actual.err && + + test_must_fail git -C clone -c fetch.output= fetch origin 2>actual.err && + cat >expect <<-EOF && + fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}${SQ} + EOF + test_cmp expect actual.err && + + test_must_fail git -C clone -c fetch.output=garbage fetch origin 2>actual.err && + cat >expect <<-EOF && + fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}garbage${SQ} + EOF + test_cmp expect actual.err +' + +test_expect_success 'fetch aligned output' ' + git clone . full-output && + test_commit looooooooooooong-tag && + ( + cd full-output && + git -c fetch.output=full fetch origin >actual 2>&1 && + grep -e "->" actual | cut -c 22- >../actual + ) && + cat >expect <<-\EOF && + main -> origin/main + looooooooooooong-tag -> looooooooooooong-tag + EOF + test_cmp expect actual +' + +test_expect_success 'fetch compact output' ' + git clone . compact && + test_commit extraaa && + ( + cd compact && + git -c fetch.output=compact fetch origin >actual 2>&1 && + grep -e "->" actual | cut -c 22- >../actual + ) && + cat >expect <<-\EOF && + main -> origin/* + extraaa -> * + EOF + test_cmp expect actual +' + +test_expect_success 'fetch porcelain output' ' + test_when_finished "rm -rf porcelain" && + + # Set up a bunch of references that we can use to demonstrate different + # kinds of flag symbols in the output format. + MAIN_OLD=$(git rev-parse HEAD) && + git branch "fast-forward" && + git branch "deleted-branch" && + git checkout -b force-updated && + test_commit --no-tag force-update-old && + FORCE_UPDATED_OLD=$(git rev-parse HEAD) && + git checkout main && + + # Clone and pre-seed the repositories. We fetch references into two + # namespaces so that we can test that rejected and force-updated + # references are reported properly. + refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" && + git clone . porcelain && + git -C porcelain fetch origin $refspecs && + + # Now that we have set up the client repositories we can change our + # local references. + git branch new-branch && + git branch -d deleted-branch && + git checkout fast-forward && + test_commit --no-tag fast-forward-new && + FAST_FORWARD_NEW=$(git rev-parse HEAD) && + git checkout force-updated && + git reset --hard HEAD~ && + test_commit --no-tag force-update-new && + FORCE_UPDATED_NEW=$(git rev-parse HEAD) && + + cat >expect <<-EOF && + - $MAIN_OLD $ZERO_OID refs/forced/deleted-branch + - $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch + $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward + ! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated + * $ZERO_OID $MAIN_OLD refs/unforced/new-branch + $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward + + $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated + * $ZERO_OID $MAIN_OLD refs/forced/new-branch + $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward + + $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated + * $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch + EOF + + # Execute a dry-run fetch first. We do this to assert that the dry-run + # and non-dry-run fetches produces the same output. Execution of the + # fetch is expected to fail as we have a rejected reference update. + test_must_fail git -C porcelain fetch \ + --porcelain --dry-run --prune origin $refspecs >actual && + test_cmp expect actual && + + # And now we perform a non-dry-run fetch. + test_must_fail git -C porcelain fetch \ + --porcelain --prune origin $refspecs >actual 2>stderr && + test_cmp expect actual && + test_must_be_empty stderr +' + +test_expect_success 'fetch porcelain with multiple remotes' ' + test_when_finished "rm -rf porcelain" && + + git switch --create multiple-remotes && + git clone . porcelain && + git -C porcelain remote add second-remote "$PWD" && + git -C porcelain fetch second-remote && + + test_commit --no-tag multi-commit && + old_commit=$(git rev-parse HEAD~) && + new_commit=$(git rev-parse HEAD) && + + cat >expect <<-EOF && + $old_commit $new_commit refs/remotes/origin/multiple-remotes + $old_commit $new_commit refs/remotes/second-remote/multiple-remotes + EOF + + git -C porcelain fetch --porcelain --all >actual 2>stderr && + test_cmp expect actual && + test_must_be_empty stderr +' + +test_expect_success 'fetch porcelain refuses to work with submodules' ' + test_when_finished "rm -rf porcelain" && + + cat >expect <<-EOF && + fatal: options ${SQ}--porcelain${SQ} and ${SQ}--recurse-submodules${SQ} cannot be used together + EOF + + git init porcelain && + test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=yes 2>stderr && + test_cmp expect stderr && + + test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=on-demand 2>stderr && + test_cmp expect stderr +' + +test_expect_success 'fetch porcelain overrides fetch.output config' ' + test_when_finished "rm -rf porcelain" && + + git switch --create config-override && + git clone . porcelain && + test_commit new-commit && + old_commit=$(git rev-parse HEAD~) && + new_commit=$(git rev-parse HEAD) && + + cat >expect <<-EOF && + $old_commit $new_commit refs/remotes/origin/config-override + * $ZERO_OID $new_commit refs/tags/new-commit + EOF + + git -C porcelain -c fetch.output=compact fetch --porcelain >stdout 2>stderr && + test_must_be_empty stderr && + test_cmp expect stdout +' + +test_expect_success 'fetch --no-porcelain overrides previous --porcelain' ' + test_when_finished "rm -rf no-porcelain" && + + git switch --create no-porcelain && + git clone . no-porcelain && + test_commit --no-tag no-porcelain && + old_commit=$(git rev-parse --short HEAD~) && + new_commit=$(git rev-parse --short HEAD) && + + cat >expect <<-EOF && + From $(test-tool path-utils real_path .)/. + $old_commit..$new_commit no-porcelain -> origin/no-porcelain + EOF + + git -C no-porcelain fetch --porcelain --no-porcelain >stdout 2>stderr && + test_cmp expect stderr && + test_must_be_empty stdout +' + +test_expect_success 'fetch output with HEAD' ' + test_when_finished "rm -rf head" && + git clone . head && + + git -C head fetch --dry-run origin HEAD >actual.out 2>actual.err && + cat >expect <<-EOF && + From $(test-tool path-utils real_path .)/. + * branch HEAD -> FETCH_HEAD + EOF + test_must_be_empty actual.out && + test_cmp expect actual.err && + + git -C head fetch origin HEAD >actual.out 2>actual.err && + test_must_be_empty actual.out && + test_cmp expect actual.err && + + git -C head fetch --dry-run origin HEAD:foo >actual.out 2>actual.err && + cat >expect <<-EOF && + From $(test-tool path-utils real_path .)/. + * [new ref] HEAD -> foo + EOF + test_must_be_empty actual.out && + test_cmp expect actual.err && + + git -C head fetch origin HEAD:foo >actual.out 2>actual.err && + test_must_be_empty actual.out && + test_cmp expect actual.err +' + +test_expect_success 'fetch porcelain output with HEAD' ' + test_when_finished "rm -rf head" && + git clone . head && + COMMIT_ID=$(git rev-parse HEAD) && + + git -C head fetch --porcelain --dry-run origin HEAD >actual && + cat >expect <<-EOF && + * $ZERO_OID $COMMIT_ID FETCH_HEAD + EOF + test_cmp expect actual && + + git -C head fetch --porcelain origin HEAD >actual && + test_cmp expect actual && + + git -C head fetch --porcelain --dry-run origin HEAD:foo >actual && + cat >expect <<-EOF && + * $ZERO_OID $COMMIT_ID refs/heads/foo + EOF + test_cmp expect actual && + + git -C head fetch --porcelain origin HEAD:foo >actual && + test_cmp expect actual +' + +test_expect_success 'fetch output with object ID' ' + test_when_finished "rm -rf object-id" && + git clone . object-id && + commit=$(git rev-parse HEAD) && + + git -C object-id fetch --dry-run origin $commit:object-id >actual.out 2>actual.err && + cat >expect <<-EOF && + From $(test-tool path-utils real_path .)/. + * [new ref] $commit -> object-id + EOF + test_must_be_empty actual.out && + test_cmp expect actual.err && + + git -C object-id fetch origin $commit:object-id >actual.out 2>actual.err && + test_must_be_empty actual.out && + test_cmp expect actual.err +' + +test_expect_success '--no-show-forced-updates' ' + mkdir forced-updates && + ( + cd forced-updates && + git init && + test_commit 1 && + test_commit 2 + ) && + git clone forced-updates forced-update-clone && + git clone forced-updates no-forced-update-clone && + git -C forced-updates reset --hard HEAD~1 && + ( + cd forced-update-clone && + git fetch --show-forced-updates origin 2>output && + test_i18ngrep "(forced update)" output + ) && + ( + cd no-forced-update-clone && + git fetch --no-show-forced-updates origin 2>output && + test_i18ngrep ! "(forced update)" output + ) +' + +test_done diff --git a/t/t5583-push-branches.sh b/t/t5583-push-branches.sh new file mode 100755 index 0000000000..e7e1b6dab6 --- /dev/null +++ b/t/t5583-push-branches.sh @@ -0,0 +1,115 @@ +#!/bin/sh + +test_description='check the consisitency of behavior of --all and --branches' + +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +delete_refs() { + dir=$1 + shift + rm -rf deletes + for arg in $* + do + echo "delete ${arg}" >>deletes + done + git -C $dir update-ref --stdin < deletes +} + +test_expect_success 'setup bare remote' ' + git init --bare remote-1 && + git -C remote-1 config gc.auto 0 && + test_commit one && + git push remote-1 HEAD +' + +test_expect_success 'setup different types of references' ' + cat >refs <<-EOF && + update refs/heads/branch-1 HEAD + update refs/heads/branch-2 HEAD + EOF + + git tag -a -m "annotated" annotated-1 HEAD && + git tag -a -m "annotated" annotated-2 HEAD && + git update-ref --stdin < refs +' + +test_expect_success '--all and --branches have the same behavior' ' + test_when_finished "delete_refs remote-1 \ + refs/heads/branch-1 \ + refs/heads/branch-2" && + git push remote-1 --all && + commit=$(git rev-parse HEAD) && + cat >expect <<-EOF && + $commit refs/heads/branch-1 + $commit refs/heads/branch-2 + $commit refs/heads/main + EOF + + git -C remote-1 show-ref --heads >actual.all && + delete_refs remote-1 refs/heads/branch-1 refs/heads/branch-2 && + git push remote-1 --branches && + git -C remote-1 show-ref --heads >actual.branches && + test_cmp actual.all actual.branches && + test_cmp expect actual.all +' + +test_expect_success '--all or --branches can not be combined with refspecs' ' + test_must_fail git push remote-1 --all main >actual.all 2>&1 && + test_must_fail git push remote-1 --branches main >actual.branches 2>&1 && + test_cmp actual.all actual.branches && + grep "be combined with refspecs" actual.all +' + +test_expect_success '--all or --branches can not be combined with --mirror' ' + test_must_fail git push remote-1 --all --mirror >actual.all 2>&1 && + test_must_fail git push remote-1 --branches --mirror >actual.branches 2>&1 && + test_cmp actual.all actual.branches && + grep "cannot be used together" actual.all +' + +test_expect_success '--all or --branches can not be combined with --tags' ' + test_must_fail git push remote-1 --all --tags >actual.all 2>&1 && + test_must_fail git push remote-1 --branches --tags >actual.branches 2>&1 && + test_cmp actual.all actual.branches && + grep "cannot be used together" actual.all +' + + +test_expect_success '--all or --branches can not be combined with --delete' ' + test_must_fail git push remote-1 --all --delete >actual.all 2>&1 && + test_must_fail git push remote-1 --branches --delete >actual.branches 2>&1 && + test_cmp actual.all actual.branches && + grep "cannot be used together" actual.all +' + +test_expect_success '--all or --branches combines with --follow-tags have same behavior' ' + test_when_finished "delete_refs remote-1 \ + refs/heads/branch-1 \ + refs/heads/branch-2 \ + refs/tags/annotated-1 \ + refs/tags/annotated-2" && + git push remote-1 --all --follow-tags && + git -C remote-1 show-ref > actual.all && + cat >expect <<-EOF && + $commit refs/heads/branch-1 + $commit refs/heads/branch-2 + $commit refs/heads/main + $(git rev-parse annotated-1) refs/tags/annotated-1 + $(git rev-parse annotated-2) refs/tags/annotated-2 + EOF + + delete_refs remote-1 \ + refs/heads/branch-1 \ + refs/heads/branch-2 \ + refs/tags/annotated-1 \ + refs/tags/annotated-2 && + git push remote-1 --branches --follow-tags && + git -C remote-1 show-ref >actual.branches && + test_cmp actual.all actual.branches && + test_cmp expect actual.all +' + +test_done diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh index 6c8d4c6cf1..a73b4d4ff6 100755 --- a/t/t5700-protocol-v1.sh +++ b/t/t5700-protocol-v1.sh @@ -244,15 +244,28 @@ test_expect_success 'push with ssh:// using protocol v1' ' grep "push< version 1" log ' +test_expect_success 'clone propagates object-format from empty repo' ' + test_when_finished "rm -fr src256 dst256" && + + echo sha256 >expect && + git init --object-format=sha256 src256 && + git clone --no-local src256 dst256 && + git -C dst256 rev-parse --show-object-format >actual && + + test_cmp expect actual +' + # Test protocol v1 with 'http://' transport # . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd -test_expect_success 'create repo to be served by http:// transport' ' +test_expect_success 'create repos to be served by http:// transport' ' git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config http.receivepack true && - test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one + test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one && + git init --object-format=sha256 "$HTTPD_DOCUMENT_ROOT_PATH/sha256" && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/sha256" config http.receivepack true ' test_expect_success 'clone with http:// using protocol v1' ' @@ -269,6 +282,20 @@ test_expect_success 'clone with http:// using protocol v1' ' grep "git< version 1" log ' +test_expect_success 'clone with http:// using protocol v1 with empty SHA-256 repo' ' + GIT_TRACE_PACKET=1 GIT_TRACE_CURL=1 git -c protocol.version=1 \ + clone "$HTTPD_URL/smart/sha256" sha256 2>log && + + echo sha256 >expect && + git -C sha256 rev-parse --show-object-format >actual && + test_cmp expect actual && + + # Client requested to use protocol v1 + grep "Git-Protocol: version=1" log && + # Server responded using protocol v1 + grep "git< version 1" log +' + test_expect_success 'fetch with http:// using protocol v1' ' test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two && diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index 41d0ca00b1..573eb97a0f 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -493,7 +493,7 @@ test_expect_success 'empty email' ' test_tick && C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) && A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) && - verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700" + test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700" ' test_expect_success 'del LF before empty (1)' ' diff --git a/t/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh index dbfa8a4d4c..4521508b83 100755 --- a/t/t6501-freshen-objects.sh +++ b/t/t6501-freshen-objects.sh @@ -152,7 +152,7 @@ test_expect_success 'do not complain about existing broken links (commit)' ' EOF commit=$(git hash-object -t commit -w broken-commit) && git gc --no-cruft -q 2>stderr && - verbose git cat-file -e $commit && + git cat-file -e $commit && test_must_be_empty stderr ' diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index d72cef8826..898a920532 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -4,6 +4,10 @@ test_description='git mv in subdirs' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-diff-data.sh +index_at_path () { + git ls-files --format='%(objectmode) %(objectname) %(stage)' "$@" +} + test_expect_success 'mv -f refreshes updated index entry' ' echo test >bar && git add bar && @@ -187,7 +191,8 @@ test_expect_success "Michael Cassar's test case" ' git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf && T=$(git write-tree) && - git ls-tree -r $T | verbose grep partA/outline.txt + git ls-tree -r $T >out && + grep partA/outline.txt out ' rm -fr papers partA path? @@ -260,12 +265,12 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' ' git init && echo 1 >dirty && git add dirty && - entry="$(git ls-files --stage dirty | cut -f 1)" && + entry="$(index_at_path dirty)" && git mv dirty dirty2 && - test "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" && + test "$entry" = "$(index_at_path dirty2)" && echo 2 >dirty2 && git mv dirty2 dirty && - test "$entry" = "$(git ls-files --stage dirty | cut -f 1)" + test "$entry" = "$(index_at_path dirty)" ' rm -f dirty dirty2 @@ -342,7 +347,7 @@ test_expect_success 'git mv cannot move a submodule in a file' ' ' test_expect_success 'git mv moves a submodule with a .git directory and no .gitmodules' ' - entry="$(git ls-files --stage sub | cut -f 1)" && + entry="$(index_at_path sub)" && git rm .gitmodules && ( cd sub && @@ -353,7 +358,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm mkdir mod && git mv sub mod/sub && test_path_is_missing sub && - test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" && + test "$entry" = "$(index_at_path mod/sub)" && git -C mod/sub status && git update-index --refresh && git diff-files --quiet @@ -363,7 +368,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu rm -rf mod && git reset --hard && git submodule update && - entry="$(git ls-files --stage sub | cut -f 1)" && + entry="$(index_at_path sub)" && ( cd sub && rm -f .git && @@ -373,7 +378,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu mkdir mod && git mv sub mod/sub && test_path_is_missing sub && - test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" && + test "$entry" = "$(index_at_path mod/sub)" && git -C mod/sub status && echo mod/sub >expected && git config -f .gitmodules submodule.sub.path >actual && @@ -386,11 +391,11 @@ test_expect_success 'git mv moves a submodule with gitfile' ' rm -rf mod && git reset --hard && git submodule update && - entry="$(git ls-files --stage sub | cut -f 1)" && + entry="$(index_at_path sub)" && mkdir mod && git -C mod mv ../sub/ . && test_path_is_missing sub && - test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" && + test "$entry" = "$(index_at_path mod/sub)" && git -C mod/sub status && echo mod/sub >expected && git config -f .gitmodules submodule.sub.path >actual && @@ -404,12 +409,12 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' ' git reset --hard && git submodule update && git rm .gitmodules && - entry="$(git ls-files --stage sub | cut -f 1)" && + entry="$(index_at_path sub)" && mkdir mod && git mv sub mod/sub 2>actual.err && test_must_be_empty actual.err && test_path_is_missing sub && - test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" && + test "$entry" = "$(index_at_path mod/sub)" && git -C mod/sub status && git update-index --refresh && git diff-files --quiet @@ -420,7 +425,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta git reset --hard && git submodule update && git config -f .gitmodules foo.bar true && - entry="$(git ls-files --stage sub | cut -f 1)" && + entry="$(index_at_path sub)" && mkdir mod && test_must_fail git mv sub mod/sub 2>actual.err && test_file_not_empty actual.err && @@ -430,7 +435,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta git mv sub mod/sub 2>actual.err && test_must_be_empty actual.err && test_path_is_missing sub && - test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" && + test "$entry" = "$(index_at_path mod/sub)" && git -C mod/sub status && git update-index --refresh && git diff-files --quiet @@ -442,13 +447,13 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule git submodule update && git config -f .gitmodules --remove-section submodule.sub && git add .gitmodules && - entry="$(git ls-files --stage sub | cut -f 1)" && + entry="$(index_at_path sub)" && echo "warning: Could not find section in .gitmodules where path=sub" >expect.err && mkdir mod && git mv sub mod/sub 2>actual.err && test_cmp expect.err actual.err && test_path_is_missing sub && - test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" && + test "$entry" = "$(index_at_path mod/sub)" && git -C mod/sub status && git update-index --refresh && git diff-files --quiet diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 0fe6ba93a2..e689db4292 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -2188,4 +2188,23 @@ test_expect_success 'Does --[no-]contains stop at commits? Yes!' ' test_cmp expected actual ' +test_expect_success 'If tag is created then tag message file is unlinked' ' + test_when_finished "git tag -d foo" && + write_script fakeeditor <<-\EOF && + echo Message >.git/TAG_EDITMSG + EOF + GIT_EDITOR=./fakeeditor git tag -a foo && + test_path_is_missing .git/TAG_EDITMSG +' + +test_expect_success 'If tag cannot be created then tag message file is not unlinked' ' + test_when_finished "git tag -d foo/bar && rm .git/TAG_EDITMSG" && + write_script fakeeditor <<-\EOF && + echo Message >.git/TAG_EDITMSG + EOF + git tag foo/bar && + test_must_fail env GIT_EDITOR=./fakeeditor git tag -a foo && + test_path_exists .git/TAG_EDITMSG +' + test_done diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index c975eb54d2..0ef7b78457 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -120,7 +120,7 @@ test_expect_success 'git clean with relative prefix' ' grep part3 | sed -n -e "s|^Would remove ||p" ) && - verbose test "$would_clean" = ../src/part3.c + test "$would_clean" = ../src/part3.c ' test_expect_success 'git clean with absolute path' ' @@ -133,7 +133,7 @@ test_expect_success 'git clean with absolute path' ' grep part3 | sed -n -e "s|^Would remove ||p" ) && - verbose test "$would_clean" = ../src/part3.c + test "$would_clean" = ../src/part3.c ' test_expect_success 'git clean with out of work tree relative path' ' diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 88d144b45b..22fc908024 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -4,7 +4,7 @@ test_description='git send-email' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -TEST_PASSES_SANITIZE_LEAK=true +# no longer TEST_PASSES_SANITIZE_LEAK=true - format-patch --thread leaks . ./test-lib.sh # May be altered later in the test @@ -47,7 +47,7 @@ clean_fake_sendmail () { test_expect_success $PREREQ 'Extract patches' ' patches=$(git format-patch -s --cc="One <one@example.com>" --cc=two@example.com -n HEAD^1) && - threaded_patches=$(git format-patch -o threaded -s --in-reply-to="format" HEAD^1) + threaded_patches=$(git format-patch -o threaded --thread=shallow -s --in-reply-to="format" HEAD^1) ' # Test no confirm early to ensure remaining tests will not hang @@ -374,13 +374,16 @@ test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email' ) ' -test_expect_success $PREREQ 'setup tocmd and cccmd scripts' ' +test_expect_success $PREREQ 'setup cmd scripts' ' write_script tocmd-sed <<-\EOF && sed -n -e "s/^tocmd--//p" "$1" EOF - write_script cccmd-sed <<-\EOF + write_script cccmd-sed <<-\EOF && sed -n -e "s/^cccmd--//p" "$1" EOF + write_script headercmd-sed <<-\EOF + sed -n -e "s/^headercmd--//p" "$1" + EOF ' test_expect_success $PREREQ 'tocmd works' ' @@ -410,6 +413,70 @@ test_expect_success $PREREQ 'cccmd works' ' grep "^ cccmd@example.com" msgtxt1 ' +test_expect_success $PREREQ 'headercmd works' ' + clean_fake_sendmail && + cp $patches headercmd.patch && + echo "headercmd--X-Debbugs-CC: dummy@example.com" >>headercmd.patch && + git send-email \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --header-cmd=./headercmd-sed \ + --smtp-server="$(pwd)/fake.sendmail" \ + headercmd.patch \ + && + grep "^X-Debbugs-CC: dummy@example.com" msgtxt1 +' + +test_expect_success $PREREQ '--no-header-cmd works' ' + clean_fake_sendmail && + cp $patches headercmd.patch && + echo "headercmd--X-Debbugs-CC: dummy@example.com" >>headercmd.patch && + git send-email \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --header-cmd=./headercmd-sed \ + --no-header-cmd \ + --smtp-server="$(pwd)/fake.sendmail" \ + headercmd.patch \ + && + ! grep "^X-Debbugs-CC: dummy@example.com" msgtxt1 +' + +test_expect_success $PREREQ 'multiline fields are correctly unfolded' ' + clean_fake_sendmail && + cp $patches headercmd.patch && + write_script headercmd-multiline <<-\EOF && + echo "X-Debbugs-CC: someone@example.com +FoldedField: This is a tale + best told using + multiple lines." + EOF + git send-email \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --header-cmd=./headercmd-multiline \ + --smtp-server="$(pwd)/fake.sendmail" \ + headercmd.patch && + grep "^FoldedField: This is a tale best told using multiple lines.$" msgtxt1 +' + +# Blank lines in the middle of the output of a command are invalid. +test_expect_success $PREREQ 'malform output reported on blank lines in command output' ' + clean_fake_sendmail && + cp $patches headercmd.patch && + write_script headercmd-malformed-output <<-\EOF && + echo "X-Debbugs-CC: someone@example.com + +SomeOtherField: someone-else@example.com" + EOF + ! git send-email \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --header-cmd=./headercmd-malformed-output \ + --smtp-server="$(pwd)/fake.sendmail" \ + headercmd.patch +' + test_expect_success $PREREQ 'reject long lines' ' z8=zzzzzzzz && z64=$z8$z8$z8$z8$z8$z8$z8$z8 && @@ -588,6 +655,21 @@ test_expect_success $PREREQ "--validate hook supports header argument" ' outdir/000?-*.patch ' +test_expect_success $PREREQ 'clear message-id before parsing a new message' ' + clean_fake_sendmail && + echo true | write_script my-hooks/sendemail-validate && + test_config core.hooksPath my-hooks && + GIT_SEND_EMAIL_NOTTY=1 \ + git send-email --validate --to=recipient@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + $patches $threaded_patches && + id0=$(grep "^Message-ID: " $threaded_patches) && + id1=$(grep "^Message-ID: " msgtxt1) && + id2=$(grep "^Message-ID: " msgtxt2) && + test "z$id0" = "z$id2" && + test "z$id1" != "z$id2" +' + for enc in 7bit 8bit quoted-printable base64 do test_expect_success $PREREQ "--transfer-encoding=$enc produces correct header" ' diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index dc88d0e064..a4b3cb9492 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -330,7 +330,7 @@ test_expect_success 'initial import time from top change time' ' test_when_finished cleanup_git && ( cd "$git" && - gittime=$(git show -s --raw --pretty=format:%at HEAD) && + gittime=$(git show -s --pretty=format:%at HEAD) && echo $p4time $gittime && test $p4time = $gittime ) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index d6c0478d98..8835e16e81 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -405,40 +405,40 @@ test_expect_success '__gitdir - remote as argument' ' test_expect_success '__git_dequote - plain unquoted word' ' __git_dequote unquoted-word && - verbose test unquoted-word = "$dequoted_word" + test unquoted-word = "$dequoted_word" ' # input: b\a\c\k\'\\\"s\l\a\s\h\es # expected: back'\"slashes test_expect_success '__git_dequote - backslash escaped' ' __git_dequote "b\a\c\k\\'\''\\\\\\\"s\l\a\s\h\es" && - verbose test "back'\''\\\"slashes" = "$dequoted_word" + test "back'\''\\\"slashes" = "$dequoted_word" ' # input: sin'gle\' '"quo'ted # expected: single\ "quoted test_expect_success '__git_dequote - single quoted' ' __git_dequote "'"sin'gle\\\\' '\\\"quo'ted"'" && - verbose test '\''single\ "quoted'\'' = "$dequoted_word" + test '\''single\ "quoted'\'' = "$dequoted_word" ' # input: dou"ble\\" "\"\quot"ed # expected: double\ "\quoted test_expect_success '__git_dequote - double quoted' ' __git_dequote '\''dou"ble\\" "\"\quot"ed'\'' && - verbose test '\''double\ "\quoted'\'' = "$dequoted_word" + test '\''double\ "\quoted'\'' = "$dequoted_word" ' # input: 'open single quote test_expect_success '__git_dequote - open single quote' ' __git_dequote "'\''open single quote" && - verbose test "open single quote" = "$dequoted_word" + test "open single quote" = "$dequoted_word" ' # input: "open double quote test_expect_success '__git_dequote - open double quote' ' __git_dequote "\"open double quote" && - verbose test "open double quote" = "$dequoted_word" + test "open double quote" = "$dequoted_word" ' @@ -616,7 +616,7 @@ test_expect_success '__git_is_configured_remote' ' test_when_finished "git remote remove remote_2" && git remote add remote_2 git://remote_2 && ( - verbose __git_is_configured_remote remote_2 && + __git_is_configured_remote remote_2 && test_must_fail __git_is_configured_remote non-existent ) ' @@ -2596,30 +2596,30 @@ test_expect_success 'options with value' ' test_expect_success 'sourcing the completion script clears cached commands' ' ( __git_compute_all_commands && - verbose test -n "$__git_all_commands" && + test -n "$__git_all_commands" && . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && - verbose test -z "$__git_all_commands" + test -z "$__git_all_commands" ) ' test_expect_success 'sourcing the completion script clears cached merge strategies' ' ( __git_compute_merge_strategies && - verbose test -n "$__git_merge_strategies" && + test -n "$__git_merge_strategies" && . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && - verbose test -z "$__git_merge_strategies" + test -z "$__git_merge_strategies" ) ' test_expect_success 'sourcing the completion script clears cached --options' ' ( __gitcomp_builtin checkout && - verbose test -n "$__gitcomp_builtin_checkout" && + test -n "$__gitcomp_builtin_checkout" && __gitcomp_builtin notes_edit && - verbose test -n "$__gitcomp_builtin_notes_edit" && + test -n "$__gitcomp_builtin_notes_edit" && . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && - verbose test -z "$__gitcomp_builtin_checkout" && - verbose test -z "$__gitcomp_builtin_notes_edit" + test -z "$__gitcomp_builtin_checkout" && + test -z "$__gitcomp_builtin_notes_edit" ) ' diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 999d46fafe..6e19ebc922 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1227,15 +1227,6 @@ test_i18ngrep () { return 1 } -# Call any command "$@" but be more verbose about its -# failure. This is handy for commands like "test" which do -# not output anything when they fail. -verbose () { - "$@" && return 0 - echo >&4 "command failed: $(git rev-parse --sq-quote "$@")" - return 1 -} - # Check if the file expected to be empty is indeed empty, and barfs # otherwise. diff --git a/upload-pack.c b/upload-pack.c index 08633dc121..d3312006a3 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -120,6 +120,7 @@ struct upload_pack_data { unsigned allow_ref_in_want : 1; /* v2 only */ unsigned allow_sideband_all : 1; /* v2 only */ unsigned advertise_sid : 1; + unsigned sent_capabilities : 1; }; static void upload_pack_data_init(struct upload_pack_data *data) @@ -1206,18 +1207,17 @@ static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) { strbuf_addf(buf, " session-id=%s", trace2_session_id()); } -static int send_ref(const char *refname, const struct object_id *oid, - int flag UNUSED, void *cb_data) +static void write_v0_ref(struct upload_pack_data *data, + const char *refname, const char *refname_nons, + const struct object_id *oid) { static const char *capabilities = "multi_ack thin-pack side-band" " side-band-64k ofs-delta shallow deepen-since deepen-not" " deepen-relative no-progress include-tag multi_ack_detailed"; - const char *refname_nons = strip_namespace(refname); struct object_id peeled; - struct upload_pack_data *data = cb_data; if (mark_our_ref(refname_nons, refname, oid, &data->hidden_refs)) - return 0; + return; if (capabilities) { struct strbuf symref_info = STRBUF_INIT; @@ -1240,12 +1240,20 @@ static int send_ref(const char *refname, const struct object_id *oid, git_user_agent_sanitized()); strbuf_release(&symref_info); strbuf_release(&session_id); + data->sent_capabilities = 1; } else { packet_fwrite_fmt(stdout, "%s %s\n", oid_to_hex(oid), refname_nons); } capabilities = NULL; if (!peel_iterated_oid(oid, &peeled)) packet_fwrite_fmt(stdout, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons); + return; +} + +static int send_ref(const char *refname, const struct object_id *oid, + int flag UNUSED, void *cb_data) +{ + write_v0_ref(cb_data, refname, strip_namespace(refname), oid); return 0; } @@ -1379,6 +1387,10 @@ void upload_pack(const int advertise_refs, const int stateless_rpc, data.no_done = 1; head_ref_namespaced(send_ref, &data); for_each_namespaced_ref(send_ref, &data); + if (!data.sent_capabilities) { + const char *refname = "capabilities^{}"; + write_v0_ref(&data, refname, refname, null_oid()); + } /* * fflush stdout before calling advertise_shallow_grafts because send_ref * uses stdio. diff --git a/userdiff.c b/userdiff.c index eaec6ebb5e..664c7c1402 100644 --- a/userdiff.c +++ b/userdiff.c @@ -444,7 +444,7 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate, check = attr_check_initl("diff", NULL); if (!path) return NULL; - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); if (ATTR_TRUE(check->items[0].value)) return &driver_true; @@ -83,7 +83,7 @@ unsigned whitespace_rule(struct index_state *istate, const char *pathname) if (!attr_whitespace_rule) attr_whitespace_rule = attr_check_initl("whitespace", NULL); - git_check_attr(istate, NULL, pathname, attr_whitespace_rule); + git_check_attr(istate, pathname, attr_whitespace_rule); value = attr_whitespace_rule->items[0].value; if (ATTR_TRUE(value)) { /* true (whitespace) */ |