diff options
100 files changed, 18759 insertions, 16583 deletions
diff --git a/Documentation/RelNotes/2.10.4.txt b/Documentation/RelNotes/2.10.4.txt new file mode 100644 index 000000000..ee8142ad2 --- /dev/null +++ b/Documentation/RelNotes/2.10.4.txt @@ -0,0 +1,4 @@ +Git v2.10.4 Release Notes +========================= + +This release forward-ports the fix for "ssh://..." URL from Git v2.7.6 diff --git a/Documentation/RelNotes/2.11.3.txt b/Documentation/RelNotes/2.11.3.txt new file mode 100644 index 000000000..4e3b78d0e --- /dev/null +++ b/Documentation/RelNotes/2.11.3.txt @@ -0,0 +1,4 @@ +Git v2.11.3 Release Notes +========================= + +This release forward-ports the fix for "ssh://..." URL from Git v2.7.6 diff --git a/Documentation/RelNotes/2.12.4.txt b/Documentation/RelNotes/2.12.4.txt new file mode 100644 index 000000000..3f5693822 --- /dev/null +++ b/Documentation/RelNotes/2.12.4.txt @@ -0,0 +1,4 @@ +Git v2.12.4 Release Notes +========================= + +This release forward-ports the fix for "ssh://..." URL from Git v2.7.6 diff --git a/Documentation/RelNotes/2.13.4.txt b/Documentation/RelNotes/2.13.4.txt index 4f46ef6fc..9a9f8f959 100644 --- a/Documentation/RelNotes/2.13.4.txt +++ b/Documentation/RelNotes/2.13.4.txt @@ -8,3 +8,21 @@ Fixes since v2.13.3 * A recent update broke an alias that contained an uppercase letter, which has been fixed. + + * On Cygwin, similar to Windows, "git push //server/share/repository" + ought to mean a repository on a network share that can be accessed + locally, but this did not work correctly due to stripping the double + slashes at the beginning. + + * The progress meter did not give a useful output when we haven't had + 0.5 seconds to measure the throughput during the interval. Instead + show the overall throughput rate at the end, which is a much more + useful number. + + * We run an early part of "git gc" that deals with refs before + daemonising (and not under lock) even when running a background + auto-gc, which caused multiple gc processes attempting to run the + early part at the same time. This is now prevented by running the + early part also under the GC lock. + +Also contains a handful of small code and documentation clean-ups. diff --git a/Documentation/RelNotes/2.13.5.txt b/Documentation/RelNotes/2.13.5.txt new file mode 100644 index 000000000..6949fcda7 --- /dev/null +++ b/Documentation/RelNotes/2.13.5.txt @@ -0,0 +1,4 @@ +Git v2.13.5 Release Notes +========================= + +This release forward-ports the fix for "ssh://..." URL from Git v2.7.6 diff --git a/Documentation/RelNotes/2.14.0.txt b/Documentation/RelNotes/2.14.0.txt index 6544e7f82..4246c68ff 100644 --- a/Documentation/RelNotes/2.14.0.txt +++ b/Documentation/RelNotes/2.14.0.txt @@ -469,14 +469,12 @@ notes for details). set does. * Code clean-up to fix possible buffer over-reading. - (merge 2d105451c0 rs/apply-avoid-over-reading later to maint). * A few tests that tried to verify the contents of push certificates did not use 'git rev-parse' to formulate the line to look for in the certificate correctly. * Update the character width tables. - (merge 7560aacd7c bb/unicode-10.0 later to maint). * After "git branch --move" of the currently checked out branch, the code to walk the reflog of HEAD via "log -g" and friends @@ -495,33 +493,25 @@ notes for details). ought to mean a repository on a network share that can be accessed locally, but this did not work correctly due to stripping the double slashes at the beginning. - (merge 496f256989 tb/push-to-cygwin-unc-path later to maint). * The progress meter did not give a useful output when we haven't had 0.5 seconds to measure the throughput during the interval. Instead show the overall throughput rate at the end, which is a much more useful number. - (merge 0fae1e072a rs/progress-overall-throughput-at-the-end later to maint). * Code clean-up, that makes us in sync with Debian by one patch. - (merge 8db1ae5740 jn/hooks-pre-rebase-sample-fix later to maint). * We run an early part of "git gc" that deals with refs before daemonising (and not under lock) even when running a background auto-gc, which caused multiple gc processes attempting to run the early part at the same time. This is now prevented by running the early part also under the GC lock. - (merge c45af94dbc jk/gc-pre-detach-under-hook later to maint). * A recent update broke an alias that contained an uppercase letter. - (merge 643df7e234 js/alias-case-sensitivity later to maint). * Other minor doc, test and build updates and code cleanups. - (merge 3f9c637ec7 pw/unquote-path-in-git-pm later to maint). (merge 5053313562 rs/urlmatch-cleanup later to maint). (merge 42c78a216e rs/use-div-round-up later to maint). (merge 5e8d2729ae rs/wt-status-cleanup later to maint). - (merge 01826066b0 ks/fix-rebase-doc-picture later to maint). - (merge f7f6dc340e jk/test-copy-bytes-fix later to maint). - (merge 9fb9495dae ew/fd-cloexec-fix later to maint). - (merge 3a33fe5c97 ks/doc-fixes later to maint). + (merge bc9b7e207f as/diff-options-grammofix later to maint). + (merge ac05222b31 ah/patch-id-doc later to maint). diff --git a/Documentation/RelNotes/2.14.1.txt b/Documentation/RelNotes/2.14.1.txt new file mode 100644 index 000000000..9403340f7 --- /dev/null +++ b/Documentation/RelNotes/2.14.1.txt @@ -0,0 +1,4 @@ +Git v2.14.1 Release Notes +========================= + +This release forward-ports the fix for "ssh://..." URL from Git v2.7.6 diff --git a/Documentation/RelNotes/2.7.6.txt b/Documentation/RelNotes/2.7.6.txt new file mode 100644 index 000000000..4c6d1dcd4 --- /dev/null +++ b/Documentation/RelNotes/2.7.6.txt @@ -0,0 +1,25 @@ +Git v2.7.6 Release Notes +======================== + +Fixes since v2.7.5 +------------------ + + * A "ssh://..." URL can result in a "ssh" command line with a + hostname that begins with a dash "-", which would cause the "ssh" + command to instead (mis)treat it as an option. This is now + prevented by forbidding such a hostname (which will not be + necessary in the real world). + + * Similarly, when GIT_PROXY_COMMAND is configured, the command is + run with host and port that are parsed out from "ssh://..." URL; + a poorly written GIT_PROXY_COMMAND could be tricked into treating + a string that begins with a dash "-". This is now prevented by + forbidding such a hostname and port number (again, which will not + be necessary in the real world). + + * In the same spirit, a repository name that begins with a dash "-" + is also forbidden now. + +Credits go to Brian Neel at GitLab, Joern Schneeweisz of Recurity +Labs and Jeff King at GitHub. + diff --git a/Documentation/RelNotes/2.8.6.txt b/Documentation/RelNotes/2.8.6.txt new file mode 100644 index 000000000..d8db55d92 --- /dev/null +++ b/Documentation/RelNotes/2.8.6.txt @@ -0,0 +1,4 @@ +Git v2.8.6 Release Notes +======================== + +This release forward-ports the fix for "ssh://..." URL from Git v2.7.6 diff --git a/Documentation/RelNotes/2.9.5.txt b/Documentation/RelNotes/2.9.5.txt new file mode 100644 index 000000000..668313ae5 --- /dev/null +++ b/Documentation/RelNotes/2.9.5.txt @@ -0,0 +1,4 @@ +Git v2.9.5 Release Notes +======================== + +This release forward-ports the fix for "ssh://..." URL from Git v2.7.6 diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index cbce8ec63..5ca942ab5 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -200,7 +200,10 @@ diff.algorithm:: + diff.wsErrorHighlight:: - A comma separated list of `old`, `new`, `context`, that - specifies how whitespace errors on lines are highlighted - with `color.diff.whitespace`. Can be overridden by the - command line option `--ws-error-highlight=<kind>` + Highlight whitespace errors in the `context`, `old` or `new` + lines of the diff. Multiple values are separated by comma, + `none` resets previous values, `default` reset the list to + `new` and `all` is a shorthand for `old,new,context`. The + whitespace errors are colored with `color.diff.whitespace`. + The command line option `--ws-error-highlight=<kind>` + overrides this setting. diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 89cc0f48d..56dedafcd 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -300,15 +300,14 @@ ifndef::git-format-patch[] with --exit-code. --ws-error-highlight=<kind>:: - Highlight whitespace errors on lines specified by <kind> - in the color specified by `color.diff.whitespace`. <kind> - is a comma separated list of `old`, `new`, `context`. When - this option is not given, only whitespace errors in `new` - lines are highlighted. E.g. `--ws-error-highlight=new,old` - highlights whitespace errors on both deleted and added lines. - `all` can be used as a short-hand for `old,new,context`. - The `diff.wsErrorHighlight` configuration variable can be - used to specify the default behaviour. + Highlight whitespace errors in the `context`, `old` or `new` + lines of the diff. Multiple values are separated by comma, + `none` resets previous values, `default` reset the list to + `new` and `all` is a shorthand for `old,new,context`. When + this option is not given, and the configuration variable + `diff.wsErrorHighlight` is not set, only whitespace errors in + `new` lines are highlighted. The whitespace errors are colored + whith `color.diff.whitespace`. endif::git-format-patch[] @@ -392,7 +391,7 @@ endif::git-log[] the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the - text after the change. In addition, the output obviously lack + text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option. + diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 03e187a10..cc42c1283 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -156,8 +156,10 @@ HEAD:: otherwise. color:: - Change output color. Followed by `:<colorname>`, where names - are described in `color.branch.*`. + Change output color. Followed by `:<colorname>`, where color + names are described under Values in the "CONFIGURATION FILE" + section of linkgit:git-config[1]. For example, + `%(color:bold red)`. align:: Left-, middle-, or right-align the content between diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index cf71fba1c..442caff8a 100644 --- a/Documentation/git-patch-id.txt +++ b/Documentation/git-patch-id.txt @@ -56,9 +56,6 @@ OPTIONS This is the default. -<patch>:: - The diff to create the ID of. - GIT --- Part of the linkgit:git[1] suite diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 2a2d7e2a4..c4f2be254 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -425,8 +425,8 @@ packet: git< capability=clean packet: git< capability=smudge packet: git< 0000 ------------------------ -Supported filter capabilities in version 2 are "clean" and -"smudge". +Supported filter capabilities in version 2 are "clean", "smudge", +and "delay". Afterwards Git sends a list of "key=value" pairs terminated with a flush packet. The list will contain at least the filter command @@ -512,12 +512,73 @@ the protocol then Git will stop the filter process and restart it with the next file that needs to be processed. Depending on the `filter.<driver>.required` flag Git will interpret that as error. -After the filter has processed a blob it is expected to wait for -the next "key=value" list containing a command. Git will close +After the filter has processed a command it is expected to wait for +a "key=value" list containing the next command. Git will close the command pipe on exit. The filter is expected to detect EOF and exit gracefully on its own. Git will wait until the filter process has stopped. +Delay +^^^^^ + +If the filter supports the "delay" capability, then Git can send the +flag "can-delay" after the filter command and pathname. This flag +denotes that the filter can delay filtering the current blob (e.g. to +compensate network latencies) by responding with no content but with +the status "delayed" and a flush packet. +------------------------ +packet: git> command=smudge +packet: git> pathname=path/testfile.dat +packet: git> can-delay=1 +packet: git> 0000 +packet: git> CONTENT +packet: git> 0000 +packet: git< status=delayed +packet: git< 0000 +------------------------ + +If the filter supports the "delay" capability then it must support the +"list_available_blobs" command. If Git sends this command, then the +filter is expected to return a list of pathnames representing blobs +that have been delayed earlier and are now available. +The list must be terminated with a flush packet followed +by a "success" status that is also terminated with a flush packet. If +no blobs for the delayed paths are available, yet, then the filter is +expected to block the response until at least one blob becomes +available. The filter can tell Git that it has no more delayed blobs +by sending an empty list. As soon as the filter responds with an empty +list, Git stops asking. All blobs that Git has not received at this +point are considered missing and will result in an error. + +------------------------ +packet: git> command=list_available_blobs +packet: git> 0000 +packet: git< pathname=path/testfile.dat +packet: git< pathname=path/otherfile.dat +packet: git< 0000 +packet: git< status=success +packet: git< 0000 +------------------------ + +After Git received the pathnames, it will request the corresponding +blobs again. These requests contain a pathname and an empty content +section. The filter is expected to respond with the smudged content +in the usual way as explained above. +------------------------ +packet: git> command=smudge +packet: git> pathname=path/testfile.dat +packet: git> 0000 +packet: git> 0000 # empty content! +packet: git< status=success +packet: git< 0000 +packet: git< SMUDGED_CONTENT +packet: git< 0000 +packet: git< 0000 # empty list, keep "status=success" unchanged! +------------------------ + +Example +^^^^^^^ + A long running filter demo implementation can be found in `contrib/long-running-filter/example.pl` located in the Git core repository. If you develop your own long running filter diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 4d6dac577..973d19606 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -173,13 +173,17 @@ endif::git-rev-list[] - '%Cblue': switch color to blue - '%Creset': reset color - '%C(...)': color specification, as described under Values in the - "CONFIGURATION FILE" section of linkgit:git-config[1]; - adding `auto,` at the beginning (e.g. `%C(auto,red)`) will emit - color only when colors are enabled for log output (by `color.diff`, - `color.ui`, or `--color`, and respecting the `auto` settings of the - former if we are going to a terminal). `auto` alone (i.e. - `%C(auto)`) will turn on auto coloring on the next placeholders - until the color is switched again. + "CONFIGURATION FILE" section of linkgit:git-config[1]. + By default, colors are shown only when enabled for log output (by + `color.diff`, `color.ui`, or `--color`, and respecting the `auto` + settings of the former if we are going to a terminal). `%C(auto,...)` + is accepted as a historical synonym for the default (e.g., + `%C(auto,red)`). Specifying `%C(always,...) will show the colors + even when color is not otherwise enabled (though consider + just using `--color=always` to enable color for the whole output, + including this format and anything else git might color). `auto` + alone (i.e. `%C(auto)`) will turn on auto coloring on the next + placeholders until the color is switched again. - '%m': left (`<`), right (`>`) or boundary (`-`) mark - '%n': newline - '%%': a raw '%' diff --git a/Documentation/technical/api-sub-process.txt b/Documentation/technical/api-sub-process.txt deleted file mode 100644 index 793508cf3..000000000 --- a/Documentation/technical/api-sub-process.txt +++ /dev/null @@ -1,59 +0,0 @@ -sub-process API -=============== - -The sub-process API makes it possible to run background sub-processes -for the entire lifetime of a Git invocation. If Git needs to communicate -with an external process multiple times, then this can reduces the process -invocation overhead. Git and the sub-process communicate through stdin and -stdout. - -The sub-processes are kept in a hashmap by command name and looked up -via the subprocess_find_entry function. If an existing instance can not -be found then a new process should be created and started. When the -parent git command terminates, all sub-processes are also terminated. - -This API is based on the run-command API. - -Data structures ---------------- - -* `struct subprocess_entry` - -The sub-process structure. Members should not be accessed directly. - -Types ------ - -'int(*subprocess_start_fn)(struct subprocess_entry *entry)':: - - User-supplied function to initialize the sub-process. This is - typically used to negotiate the interface version and capabilities. - - -Functions ---------- - -`cmd2process_cmp`:: - - Function to test two subprocess hashmap entries for equality. - -`subprocess_start`:: - - Start a subprocess and add it to the subprocess hashmap. - -`subprocess_stop`:: - - Kill a subprocess and remove it from the subprocess hashmap. - -`subprocess_find_entry`:: - - Find a subprocess in the subprocess hashmap. - -`subprocess_get_child_process`:: - - Get the underlying `struct child_process` from a subprocess. - -`subprocess_read_status`:: - - Helper function to read packets looking for the last "status=<foo>" - key/value pair. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 96c688bd2..2388ba13c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.14.0-rc1 +DEF_VER=v2.14.1 LF=' ' @@ -1 +1 @@ -Documentation/RelNotes/2.14.0.txt
\ No newline at end of file +Documentation/RelNotes/2.14.1.txt
\ No newline at end of file @@ -2809,13 +2809,10 @@ static void update_image(struct apply_state *state, img->line_allocated = img->line; } if (preimage_limit != postimage->nr) - memmove(img->line + applied_pos + postimage->nr, - img->line + applied_pos + preimage_limit, - (img->nr - (applied_pos + preimage_limit)) * - sizeof(*img->line)); - memcpy(img->line + applied_pos, - postimage->line, - postimage->nr * sizeof(*img->line)); + MOVE_ARRAY(img->line + applied_pos + postimage->nr, + img->line + applied_pos + preimage_limit, + img->nr - (applied_pos + preimage_limit)); + COPY_ARRAY(img->line + applied_pos, postimage->line, postimage->nr); if (!state->allow_overlap) for (i = 0; i < postimage->nr; i++) img->line[applied_pos + i].flag |= LINE_PATCHED; @@ -1663,7 +1663,7 @@ static struct commit *find_single_final(struct rev_info *revs, name = revs->pending.objects[i].name; } if (name_p) - *name_p = name; + *name_p = xstrdup_or_null(name); return found; } @@ -1735,7 +1735,7 @@ static struct commit *find_single_initial(struct rev_info *revs, die("No commit to dig up from?"); if (name_p) - *name_p = name; + *name_p = xstrdup(name); return found; } @@ -1843,6 +1843,8 @@ void setup_scoreboard(struct blame_scoreboard *sb, const char *path, struct blam if (orig) *orig = o; + + free((char *)final_commit_name); } diff --git a/builtin/branch.c b/builtin/branch.c index 8a0595e11..16d391b40 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -92,7 +92,7 @@ static int git_branch_config(const char *var, const char *value, void *cb) return config_error_nonbool(var); return color_parse(value, branch_colors[slot]); } - return git_color_default_config(var, value, cb); + return git_default_config(var, value, cb); } static const char *branch_get_color(enum color_branch ix) @@ -383,7 +383,7 @@ static char *build_format(struct ref_filter *filter, int maxwidth, const char *r return strbuf_detach(&fmt, NULL); } -static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting, const char *format) +static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting, struct ref_format *format) { int i; struct ref_array array; @@ -407,14 +407,17 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin if (filter->verbose) maxwidth = calc_maxwidth(&array, strlen(remote_prefix)); - if (!format) - format = to_free = build_format(filter, maxwidth, remote_prefix); - verify_ref_format(format); + if (!format->format) + format->format = to_free = build_format(filter, maxwidth, remote_prefix); + format->use_color = branch_use_color; + + if (verify_ref_format(format)) + die(_("unable to parse format string")); ref_array_sort(sorting, &array); for (i = 0; i < array.nr; i++) { - format_ref_array_item(array.items[i], format, 0, &out); + format_ref_array_item(array.items[i], format, &out); if (column_active(colopts)) { assert(!filter->verbose && "--column and --verbose are incompatible"); /* format to a string_list to let print_columns() do its job */ @@ -549,7 +552,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) struct ref_filter filter; int icase = 0; static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting; - const char *format = NULL; + struct ref_format format = REF_FORMAT_INIT; struct option options[] = { OPT_GROUP(N_("Generic options")), @@ -593,7 +596,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) N_("print only branches of the object"), 0, parse_opt_object_name }, OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")), - OPT_STRING( 0 , "format", &format, N_("format"), N_("format to use for the output")), + OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")), OPT_END(), }; @@ -667,7 +670,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (!sorting) sorting = ref_default_sorting(); sorting->ignore_case = icase; - print_ref_list(&filter, sorting, format); + print_ref_list(&filter, sorting, &format); print_columns(&output, colopts, NULL); string_list_clear(&output, 0); return 0; diff --git a/builtin/checkout.c b/builtin/checkout.c index 9661e1bcb..2d75ac66c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -358,6 +358,8 @@ static int checkout_paths(const struct checkout_opts *opts, state.force = 1; state.refresh_cache = 1; state.istate = &the_index; + + enable_delayed_checkout(&state); for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; if (ce->ce_flags & CE_MATCHED) { @@ -372,6 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts, pos = skip_same_name(ce, pos) - 1; } } + errs |= finish_delayed_checkout(&state); if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) die(_("unable to write new index file")); diff --git a/builtin/clean.c b/builtin/clean.c index 057fc97fe..c1bafda5b 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -125,8 +125,7 @@ static int git_clean_config(const char *var, const char *value, void *cb) return 0; } - /* inspect the color.ui config variable and others */ - return git_color_default_config(var, value, cb); + return git_default_config(var, value, cb); } static const char *clean_get_color(enum color_clean ix) diff --git a/builtin/commit.c b/builtin/commit.c index 8e9380251..1a0da71a4 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1739,17 +1739,17 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (verbose || /* Truncate the message just before the diff, if any. */ cleanup_mode == CLEANUP_SCISSORS) strbuf_setlen(&sb, wt_status_locate_end(sb.buf, sb.len)); - if (cleanup_mode != CLEANUP_NONE) strbuf_stripspace(&sb, cleanup_mode == CLEANUP_ALL); - if (template_untouched(&sb) && !allow_empty_message) { + + if (message_is_empty(&sb) && !allow_empty_message) { rollback_index_files(); - fprintf(stderr, _("Aborting commit; you did not edit the message.\n")); + fprintf(stderr, _("Aborting commit due to empty commit message.\n")); exit(1); } - if (message_is_empty(&sb) && !allow_empty_message) { + if (template_untouched(&sb) && !allow_empty_message) { rollback_index_files(); - fprintf(stderr, _("Aborting commit due to empty commit message.\n")); + fprintf(stderr, _("Aborting commit; you did not edit the message.\n")); exit(1); } diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 10cbb4341..e99b5ddbf 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -408,7 +408,8 @@ static void shortlog(const char *name, } static void fmt_merge_msg_title(struct strbuf *out, - const char *current_branch) { + const char *current_branch) +{ int i = 0; char *sep = ""; diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 52be99cba..5d7c921a7 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -17,25 +17,25 @@ static char const * const for_each_ref_usage[] = { int cmd_for_each_ref(int argc, const char **argv, const char *prefix) { int i; - const char *format = "%(objectname) %(objecttype)\t%(refname)"; struct ref_sorting *sorting = NULL, **sorting_tail = &sorting; - int maxcount = 0, quote_style = 0, icase = 0; + int maxcount = 0, icase = 0; struct ref_array array; struct ref_filter filter; + struct ref_format format = REF_FORMAT_INIT; struct option opts[] = { - OPT_BIT('s', "shell", "e_style, + OPT_BIT('s', "shell", &format.quote_style, N_("quote placeholders suitably for shells"), QUOTE_SHELL), - OPT_BIT('p', "perl", "e_style, + OPT_BIT('p', "perl", &format.quote_style, N_("quote placeholders suitably for perl"), QUOTE_PERL), - OPT_BIT(0 , "python", "e_style, + OPT_BIT(0 , "python", &format.quote_style, N_("quote placeholders suitably for python"), QUOTE_PYTHON), - OPT_BIT(0 , "tcl", "e_style, + OPT_BIT(0 , "tcl", &format.quote_style, N_("quote placeholders suitably for Tcl"), QUOTE_TCL), OPT_GROUP(""), OPT_INTEGER( 0 , "count", &maxcount, N_("show only <n> matched refs")), - OPT_STRING( 0 , "format", &format, N_("format"), N_("format to use for the output")), + OPT_STRING( 0 , "format", &format.format, N_("format"), N_("format to use for the output")), OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"), N_("field name to sort on"), &parse_opt_ref_sorting), OPT_CALLBACK(0, "points-at", &filter.points_at, @@ -52,16 +52,20 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) memset(&array, 0, sizeof(array)); memset(&filter, 0, sizeof(filter)); + format.format = "%(objectname) %(objecttype)\t%(refname)"; + + git_config(git_default_config, NULL); + parse_options(argc, argv, prefix, opts, for_each_ref_usage, 0); if (maxcount < 0) { error("invalid --count argument: `%d'", maxcount); usage_with_options(for_each_ref_usage, opts); } - if (HAS_MULTI_BITS(quote_style)) { + if (HAS_MULTI_BITS(format.quote_style)) { error("more than one quoting style?"); usage_with_options(for_each_ref_usage, opts); } - if (verify_ref_format(format)) + if (verify_ref_format(&format)) usage_with_options(for_each_ref_usage, opts); if (!sorting) @@ -69,9 +73,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) sorting->ignore_case = icase; filter.ignore_case = icase; - /* for warn_ambiguous_refs */ - git_config(git_default_config, NULL); - filter.name_patterns = argv; filter.match_as_path = 1; filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN); @@ -80,7 +81,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) if (!maxcount || array.nr < maxcount) maxcount = array.nr; for (i = 0; i < maxcount; i++) - show_ref_array_item(array.items[i], format, quote_style); + show_ref_array_item(array.items[i], &format); ref_array_clear(&array); return 0; } diff --git a/builtin/fsck.c b/builtin/fsck.c index 99dea7adf..64542ac3d 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -19,6 +19,8 @@ #define REACHABLE 0x0001 #define SEEN 0x0002 #define HAS_OBJ 0x0004 +/* This flag is set if something points to this object. */ +#define USED 0x0008 static int show_root; static int show_tags; @@ -168,18 +170,7 @@ static void mark_object_reachable(struct object *obj) static int traverse_one_object(struct object *obj) { - int result; - struct tree *tree = NULL; - - if (obj->type == OBJ_TREE) { - tree = (struct tree *)obj; - if (parse_tree(tree) < 0) - return 1; /* error already displayed */ - } - result = fsck_walk(obj, obj, &fsck_walk_options); - if (tree) - free_tree_buffer(tree); - return result; + return fsck_walk(obj, obj, &fsck_walk_options); } static int traverse_reachable(void) @@ -206,7 +197,7 @@ static int mark_used(struct object *obj, int type, void *data, struct fsck_optio { if (!obj) return 1; - obj->used = 1; + obj->flags |= USED; return 0; } @@ -255,7 +246,7 @@ static void check_unreachable_object(struct object *obj) } /* - * "!used" means that nothing at all points to it, including + * "!USED" means that nothing at all points to it, including * other unreachable objects. In other words, it's the "tip" * of some set of unreachable objects, usually a commit that * got dropped. @@ -266,7 +257,7 @@ static void check_unreachable_object(struct object *obj) * deleted a branch by mistake, this is a prime candidate to * start looking at, for example. */ - if (!obj->used) { + if (!(obj->flags & USED)) { if (show_dangling) printf("dangling %s %s\n", printable_type(obj), describe_object(obj)); @@ -390,7 +381,8 @@ static int fsck_obj_buffer(const struct object_id *oid, enum object_type type, errors_found |= ERROR_OBJECT; return error("%s: object corrupt or missing", oid_to_hex(oid)); } - obj->flags = HAS_OBJ; + obj->flags &= ~(REACHABLE | SEEN); + obj->flags |= HAS_OBJ; return fsck_obj(obj); } @@ -408,7 +400,7 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid, add_decoration(fsck_walk_options.object_names, obj, xstrfmt("%s@{%"PRItime"}", refname, timestamp)); - obj->used = 1; + obj->flags |= USED; mark_object_reachable(obj); } else { error("%s: invalid reflog entry %s", refname, oid_to_hex(oid)); @@ -456,7 +448,7 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid, errors_found |= ERROR_REFS; } default_refs++; - obj->used = 1; + obj->flags |= USED; if (name_objects) add_decoration(fsck_walk_options.object_names, obj, xstrdup(refname)); @@ -524,7 +516,8 @@ static int fsck_loose(const struct object_id *oid, const char *path, void *data) return 0; /* keep checking other objects */ } - obj->flags = HAS_OBJ; + obj->flags &= ~(REACHABLE | SEEN); + obj->flags |= HAS_OBJ; if (fsck_obj(obj)) errors_found |= ERROR_OBJECT; return 0; @@ -606,7 +599,7 @@ static int fsck_cache_tree(struct cache_tree *it) errors_found |= ERROR_REFS; return 1; } - obj->used = 1; + obj->flags |= USED; if (name_objects) add_decoration(fsck_walk_options.object_names, obj, xstrdup(":")); @@ -667,7 +660,7 @@ static struct option fsck_opts[] = { int cmd_fsck(int argc, const char **argv, const char *prefix) { - int i, heads; + int i; struct alternate_object_database *alt; errors_found = 0; @@ -735,7 +728,6 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } } - heads = 0; for (i = 0; i < argc; i++) { const char *arg = argv[i]; unsigned char sha1[20]; @@ -748,12 +740,11 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) continue; } - obj->used = 1; + obj->flags |= USED; if (name_objects) add_decoration(fsck_walk_options.object_names, obj, xstrdup(arg)); mark_object_reachable(obj); - heads++; continue; } error("invalid parameter: expected sha1, got '%s'", arg); @@ -785,7 +776,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) if (!blob) continue; obj = &blob->object; - obj->used = 1; + obj->flags |= USED; if (name_objects) add_decoration(fsck_walk_options.object_names, obj, diff --git a/builtin/grep.c b/builtin/grep.c index 7e79eb1a7..42ff87065 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -284,7 +284,7 @@ static int wait_all(void) static int grep_cmd_config(const char *var, const char *value, void *cb) { int st = grep_config(var, value, cb); - if (git_color_default_config(var, value, cb) < 0) + if (git_default_config(var, value, cb) < 0) st = -1; if (!strcmp(var, "grep.threads")) { diff --git a/builtin/log.c b/builtin/log.c index c6362cf92..5ffc380bd 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -372,11 +372,14 @@ static int cmd_log_walk(struct rev_info *rev) */ rev->max_count++; if (!rev->reflog_info) { - /* we allow cycles in reflog ancestry */ + /* + * We may show a given commit multiple times when + * walking the reflogs. + */ free_commit_buffer(commit); + free_commit_list(commit->parents); + commit->parents = NULL; } - free_commit_list(commit->parents); - commit->parents = NULL; if (saved_nrl < rev->diffopt.needed_rename_limit) saved_nrl = rev->diffopt.needed_rename_limit; if (rev->diffopt.degraded_cc_to_c) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b8514a002..c6126eae5 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -362,7 +362,7 @@ static void prune_index(struct index_state *istate, int pos; unsigned int first, last; - if (!prefix) + if (!prefix || !istate->cache_nr) return; pos = index_name_pos(istate, prefix, prefixlen); if (pos < 0) @@ -378,8 +378,7 @@ static void prune_index(struct index_state *istate, } last = next; } - memmove(istate->cache, istate->cache + pos, - (last - pos) * sizeof(struct cache_entry *)); + MOVE_ARRAY(istate->cache, istate->cache + pos, last - pos); istate->cache_nr = last - pos; } diff --git a/builtin/merge.c b/builtin/merge.c index 900bafdb4..d5797b8fe 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -537,7 +537,7 @@ static void parse_branch_merge_options(char *bmo) die(_("Bad branch.%s.mergeoptions string: %s"), branch, split_cmdline_strerror(argc)); REALLOC_ARRAY(argv, argc + 2); - memmove(argv + 1, argv, sizeof(*argv) * (argc + 1)); + MOVE_ARRAY(argv + 1, argv, argc + 1); argc++; argv[0] = "branch.*.mergeoptions"; parse_options(argc, argv, NULL, builtin_merge_options, diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index f4a8441fe..c753e9237 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1289,7 +1289,7 @@ static int done_pbase_path_pos(unsigned hash) static int check_pbase_path(unsigned hash) { - int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash); + int pos = done_pbase_path_pos(hash); if (0 <= pos) return 1; pos = -pos - 1; @@ -1298,9 +1298,8 @@ static int check_pbase_path(unsigned hash) done_pbase_paths_alloc); done_pbase_paths_num++; if (pos < done_pbase_paths_num) - memmove(done_pbase_paths + pos + 1, - done_pbase_paths + pos, - (done_pbase_paths_num - pos - 1) * sizeof(unsigned)); + MOVE_ARRAY(done_pbase_paths + pos + 1, done_pbase_paths + pos, + done_pbase_paths_num - pos - 1); done_pbase_paths[pos] = hash; return 0; } diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 95d84d5cd..e8f504890 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -11,6 +11,7 @@ #include "graph.h" #include "bisect.h" #include "progress.h" +#include "reflog-walk.h" static const char rev_list_usage[] = "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n" @@ -122,6 +123,7 @@ static void show_commit(struct commit *commit, void *data) ctx.date_mode_explicit = revs->date_mode_explicit; ctx.fmt = revs->commit_format; ctx.output_encoding = get_log_output_encoding(); + ctx.color = revs->diffopt.use_color; pretty_print_commit(&ctx, commit, &buf); if (buf.len) { if (revs->commit_format != CMIT_FMT_ONELINE) @@ -348,7 +350,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) /* Only --header was specified */ revs.commit_format = CMIT_FMT_RAW; - if ((!revs.commits && + if ((!revs.commits && reflog_walk_empty(revs.reflog_info) && (!(revs.tag_objects || revs.tree_objects || revs.blob_objects) && !revs.pending.nr)) || revs.diff) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 7073a3eb9..28f245c8c 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -554,7 +554,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb) return 0; } - return git_color_default_config(var, value, cb); + return git_default_config(var, value, cb); } static int omit_in_dense(struct commit *commit, struct commit **rev, int n) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 6abdad329..3a3c9ca72 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -930,7 +930,7 @@ static int update_clone_task_finished(int result, const struct cache_entry *ce; struct submodule_update_clone *suc = suc_cb; - int *idxP = *(int**)idx_task_cb; + int *idxP = idx_task_cb; int idx = *idxP; free(idxP); diff --git a/builtin/tag.c b/builtin/tag.c index 01154ea8d..66e35b823 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -32,7 +32,8 @@ static const char * const git_tag_usage[] = { static unsigned int colopts; static int force_sign_annotate; -static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, const char *format) +static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, + struct ref_format *format) { struct ref_array array; char *to_free = NULL; @@ -43,23 +44,24 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, con if (filter->lines == -1) filter->lines = 0; - if (!format) { + if (!format->format) { if (filter->lines) { to_free = xstrfmt("%s %%(contents:lines=%d)", "%(align:15)%(refname:lstrip=2)%(end)", filter->lines); - format = to_free; + format->format = to_free; } else - format = "%(refname:lstrip=2)"; + format->format = "%(refname:lstrip=2)"; } - verify_ref_format(format); + if (verify_ref_format(format)) + die(_("unable to parse format string")); filter->with_commit_tag_algo = 1; filter_refs(&array, filter, FILTER_REFS_TAGS); ref_array_sort(sorting, &array); for (i = 0; i < array.nr; i++) - show_ref_array_item(array.items[i], format, 0); + show_ref_array_item(array.items[i], format); ref_array_clear(&array); free(to_free); @@ -105,17 +107,17 @@ static int verify_tag(const char *name, const char *ref, const struct object_id *oid, const void *cb_data) { int flags; - const char *fmt_pretty = cb_data; + const struct ref_format *format = cb_data; flags = GPG_VERIFY_VERBOSE; - if (fmt_pretty) + if (format->format) flags = GPG_VERIFY_OMIT_STATUS; if (gpg_verify_tag(oid->hash, name, flags)) return -1; - if (fmt_pretty) - pretty_print_ref(name, oid->hash, fmt_pretty); + if (format->format) + pretty_print_ref(name, oid->hash, format); return 0; } @@ -134,30 +136,6 @@ static const char tag_template_nocleanup[] = "Lines starting with '%c' will be kept; you may remove them" " yourself if you want to.\n"); -/* Parse arg given and add it the ref_sorting array */ -static int parse_sorting_string(const char *arg, struct ref_sorting **sorting_tail) -{ - struct ref_sorting *s; - int len; - - s = xcalloc(1, sizeof(*s)); - s->next = *sorting_tail; - *sorting_tail = s; - - if (*arg == '-') { - s->reverse = 1; - arg++; - } - if (skip_prefix(arg, "version:", &arg) || - skip_prefix(arg, "v:", &arg)) - s->version = 1; - - len = strlen(arg); - s->atom = parse_ref_filter_atom(arg, arg+len); - - return 0; -} - static int git_tag_config(const char *var, const char *value, void *cb) { int status; @@ -166,7 +144,7 @@ static int git_tag_config(const char *var, const char *value, void *cb) if (!strcmp(var, "tag.sort")) { if (!value) return config_error_nonbool(var); - parse_sorting_string(value, sorting_tail); + parse_ref_sorting(sorting_tail, value); return 0; } @@ -392,7 +370,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) struct strbuf err = STRBUF_INIT; struct ref_filter filter; static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting; - const char *format = NULL; + struct ref_format format = REF_FORMAT_INIT; int icase = 0; struct option options[] = { OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'), @@ -431,7 +409,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) N_("print only tags of the object"), PARSE_OPT_LASTARG_DEFAULT, parse_opt_object_name, (intptr_t) "HEAD" }, - OPT_STRING( 0 , "format", &format, N_("format"), N_("format to use for the output")), + OPT_STRING( 0 , "format", &format.format, N_("format"), + N_("format to use for the output")), OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")), OPT_END() }; @@ -483,7 +462,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) run_column_filter(colopts, &copts); } filter.name_patterns = argv; - ret = list_tags(&filter, sorting, format); + ret = list_tags(&filter, sorting, &format); if (column_active(colopts)) stop_column_filter(); return ret; @@ -501,9 +480,9 @@ int cmd_tag(int argc, const char **argv, const char *prefix) if (cmdmode == 'd') return for_each_tag_name(argv, delete_tag, NULL); if (cmdmode == 'v') { - if (format) - verify_ref_format(format); - return for_each_tag_name(argv, verify_tag, format); + if (format.format && verify_ref_format(&format)) + usage_with_options(git_tag_usage, options); + return for_each_tag_name(argv, verify_tag, &format); } if (msg.given || msgfile) { diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index f9a5f7535..87d73e856 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -32,11 +32,11 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) { int i = 1, verbose = 0, had_error = 0; unsigned flags = 0; - char *fmt_pretty = NULL; + struct ref_format format = REF_FORMAT_INIT; const struct option verify_tag_options[] = { OPT__VERBOSE(&verbose, N_("print tag contents")), OPT_BIT(0, "raw", &flags, N_("print raw gpg status output"), GPG_VERIFY_RAW), - OPT_STRING( 0 , "format", &fmt_pretty, N_("format"), N_("format to use for the output")), + OPT_STRING(0, "format", &format.format, N_("format"), N_("format to use for the output")), OPT_END() }; @@ -50,8 +50,10 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) if (verbose) flags |= GPG_VERIFY_VERBOSE; - if (fmt_pretty) { - verify_ref_format(fmt_pretty); + if (format.format) { + if (verify_ref_format(&format)) + usage_with_options(verify_tag_usage, + verify_tag_options); flags |= GPG_VERIFY_OMIT_STATUS; } @@ -68,8 +70,8 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) continue; } - if (fmt_pretty) - pretty_print_ref(name, sha1, fmt_pretty); + if (format.format) + pretty_print_ref(name, sha1, &format); } return had_error; } diff --git a/cache-tree.c b/cache-tree.c index ec23d8c03..2440d1dc8 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -131,9 +131,8 @@ static int do_invalidate_path(struct cache_tree *it, const char *path) * move 4 and 5 up one place (2 entries) * 2 = 6 - 3 - 1 = subtree_nr - pos - 1 */ - memmove(it->down+pos, it->down+pos+1, - sizeof(struct cache_tree_sub *) * - (it->subtree_nr - pos - 1)); + MOVE_ARRAY(it->down + pos, it->down + pos + 1, + it->subtree_nr - pos - 1); it->subtree_nr--; } return 1; @@ -1146,6 +1146,14 @@ char *strip_path_suffix(const char *path, const char *suffix); int daemon_avoid_alias(const char *path); extern int is_ntfs_dotgit(const char *name); +/* + * Returns true iff "str" could be confused as a command-line option when + * passed to a sub-program like "ssh". Note that this has nothing to do with + * shell-quoting, which should be handled separately; we're assuming here that + * the string makes it verbatim to the sub-program. + */ +int looks_like_command_line_option(const char *str); + /** * Return a newly allocated string with the evaluation of * "$XDG_CONFIG_HOME/git/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise @@ -1492,6 +1500,7 @@ struct checkout { struct index_state *istate; const char *base_dir; int base_dir_len; + struct delayed_checkout *delayed_checkout; unsigned force:1, quiet:1, not_new:1, @@ -1501,6 +1510,8 @@ struct checkout { #define TEMPORARY_FILENAME_LENGTH 25 extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath); +extern void enable_delayed_checkout(struct checkout *state); +extern int finish_delayed_checkout(struct checkout *state); struct cache_def { struct strbuf path; @@ -361,14 +361,6 @@ int git_color_config(const char *var, const char *value, void *cb) return 0; } -int git_color_default_config(const char *var, const char *value, void *cb) -{ - if (git_color_config(var, value, cb) < 0) - return -1; - - return git_default_config(var, value, cb); -} - void color_print_strbuf(FILE *fp, const char *color, const struct strbuf *sb) { if (*color) @@ -223,9 +223,8 @@ int unregister_shallow(const struct object_id *oid) if (pos < 0) return -1; if (pos + 1 < commit_graft_nr) - memmove(commit_graft + pos, commit_graft + pos + 1, - sizeof(struct commit_graft *) - * (commit_graft_nr - pos - 1)); + MOVE_ARRAY(commit_graft + pos, commit_graft + pos + 1, + commit_graft_nr - pos - 1); commit_graft_nr--; return 0; } diff --git a/compat/bswap.h b/compat/bswap.h index d47c00354..7d063e9e4 100644 --- a/compat/bswap.h +++ b/compat/bswap.h @@ -162,19 +162,29 @@ static inline uint64_t git_bswap64(uint64_t x) #else -#define get_be16(p) ( \ - (*((unsigned char *)(p) + 0) << 8) | \ - (*((unsigned char *)(p) + 1) << 0) ) -#define get_be32(p) ( \ - (*((unsigned char *)(p) + 0) << 24) | \ - (*((unsigned char *)(p) + 1) << 16) | \ - (*((unsigned char *)(p) + 2) << 8) | \ - (*((unsigned char *)(p) + 3) << 0) ) -#define put_be32(p, v) do { \ - unsigned int __v = (v); \ - *((unsigned char *)(p) + 0) = __v >> 24; \ - *((unsigned char *)(p) + 1) = __v >> 16; \ - *((unsigned char *)(p) + 2) = __v >> 8; \ - *((unsigned char *)(p) + 3) = __v >> 0; } while (0) +static inline uint16_t get_be16(const void *ptr) +{ + const unsigned char *p = ptr; + return (uint16_t)p[0] << 8 | + (uint16_t)p[1] << 0; +} + +static inline uint32_t get_be32(const void *ptr) +{ + const unsigned char *p = ptr; + return (uint32_t)p[0] << 24 | + (uint32_t)p[1] << 16 | + (uint32_t)p[2] << 8 | + (uint32_t)p[3] << 0; +} + +static inline void put_be32(void *ptr, uint32_t value) +{ + unsigned char *p = ptr; + p[0] = value >> 24; + p[1] = value >> 16; + p[2] = value >> 8; + p[3] = value >> 0; +} #endif @@ -16,6 +16,7 @@ #include "string-list.h" #include "utf8.h" #include "dir.h" +#include "color.h" struct config_source { struct config_source *prev; @@ -1350,6 +1351,9 @@ int git_default_config(const char *var, const char *value, void *dummy) if (starts_with(var, "advice.")) return git_default_advice_config(var, value); + if (git_color_config(var, value, dummy) < 0) + return -1; + if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) { pager_use_color = git_config_bool(var,value); return 0; @@ -578,6 +578,11 @@ static struct child_process *git_proxy_connect(int fd[2], char *host) get_host_and_port(&host, &port); + if (looks_like_command_line_option(host)) + die("strange hostname '%s' blocked", host); + if (looks_like_command_line_option(port)) + die("strange port '%s' blocked", port); + proxy = xmalloc(sizeof(*proxy)); child_process_init(proxy); argv_array_push(&proxy->args, git_proxy_command); @@ -824,6 +829,9 @@ struct child_process *git_connect(int fd[2], const char *url, conn = xmalloc(sizeof(*conn)); child_process_init(conn); + if (looks_like_command_line_option(path)) + die("strange pathname '%s' blocked", path); + strbuf_addstr(&cmd, prog); strbuf_addch(&cmd, ' '); sq_quote_buf(&cmd, path); @@ -857,6 +865,9 @@ struct child_process *git_connect(int fd[2], const char *url, return NULL; } + if (looks_like_command_line_option(ssh_host)) + die("strange hostname '%s' blocked", ssh_host); + ssh = get_ssh_command(); if (ssh) handle_ssh_variant(ssh, 1, &port_option, diff --git a/contrib/coccinelle/array.cocci b/contrib/coccinelle/array.cocci index 4ba98b7ea..c61d1ca8d 100644 --- a/contrib/coccinelle/array.cocci +++ b/contrib/coccinelle/array.cocci @@ -27,6 +27,23 @@ expression n; @@ type T; +T *dst; +T *src; +expression n; +@@ +( +- memmove(dst, src, (n) * sizeof(*dst)); ++ MOVE_ARRAY(dst, src, n); +| +- memmove(dst, src, (n) * sizeof(*src)); ++ MOVE_ARRAY(dst, src, n); +| +- memmove(dst, src, (n) * sizeof(T)); ++ MOVE_ARRAY(dst, src, n); +) + +@@ +type T; T *ptr; expression n; @@ @@ -501,6 +501,7 @@ static int apply_single_file_filter(const char *path, const char *src, size_t le #define CAP_CLEAN (1u<<0) #define CAP_SMUDGE (1u<<1) +#define CAP_DELAY (1u<<2) struct cmd2process { struct subprocess_entry subprocess; /* must be the first member! */ @@ -512,69 +513,49 @@ static struct hashmap subprocess_map; static int start_multi_file_filter_fn(struct subprocess_entry *subprocess) { - int err; + static int versions[] = {2, 0}; + static struct subprocess_capability capabilities[] = { + { "clean", CAP_CLEAN }, + { "smudge", CAP_SMUDGE }, + { "delay", CAP_DELAY }, + { NULL, 0 } + }; struct cmd2process *entry = (struct cmd2process *)subprocess; - struct string_list cap_list = STRING_LIST_INIT_NODUP; - char *cap_buf; - const char *cap_name; - struct child_process *process = &subprocess->process; - const char *cmd = subprocess->cmd; - - sigchain_push(SIGPIPE, SIG_IGN); - - err = packet_writel(process->in, "git-filter-client", "version=2", NULL); - if (err) - goto done; - - err = strcmp(packet_read_line(process->out, NULL), "git-filter-server"); - if (err) { - error("external filter '%s' does not support filter protocol version 2", cmd); - goto done; - } - err = strcmp(packet_read_line(process->out, NULL), "version=2"); - if (err) - goto done; - err = packet_read_line(process->out, NULL) != NULL; - if (err) - goto done; - - err = packet_writel(process->in, "capability=clean", "capability=smudge", NULL); - - for (;;) { - cap_buf = packet_read_line(process->out, NULL); - if (!cap_buf) - break; - string_list_split_in_place(&cap_list, cap_buf, '=', 1); - - if (cap_list.nr != 2 || strcmp(cap_list.items[0].string, "capability")) - continue; - - cap_name = cap_list.items[1].string; - if (!strcmp(cap_name, "clean")) { - entry->supported_capabilities |= CAP_CLEAN; - } else if (!strcmp(cap_name, "smudge")) { - entry->supported_capabilities |= CAP_SMUDGE; - } else { - warning( - "external filter '%s' requested unsupported filter capability '%s'", - cmd, cap_name - ); - } + return subprocess_handshake(subprocess, "git-filter", versions, NULL, + capabilities, + &entry->supported_capabilities); +} - string_list_clear(&cap_list, 0); +static void handle_filter_error(const struct strbuf *filter_status, + struct cmd2process *entry, + const unsigned int wanted_capability) { + if (!strcmp(filter_status->buf, "error")) + ; /* The filter signaled a problem with the file. */ + else if (!strcmp(filter_status->buf, "abort") && wanted_capability) { + /* + * The filter signaled a permanent problem. Don't try to filter + * files with the same command for the lifetime of the current + * Git process. + */ + entry->supported_capabilities &= ~wanted_capability; + } else { + /* + * Something went wrong with the protocol filter. + * Force shutdown and restart if another blob requires filtering. + */ + error("external filter '%s' failed", entry->subprocess.cmd); + subprocess_stop(&subprocess_map, &entry->subprocess); + free(entry); } - -done: - sigchain_pop(SIGPIPE); - - return err; } static int apply_multi_file_filter(const char *path, const char *src, size_t len, int fd, struct strbuf *dst, const char *cmd, - const unsigned int wanted_capability) + const unsigned int wanted_capability, + struct delayed_checkout *dco) { int err; + int can_delay = 0; struct cmd2process *entry; struct child_process *process; struct strbuf nbuf = STRBUF_INIT; @@ -603,12 +584,12 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len } process = &entry->subprocess.process; - if (!(wanted_capability & entry->supported_capabilities)) + if (!(entry->supported_capabilities & wanted_capability)) return 0; - if (CAP_CLEAN & wanted_capability) + if (wanted_capability & CAP_CLEAN) filter_type = "clean"; - else if (CAP_SMUDGE & wanted_capability) + else if (wanted_capability & CAP_SMUDGE) filter_type = "smudge"; else die("unexpected filter type"); @@ -630,6 +611,14 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len if (err) goto done; + if ((entry->supported_capabilities & CAP_DELAY) && + dco && dco->state == CE_CAN_DELAY) { + can_delay = 1; + err = packet_write_fmt_gently(process->in, "can-delay=1\n"); + if (err) + goto done; + } + err = packet_flush_gently(process->in); if (err) goto done; @@ -645,14 +634,73 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len if (err) goto done; - err = strcmp(filter_status.buf, "success"); + if (can_delay && !strcmp(filter_status.buf, "delayed")) { + string_list_insert(&dco->filters, cmd); + string_list_insert(&dco->paths, path); + } else { + /* The filter got the blob and wants to send us a response. */ + err = strcmp(filter_status.buf, "success"); + if (err) + goto done; + + err = read_packetized_to_strbuf(process->out, &nbuf) < 0; + if (err) + goto done; + + err = subprocess_read_status(process->out, &filter_status); + if (err) + goto done; + + err = strcmp(filter_status.buf, "success"); + } + +done: + sigchain_pop(SIGPIPE); + + if (err) + handle_filter_error(&filter_status, entry, wanted_capability); + else + strbuf_swap(dst, &nbuf); + strbuf_release(&nbuf); + return !err; +} + + +int async_query_available_blobs(const char *cmd, struct string_list *available_paths) +{ + int err; + char *line; + struct cmd2process *entry; + struct child_process *process; + struct strbuf filter_status = STRBUF_INIT; + + assert(subprocess_map_initialized); + entry = (struct cmd2process *)subprocess_find_entry(&subprocess_map, cmd); + if (!entry) { + error("external filter '%s' is not available anymore although " + "not all paths have been filtered", cmd); + return 0; + } + process = &entry->subprocess.process; + sigchain_push(SIGPIPE, SIG_IGN); + + err = packet_write_fmt_gently( + process->in, "command=list_available_blobs\n"); if (err) goto done; - err = read_packetized_to_strbuf(process->out, &nbuf) < 0; + err = packet_flush_gently(process->in); if (err) goto done; + while ((line = packet_read_line(process->out, NULL))) { + const char *path; + if (skip_prefix(line, "pathname=", &path)) + string_list_insert(available_paths, xstrdup(path)); + else + ; /* ignore unknown keys */ + } + err = subprocess_read_status(process->out, &filter_status); if (err) goto done; @@ -662,29 +710,8 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len done: sigchain_pop(SIGPIPE); - if (err) { - if (!strcmp(filter_status.buf, "error")) { - /* The filter signaled a problem with the file. */ - } else if (!strcmp(filter_status.buf, "abort")) { - /* - * The filter signaled a permanent problem. Don't try to filter - * files with the same command for the lifetime of the current - * Git process. - */ - entry->supported_capabilities &= ~wanted_capability; - } else { - /* - * Something went wrong with the protocol filter. - * Force shutdown and restart if another blob requires filtering. - */ - error("external filter '%s' failed", cmd); - subprocess_stop(&subprocess_map, &entry->subprocess); - free(entry); - } - } else { - strbuf_swap(dst, &nbuf); - } - strbuf_release(&nbuf); + if (err) + handle_filter_error(&filter_status, entry, 0); return !err; } @@ -699,7 +726,8 @@ static struct convert_driver { static int apply_filter(const char *path, const char *src, size_t len, int fd, struct strbuf *dst, struct convert_driver *drv, - const unsigned int wanted_capability) + const unsigned int wanted_capability, + struct delayed_checkout *dco) { const char *cmd = NULL; @@ -709,15 +737,16 @@ static int apply_filter(const char *path, const char *src, size_t len, if (!dst) return 1; - if ((CAP_CLEAN & wanted_capability) && !drv->process && drv->clean) + if ((wanted_capability & CAP_CLEAN) && !drv->process && drv->clean) cmd = drv->clean; - else if ((CAP_SMUDGE & wanted_capability) && !drv->process && drv->smudge) + else if ((wanted_capability & CAP_SMUDGE) && !drv->process && drv->smudge) cmd = drv->smudge; if (cmd && *cmd) return apply_single_file_filter(path, src, len, fd, dst, cmd); else if (drv->process && *drv->process) - return apply_multi_file_filter(path, src, len, fd, dst, drv->process, wanted_capability); + return apply_multi_file_filter(path, src, len, fd, dst, + drv->process, wanted_capability, dco); return 0; } @@ -1058,7 +1087,7 @@ int would_convert_to_git_filter_fd(const char *path) if (!ca.drv->required) return 0; - return apply_filter(path, NULL, 0, -1, NULL, ca.drv, CAP_CLEAN); + return apply_filter(path, NULL, 0, -1, NULL, ca.drv, CAP_CLEAN, NULL); } const char *get_convert_attr_ascii(const char *path) @@ -1096,7 +1125,7 @@ int convert_to_git(const struct index_state *istate, convert_attrs(&ca, path); - ret |= apply_filter(path, src, len, -1, dst, ca.drv, CAP_CLEAN); + ret |= apply_filter(path, src, len, -1, dst, ca.drv, CAP_CLEAN, NULL); if (!ret && ca.drv && ca.drv->required) die("%s: clean filter '%s' failed", path, ca.drv->name); @@ -1122,7 +1151,7 @@ void convert_to_git_filter_fd(const struct index_state *istate, assert(ca.drv); assert(ca.drv->clean || ca.drv->process); - if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN)) + if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN, NULL)) die("%s: clean filter '%s' failed", path, ca.drv->name); crlf_to_git(istate, path, dst->buf, dst->len, dst, ca.crlf_action, checksafe); @@ -1131,7 +1160,7 @@ void convert_to_git_filter_fd(const struct index_state *istate, static int convert_to_working_tree_internal(const char *path, const char *src, size_t len, struct strbuf *dst, - int normalizing) + int normalizing, struct delayed_checkout *dco) { int ret = 0, ret_filter = 0; struct conv_attrs ca; @@ -1156,22 +1185,30 @@ static int convert_to_working_tree_internal(const char *path, const char *src, } } - ret_filter = apply_filter(path, src, len, -1, dst, ca.drv, CAP_SMUDGE); + ret_filter = apply_filter( + path, src, len, -1, dst, ca.drv, CAP_SMUDGE, dco); if (!ret_filter && ca.drv && ca.drv->required) die("%s: smudge filter %s failed", path, ca.drv->name); return ret | ret_filter; } +int async_convert_to_working_tree(const char *path, const char *src, + size_t len, struct strbuf *dst, + void *dco) +{ + return convert_to_working_tree_internal(path, src, len, dst, 0, dco); +} + int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst) { - return convert_to_working_tree_internal(path, src, len, dst, 0); + return convert_to_working_tree_internal(path, src, len, dst, 0, NULL); } int renormalize_buffer(const struct index_state *istate, const char *path, const char *src, size_t len, struct strbuf *dst) { - int ret = convert_to_working_tree_internal(path, src, len, dst, 1); + int ret = convert_to_working_tree_internal(path, src, len, dst, 1, NULL); if (ret) { src = dst->buf; len = dst->len; @@ -4,6 +4,8 @@ #ifndef CONVERT_H #define CONVERT_H +#include "string-list.h" + struct index_state; enum safe_crlf { @@ -34,6 +36,26 @@ enum eol { #endif }; +enum ce_delay_state { + CE_NO_DELAY = 0, + CE_CAN_DELAY = 1, + CE_RETRY = 2 +}; + +struct delayed_checkout { + /* + * State of the currently processed cache entry. If the state is + * CE_CAN_DELAY, then the filter can delay the current cache entry. + * If the state is CE_RETRY, then this signals the filter that the + * cache entry was requested before. + */ + enum ce_delay_state state; + /* List of filter drivers that signaled delayed blobs. */ + struct string_list filters; + /* List of delayed blobs identified by their path. */ + struct string_list paths; +}; + extern enum eol core_eol; extern const char *get_cached_convert_stats_ascii(const struct index_state *istate, const char *path); @@ -46,6 +68,10 @@ extern int convert_to_git(const struct index_state *istate, struct strbuf *dst, enum safe_crlf checksafe); extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst); +extern int async_convert_to_working_tree(const char *path, const char *src, + size_t len, struct strbuf *dst, + void *dco); +extern int async_query_available_blobs(const char *cmd, struct string_list *available_paths); extern int renormalize_buffer(const struct index_state *istate, const char *path, const char *src, size_t len, struct strbuf *dst); diff --git a/credential-cache.c b/credential-cache.c index 91550bfb0..1cccc3a0b 100644 --- a/credential-cache.c +++ b/credential-cache.c @@ -25,7 +25,7 @@ static int send_request(const char *socket, const struct strbuf *out) int r; r = read_in_full(fd, in, sizeof(in)); - if (r == 0) + if (r == 0 || (r < 0 && errno == ECONNRESET)) break; if (r < 0) die_errno("read error from cache daemon"); @@ -299,9 +299,6 @@ int git_diff_ui_config(const char *var, const char *value, void *cb) return 0; } - if (git_color_config(var, value, cb) < 0) - return -1; - return git_diff_basic_config(var, value, cb); } @@ -2398,7 +2398,8 @@ struct ondisk_untracked_cache { char exclude_per_dir[FLEX_ARRAY]; }; -#define ouc_size(len) (offsetof(struct ondisk_untracked_cache, exclude_per_dir) + len + 1) +#define ouc_offset(x) offsetof(struct ondisk_untracked_cache, x) +#define ouc_size(len) (ouc_offset(exclude_per_dir) + len + 1) struct write_data { int index; /* number of written untracked_cache_dir */ @@ -2560,17 +2561,18 @@ struct read_data { const unsigned char *end; }; -static void stat_data_from_disk(struct stat_data *to, const struct stat_data *from) +static void stat_data_from_disk(struct stat_data *to, const unsigned char *data) { - to->sd_ctime.sec = get_be32(&from->sd_ctime.sec); - to->sd_ctime.nsec = get_be32(&from->sd_ctime.nsec); - to->sd_mtime.sec = get_be32(&from->sd_mtime.sec); - to->sd_mtime.nsec = get_be32(&from->sd_mtime.nsec); - to->sd_dev = get_be32(&from->sd_dev); - to->sd_ino = get_be32(&from->sd_ino); - to->sd_uid = get_be32(&from->sd_uid); - to->sd_gid = get_be32(&from->sd_gid); - to->sd_size = get_be32(&from->sd_size); + memcpy(to, data, sizeof(*to)); + to->sd_ctime.sec = ntohl(to->sd_ctime.sec); + to->sd_ctime.nsec = ntohl(to->sd_ctime.nsec); + to->sd_mtime.sec = ntohl(to->sd_mtime.sec); + to->sd_mtime.nsec = ntohl(to->sd_mtime.nsec); + to->sd_dev = ntohl(to->sd_dev); + to->sd_ino = ntohl(to->sd_ino); + to->sd_uid = ntohl(to->sd_uid); + to->sd_gid = ntohl(to->sd_gid); + to->sd_size = ntohl(to->sd_size); } static int read_one_dir(struct untracked_cache_dir **untracked_, @@ -2645,7 +2647,7 @@ static void read_stat(size_t pos, void *cb) rd->data = rd->end + 1; return; } - stat_data_from_disk(&ud->stat_data, (struct stat_data *)rd->data); + stat_data_from_disk(&ud->stat_data, rd->data); rd->data += sizeof(struct stat_data); ud->valid = 1; } @@ -2663,22 +2665,22 @@ static void read_sha1(size_t pos, void *cb) } static void load_sha1_stat(struct sha1_stat *sha1_stat, - const struct stat_data *stat, + const unsigned char *data, const unsigned char *sha1) { - stat_data_from_disk(&sha1_stat->stat, stat); + stat_data_from_disk(&sha1_stat->stat, data); hashcpy(sha1_stat->sha1, sha1); sha1_stat->valid = 1; } struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz) { - const struct ondisk_untracked_cache *ouc; struct untracked_cache *uc; struct read_data rd; const unsigned char *next = data, *end = (const unsigned char *)data + sz; const char *ident; int ident_len, len; + const char *exclude_per_dir; if (sz <= 1 || end[-1] != '\0') return NULL; @@ -2690,21 +2692,23 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long ident = (const char *)next; next += ident_len; - ouc = (const struct ondisk_untracked_cache *)next; if (next + ouc_size(0) > end) return NULL; uc = xcalloc(1, sizeof(*uc)); strbuf_init(&uc->ident, ident_len); strbuf_add(&uc->ident, ident, ident_len); - load_sha1_stat(&uc->ss_info_exclude, &ouc->info_exclude_stat, - ouc->info_exclude_sha1); - load_sha1_stat(&uc->ss_excludes_file, &ouc->excludes_file_stat, - ouc->excludes_file_sha1); - uc->dir_flags = get_be32(&ouc->dir_flags); - uc->exclude_per_dir = xstrdup(ouc->exclude_per_dir); + load_sha1_stat(&uc->ss_info_exclude, + next + ouc_offset(info_exclude_stat), + next + ouc_offset(info_exclude_sha1)); + load_sha1_stat(&uc->ss_excludes_file, + next + ouc_offset(excludes_file_stat), + next + ouc_offset(excludes_file_sha1)); + uc->dir_flags = get_be32(next + ouc_offset(dir_flags)); + exclude_per_dir = (const char *)next + ouc_offset(exclude_per_dir); + uc->exclude_per_dir = xstrdup(exclude_per_dir); /* NUL after exclude_per_dir is covered by sizeof(*ouc) */ - next += ouc_size(strlen(ouc->exclude_per_dir)); + next += ouc_size(strlen(exclude_per_dir)); if (next >= end) goto done2; @@ -137,6 +137,105 @@ static int streaming_write_entry(const struct cache_entry *ce, char *path, return result; } +void enable_delayed_checkout(struct checkout *state) +{ + if (!state->delayed_checkout) { + state->delayed_checkout = xmalloc(sizeof(*state->delayed_checkout)); + state->delayed_checkout->state = CE_CAN_DELAY; + string_list_init(&state->delayed_checkout->filters, 0); + string_list_init(&state->delayed_checkout->paths, 0); + } +} + +static int remove_available_paths(struct string_list_item *item, void *cb_data) +{ + struct string_list *available_paths = cb_data; + struct string_list_item *available; + + available = string_list_lookup(available_paths, item->string); + if (available) + available->util = (void *)item->string; + return !available; +} + +int finish_delayed_checkout(struct checkout *state) +{ + int errs = 0; + struct string_list_item *filter, *path; + struct delayed_checkout *dco = state->delayed_checkout; + + if (!state->delayed_checkout) + return errs; + + dco->state = CE_RETRY; + while (dco->filters.nr > 0) { + for_each_string_list_item(filter, &dco->filters) { + struct string_list available_paths = STRING_LIST_INIT_NODUP; + + if (!async_query_available_blobs(filter->string, &available_paths)) { + /* Filter reported an error */ + errs = 1; + filter->string = ""; + continue; + } + if (available_paths.nr <= 0) { + /* + * Filter responded with no entries. That means + * the filter is done and we can remove the + * filter from the list (see + * "string_list_remove_empty_items" call below). + */ + filter->string = ""; + continue; + } + + /* + * In dco->paths we store a list of all delayed paths. + * The filter just send us a list of available paths. + * Remove them from the list. + */ + filter_string_list(&dco->paths, 0, + &remove_available_paths, &available_paths); + + for_each_string_list_item(path, &available_paths) { + struct cache_entry* ce; + + if (!path->util) { + error("external filter '%s' signaled that '%s' " + "is now available although it has not been " + "delayed earlier", + filter->string, path->string); + errs |= 1; + + /* + * Do not ask the filter for available blobs, + * again, as the filter is likely buggy. + */ + filter->string = ""; + continue; + } + ce = index_file_exists(state->istate, path->string, + strlen(path->string), 0); + errs |= (ce ? checkout_entry(ce, state, NULL) : 1); + } + } + string_list_remove_empty_items(&dco->filters, 0); + } + string_list_clear(&dco->filters, 0); + + /* At this point we should not have any delayed paths anymore. */ + errs |= dco->paths.nr; + for_each_string_list_item(path, &dco->paths) { + error("'%s' was not filtered properly", path->string); + } + string_list_clear(&dco->paths, 0); + + free(dco); + state->delayed_checkout = NULL; + + return errs; +} + static int write_entry(struct cache_entry *ce, char *path, const struct checkout *state, int to_tempfile) { @@ -179,11 +278,34 @@ static int write_entry(struct cache_entry *ce, /* * Convert from git internal format to working tree format */ - if (ce_mode_s_ifmt == S_IFREG && - convert_to_working_tree(ce->name, new, size, &buf)) { - free(new); - new = strbuf_detach(&buf, &newsize); - size = newsize; + if (ce_mode_s_ifmt == S_IFREG) { + struct delayed_checkout *dco = state->delayed_checkout; + if (dco && dco->state != CE_NO_DELAY) { + /* Do not send the blob in case of a retry. */ + if (dco->state == CE_RETRY) { + new = NULL; + size = 0; + } + ret = async_convert_to_working_tree( + ce->name, new, size, &buf, dco); + if (ret && string_list_has_string(&dco->paths, ce->name)) { + free(new); + goto finish; + } + } else + ret = convert_to_working_tree( + ce->name, new, size, &buf); + + if (ret) { + free(new); + new = strbuf_detach(&buf, &newsize); + size = newsize; + } + /* + * No "else" here as errors from convert are OK at this + * point. If the error would have been fatal (e.g. + * filter is required), then we would have died already. + */ } fd = open_output_fd(path, ce, to_tempfile); diff --git a/git-compat-util.h b/git-compat-util.h index db9c22de7..7d2c0ca75 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -828,6 +828,14 @@ static inline void copy_array(void *dst, const void *src, size_t n, size_t size) memcpy(dst, src, st_mult(size, n)); } +#define MOVE_ARRAY(dst, src, n) move_array((dst), (src), (n), sizeof(*(dst)) + \ + BUILD_ASSERT_OR_ZERO(sizeof(*(dst)) == sizeof(*(src)))) +static inline void move_array(void *dst, const void *src, size_t n, size_t size) +{ + if (n) + memmove(dst, src, st_mult(size, n)); +} + /* * These functions help you allocate structs with flex arrays, and copy * the data directly into the array. For example, if you had: diff --git a/git-gui/Makefile b/git-gui/Makefile index fe30be38d..918a8de36 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -161,7 +161,9 @@ ifeq ($(uname_S),Darwin) endif endif ifneq (,$(findstring MINGW,$(uname_S))) +ifeq ($(shell expr "$(uname_R)" : '1\.'),2) NO_MSGFMT=1 +endif GITGUI_WINDOWS_WRAPPER := YesPlease GITGUI_RELATIVE := 1 endif diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl index 75d1da8d3..80f5a59bb 100644 --- a/git-gui/lib/choose_repository.tcl +++ b/git-gui/lib/choose_repository.tcl @@ -142,6 +142,10 @@ constructor pick {} { -label [mc "Recent Repositories"] } + if {[set lenrecent [llength $sorted_recent]] < $maxrecent} { + set lenrecent $maxrecent + } + ${NS}::label $w_body.space ${NS}::label $w_body.recentlabel \ -anchor w \ @@ -153,7 +157,7 @@ constructor pick {} { -background [get_bg_color $w_body.recentlabel] \ -wrap none \ -width 50 \ - -height $maxrecent + -height $lenrecent $w_recentlist tag conf link \ -foreground blue \ -underline 1 @@ -235,19 +239,19 @@ method _invoke_next {} { proc _get_recentrepos {} { set recent [list] - foreach p [get_config gui.recentrepo] { + foreach p [lsort -unique [get_config gui.recentrepo]] { if {[_is_git [file join $p .git]]} { lappend recent $p } else { _unset_recentrepo $p } } - return [lsort $recent] + return $recent } proc _unset_recentrepo {p} { regsub -all -- {([()\[\]{}\.^$+*?\\])} $p {\\\1} p - git config --global --unset gui.recentrepo "^$p\$" + catch {git config --global --unset-all gui.recentrepo "^$p\$"} load_config 1 } @@ -262,12 +266,11 @@ proc _append_recentrepos {path} { set i [lsearch $recent $path] if {$i >= 0} { _unset_recentrepo $path - set recent [lreplace $recent $i $i] } - lappend recent $path git config --global --add gui.recentrepo $path load_config 1 + set recent [get_config gui.recentrepo] if {[set maxrecent [get_config gui.maxrecentrepo]] eq {}} { set maxrecent 10 @@ -275,7 +278,7 @@ proc _append_recentrepos {path} { while {[llength $recent] > $maxrecent} { _unset_recentrepo [lindex $recent 0] - set recent [lrange $recent 1 end] + set recent [get_config gui.recentrepo] } } diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 3d4a8ee27..9208f42ed 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3071,6 +3071,8 @@ sub git_get_projects_list { return if (m!^[/.]$!); # only directories can be git repositories return unless (-d $_); + # need search permission + return unless (-x $_); # don't traverse too deep (Find is super slow on os x) # $project_maxdepth excludes depth of $projectroot if (($File::Find::name =~ tr!/!!) - $pfxdepth > $project_maxdepth) { @@ -272,10 +272,10 @@ static int http_options(const char *var, const char *value, void *cb) if (!strcmp("http.sslversion", var)) return git_config_string(&ssl_version, var, value); if (!strcmp("http.sslcert", var)) - return git_config_string(&ssl_cert, var, value); + return git_config_pathname(&ssl_cert, var, value); #if LIBCURL_VERSION_NUM >= 0x070903 if (!strcmp("http.sslkey", var)) - return git_config_string(&ssl_key, var, value); + return git_config_pathname(&ssl_key, var, value); #endif #if LIBCURL_VERSION_NUM >= 0x070908 if (!strcmp("http.sslcapath", var)) diff --git a/notes-merge.c b/notes-merge.c index 70e3fbeef..c12b354f1 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -99,8 +99,7 @@ static struct notes_merge_pair *find_notes_merge_pair_pos( else { *occupied = 0; if (insert_new && i < len) { - memmove(list + i + 1, list + i, - (len - i) * sizeof(struct notes_merge_pair)); + MOVE_ARRAY(list + i + 1, list + i, len - i); memset(list + i, 0, sizeof(struct notes_merge_pair)); } } @@ -141,7 +141,6 @@ void *create_object(const unsigned char *sha1, void *o) struct object *obj = o; obj->parsed = 0; - obj->used = 0; obj->flags = 0; hashcpy(obj->oid.hash, sha1); @@ -38,6 +38,7 @@ struct object_array { * http-push.c: 16-----19 * commit.c: 16-----19 * sha1_name.c: 20 + * builtin/fsck.c: 0--3 */ #define FLAG_BITS 27 @@ -46,7 +47,6 @@ struct object_array { */ struct object { unsigned parsed : 1; - unsigned used : 1; unsigned type : TYPE_BITS; unsigned flags : FLAG_BITS; struct object_id oid; @@ -1321,6 +1321,11 @@ int is_ntfs_dotgit(const char *name) } } +int looks_like_command_line_option(const char *str) +{ + return str && str[0] == '-'; +} + char *xdg_config_home(const char *filename) { const char *home, *config_home; diff --git a/pkt-line.c b/pkt-line.c index 9d845ecc3..7db911957 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -171,25 +171,6 @@ int packet_write_fmt_gently(int fd, const char *fmt, ...) return status; } -int packet_writel(int fd, const char *line, ...) -{ - va_list args; - int err; - va_start(args, line); - for (;;) { - if (!line) - break; - if (strlen(line) > LARGE_PACKET_DATA_MAX) - return -1; - err = packet_write_fmt_gently(fd, "%s\n", line); - if (err) - return err; - line = va_arg(args, const char*); - } - va_end(args); - return packet_flush_gently(fd); -} - static int packet_write_gently(const int fd_out, const char *buf, size_t size) { static char packet_write_buffer[LARGE_PACKET_MAX]; diff --git a/pkt-line.h b/pkt-line.h index 450183b64..66ef610fc 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -25,8 +25,6 @@ void packet_buf_flush(struct strbuf *buf); void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3))); int packet_flush_gently(int fd); int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3))); -LAST_ARG_MUST_BE_NULL -int packet_writel(int fd, const char *line, ...); int write_packetized_from_fd(int fd_in, int fd_out); int write_packetized_from_buf(const char *src_in, size_t len, int fd_out); @@ -58,5 +58,6 @@ Members: Nguyá»…n Thái Ngá»c Duy <pclouds AT gmail.com> Language: zh_CN (Simplified Chinese) Repository: https://github.com/jiangxin/git/ -Leader: Jiang Xin <worldhello.net@gmail.com> -Members: Ray Chen <oldsharp@gmail.com> +Leader: Jiang Xin <worldhello.net AT gmail.com> +Members: Ray Chen <oldsharp AT gmail.com> + ä¾äº‘ <lilydjwg AT gmail.com> @@ -94,8 +94,8 @@ msgid "" msgstr "" "Project-Id-Version: git master\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-15 11:57+0800\n" -"PO-Revision-Date: 2017-07-14 10:54+0200\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" +"PO-Revision-Date: 2017-07-24 17:26+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -1585,19 +1585,69 @@ msgstr "" msgid "in the future" msgstr "в бъдещето" -#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167 -#: date.c:175 date.c:180 -msgid "%" -msgid_plural "%" -msgstr[0] "%" -msgstr[1] "%" +#: date.c:122 +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "преди %<PRIuMAX> Ñекунда" +msgstr[1] "преди %<PRIuMAX> Ñекунди" + +#: date.c:129 +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "преди %<PRIuMAX> минута" +msgstr[1] "преди %<PRIuMAX> минути" + +#: date.c:136 +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "преди %<PRIuMAX> чаÑ" +msgstr[1] "преди %<PRIuMAX> чаÑа" + +#: date.c:143 +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "преди %<PRIuMAX> ден" +msgstr[1] "преди %<PRIuMAX> дена" + +#: date.c:149 +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "преди %<PRIuMAX> Ñедмица" +msgstr[1] "преди %<PRIuMAX> Ñедмици" + +#: date.c:156 +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "преди %<PRIuMAX> меÑец" +msgstr[1] "преди %<PRIuMAX> меÑеца" + +#: date.c:167 +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> година" +msgstr[1] "%<PRIuMAX> години" #. TRANSLATORS: "%s" is "<n> years" #: date.c:170 -msgid "%s, %" -msgid_plural "%s, %" -msgstr[0] "%s, %" -msgstr[1] "%s, %" +#, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "преди %s и %<PRIuMAX> меÑец" +msgstr[1] "преди %s и %<PRIuMAX> меÑеца" + +#: date.c:175 date.c:180 +#, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "преди %<PRIuMAX> година" +msgstr[1] "преди %<PRIuMAX> години" #: diffcore-order.c:24 #, c-format @@ -1776,7 +1826,7 @@ msgstr "неправилно подаване: „%s“" msgid "giving up" msgstr "преуÑтановÑване" -#: fetch-pack.c:533 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "дейÑтвието завърши" @@ -3196,12 +3246,12 @@ msgstr "Ñъобщението за подаване към „%s“ не мож #: sequencer.c:879 #, c-format msgid "This is the commit message #%d:" -msgstr "Това е Ñъобщение при подаване â„–${%d}:" +msgstr "Това е Ñъобщение при подаване â„–%d:" #: sequencer.c:884 #, c-format msgid "The commit message #%d will be skipped:" -msgstr "Съобщение при подаване â„–${%d} ще бъде преÑкочено:" +msgstr "Съобщение при подаване â„–%d ще бъде преÑкочено:" #: sequencer.c:889 #, c-format @@ -8664,7 +8714,7 @@ msgstr "" "Погледнете ръководÑтвото за повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÐºÐ°Ðº да изпълните „git help " "gc“.\n" -#: builtin/gc.c:432 +#: builtin/gc.c:436 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8673,7 +8723,7 @@ msgstr "" "процеÑа: %<PRIuMAX> (ако Ñте Ñигурни, че това не е вÑрно, това използвайте\n" "опциÑта „--force“)" -#: builtin/gc.c:476 +#: builtin/gc.c:480 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -1,5 +1,4 @@ # Catalan translations for Git. -# Copyright (C) 2014 Alex Henrie <alexhenrie24@gmail.com> # This file is distributed under the same license as the Git package. # Alex Henrie <alexhenrie24@gmail.com>, 2014-2016. # Jordi Mas i Hernà ndez <jmas@softcatala.org>, 2016-2017 @@ -43,7 +42,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-05-05 09:35+0800\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" "PO-Revision-Date: 2017-07-18 20:41+0200\n" "Last-Translator: Jordi Mas <jmas@softcatala.org>\n" "Language-Team: Catalan\n" @@ -54,37 +53,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.1\n" -#: advice.c:55 +#: advice.c:58 #, c-format msgid "hint: %.*s\n" msgstr "pista: %.*s\n" -#: advice.c:83 +#: advice.c:86 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar." -#: advice.c:85 +#: advice.c:88 msgid "Committing is not possible because you have unmerged files." msgstr "Cometre no és possible perquè teniu fitxers sense fusionar." -#: advice.c:87 +#: advice.c:90 msgid "Merging is not possible because you have unmerged files." msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:89 +#: advice.c:92 msgid "Pulling is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:91 +#: advice.c:94 msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no és possible perquè teniu fitxers sense fusionar." -#: advice.c:93 +#: advice.c:96 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No és possible %s perquè teniu fitxers sense fusionar." -#: advice.c:101 +#: advice.c:104 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." @@ -93,23 +92,23 @@ msgstr "" "'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n" "resolució i feu una comissió." -#: advice.c:109 +#: advice.c:112 msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:114 builtin/merge.c:1185 +#: advice.c:117 builtin/merge.c:1184 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." -#: advice.c:116 +#: advice.c:119 msgid "Please, commit your changes before merging." msgstr "Si us plau, cometeu els vostres canvis abans de fusionar." -#: advice.c:117 +#: advice.c:120 msgid "Exiting because of unfinished merge." msgstr "S'està sortint a causa d'una fusió no terminada." -#: advice.c:123 +#: advice.c:126 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -136,170 +135,186 @@ msgstr "" "\n" " git checkout -b <nom-de-branca-nova>\n" -#: apply.c:57 +#: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opció d'espai en blanc '%s' no reconeguda" -#: apply.c:73 +#: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opció d'ignora l'espai en blanc '%s' no reconeguda" -#: apply.c:125 +#: apply.c:126 msgid "--reject and --3way cannot be used together." msgstr "--reject i --3way no es poden usar junts." -#: apply.c:127 +#: apply.c:128 msgid "--cached and --3way cannot be used together." msgstr "--cached i --3way no es poden usar junts." -#: apply.c:130 +#: apply.c:131 msgid "--3way outside a repository" msgstr "--3way fora d'un dipòsit" -#: apply.c:141 +#: apply.c:142 msgid "--index outside a repository" msgstr "--index fora d'un dipòsit" -#: apply.c:144 +#: apply.c:145 msgid "--cached outside a repository" msgstr "--cached fora d'un dipòsit" -#: apply.c:845 +#: apply.c:836 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No es pot preparar l'expressió regular de marca de temps %s" -#: apply.c:854 +#: apply.c:845 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec ha retornat %d per l'entrada: %s" -#: apply.c:938 +#: apply.c:929 #, c-format msgid "unable to find filename in patch at line %d" msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la lÃnia %d" -#: apply.c:977 +#: apply.c:967 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply: git-diff dolent - /dev/null esperat, %s rebut en la lÃnia %d" +msgstr "" +"git apply: git-diff dolent - /dev/null esperat, %s rebut en la lÃnia %d" -#: apply.c:983 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: git-diff dolent - nom de fitxer nou inconsistent en la lÃnia %d" +msgstr "" +"git apply: git-diff dolent - nom de fitxer nou inconsistent en la lÃnia %d" -#: apply.c:984 +#: apply.c:974 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: git-diff dolent - nom de fitxer antic inconsistent en la lÃnia %d" +msgstr "" +"git apply: git-diff dolent - nom de fitxer antic inconsistent en la lÃnia %d" -#: apply.c:990 +#: apply.c:979 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff dolent - /dev/null esperat en la lÃnia %d" -#: apply.c:1488 +#: apply.c:1008 +#, fuzzy, c-format +msgid "invalid mode on line %d: %s" +msgstr "lÃnia d'identitat no và lida: %s" + +#: apply.c:1326 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "" + +#: apply.c:1498 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recompte: lÃnia inesperada: %.*s" -#: apply.c:1557 +#: apply.c:1567 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de pedaç sense capçalera a la lÃnia %d: %.*s" -#: apply.c:1577 +#: apply.c:1587 #, c-format msgid "" -"git diff header lacks filename information when removing %d leading pathname component (line %d)" +"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)" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" msgstr[0] "" -"a la capçalera de git diff li manca informació de nom de fitxer en eliminar %d component de nom " -"de camà inicial (lÃnia %d)" +"a la capçalera de git diff li manca informació de nom de fitxer en eliminar " +"%d component de nom de camà inicial (lÃnia %d)" msgstr[1] "" -"a la capçalera de git diff li manca informació de nom de fitxer en eliminar %d components de nom " -"de camà inicial (lÃnia %d)" +"a la capçalera de git diff li manca informació de nom de fitxer en eliminar " +"%d components de nom de camà inicial (lÃnia %d)" -#: apply.c:1589 +#: apply.c:1600 #, c-format msgid "git diff header lacks filename information (line %d)" -msgstr "a la capçalera de git diff li manca informació de nom de fitxer (lÃnia %d)" +msgstr "" +"a la capçalera de git diff li manca informació de nom de fitxer (lÃnia %d)" -#: apply.c:1759 +#: apply.c:1770 msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: apply.c:1761 +#: apply.c:1772 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: apply.c:1795 +#: apply.c:1806 #, c-format msgid "corrupt patch at line %d" msgstr "pedaç malmès a la lÃnia %d" -#: apply.c:1832 +#: apply.c:1843 #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depèn dels continguts antics" -#: apply.c:1834 +#: apply.c:1845 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: apply.c:1837 +#: apply.c:1848 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** advertència: el fitxer %s queda buit però no se suprimeix" -#: apply.c:1984 +#: apply.c:1995 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaç binari malmès a la lÃnia %d: %.*s" -#: apply.c:2021 +#: apply.c:2032 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la lÃnia %d" -#: apply.c:2182 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la lÃnia %d" -#: apply.c:2265 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: apply.c:2269 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: apply.c:2922 +#: apply.c:2933 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de lÃnia no và lid: '%c'" -#: apply.c:3041 +#: apply.c:3052 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d lÃnia)." msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d lÃnies)." -#: apply.c:3053 +#: apply.c:3064 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d" -#: apply.c:3059 +#: apply.c:3070 #, c-format msgid "" "while searching for:\n" @@ -308,555 +323,575 @@ msgstr "" "tot cercant:\n" "%.*s" -#: apply.c:3081 +#: apply.c:3092 #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaç binari de '%s'" -#: apply.c:3089 +#: apply.c:3100 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a '%s'" -#: apply.c:3135 +#: apply.c:3146 #, c-format msgid "cannot apply binary patch to '%s' without full index line" -msgstr "no es pot aplicar un pedaç binari a '%s' sense la lÃnia d'Ãndex completa" +msgstr "" +"no es pot aplicar un pedaç binari a '%s' sense la lÃnia d'Ãndex completa" -#: apply.c:3145 +#: apply.c:3156 #, c-format -msgid "the patch applies to '%s' (%s), which does not match the current contents." -msgstr "el pedaç s'aplica a '%s' (%s), el qual no coincideix amb els continguts actuals." +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" +"el pedaç s'aplica a '%s' (%s), el qual no coincideix amb els continguts " +"actuals." -#: apply.c:3153 +#: apply.c:3164 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el pedaç s'aplica a un '%s' buit però no és buit" -#: apply.c:3171 +#: apply.c:3182 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "no es pot llegir la postimatge %s necessà ria per a '%s'" -#: apply.c:3184 +#: apply.c:3195 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a '%s'" -#: apply.c:3190 +#: apply.c:3201 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)" +msgstr "" +"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)" -#: apply.c:3211 +#: apply.c:3222 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: apply.c:3333 +#: apply.c:3344 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 +#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 #, c-format msgid "failed to read %s" msgstr "s'ha produït un error en llegir %s" -#: apply.c:3389 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic" -#: apply.c:3418 apply.c:3658 +#: apply.c:3429 apply.c:3669 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camà %s s'ha canviat de nom / s'ha suprimit" -#: apply.c:3501 apply.c:3672 +#: apply.c:3512 apply.c:3683 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'Ãndex" -#: apply.c:3510 apply.c:3680 +#: apply.c:3521 apply.c:3691 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'Ãndex" -#: apply.c:3545 +#: apply.c:3556 msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies." +msgstr "" +"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies." -#: apply.c:3548 +#: apply.c:3559 #, c-format msgid "Falling back to three-way merge...\n" msgstr "S'està retrocedint a una fusió de 3 vies...\n" -#: apply.c:3564 apply.c:3568 +#: apply.c:3575 apply.c:3579 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no es poden llegir els continguts actuals de '%s'" -#: apply.c:3580 +#: apply.c:3591 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n" -#: apply.c:3594 +#: apply.c:3605 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "S'ha aplicat el pedaç a '%s' amb conflictes.\n" -#: apply.c:3599 +#: apply.c:3610 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "S'ha aplicat el pedaç a '%s' netament.\n" -#: apply.c:3625 +#: apply.c:3636 msgid "removal patch leaves file contents" msgstr "el pedaç d'eliminació deixa els continguts dels fitxers" -#: apply.c:3697 +#: apply.c:3708 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: apply.c:3699 +#: apply.c:3710 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: apply.c:3850 apply.c:3852 +#: apply.c:3860 apply.c:3862 #, c-format msgid "invalid path '%s'" msgstr "camà no và lid: %s" -#: apply.c:3908 +#: apply.c:3918 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'Ãndex" -#: apply.c:3911 +#: apply.c:3921 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: apply.c:3931 +#: apply.c:3941 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)" -#: apply.c:3936 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s" -#: apply.c:3956 +#: apply.c:3966 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic" -#: apply.c:3960 +#: apply.c:3970 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no s'aplica" -#: apply.c:3975 +#: apply.c:3985 #, c-format msgid "Checking patch %s..." msgstr "S'està comprovant el pedaç %s..." -#: apply.c:4066 +#: apply.c:4076 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta la informació sha1 o és inútil per al submòdul %s" -#: apply.c:4073 +#: apply.c:4083 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "canvi de mode per a %s, el qual no està en el HEAD actual" -#: apply.c:4076 +#: apply.c:4086 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informació sha1 o és inútil (%s)." -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 +#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camà '%s'" -#: apply.c:4085 +#: apply.c:4095 #, c-format msgid "could not add %s to temporary index" msgstr "no s'ha pogut afegir %s a l'Ãndex temporal" -#: apply.c:4095 +#: apply.c:4105 #, c-format msgid "could not write temporary index to %s" msgstr "no s'ha pogut escriure l'Ãndex temporal a %s" -#: apply.c:4233 +#: apply.c:4243 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'Ãndex" -#: apply.c:4268 +#: apply.c:4278 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç malmès per al submòdul %s" -#: apply.c:4274 +#: apply.c:4284 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "unable to create backing store for newly created file %s" -msgstr "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat %s" +msgstr "" +"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " +"%s" -#: apply.c:4288 apply.c:4432 +#: apply.c:4298 apply.c:4442 #, c-format msgid "unable to add cache entry for %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: apply.c:4329 +#: apply.c:4339 #, c-format msgid "failed to write to '%s'" msgstr "no s'ha pogut escriure a '%s'" -#: apply.c:4333 +#: apply.c:4343 #, c-format msgid "closing file '%s'" msgstr "s'està tancant el fitxer '%s'" -#: apply.c:4403 +#: apply.c:4413 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer '%s' mode %o" -#: apply.c:4501 +#: apply.c:4511 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: apply.c:4509 +#: apply.c:4519 msgid "internal error" msgstr "error intern" -#: apply.c:4512 +#: apply.c:4522 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..." msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..." -#: apply.c:4523 +#: apply.c:4533 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 +#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" -#: apply.c:4545 +#: apply.c:4555 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: apply.c:4549 +#: apply.c:4559 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: apply.c:4659 +#: apply.c:4669 #, c-format msgid "Skipped patch '%s'." msgstr "S'ha omès el pedaç '%s'." -#: apply.c:4667 +#: apply.c:4677 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: apply.c:4686 +#: apply.c:4696 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'Ãndex" -#: apply.c:4823 +#: apply.c:4833 #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaç '%s': %s" -#: apply.c:4850 +#: apply.c:4860 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "s'ha silenciat %d error d'espai en blanc" msgstr[1] "s'han silenciat %d errors d'espai en blanc" -#: apply.c:4856 apply.c:4871 +#: apply.c:4866 apply.c:4881 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d lÃnia afegeix errors d'espai en blanc." msgstr[1] "%d lÃnies afegeixen errors d'espai en blanc." -#: apply.c:4864 +#: apply.c:4874 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." -msgstr[0] "S'ha aplicat %d lÃnia després d'arreglar els errors d'espai en blanc." -msgstr[1] "S'han aplicat %d lÃnies després d'arreglar els errors d'espai en blanc." +msgstr[0] "" +"S'ha aplicat %d lÃnia després d'arreglar els errors d'espai en blanc." +msgstr[1] "" +"S'han aplicat %d lÃnies després d'arreglar els errors d'espai en blanc." -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'Ãndex nou" -#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 builtin/clone.c:113 -#: builtin/fetch.c:98 builtin/pull.c:180 builtin/submodule--helper.c:304 -#: builtin/submodule--helper.c:629 builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 git-add--interactive.perl:239 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 +#: git-add--interactive.perl:197 msgid "path" msgstr "camÃ" -#: apply.c:4912 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camà donat" -#: apply.c:4915 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camà donat" -#: apply.c:4917 builtin/am.c:2285 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "número" -#: apply.c:4918 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" -msgstr "elimina <nombre> barres obliqües inicials dels camins de diferència tradicionals" +msgstr "" +"elimina <nombre> barres obliqües inicials dels camins de diferència " +"tradicionals" -#: apply.c:4921 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: apply.c:4923 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" -msgstr "en lloc d'aplicar el pedaç, emet les estadÃstiques de diferència de l'entrada" +msgstr "" +"en lloc d'aplicar el pedaç, emet les estadÃstiques de diferència de l'entrada" -#: apply.c:4927 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "mostra el nombre de lÃnies afegides i suprimides en notació decimal" -#: apply.c:4929 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" -#: apply.c:4931 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" -#: apply.c:4933 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'Ãndex actual" -#: apply.c:4935 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: apply.c:4937 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'à rea de treball" -#: apply.c:4939 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: apply.c:4941 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: apply.c:4943 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "construeix un Ãndex temporal basat en la informació d'Ãndex incrustada" -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 +#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "els camins se separen amb el carà cter NUL" -#: apply.c:4948 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> lÃnies de context coincideixin" -#: apply.c:4949 builtin/am.c:2264 +#: apply.c:4959 builtin/am.c:2245 msgid "action" msgstr "acció" -#: apply.c:4950 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" -msgstr "detecta les lÃnies noves o modificades que tinguin errors d'espai en blanc" +msgstr "" +"detecta les lÃnies noves o modificades que tinguin errors d'espai en blanc" -#: apply.c:4953 apply.c:4956 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:4959 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: apply.c:4961 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "no esperis almenys una lÃnia de context" -#: apply.c:4963 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:4965 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 builtin/commit.c:1337 -#: builtin/count-objects.c:94 builtin/fsck.c:651 builtin/log.c:1867 builtin/mv.c:122 -#: builtin/read-tree.c:134 +#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 +#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 +#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "sigues detallat" -#: apply.c:4968 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolera una lÃnia nova incorrectament detectada al final del fitxer" -#: apply.c:4971 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "no confiïs en els recomptes de lÃnia en les capçaleres dels trossos" -#: apply.c:4973 builtin/am.c:2273 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "arrel" -#: apply.c:4974 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" -#: archive.c:12 +#: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<opcions>] <arbre> [<camÃ>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:14 -msgid "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" -msgstr "git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> [<camÃ>...]" - #: archive.c:15 +msgid "" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> " +"[<camÃ>...]" + +#: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camà '%s' no ha coincidit amb cap fitxer" -#: archive.c:417 +#: archive.c:418 msgid "fmt" msgstr "format" -#: archive.c:417 +#: archive.c:418 msgid "archive format" msgstr "format d'arxiu" -#: archive.c:418 builtin/log.c:1436 +#: archive.c:419 builtin/log.c:1446 msgid "prefix" msgstr "prefix" -#: archive.c:419 +#: archive.c:420 msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camà en l'arxiu" -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/read-tree.c:129 parse-options.h:153 +#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 +#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 +#: parse-options.h:153 msgid "file" msgstr "fitxer" -#: archive.c:421 builtin/archive.c:89 +#: archive.c:422 builtin/archive.c:89 msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" -#: archive.c:423 +#: archive.c:424 msgid "read .gitattributes in working directory" msgstr "llegeix .gitattributes en el directori de treball" -#: archive.c:424 +#: archive.c:425 msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" -#: archive.c:425 +#: archive.c:426 msgid "store only" msgstr "només emmagatzema" -#: archive.c:426 +#: archive.c:427 msgid "compress faster" msgstr "comprimeix més rà pidament" -#: archive.c:434 +#: archive.c:435 msgid "compress better" msgstr "comprimeix millor" -#: archive.c:437 +#: archive.c:438 msgid "list supported archive formats" msgstr "llista els formats d'arxiu admesos" -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "dipòsit" -#: archive.c:440 builtin/archive.c:91 +#: archive.c:441 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'arxiu del dipòsit remot <dipòsit>" -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 msgid "command" msgstr "ordre" -#: archive.c:442 builtin/archive.c:93 +#: archive.c:443 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "camà a l'ordre git-upload-archive remota" -#: archive.c:449 +#: archive.c:450 msgid "Unexpected option --remote" msgstr "Opció inesperada --remote" -#: archive.c:451 +#: archive.c:452 msgid "Option --exec can only be used together with --remote" msgstr "L'opció --exec només es pot usar junt amb --remote" -#: archive.c:453 +#: archive.c:454 msgid "Unexpected option --output" msgstr "Opció inesperada --output" -#: archive.c:475 +#: archive.c:476 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'arxiu desconegut '%s'" -#: archive.c:482 +#: archive.c:483 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Parà metre no admès per al format '%s': -%d" -#: attr.c:212 +#: attr.c:214 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no és un nom d'atribut và lid" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -864,27 +899,22 @@ msgstr "" "Els patrons negatius s'ignoren en els atributs de git\n" "Useu '\\!' per exclamació capdavantera literal." -#: bisect.c:444 -#, c-format -msgid "Could not open file '%s'" -msgstr "No s'ha pogut obrir el fitxer '%s'" - -#: bisect.c:449 +#: bisect.c:447 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Comentari amb cometes errònies en el fitxer '%s': %s" -#: bisect.c:657 +#: bisect.c:655 #, c-format msgid "We cannot bisect more!\n" msgstr "No podem bisecar més!\n" -#: bisect.c:710 +#: bisect.c:708 #, c-format msgid "Not a valid commit name %s" msgstr "No és un nom de comissió và lid %s" -#: bisect.c:734 +#: bisect.c:732 #, c-format msgid "" "The merge base %s is bad.\n" @@ -893,7 +923,7 @@ msgstr "" "La base de fusió %s és errònia.\n" "Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n" -#: bisect.c:739 +#: bisect.c:737 #, c-format msgid "" "The merge base %s is new.\n" @@ -902,7 +932,7 @@ msgstr "" "La base de fusió %s és nova.\n" "La propietat s'ha canviat entre %s i [%s].\n" -#: bisect.c:744 +#: bisect.c:742 #, c-format msgid "" "The merge base %s is %s.\n" @@ -911,7 +941,7 @@ msgstr "" "La base de fusió %s és %s.\n" "Això vol dir que la primera comissió '%s' és entre %s i [%s].\n" -#: bisect.c:752 +#: bisect.c:750 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -922,7 +952,7 @@ msgstr "" "git bisect no pot funcionar correctament en aquest cas.\n" "Potser heu confós les revisions %s i %s?\n" -#: bisect.c:765 +#: bisect.c:763 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -930,39 +960,40 @@ msgid "" "We continue anyway." msgstr "" "s'ha d'ometre la base de fusió entre %s i [%s].\n" -"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s i %s.\n" +"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s " +"i %s.\n" "Continuem de totes maneres." -#: bisect.c:800 +#: bisect.c:798 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecant: s'ha de provar una base de fusió\n" -#: bisect.c:851 +#: bisect.c:849 #, c-format msgid "a %s revision is needed" msgstr "es necessita una revisió %s" -#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer '%s'" -#: bisect.c:919 +#: bisect.c:917 #, c-format msgid "could not read file '%s'" msgstr "no s'ha pogut llegir el fitxer '%s'" -#: bisect.c:949 +#: bisect.c:947 msgid "reading bisect refs failed" msgstr "la lectura de les referències de bisecció ha fallat" -#: bisect.c:969 +#: bisect.c:967 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era ambdós %s i %s\n" -#: bisect.c:977 +#: bisect.c:975 #, c-format msgid "" "No testable commit found.\n" @@ -971,15 +1002,16 @@ msgstr "" "No s'ha trobat cap comissió comprovable.\n" "Potser heu començat amb parà metres de camà dolents?\n" -#: bisect.c:996 +#: bisect.c:994 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "(aproximadament %d pas)" msgstr[1] "(aproximadament %d passos)" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. #: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" @@ -987,6 +1019,44 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n" msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n" +#: blame.c:1757 +msgid "--contents and --reverse do not blend well." +msgstr "--contents i --reverse no funcionen bé juntes." + +#: blame.c:1768 +msgid "cannot use --contents with final commit object name" +msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" + +#: blame.c:1788 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse i --first-parent-together requereixen una última comissió " +"especificada" + +#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 +#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 +#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 +#: builtin/shortlog.c:177 +msgid "revision walk setup failed" +msgstr "la configuració del passeig per revisions ha fallat" + +#: blame.c:1815 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent junts requereixen un rang de la cadena de mares " +"primeres" + +#: blame.c:1826 +#, c-format +msgid "no such path %s in %s" +msgstr "no hi ha tal camà %s en %s" + +#: blame.c:1837 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "no es pot llegir el blob %s per al camà %s" + #: branch.c:53 #, c-format msgid "" @@ -1008,7 +1078,9 @@ msgstr "No s'està establint la branca %s com a la seva pròpia font." #: branch.c:93 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." -msgstr "La branca %s està configurada per a seguir la branca remota %s de %s per rebasar." +msgstr "" +"La branca %s està configurada per a seguir la branca remota %s de %s fent " +"«rebase»." #: branch.c:94 #, c-format @@ -1018,7 +1090,8 @@ msgstr "La branca %s està configurada per a seguir la branca remota %s de %s." #: branch.c:98 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "La branca %s està configurada per a seguir la branca local %s per rebasar." +msgstr "" +"La branca %s està configurada per a seguir la branca local %s fent «rebase»." #: branch.c:99 #, c-format @@ -1028,7 +1101,9 @@ msgstr "La branca %s està configurada per a seguir la branca local %s." #: branch.c:104 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "La branca %s està configurada per a seguir la referència remota %s per rebasar." +msgstr "" +"La branca %s està configurada per a seguir la referència remota %s fent " +"«rebase»." #: branch.c:105 #, c-format @@ -1038,7 +1113,9 @@ msgstr "La branca %s està configurada per a seguir la referència remota %s." #: branch.c:109 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." -msgstr "La branca %s està configurada per a seguir la referència local %s per rebasar." +msgstr "" +"La branca %s està configurada per a seguir la referència local %s fent " +"«rebase»." #: branch.c:110 #, c-format @@ -1071,7 +1148,9 @@ msgstr "No es pot actualitzar la branca actual a la força." #: branch.c:218 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "No es pot configurar la informació de seguiment; el punt inicial '%s' no és una branca." +msgstr "" +"No es pot configurar la informació de seguiment; el punt inicial '%s' no és " +"una branca." #: branch.c:220 #, c-format @@ -1119,7 +1198,7 @@ msgstr "No és un punt de ramificació và lid: '%s'." msgid "'%s' is already checked out at '%s'" msgstr "'%s' ja s'ha agafat a '%s'" -#: branch.c:364 +#: branch.c:366 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "La HEAD de l'arbre de treball %s no està actualitzat" @@ -1129,91 +1208,85 @@ msgstr "La HEAD de l'arbre de treball %s no està actualitzat" msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' no sembla un fitxer de farcell v2" -#: bundle.c:61 +#: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 +#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir '%s'" -#: bundle.c:139 +#: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 builtin/blame.c:2811 -#: builtin/commit.c:1061 builtin/log.c:353 builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 -#: builtin/log.c:1916 builtin/merge.c:359 builtin/shortlog.c:176 -msgid "revision walk setup failed" -msgstr "la configuració del passeig per revisions ha fallat" - -#: bundle.c:185 +#: bundle.c:186 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El farcell conté aquesta referència:" msgstr[1] "El farcell conté aquestes %d referències:" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "El farcell registra una història completa." -#: bundle.c:194 +#: bundle.c:195 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "El farcell requereix aquesta referència:" msgstr[1] "El farcell requereix aquestes %d referències:" -#: bundle.c:253 +#: bundle.c:254 msgid "Could not spawn pack-objects" msgstr "No s'ha pogut executar el pack-objects" -#: bundle.c:264 +#: bundle.c:265 msgid "pack-objects died" msgstr "El pack-objects s'ha mort" -#: bundle.c:304 +#: bundle.c:307 msgid "rev-list died" msgstr "El rev-list s'ha mort" -#: bundle.c:353 +#: bundle.c:356 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "les opcions de la llista de revisions exclouen la referència '%s'" -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 +#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "parà metre no reconegut: %s" -#: bundle.c:451 +#: bundle.c:454 msgid "Refusing to create empty bundle." msgstr "S'està refusant crear un farcell buit." -#: bundle.c:463 +#: bundle.c:466 #, c-format msgid "cannot create '%s'" msgstr "no es pot crear '%s'" -#: bundle.c:491 +#: bundle.c:494 msgid "index-pack died" msgstr "L'index-pack s'ha mort" -#: color.c:300 +#: color.c:301 #, c-format msgid "invalid color value: %.*s" msgstr "valor de color no và lid: %.*s" -#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 builtin/am.c:1489 -#: builtin/am.c:2126 +#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 +#: builtin/am.c:1469 builtin/am.c:2107 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" -#: commit.c:42 +#: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s no és una comissió!" @@ -1233,161 +1306,166 @@ msgstr "" msgid "memory exhausted" msgstr "memòria esgotada" -#: config.c:191 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:711 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "lÃnia de configuració %d errònia en el blob %s" -#: config.c:715 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "lÃnia de configuració %d errònia en el fitxer %s" -#: config.c:719 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "lÃnia de configuració %d errònia en l'entrada està ndard" -#: config.c:723 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "lÃnia de configuració %d errònia en el blob de submòdul %s" -#: config.c:727 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "lÃnia de configuració %d errònia en la lÃnia d'ordres %s" -#: config.c:731 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "lÃnia de configuració %d errònia en %s" -#: config.c:859 +#: config.c:868 msgid "out of range" msgstr "fora de rang" -#: config.c:859 +#: config.c:868 msgid "invalid unit" msgstr "unitat no và lida" -#: config.c:865 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor de configuració numèric erroni '%s' per '%s': %s" -#: config.c:870 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valor de configuració numèric erroni '%s' per '%s' en el blob %s: %s" -#: config.c:873 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valor de configuració numèric '%s' erroni per '%s' en el fitxer %s: %s" -#: config.c:876 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "valor de configuració numèric '%s' erroni per '%s' en l'entrada està ndard: %s" +msgstr "" +"valor de configuració numèric '%s' erroni per '%s' en l'entrada està ndard: %s" -#: config.c:879 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "valor de configuració numèric '%s' erroni' per '%s' en el blob de submòdul %s: %s" +msgstr "" +"valor de configuració numèric '%s' erroni' per '%s' en el blob de submòdul " +"%s: %s" -#: config.c:882 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "valor de configuració numèric '%s' erroni per '%s' en la lÃnia d'ordres %s: %s" +msgstr "" +"valor de configuració numèric '%s' erroni per '%s' en la lÃnia d'ordres %s: " +"%s" -#: config.c:885 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s" -#: config.c:980 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "s'ha produït un error en expandir el directori d'usuari en: '%s'" -#: config.c:1075 config.c:1086 +#: config.c:1084 config.c:1095 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib dolent %d" -#: config.c:1203 +#: config.c:1212 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no và lid: %s" -#: config.c:1359 +#: config.c:1368 #, c-format msgid "bad pack compression level %d" msgstr "nivell de compressió de paquet %d Erroni" -#: config.c:1557 +#: config.c:1564 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la lÃnia d'ordres" -#: config.c:1611 +#: config.c:1894 msgid "unknown error occurred while reading the configuration files" msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" -#: config.c:1970 +#: config.c:2064 #, c-format msgid "Invalid %s: '%s'" msgstr "%s no và lid: %s" -#: config.c:1991 +#: config.c:2085 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2017 +#: config.c:2111 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2028 +#: config.c:2122 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar '%s' de la configuració de la lÃnia d'ordres" -#: config.c:2030 +#: config.c:2124 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració '%s' errònia en el fitxer '%s' a la lÃnia %d" -#: config.c:2089 +#: config.c:2183 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" -#: config.c:2423 config.c:2648 +#: config.c:2517 config.c:2745 #, c-format msgid "fstat on %s failed" msgstr "ha fallat fstat a %s" -#: config.c:2541 +#: config.c:2635 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir '%s' a '%s'" -#: config.c:2543 builtin/remote.c:774 +#: config.c:2637 builtin/remote.c:775 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desestablir '%s'" -#: connect.c:49 +#: connect.c:50 msgid "The remote end hung up upon initial contact" msgstr "El costat remot ha penjat en el moment de contacte inicial" -#: connect.c:51 +#: connect.c:52 msgid "" "Could not read from remote repository.\n" "\n" @@ -1399,7 +1477,7 @@ msgstr "" "Si us plau, assegureu-vos que tingueu els permisos\n" "d'accés correctes i que el dipòsit existeixi." -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 msgid "Checking connectivity" msgstr "S'està comprovant la connectivitat" @@ -1415,101 +1493,103 @@ msgstr "escriptura fallada al rev-list" msgid "failed to close rev-list's stdin" msgstr "s'ha produït un error en tancar l'stdin del rev-list" -#: convert.c:201 +#: convert.c:205 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory." msgstr "" "LF reemplaçarà CRLF en %s.\n" -"El fitxer tindrà els seus terminadors de lÃnia originals en el vostre directori de treball." +"El fitxer tindrà els seus terminadors de lÃnia originals en el vostre " +"directori de treball." -#: convert.c:205 +#: convert.c:209 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "LF reemplaçaria CRLF en %s." -#: convert.c:211 +#: convert.c:215 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory." msgstr "" "CRLF reemplaçarà LF en %s.\n" -"El fitxer tindrà els seus terminadors de lÃnia originals en el vostre directori de treball." +"El fitxer tindrà els seus terminadors de lÃnia originals en el vostre " +"directori de treball." -#: convert.c:215 +#: convert.c:219 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "CRLF reemplaçaria LF en %s" -#: date.c:97 +#: date.c:116 msgid "in the future" msgstr "en el futur" -#: date.c:103 +#: date.c:122 #, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" -msgstr[0] "fa %lu segon" -msgstr[1] "fa %lu segons" +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "fa %<PRIuMAX> segon" +msgstr[1] "fa %<PRIuMAX> segons" -#: date.c:110 +#: date.c:129 #, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" -msgstr[0] "fa %lu minut" -msgstr[1] "fa %lu minuts" +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "fa %<PRIuMAX> minut" +msgstr[1] "fa %<PRIuMAX> minuts" -#: date.c:117 +#: date.c:136 #, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" -msgstr[0] "fa %lu hora" -msgstr[1] "fa %lu hores" +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "fa %<PRIuMAX> hora" +msgstr[1] "fa %<PRIuMAX> hores" -#: date.c:124 +#: date.c:143 #, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" -msgstr[0] "fa %lu dia" -msgstr[1] "fa %lu dies" +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "fa %<PRIuMAX> dia" +msgstr[1] "fa %<PRIuMAX> dies" -#: date.c:130 +#: date.c:149 #, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" -msgstr[0] "fa %lu setmana" -msgstr[1] "fa %lu setmanes" +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "fa %<PRIuMAX> setmana" +msgstr[1] "fa %<PRIuMAX> setmanes" -#: date.c:137 +#: date.c:156 #, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" -msgstr[0] "fa %lu mes" -msgstr[1] "fa %lu mesos" +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "fa %<PRIuMAX> mes" +msgstr[1] "fa %<PRIuMAX> mesos" -#: date.c:148 +#: date.c:167 #, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "%lu any" -msgstr[1] "%lu anys" +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> any" +msgstr[1] "%<PRIuMAX> anys" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:151 +#: date.c:170 #, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "fa %s i %lu mes" -msgstr[1] "fa %s i %lu mesos" +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "fa %s i %<PRIuMAX> mes" +msgstr[1] "fa %s i %<PRIuMAX> mesos" -#: date.c:156 date.c:161 +#: date.c:175 date.c:180 #, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "fa %lu any" -msgstr[1] "fa %lu anys" +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "fa %<PRIuMAX> any" +msgstr[1] "fa %<PRIuMAX> anys" #: diffcore-order.c:24 #, c-format @@ -1520,27 +1600,30 @@ msgstr "s'ha produït un error en llegir el fitxer d'ordres '%s'" msgid "Performing inexact rename detection" msgstr "S'està realitzant una detecció inexacta de canvis de nom" -#: diff.c:62 +#: diff.c:63 #, c-format msgid "option '%s' requires a value" msgstr "l'opció '%s' requereix un valor" -#: diff.c:124 +#: diff.c:125 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " S'ha produït un error en analitzar el percentatge limitant de dirstat '%s'\n" +msgstr "" +" S'ha produït un error en analitzar el percentatge limitant de dirstat " +"'%s'\n" -#: diff.c:129 +#: diff.c:130 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parà metre de dirstat desconegut '%s'\n" -#: diff.c:281 +#: diff.c:282 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "Valor desconegut de la variable de configuració de 'diff.submodule': '%s'" +msgstr "" +"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'" -#: diff.c:344 +#: diff.c:342 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1549,20 +1632,20 @@ msgstr "" "S'han trobat errors en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:3102 +#: diff.c:3101 #, c-format msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'està aturant a %s" -#: diff.c:3428 +#: diff.c:3427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check i -s són mutualment exclusius" -#: diff.c:3518 +#: diff.c:3517 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camÃ" -#: diff.c:3681 +#: diff.c:3680 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1571,276 +1654,283 @@ msgstr "" "S'ha produït un error en analitzar el parà metre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:3695 +#: diff.c:3694 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "S'ha produït un error en analitzar el parà metre d'opció de --submodule: '%s'" +msgstr "" +"S'ha produït un error en analitzar el parà metre d'opció de --submodule: '%s'" -#: diff.c:4719 +#: diff.c:4716 msgid "inexact rename detection was skipped due to too many files." msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers." -#: diff.c:4722 +#: diff.c:4719 msgid "only found copies from modified paths due to too many files." -msgstr "només s'han trobat còpies des de camins modificats a causa de massa fitxers." +msgstr "" +"només s'han trobat còpies des de camins modificats a causa de massa fitxers." -#: diff.c:4725 +#: diff.c:4722 #, c-format -msgid "you may want to set your %s variable to at least %d and retry the command." -msgstr "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar l'ordre." +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" +"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " +"l'ordre." -#: dir.c:1899 +#: dir.c:1948 msgid "failed to get kernel name and information" msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli" -#: dir.c:2018 +#: dir.c:2067 msgid "Untracked cache is disabled on this system or location." -msgstr "La memòria cau no seguida està inhabilitada en aquest sistema o ubicació." +msgstr "" +"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació." -#: dir.c:2776 dir.c:2781 +#: dir.c:2846 dir.c:2851 #, c-format msgid "could not create directories for %s" msgstr "no s'ha pogut crear directoris per %s" -#: dir.c:2806 +#: dir.c:2876 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no s'ha pogut migrar el directori de '%s' a '%s'" -#: entry.c:280 +#: entry.c:281 #, c-format msgid "could not stat file '%s'" msgstr "no s'ha pogut fer «stat» sobre el fitxer '%s'" -#: fetch-pack.c:249 +#: fetch-pack.c:251 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: llista superficial esperada" -#: fetch-pack.c:261 +#: fetch-pack.c:263 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut" -#: fetch-pack.c:280 builtin/archive.c:63 +#: fetch-pack.c:282 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "error remot: %s" -#: fetch-pack.c:281 +#: fetch-pack.c:283 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut" -#: fetch-pack.c:333 +#: fetch-pack.c:335 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requereix multi_ack_detailed" -#: fetch-pack.c:419 +#: fetch-pack.c:421 #, c-format msgid "invalid shallow line: %s" msgstr "lÃnia de shallow no và lida: %s" -#: fetch-pack.c:425 +#: fetch-pack.c:427 #, c-format msgid "invalid unshallow line: %s" msgstr "lÃnia d'unshallow no và lida: %s" -#: fetch-pack.c:427 +#: fetch-pack.c:429 #, c-format msgid "object not found: %s" msgstr "objecte no trobat: %s" -#: fetch-pack.c:430 +#: fetch-pack.c:432 #, c-format msgid "error in object: %s" msgstr "error en objecte: %s" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "no shallow found: %s" msgstr "no s'ha trobat cap shallow: %s" -#: fetch-pack.c:435 +#: fetch-pack.c:437 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: fetch-pack.c:474 +#: fetch-pack.c:476 #, c-format msgid "got %s %d %s" msgstr "%s %d %s rebut" -#: fetch-pack.c:488 +#: fetch-pack.c:490 #, c-format msgid "invalid commit %s" msgstr "comissió no và lida %s" -#: fetch-pack.c:521 +#: fetch-pack.c:523 msgid "giving up" msgstr "s'està rendint" -#: fetch-pack.c:531 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "fet" -#: fetch-pack.c:543 +#: fetch-pack.c:545 #, c-format msgid "got %s (%d) %s" msgstr "s'ha rebut %s (%d) %s" -#: fetch-pack.c:589 +#: fetch-pack.c:591 #, c-format msgid "Marking %s as complete" msgstr "S'està marcant %s com a complet" -#: fetch-pack.c:737 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "ja es té %s (%s)" -#: fetch-pack.c:775 +#: fetch-pack.c:813 msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-pack: no s'ha pogut bifurcar del demultiplexor de banda lateral" +msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral" -#: fetch-pack.c:783 +#: fetch-pack.c:821 msgid "protocol error: bad pack header" msgstr "error de protocol: capçalera de paquet errònia" -#: fetch-pack.c:839 +#: fetch-pack.c:877 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no es pot bifurcar de %s" -#: fetch-pack.c:855 +#: fetch-pack.c:893 #, c-format msgid "%s failed" msgstr "%s ha fallat" -#: fetch-pack.c:857 +#: fetch-pack.c:895 msgid "error in sideband demultiplexer" -msgstr "error en demultiplexor de banda lateral" +msgstr "error en desmultiplexor de banda lateral" -#: fetch-pack.c:884 +#: fetch-pack.c:922 msgid "Server does not support shallow clients" msgstr "El servidor no permet clients superficials" -#: fetch-pack.c:888 +#: fetch-pack.c:926 msgid "Server supports multi_ack_detailed" msgstr "El servidor accepta multi_ack_detailed" -#: fetch-pack.c:891 +#: fetch-pack.c:929 msgid "Server supports no-done" msgstr "El servidor accepta no-done" -#: fetch-pack.c:897 +#: fetch-pack.c:935 msgid "Server supports multi_ack" msgstr "El servidor accepta multi_ack" -#: fetch-pack.c:901 +#: fetch-pack.c:939 msgid "Server supports side-band-64k" msgstr "El servidor accepta side-band-64k" -#: fetch-pack.c:905 +#: fetch-pack.c:943 msgid "Server supports side-band" msgstr "El servidor accepta banda lateral" -#: fetch-pack.c:909 +#: fetch-pack.c:947 msgid "Server supports allow-tip-sha1-in-want" msgstr "El servidor accepta allow-tip-sha1-in-want" -#: fetch-pack.c:913 +#: fetch-pack.c:951 msgid "Server supports allow-reachable-sha1-in-want" msgstr "El servidor accepta allow-reachable-sha1-in-want" -#: fetch-pack.c:923 +#: fetch-pack.c:961 msgid "Server supports ofs-delta" msgstr "El servidor accepta ofs-delta" -#: fetch-pack.c:930 +#: fetch-pack.c:968 #, c-format msgid "Server version is %.*s" msgstr "La versió del servidor és %.*s" -#: fetch-pack.c:936 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "El servidor no admet --shallow-since" -#: fetch-pack.c:940 +#: fetch-pack.c:978 msgid "Server does not support --shallow-exclude" msgstr "El servidor no admet --shallow-exclude" -#: fetch-pack.c:942 +#: fetch-pack.c:980 msgid "Server does not support --deepen" msgstr "El servidor no admet --deepen" -#: fetch-pack.c:953 +#: fetch-pack.c:991 msgid "no common commits" msgstr "cap comissió en comú" -#: fetch-pack.c:965 +#: fetch-pack.c:1003 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: l'obtenció ha fallat." -#: fetch-pack.c:1127 +#: fetch-pack.c:1165 msgid "no matching remote head" msgstr "no hi ha cap HEAD remot coincident" -#: fetch-pack.c:1149 +#: fetch-pack.c:1187 #, c-format msgid "no such remote ref %s" msgstr "no existeix la referència remota %s" -#: fetch-pack.c:1152 +#: fetch-pack.c:1190 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permet sol·licitar objectes no anunciats %s" -#: gpg-interface.c:185 +#: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "gpg ha fallat en signar les dades" -#: gpg-interface.c:215 +#: gpg-interface.c:211 msgid "could not create temporary file" msgstr "no s'ha pogut crear el fitxer temporal" -#: gpg-interface.c:217 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "s'ha produït un error en escriure la signatura separada a '%s'" -#: graph.c:96 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora el color invà lid '%.*s' en log.graphColors" -#: grep.c:1796 +#: grep.c:1981 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no s'ha pogut llegir %s" -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "s'ha produït un error en fer stat a '%s'" -#: grep.c:1824 +#: grep.c:2009 #, c-format msgid "'%s': short read" msgstr "'%s': lectura curta" -#: help.c:218 +#: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "ordres de git disponibles en '%s'" -#: help.c:225 +#: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" -#: help.c:256 +#: help.c:217 msgid "These are common Git commands used in various situations:" -msgstr "Aquestes són ordres del Git habitualment usades en diverses situacions:" +msgstr "" +"Aquestes són ordres del Git habitualment usades en diverses situacions:" -#: help.c:321 +#: help.c:281 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1849,30 +1939,53 @@ msgstr "" "'%s' sembla una ordre de git, però no hem pogut\n" "executar-la. Pot ser que git-%s estigui malmès?" -#: help.c:376 +#: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ai. El vostre sistema no informa de cap ordre de Git." -#: help.c:398 -#, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" +#: help.c:358 +#, fuzzy, c-format +msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no existeix.\n" +"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no " +"existeix.\n" "S'està continuant sota l'assumpció que volÃeu dir '%s'" -#: help.c:403 +#: help.c:363 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "en %0.1f segons automà ticament..." +msgid "Continuing under the assumption that you meant '%s'." +msgstr "" -#: help.c:410 +#: help.c:368 +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "" + +#: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'." -#: help.c:414 help.c:480 +#: help.c:380 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "" +msgstr[1] "" + +#: help.c:395 +msgid "git version [<options>]" +msgstr "git version [<opcions>]" + +#: help.c:456 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s - %s" + +#: help.c:460 msgid "" "\n" "Did you mean this?" @@ -1886,12 +1999,7 @@ msgstr[1] "" "\n" "VolÃeu dir un d'aquests?" -#: help.c:476 -#, c-format -msgid "%s: %s - %s" -msgstr "%s: %s - %s" - -#: ident.c:343 +#: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1916,35 +2024,40 @@ msgstr "" "per a establir la identitat predeterminada del vostre compte.\n" "Ometeu --global per a establir la identitat només en aquest dipòsit.\n" -#: ident.c:367 +#: ident.c:366 msgid "no email was given and auto-detection is disabled" -msgstr "no s'ha proporcionat cap adreça electrònica i la detecció automà tica està inhabilitada" +msgstr "" +"no s'ha proporcionat cap adreça electrònica i la detecció automà tica està " +"inhabilitada" -#: ident.c:372 +#: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" -msgstr "no s'ha pogut detectar automà ticament una adreça de correu và lida ('%s' rebut)" +msgstr "" +"no s'ha pogut detectar automà ticament una adreça de correu và lida ('%s' " +"rebut)" -#: ident.c:382 +#: ident.c:381 msgid "no name was given and auto-detection is disabled" -msgstr "no s'ha proporcionat cap nom i la detecció automà tica està inhabilitada" +msgstr "" +"no s'ha proporcionat cap nom i la detecció automà tica està inhabilitada" -#: ident.c:388 +#: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "no s'ha pogut detectar automà ticament el nom ('%s' rebut)" -#: ident.c:396 +#: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "" -#: ident.c:402 +#: ident.c:401 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:417 builtin/commit.c:611 +#: ident.c:416 builtin/commit.c:612 #, c-format msgid "invalid date format: %s" msgstr "format de data no và lid: %s" @@ -1978,256 +2091,268 @@ msgstr "No s'ha pogut crear '%s.lock': %s" msgid "failed to read the cache" msgstr "s'ha produït un error en llegir la memòria cau" -#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 builtin/checkout.c:607 -#: builtin/clone.c:749 +#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 +#: builtin/checkout.c:591 builtin/clone.c:753 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'Ãndex nou" -#: merge-recursive.c:209 +#: merge-recursive.c:210 msgid "(bad commit)\n" msgstr "(comissió errònia)\n" -#: merge-recursive.c:231 merge-recursive.c:239 +#: merge-recursive.c:232 merge-recursive.c:240 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache ha fallat per al camà '%s'" -#: merge-recursive.c:303 +#: merge-recursive.c:304 msgid "error building trees" msgstr "error en construir arbres" -#: merge-recursive.c:727 +#: merge-recursive.c:728 #, c-format msgid "failed to create path '%s'%s" msgstr "s'ha produït un error en crear el camà '%s'%s" -#: merge-recursive.c:738 +#: merge-recursive.c:739 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "S'està eliminant %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:752 merge-recursive.c:771 +#: merge-recursive.c:753 merge-recursive.c:772 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:761 +#: merge-recursive.c:762 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "s'està refusant perdre el fitxer no seguit a '%s'" -#: merge-recursive.c:803 builtin/cat-file.c:34 +#: merge-recursive.c:804 builtin/cat-file.c:36 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s '%s'" -#: merge-recursive.c:805 +#: merge-recursive.c:806 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s '%s'" -#: merge-recursive.c:829 +#: merge-recursive.c:830 #, c-format msgid "failed to open '%s': %s" msgstr "s'ha produït un error en obrir '%s': %s" -#: merge-recursive.c:840 +#: merge-recursive.c:841 #, c-format msgid "failed to symlink '%s': %s" msgstr "s'ha produït un error en fer l'enllaç simbòlic '%s': %s" -#: merge-recursive.c:845 +#: merge-recursive.c:846 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se sap què fer amb %06o %s '%s'" -#: merge-recursive.c:985 +#: merge-recursive.c:986 msgid "Failed to execute internal merge" msgstr "S'ha produït un error en executar la fusió interna" -#: merge-recursive.c:989 +#: merge-recursive.c:990 #, c-format msgid "Unable to add %s to database" msgstr "No s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:1092 +#: merge-recursive.c:1093 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." msgstr "" -"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s s'ha deixat en " -"l'arbre." +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " +"s'ha deixat en l'arbre." -#: merge-recursive.c:1097 +#: merge-recursive.c:1098 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." msgstr "" -"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s s'ha deixat en " -"l'arbre." +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " +"de %s s'ha deixat en l'arbre." -#: merge-recursive.c:1104 +#: merge-recursive.c:1105 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." msgstr "" -"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s s'ha deixat en " -"l'arbre a %s." +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " +"s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1109 +#: merge-recursive.c:1110 #, 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." +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." msgstr "" -"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s s'ha deixat en " -"l'arbre a %s." +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " +"de %s s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "rename" msgstr "canvi de nom" -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1200 +#: merge-recursive.c:1201 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1225 +#: merge-recursive.c:1226 #, c-format msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" in \"%s" -"\"%s" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" msgstr "" -"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la branca \"%s\" canvi de " -"nom \"%s\"->\"%s\" en \"%s\"%s" +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la " +"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1231 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1293 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de nom %s->%s en %s" +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " +"nom %s->%s en %s" -#: merge-recursive.c:1325 +#: merge-recursive.c:1326 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això" -#: merge-recursive.c:1528 +#: merge-recursive.c:1529 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -msgstr "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en %s" +msgstr "" +"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en " +"%s" -#: merge-recursive.c:1543 +#: merge-recursive.c:1544 #, c-format msgid "Adding merged %s" msgstr "S'està afegint %s fusionat" -#: merge-recursive.c:1550 merge-recursive.c:1780 +#: merge-recursive.c:1551 merge-recursive.c:1781 #, c-format msgid "Adding as %s instead" msgstr "S'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1607 +#: merge-recursive.c:1608 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:1610 +#: merge-recursive.c:1611 #, c-format msgid "object %s is not a blob" msgstr "l'objecte %s no és un blob" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modify" msgstr "modificació" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modified" msgstr "modificat" -#: merge-recursive.c:1689 +#: merge-recursive.c:1690 msgid "content" msgstr "contingut" -#: merge-recursive.c:1696 +#: merge-recursive.c:1697 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:1732 +#: merge-recursive.c:1733 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "S'ha omès %s (el fusionat és igual a l'existent)" -#: merge-recursive.c:1746 +#: merge-recursive.c:1747 #, c-format msgid "Auto-merging %s" msgstr "S'està autofusionant %s" -#: merge-recursive.c:1750 git-submodule.sh:944 +#: merge-recursive.c:1751 git-submodule.sh:945 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:1751 +#: merge-recursive.c:1752 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Removing %s" msgstr "S'està eliminant %s" -#: merge-recursive.c:1871 +#: merge-recursive.c:1872 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:1877 +#: merge-recursive.c:1878 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:1883 +#: merge-recursive.c:1884 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a %s" +msgstr "" +"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a " +"%s" -#: merge-recursive.c:1892 +#: merge-recursive.c:1893 #, c-format msgid "Adding %s" msgstr "S'està afegint %s" -#: merge-recursive.c:1929 +#: merge-recursive.c:1930 msgid "Already up-to-date!" msgstr "Ja està al dia!" -#: merge-recursive.c:1938 +#: merge-recursive.c:1939 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:2021 +#: merge-recursive.c:2022 msgid "Merging:" msgstr "Fusionant:" -#: merge-recursive.c:2034 +#: merge-recursive.c:2035 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat en comú:" msgstr[1] "s'han trobat %u avantpassats en comú:" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:2136 +#: merge-recursive.c:2137 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte '%s'" -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'Ãndex." @@ -2235,35 +2360,37 @@ msgstr "No s'ha pogut escriure l'Ãndex." #, 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." +"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 "" "No heu acabat la vostra fusió de notes prèvia (%s existeix).\n" -"Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per a cometre/avortar la " -"fusió prèvia abans de començar una fusió de notes nova." +"Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per " +"a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova." #: notes-merge.c:280 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "No heu conclòs la vostra fusió de notes (%s existeix)." -#: notes-utils.c:41 +#: notes-utils.c:42 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat" -#: notes-utils.c:100 +#: notes-utils.c:101 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Valor de notes.rewriteMode erroni: '%s'" -#: notes-utils.c:110 +#: notes-utils.c:111 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" 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 -#: notes-utils.c:137 +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c:141 #, c-format msgid "Bad %s value: '%s'" msgstr "Valor erroni de %s: '%s'" @@ -2273,28 +2400,29 @@ msgstr "Valor erroni de %s: '%s'" msgid "unable to parse object: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: parse-options.c:572 +#: parse-options.c:573 msgid "..." msgstr "..." -#: parse-options.c:590 +#: parse-options.c:591 #, c-format msgid "usage: %s" msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#. +#: parse-options.c:597 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:597 +#: parse-options.c:600 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:631 +#: parse-options.c:634 msgid "-NUM" msgstr "-NUM" @@ -2303,100 +2431,103 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nom d'objecte mal format '%s'" -#: path.c:810 +#: path.c:890 #, c-format msgid "Could not make %s writable by group" msgstr "No s'ha pogut fer %s escrivible pel grup" -#: pathspec.c:125 +#: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "El carà cter d'escapament '\\' no està permès com a últim carà cter en un valor d'un atribut" +msgstr "" +"El carà cter d'escapament '\\' no està permès com a últim carà cter en un " +"valor d'un atribut" -#: pathspec.c:143 +#: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." msgstr "només es permet una especificació 'attr:'." -#: pathspec.c:146 +#: pathspec.c:150 msgid "attr spec must not be empty" msgstr "una especificació d'atribut no pot estar buida" -#: pathspec.c:189 +#: pathspec.c:193 #, c-format msgid "invalid attribute name %s" msgstr "nom d'atribut no và lid %s" -#: pathspec.c:254 +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "els ajusts d'especificació de camà 'glob' i 'noglob' globals són incompatibles" +msgstr "" +"els ajusts d'especificació de camà 'glob' i 'noglob' globals són " +"incompatibles" -#: pathspec.c:261 -msgid "global 'literal' pathspec setting is incompatible with all other global pathspec settings" +#: pathspec.c:265 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" msgstr "" -"l'ajust d'especificació de camà 'literal' global és incompatible amb tots els altres ajusts " -"d'especificació de camà globals" +"l'ajust d'especificació de camà 'literal' global és incompatible amb tots " +"els altres ajusts d'especificació de camà globals" -#: pathspec.c:301 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parà metre no và lid per a la mà gia d'especificació de camà 'prefix'" -#: pathspec.c:322 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Mà gia d'especificació de camà no và lida '%.*s' en '%s'" -#: pathspec.c:327 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' mancant al final de la mà gia d'especificació de camà en '%s'" -#: pathspec.c:365 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Mà gia d'especificació de camà no implementada '%c' en '%s'" -#: pathspec.c:421 pathspec.c:443 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "L'especificació '%s' és en el submòdul '%.*s'" - -#: pathspec.c:483 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' i 'glob' són incompatibles" -#: pathspec.c:496 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: '%s' és fora del dipòsit" -#: pathspec.c:584 +#: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnemònic: '%c')" -#: pathspec.c:594 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s: aquesta ordre no està admesa amb la mà gia d'especificació de camÃ: %s" +msgstr "" +"%s: aquesta ordre no està admesa amb la mà gia d'especificació de camÃ: %s" -#: pathspec.c:644 +#: pathspec.c:575 msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please use . instead if " -"you meant to match all paths" +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" msgstr "" -"es faran no và lides les cadenes buides com especificacions de camà en versions futures. Si us " -"plau, useu . en lloc d'això si volÃeu coincidir amb tots els camins" +"es faran no và lides les cadenes buides com especificacions de camà en " +"versions futures. Si us plau, useu . en lloc d'això si volÃeu coincidir amb " +"tots els camins" -#: pathspec.c:668 +#: pathspec.c:599 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "l'especificació de camà '%s' és més enllà d'un enllaç simbòlic" -#: pretty.c:982 +#: pretty.c:963 msgid "unable to parse --pretty format" msgstr "no s'ha pogut analitzar el format --pretty" -#: read-cache.c:1442 +#: read-cache.c:1443 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2405,7 +2536,7 @@ msgstr "" "index.version està establerta, però el valor no és và lid.\n" "S'està usant la versió %i" -#: read-cache.c:1452 +#: read-cache.c:1453 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2414,46 +2545,51 @@ msgstr "" "GIT_INDEX_VERSION està establerta, però el valor no és và lid.\n" "S'està usant la versió %i" -#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#: read-cache.c:2308 builtin/merge.c:1019 +#, c-format +msgid "could not close '%s'" +msgstr "no s'ha pogut tancar '%s'" + +#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 #, c-format msgid "could not stat '%s'" msgstr "no s'ha pogut fer stat a '%s'" -#: read-cache.c:2388 +#: read-cache.c:2396 #, c-format msgid "unable to open git dir: %s" msgstr "no s'ha pogut obrir el directori git: %s" -#: read-cache.c:2400 +#: read-cache.c:2408 #, c-format msgid "unable to unlink: %s" msgstr "no s'ha pogut desenllaçar: %s" -#: refs.c:620 builtin/merge.c:844 +#: refs.c:622 #, c-format msgid "Could not open '%s' for writing" msgstr "No s'ha pogut obrir '%s' per a escriptura" -#: refs.c:1667 +#: refs.c:1769 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs/files-backend.c:1631 +#: refs/files-backend.c:1664 #, c-format msgid "could not delete reference %s: %s" msgstr "no s'ha pogut suprimir la referència %s: %s" -#: refs/files-backend.c:1634 +#: refs/files-backend.c:1667 #, c-format msgid "could not delete references: %s" msgstr "no s'ha pogut suprimir les referències: %s" -#: refs/files-backend.c:1643 +#: refs/files-backend.c:1676 #, c-format msgid "could not remove reference %s" msgstr "no s'ha pogut eliminar la referència %s" -#: ref-filter.c:35 wt-status.c:1780 +#: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "no hi és" @@ -2472,312 +2608,320 @@ msgstr "darrere per %d" msgid "ahead %d, behind %d" msgstr "davant per %d, darrere per %d" -#: ref-filter.c:104 +#: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format esperat: %%(color:<color>)" -#: ref-filter.c:106 +#: ref-filter.c:107 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconegut: %%(color:%s)" -#: ref-filter.c:120 +#: ref-filter.c:121 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "valor enter esperat pel nom de referència:lstrip=%s" -#: ref-filter.c:124 +#: ref-filter.c:125 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "valor enter esperat pel nom de referència:rstrip=%s" -#: ref-filter.c:126 +#: ref-filter.c:127 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "parà metre %%(%s) desconegut: %s" -#: ref-filter.c:166 +#: ref-filter.c:167 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no accepta parà metres" -#: ref-filter.c:173 +#: ref-filter.c:174 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no accepta parà metres" -#: ref-filter.c:180 +#: ref-filter.c:181 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) no accepta parà metres" -#: ref-filter.c:199 +#: ref-filter.c:200 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positiu esperat conté:lines=%s" -#: ref-filter.c:201 +#: ref-filter.c:202 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "parà metre %%(contents) no reconegut: %s" -#: ref-filter.c:214 +#: ref-filter.c:215 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positiu esperat nom d'objecte:curt=%s" -#: ref-filter.c:218 +#: ref-filter.c:219 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "parà metre %%(objectname) no reconegut: %s" -#: ref-filter.c:245 +#: ref-filter.c:246 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format esperat: %%(align:<amplada>,<posició>)" -#: ref-filter.c:257 +#: ref-filter.c:258 #, c-format msgid "unrecognized position:%s" msgstr "posició no reconeguda:%s" -#: ref-filter.c:261 +#: ref-filter.c:262 #, c-format msgid "unrecognized width:%s" msgstr "amplada no reconeguda:%s" -#: ref-filter.c:267 +#: ref-filter.c:268 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "parà metre %%(align) no reconegut: %s" -#: ref-filter.c:271 +#: ref-filter.c:272 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "amplada positiva esperada amb l'à tom %%(align)" -#: ref-filter.c:286 +#: ref-filter.c:287 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "parà metre %%(if) no reconegut: %s" -#: ref-filter.c:371 +#: ref-filter.c:378 #, c-format msgid "malformed field name: %.*s" msgstr "nom de camp mal format: %.*s" -#: ref-filter.c:397 +#: ref-filter.c:404 #, c-format msgid "unknown field name: %.*s" msgstr "nom de camp desconegut: %.*s" -#: ref-filter.c:501 +#: ref-filter.c:508 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: s'ha usat l'à tom %%(if) sense un à tom %%(then)" -#: ref-filter.c:561 +#: ref-filter.c:568 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: s'ha usat l'à tom %%(then) sense un à tom %%(if)" -#: ref-filter.c:563 +#: ref-filter.c:570 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: s'ha usat l'à tom %%(then) més d'un cop" -#: ref-filter.c:565 +#: ref-filter.c:572 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: s'ha usat l'à tom %%(then) després de %%(else)" -#: ref-filter.c:591 +#: ref-filter.c:598 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: s'ha usat l'à tom %%(else) sense un à tom %%(if)" -#: ref-filter.c:593 +#: ref-filter.c:600 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: s'ha usat l'à tom %%(else) sense un à tom %%(then)" -#: ref-filter.c:595 +#: ref-filter.c:602 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: s'ha usat l'à tom %%(else) més d'un cop" -#: ref-filter.c:608 +#: ref-filter.c:615 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: s'ha usat l'à tom %%(end) sense l'à tom corresponent" -#: ref-filter.c:663 +#: ref-filter.c:670 #, c-format msgid "malformed format string %s" msgstr "cadena de format mal format %s" -#: ref-filter.c:1247 +#: ref-filter.c:1254 #, c-format msgid "(no branch, rebasing %s)" -msgstr "(cap branca, s'està rebasant %s)" +msgstr "(cap branca, s'està fent «rebase» %s)" -#: ref-filter.c:1250 +#: ref-filter.c:1257 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(cap branca, bisecció començada en %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: ref-filter.c:1256 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1265 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD separat a %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: ref-filter.c:1261 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1272 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD separat de %s)" -#: ref-filter.c:1265 +#: ref-filter.c:1276 msgid "(no branch)" msgstr "(cap branca)" -#: ref-filter.c:1420 ref-filter.c:1451 +#: ref-filter.c:1426 ref-filter.c:1457 #, c-format msgid "missing object %s for %s" msgstr "manca l'objecte %s per a %s" -#: ref-filter.c:1423 ref-filter.c:1454 +#: ref-filter.c:1429 ref-filter.c:1460 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer ha fallat en %s per a %s" -#: ref-filter.c:1692 +#: ref-filter.c:1760 #, c-format msgid "malformed object at '%s'" msgstr "objecte mal format a '%s'" -#: ref-filter.c:1759 +#: ref-filter.c:1827 #, c-format msgid "ignoring ref with broken name %s" msgstr "s'està ignorant la referència amb nom malmès %s" -#: ref-filter.c:1764 +#: ref-filter.c:1832 #, c-format msgid "ignoring broken ref %s" msgstr "s'està ignorant la referència trencada %s" -#: ref-filter.c:2028 +#: ref-filter.c:2095 #, c-format msgid "format: %%(end) atom missing" msgstr "format: manca l'à tom %%(end)" -#: ref-filter.c:2109 +#: ref-filter.c:2176 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: remote.c:754 +#: remote.c:747 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No es poden obtenir ambdós %s i %s a %s" -#: remote.c:758 +#: remote.c:751 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:762 +#: remote.c:755 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdós %s i %s" -#: remote.c:770 +#: remote.c:763 msgid "Internal error" msgstr "Error intern" -#: remote.c:1685 remote.c:1787 +#: remote.c:1680 remote.c:1782 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap branca" -#: remote.c:1694 +#: remote.c:1689 #, c-format msgid "no such branch: '%s'" msgstr "no hi ha tal branca: '%s'" -#: remote.c:1697 +#: remote.c:1692 #, c-format msgid "no upstream configured for branch '%s'" msgstr "cap font configurada per a la branca '%s'" -#: remote.c:1703 +#: remote.c:1698 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branca font '%s' no s'emmagatzema com a branca amb seguiment remot" -#: remote.c:1718 +#: remote.c:1713 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" -msgstr "el destà de pujada '%s' en el remot '%s' no té cap branca amb seguiment remot" +msgstr "" +"el destà de pujada '%s' en el remot '%s' no té cap branca amb seguiment remot" -#: remote.c:1730 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branca '%s' no té cap remot al qual pujar" -#: remote.c:1741 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les especificacions de referència de '%s' no inclouen '%s'" -#: remote.c:1754 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "push no té destà (push.default és 'nothing')" -#: remote.c:1776 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "no es pot resoldre una pujada 'simple' a un sol destÃ" -#: remote.c:2081 +#: remote.c:2076 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "La vostra branca està basada en '%s', però la font no hi és.\n" -#: remote.c:2085 +#: remote.c:2080 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:2088 +#: remote.c:2083 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "La vostra branca està al dia amb '%s'.\n" -#: remote.c:2092 +#: remote.c:2087 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n" msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n" -#: remote.c:2098 +#: remote.c:2093 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:2101 +#: remote.c:2096 #, 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] "La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se rà pidament.\n" -msgstr[1] "La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se rà pidament.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +"La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se " +"rà pidament.\n" +msgstr[1] "" +"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se " +"rà pidament.\n" -#: remote.c:2109 +#: remote.c:2104 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n" -#: remote.c:2112 +#: remote.c:2107 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2792,81 +2936,79 @@ msgstr[1] "" "La vostra branca i '%s' han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2122 +#: remote.c:2117 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n" -#: revision.c:2158 +#: revision.c:2187 msgid "your current branch appears to be broken" msgstr "la vostra branca actual sembla malmesa" -#: revision.c:2161 +#: revision.c:2190 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "la vostra branca actual '%s' encara no té cap comissió" -#: revision.c:2355 +#: revision.c:2384 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent és incompatible amb --bisect" -#: run-command.c:125 +#: run-command.c:644 msgid "open /dev/null failed" msgstr "s'ha produït un error en obrir /dev/null" -#: run-command.c:127 -#, c-format -msgid "dup2(%d,%d) failed" -msgstr "dup2(%d,%d) ha fallat" - -#: send-pack.c:150 +#: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s" -#: send-pack.c:152 +#: send-pack.c:153 #, c-format msgid "remote unpack failed: %s" msgstr "s'ha produït un error en el desempaquetament remot: %s" -#: send-pack.c:315 +#: send-pack.c:316 msgid "failed to sign the push certificate" msgstr "s'ha produït un error en signar el certificat de pujada" -#: send-pack.c:428 +#: send-pack.c:429 msgid "the receiving end does not support --signed push" msgstr "el destà receptor no admet pujar --signed" -#: send-pack.c:430 -msgid "not sending a push certificate since the receiving end does not support --signed push" +#: send-pack.c:431 +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" msgstr "" -"no s'està enviant una certificació de pujada perquè el destà receptor no admet pujar --signed" +"no s'està enviant una certificació de pujada perquè el destà receptor no " +"admet pujar --signed" -#: send-pack.c:442 +#: send-pack.c:443 msgid "the receiving end does not support --atomic push" msgstr "el destà receptor no admet pujar --atomic" -#: send-pack.c:447 +#: send-pack.c:448 msgid "the receiving end does not support push options" msgstr "el destà receptor no admet opcions de pujada" -#: sequencer.c:215 +#: sequencer.c:216 msgid "revert" msgstr "revertir" -#: sequencer.c:217 +#: sequencer.c:218 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:219 +#: sequencer.c:220 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:221 +#: sequencer.c:222 #, c-format msgid "Unknown action: %d" msgstr "Acció desconeguda: %d" -#: sequencer.c:278 +#: sequencer.c:279 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2874,7 +3016,7 @@ msgstr "" "després de resoldre els conflictes, marqueu els camins\n" "corregits amb 'git add <camins>' o 'git rm <camins>'" -#: sequencer.c:281 +#: sequencer.c:282 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2884,63 +3026,63 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:294 sequencer.c:1682 +#: sequencer.c:295 sequencer.c:1685 #, c-format msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar '%s'" -#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 #, c-format msgid "could not write to '%s'" msgstr "no s'ha pogut escriure a '%s'" -#: sequencer.c:301 +#: sequencer.c:302 #, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de lÃnia a '%s'" -#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 #, c-format msgid "failed to finalize '%s'." msgstr "s'ha produït un error en finalitzar '%s'." -#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 builtin/commit.c:749 -#: builtin/merge.c:1018 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 +#: builtin/commit.c:750 builtin/merge.c:1017 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir '%s'" -#: sequencer.c:355 +#: sequencer.c:356 #, c-format msgid "your local changes would be overwritten by %s." msgstr "els vostres canvis locals se sobreescriurien per %s." -#: sequencer.c:359 +#: sequencer.c:360 msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir." -#: sequencer.c:388 +#: sequencer.c:389 #, c-format msgid "%s: fast-forward" msgstr "%s: avanç rà pid" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". +#. "rebase -i". #. -#: sequencer.c:470 +#: sequencer.c:472 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'Ãndex nou" -#: sequencer.c:489 +#: sequencer.c:491 msgid "could not resolve HEAD commit\n" msgstr "no s'ha pogut resoldre la comissió HEAD\n" -#: sequencer.c:509 +#: sequencer.c:511 msgid "unable to update cache tree\n" msgstr "no s'ha pogut actualitzar l'arbre cau\n" -#: sequencer.c:592 +#: sequencer.c:595 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2957,7 +3099,8 @@ msgid "" " git rebase --continue\n" msgstr "" "teniu canvis «staged» en el vostre arbre de treball\n" -"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n" +"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, " +"executeu:\n" "\n" " git commit --amend %s\n" "\n" @@ -2969,17 +3112,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:694 +#: sequencer.c:697 #, c-format msgid "could not parse commit %s\n" msgstr "no s'ha pogut analitzar la comissió %s\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse parent commit %s\n" msgstr "no s'ha pogut analitzar la comissió pare %s\n" -#: sequencer.c:821 +#: sequencer.c:824 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2990,7 +3133,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:827 +#: sequencer.c:830 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3001,229 +3144,230 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:833 sequencer.c:858 +#: sequencer.c:836 sequencer.c:861 #, c-format msgid "This is a combination of %d commits." msgstr "Això és una combinació de %d comissions." -#: sequencer.c:842 +#: sequencer.c:845 msgid "need a HEAD to fixup" msgstr "cal un HEAD per reparar-ho" -#: sequencer.c:844 +#: sequencer.c:847 msgid "could not read HEAD" msgstr "no s'ha pogut llegir HEAD" -#: sequencer.c:846 +#: sequencer.c:849 msgid "could not read HEAD's commit message" msgstr "no s'ha pogut llegir el missatge de comissió de HEAD" -#: sequencer.c:852 +#: sequencer.c:855 #, c-format msgid "cannot write '%s'" msgstr "no es pot escriure '%s'" -#: sequencer.c:861 git-rebase--interactive.sh:445 +#: sequencer.c:864 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "Aquest és el 1r missatge de comissió:" -#: sequencer.c:869 +#: sequencer.c:872 #, c-format msgid "could not read commit message of %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:876 +#: sequencer.c:879 #, c-format msgid "This is the commit message #%d:" msgstr "Aquest és el missatge de comissió #%d:" -#: sequencer.c:881 +#: sequencer.c:884 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El missatge de comissió núm. #%d s'ometrà :" -#: sequencer.c:886 +#: sequencer.c:889 #, c-format msgid "unknown command: %d" msgstr "ordre desconeguda: %d" -#: sequencer.c:952 +#: sequencer.c:955 msgid "your index file is unmerged." msgstr "el vostre fitxer d'Ãndex està sense fusionar." -#: sequencer.c:970 +#: sequencer.c:973 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:978 +#: sequencer.c:981 #, c-format msgid "commit %s does not have parent %d" msgstr "la comissió %s no té pare %d" -#: sequencer.c:982 +#: sequencer.c:985 #, c-format msgid "mainline was specified but commit %s is not a merge." -msgstr "s'ha especificat la lÃnia principal però la comissió %s no és una fusió." +msgstr "" +"s'ha especificat la lÃnia principal però la comissió %s no és una fusió." -#: sequencer.c:988 +#: sequencer.c:991 #, c-format msgid "cannot get commit message for %s" msgstr "no es pot obtenir el missatge de comissió de %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1009 +#: sequencer.c:1012 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió pare %s" -#: sequencer.c:1071 sequencer.c:1827 +#: sequencer.c:1075 sequencer.c:1830 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no s'ha pogut canviar el nom '%s' a '%s'" -#: sequencer.c:1122 +#: sequencer.c:1126 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:1123 +#: sequencer.c:1127 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:1165 +#: sequencer.c:1169 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:1175 +#: sequencer.c:1179 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha produït un error en llegir l'Ãndex" -#: sequencer.c:1182 +#: sequencer.c:1186 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha produït un error en actualitzar l'Ãndex" -#: sequencer.c:1303 +#: sequencer.c:1306 #, c-format msgid "invalid line %d: %.*s" msgstr "lÃnia no và lida %d: %.*s" -#: sequencer.c:1311 +#: sequencer.c:1314 #, c-format msgid "cannot '%s' without a previous commit" msgstr "No es pot '%s' sense una comissió prèvia" -#: sequencer.c:1344 +#: sequencer.c:1347 #, c-format msgid "could not read '%s'." msgstr "no s'ha pogut llegir '%s'." -#: sequencer.c:1356 +#: sequencer.c:1359 msgid "please fix this using 'git rebase --edit-todo'." msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'." -#: sequencer.c:1358 +#: sequencer.c:1361 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: '%s'" -#: sequencer.c:1363 +#: sequencer.c:1366 msgid "no commits parsed." msgstr "no s'ha analitzat cap comissió." -#: sequencer.c:1374 +#: sequencer.c:1377 msgid "cannot cherry-pick during a revert." msgstr "no es pot fer «cherry pick» durant una reversió." -#: sequencer.c:1376 +#: sequencer.c:1379 msgid "cannot revert during a cherry-pick." msgstr "no es pot revertir durant un «cherry pick»." -#: sequencer.c:1439 +#: sequencer.c:1442 #, c-format msgid "invalid key: %s" msgstr "clau no và lida: %s" -#: sequencer.c:1442 +#: sequencer.c:1445 #, c-format msgid "invalid value for %s: %s" msgstr "valor no và lid per a %s: %s" -#: sequencer.c:1499 +#: sequencer.c:1502 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: '%s'" -#: sequencer.c:1537 +#: sequencer.c:1540 msgid "a cherry-pick or revert is already in progress" msgstr "un «cherry pick» o una reversió ja està en curs" -#: sequencer.c:1538 +#: sequencer.c:1541 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1541 +#: sequencer.c:1544 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador '%s'" -#: sequencer.c:1555 +#: sequencer.c:1558 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:1611 sequencer.c:2181 +#: sequencer.c:1614 sequencer.c:2188 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:1613 +#: sequencer.c:1616 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:1615 sequencer.c:1649 +#: sequencer.c:1618 sequencer.c:1652 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nà ixer" -#: sequencer.c:1635 builtin/grep.c:910 +#: sequencer.c:1638 builtin/grep.c:929 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir '%s'" -#: sequencer.c:1637 +#: sequencer.c:1640 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir '%s': %s" -#: sequencer.c:1638 +#: sequencer.c:1641 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:1644 +#: sequencer.c:1647 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» '%s' és malmès" -#: sequencer.c:1655 +#: sequencer.c:1658 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD" -#: sequencer.c:1792 sequencer.c:2080 +#: sequencer.c:1795 sequencer.c:2086 msgid "cannot read HEAD" msgstr "No es pot llegir HEAD" -#: sequencer.c:1832 builtin/difftool.c:616 +#: sequencer.c:1835 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar '%s' a '%s'" -#: sequencer.c:1848 +#: sequencer.c:1851 msgid "could not read index" msgstr "no s'ha pogut llegir l'Ãndex" -#: sequencer.c:1853 +#: sequencer.c:1856 #, c-format msgid "" "execution failed: %s\n" @@ -3238,11 +3382,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1859 +#: sequencer.c:1862 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" -#: sequencer.c:1865 +#: sequencer.c:1868 #, c-format msgid "" "execution succeeded: %s\n" @@ -3258,17 +3402,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1920 git-rebase.sh:169 -#, c-format -msgid "Applied autostash." +#: sequencer.c:1925 +#, fuzzy, c-format +msgid "Applied autostash.\n" msgstr "S'ha aplicat el magatzem automà tic." -#: sequencer.c:1932 +#: sequencer.c:1937 #, c-format msgid "cannot store %s" msgstr "no es pot emmagatzemar %s" -#: sequencer.c:1934 git-rebase.sh:173 +#: sequencer.c:1940 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3279,57 +3423,57 @@ msgstr "" "Els vostres canvis estan segurs en el magatzem.\n" "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" -#: sequencer.c:2016 +#: sequencer.c:2022 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:2058 +#: sequencer.c:2064 #, c-format msgid "unknown command %d" msgstr "ordre %d desconeguda" -#: sequencer.c:2088 +#: sequencer.c:2094 msgid "could not read orig-head" msgstr "No s'ha pogut llegir orig-head" -#: sequencer.c:2092 +#: sequencer.c:2099 msgid "could not read 'onto'" msgstr "no s'ha pogut llegir 'onto'" -#: sequencer.c:2099 +#: sequencer.c:2106 #, c-format msgid "could not update %s" msgstr "no s'ha pogut analitzar %s" -#: sequencer.c:2106 +#: sequencer.c:2113 #, c-format msgid "could not update HEAD to %s" msgstr "no s'ha pogut actualitzar HEAD a %s" -#: sequencer.c:2190 +#: sequencer.c:2197 msgid "cannot rebase: You have unstaged changes." -msgstr "No es pot rebasar: Teniu canvis «unstaged»." +msgstr "No es pot fer «rebase»: teniu canvis «unstaged»." -#: sequencer.c:2195 +#: sequencer.c:2202 msgid "could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: sequencer.c:2204 +#: sequencer.c:2211 msgid "cannot amend non-existing commit" msgstr "no es pot esmenar una comissió no existent" -#: sequencer.c:2206 +#: sequencer.c:2213 #, c-format msgid "invalid file: '%s'" msgstr "fitxer no và lid: '%s'" -#: sequencer.c:2208 +#: sequencer.c:2215 #, c-format msgid "invalid contents: '%s'" msgstr "contingut no và lid: '%s'" -#: sequencer.c:2211 +#: sequencer.c:2218 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3339,34 +3483,35 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n" "primer cometeu-los i després executeu 'git rebase --continue' de nou." -#: sequencer.c:2221 +#: sequencer.c:2228 msgid "could not commit staged changes." msgstr "No s'ha pogut cometre els canvis «staged»." -#: sequencer.c:2301 +#: sequencer.c:2308 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot fer «cherry pick» a %s" -#: sequencer.c:2305 +#: sequencer.c:2312 #, c-format msgid "%s: bad revision" msgstr "%s: revisió dolenta" -#: sequencer.c:2338 +#: sequencer.c:2345 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissió inicial" -#: setup.c:165 +#: setup.c:171 #, 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: no hi ha tal camà en l'arbre de treball.\n" -"Useu 'git <ordre> -- <camÃ>...' per a especificar camins que no existeixin localment." +"Useu 'git <ordre> -- <camÃ>...' per a especificar camins que no existeixin " +"localment." -#: setup.c:178 +#: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3377,7 +3522,7 @@ msgstr "" "Useu '--' per a separar els camins de les revisions, com això:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:228 +#: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3388,72 +3533,76 @@ msgstr "" "Useu '--' per a separar els camins de les revisions, com això:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:475 +#: setup.c:504 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d" -#: setup.c:483 +#: setup.c:512 msgid "unknown repository extensions found:" msgstr "s'han trobat extensions de dipòsit desconegudes:" -#: setup.c:776 +#: setup.c:810 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s" -#: setup.c:778 builtin/index-pack.c:1646 +#: setup.c:812 builtin/index-pack.c:1652 msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: setup.c:1010 +#: setup.c:1050 msgid "Unable to read current working directory" msgstr "No s'ha pogut llegir el directori de treball actual" -#: setup.c:1022 setup.c:1028 +#: setup.c:1062 setup.c:1068 #, c-format msgid "Cannot change to '%s'" msgstr "No es pot canviar a '%s'" -#: setup.c:1041 +#: setup.c:1081 #, 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 "" "No un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n" -"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està establert)." +"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " +"no està establert)." -#: setup.c:1106 +#: setup.c:1173 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -"Hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n" -"El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura." +"Hi ha un problema amb el valor de mode de fitxer core.sharedRepository " +"(0%.3o).\n" +"El propietari dels fitxers sempre ha de tenir permisos de lectura i " +"escriptura." -#: sha1_file.c:559 +#: sha1_file.c:560 #, c-format msgid "path '%s' does not exist" msgstr "el camà '%s' no existeix" -#: sha1_file.c:585 +#: sha1_file.c:586 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat." +msgstr "" +"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat." -#: sha1_file.c:591 +#: sha1_file.c:592 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "el dipòsit de referència '%s' no és un dipòsit local." -#: sha1_file.c:597 +#: sha1_file.c:598 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència '%s' és superficial" -#: sha1_file.c:605 +#: sha1_file.c:606 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència '%s' és empeltat" @@ -3462,26 +3611,28 @@ msgstr "el dipòsit de referència '%s' és empeltat" msgid "offset before end of packfile (broken .idx?)" msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: sha1_file.c:2721 +#: sha1_file.c:2729 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "desplaçament abans d'inici d'Ãndex de paquet per a %s (Ãndex corromput?)" +msgstr "" +"desplaçament abans d'inici d'Ãndex de paquet per a %s (Ãndex corromput?)" -#: sha1_file.c:2725 +#: sha1_file.c:2733 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "desplaçament més enllà de la fi d'Ãndex de paquet per a %s (Ãndex truncat?)" +msgstr "" +"desplaçament més enllà de la fi d'Ãndex de paquet per a %s (Ãndex truncat?)" -#: sha1_name.c:409 +#: sha1_name.c:419 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "l'SHA1 %s curt és ambigu" -#: sha1_name.c:420 +#: sha1_name.c:430 msgid "The candidates are:" msgstr "Els candidats són:" -#: sha1_name.c:580 +#: sha1_name.c:589 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" @@ -3505,69 +3656,85 @@ msgstr "" "suprimiu-les. Desactiveu aquest missatge executant\n" "\"git config advice.objectNameWarning false\"" -#: submodule.c:67 submodule.c:101 +#: submodule.c:70 submodule.c:104 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes de fusió" +msgstr "" +"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes " +"de fusió" -#: submodule.c:71 submodule.c:105 +#: submodule.c:74 submodule.c:108 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s" -#: submodule.c:79 +#: submodule.c:82 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" -#: submodule.c:112 +#: submodule.c:115 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" -#: submodule.c:123 +#: submodule.c:126 msgid "staging updated .gitmodules failed" msgstr "l'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:161 +#: submodule.c:165 msgid "negative values not allowed for submodule.fetchJobs" msgstr "no es permeten els valors negatius a submodule.fetchJobs" -#: submodule.c:1194 +#: submodule.c:376 +#, fuzzy, c-format +msgid "in unpopulated submodule '%s'" +msgstr "S'està ometent el submòdul '%s'" + +#: submodule.c:407 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "L'especificació '%s' és en el submòdul '%.*s'" + +#: submodule.c:1337 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconegut com un dipòsit git" -#: submodule.c:1332 +#: submodule.c:1475 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no s'ha pogut iniciar 'git status' al submòdul '%s'" -#: submodule.c:1345 +#: submodule.c:1488 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no s'ha pogut executar 'git status' al submòdul '%s'" -#: submodule.c:1421 +#: submodule.c:1581 #, c-format msgid "submodule '%s' has dirty index" msgstr "el submòdul '%s' té l'Ãndex brut" -#: submodule.c:1678 +#: submodule.c:1845 #, c-format -msgid "relocate_gitdir for submodule '%s' with more than one worktree not supported" -msgstr "no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de treball" +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" +"no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de " +"treball" -#: submodule.c:1690 submodule.c:1746 +#: submodule.c:1857 submodule.c:1913 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no s'ha trobat el nom pel submòdul '%s'" -#: submodule.c:1694 builtin/submodule--helper.c:678 builtin/submodule--helper.c:688 +#: submodule.c:1861 builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori '%s'" -#: submodule.c:1697 +#: submodule.c:1864 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3578,93 +3745,94 @@ msgstr "" "'%s' a\n" "'%s'\n" -#: submodule.c:1781 +#: submodule.c:1948 #, c-format msgid "could not recurse into submodule '%s'" msgstr "s'ha produït un error en cercar recursivament al camà de submòdul '%s'" -#: submodule.c:1825 +#: submodule.c:1992 msgid "could not start ls-files in .." msgstr "no s'ha pogut iniciar ls-files a .." -#: submodule.c:1845 +#: submodule.c:2012 msgid "BUG: returned path string doesn't match cwd?" msgstr "ERRADA: la cadena del camà retornada no coincideix amb cwd?" -#: submodule.c:1864 +#: submodule.c:2031 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha retornat un codi de retorn %d no esperat" -#: submodule-config.c:380 +#: submodule-config.c:420 #, c-format msgid "invalid value for %s" msgstr "valor no và lid per a %s" -#: trailer.c:240 +#: trailer.c:241 #, c-format msgid "running trailer command '%s' failed" msgstr "l'execució de l'ordre de remolc '%s' ha fallat" -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 trailer.c:543 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 +#: trailer.c:544 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut '%s' per a la clau '%s'" -#: trailer.c:525 trailer.c:530 builtin/remote.c:289 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "més d'un %s" -#: trailer.c:702 +#: trailer.c:703 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "testimoni de remolc buit en el remolc '%.*s'" -#: trailer.c:722 +#: trailer.c:723 #, c-format msgid "could not read input file '%s'" msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" -#: trailer.c:725 +#: trailer.c:726 msgid "could not read from stdin" msgstr "no s'ha pogut llegir des d'stdin" -#: trailer.c:949 builtin/am.c:44 +#: trailer.c:950 builtin/am.c:45 #, c-format msgid "could not stat %s" msgstr "no s'ha pogut fer stat a %s" -#: trailer.c:951 +#: trailer.c:952 #, c-format msgid "file %s is not a regular file" msgstr "el fitxer %s no és un fitxer regular" -#: trailer.c:953 +#: trailer.c:954 #, c-format msgid "file %s is not writable by user" msgstr "el fitxer %s no és gravable per l'usuari" -#: trailer.c:965 +#: trailer.c:966 msgid "could not open temporary file" msgstr "no s'ha pogut obrir el fitxer temporal" -#: trailer.c:1001 +#: trailer.c:1002 #, c-format msgid "could not rename temporary file to %s" msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Canviaria la font de '%s' a '%s' de '%s'\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opció de profunditat no và lida '%s'" -#: transport.c:889 +#: transport.c:890 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3673,7 +3841,7 @@ msgstr "" "Els camins de submòdul següents contenen canvis que no\n" "es poden trobar en cap remot:\n" -#: transport.c:893 +#: transport.c:894 #, c-format msgid "" "\n" @@ -3699,11 +3867,11 @@ msgstr "" "\n" "per a pujar-los a un remot.\n" -#: transport.c:901 +#: transport.c:902 msgid "Aborting." msgstr "S'està avortant." -#: transport-helper.c:1080 +#: transport-helper.c:1071 #, c-format msgid "Could not read ref %s" msgstr "No s'ha pogut llegir la referència %s" @@ -3724,43 +3892,49 @@ msgstr "nom de fitxer buit en una entrada d'arbre" msgid "too-short tree file" msgstr "fitxer d'arbre massa curt" -#: unpack-trees.c:104 +#: unpack-trees.c:105 #, 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 "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n" -"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de canviar de branca." +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"agafar:\n" +"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " +"canviar de branca." -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"agafar:\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:110 #, 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 "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n" -"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de fusionar." +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"fusionar:\n" +"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " +"fusionar." -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"fusionar:\n" "%%s" -#: unpack-trees.c:114 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3769,7 +3943,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s." -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3778,7 +3952,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:122 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3787,43 +3961,47 @@ msgstr "" "En actualitzar els directoris següents perdria fitxers no seguits en el:\n" "%s" -#: unpack-trees.c:125 +#: unpack-trees.c:126 #, 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 "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"agafar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"agafar:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"fusionar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"fusionar:\n" "%%s" -#: unpack-trees.c:135 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3832,7 +4010,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%sSi us plau, moveu-los o elimineu-los abans de %s." -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3841,94 +4019,106 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:143 #, c-format msgid "" -"The following untracked working tree files would be overwritten by checkout:\n" +"The following untracked working tree files would be overwritten by " +"checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"agafar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" -"The following untracked working tree files would be overwritten by checkout:\n" +"The following untracked working tree files would be overwritten by " +"checkout:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"agafar:\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"fusionar:\n" "%%sSi us plau, moveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"fusionar:\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"%s:\n" "%%sSi us plau, moveu-los o elimineu-los abans de %s." -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"%s:\n" "%%s" -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular." -#: unpack-trees.c:164 +#: unpack-trees.c:165 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" "%s" msgstr "" -"No es pot actualitzar l'agafament parcial: les entrades següents no estan al dia:\n" +"No es pot actualitzar l'agafament parcial: les entrades següents no estan al " +"dia:\n" "%s" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout update:\n" +"The following working tree files would be overwritten by sparse checkout " +"update:\n" "%s" msgstr "" -"Els fitxers següents en l'arbre de treball se sobreescriurien per actualitzar l'agafament " -"parcial:\n" +"Els fitxers següents en l'arbre de treball se sobreescriurien per " +"actualitzar l'agafament parcial:\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout update:\n" +"The following working tree files would be removed by sparse checkout " +"update:\n" "%s" msgstr "" -"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar l'agafament parcial:\n" +"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar " +"l'agafament parcial:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "Cannot update submodule:\n" @@ -3937,17 +4127,17 @@ msgstr "" "No es pot actualitzar el submòdul:\n" "%s" -#: unpack-trees.c:247 +#: unpack-trees.c:248 #, c-format msgid "Aborting\n" msgstr "S'està avortant\n" -#: unpack-trees.c:272 +#: unpack-trees.c:277 #, c-format msgid "submodule update strategy not supported for submodule '%s'" msgstr "el submòdul'%s' té una estratègia d'actualització no admesa" -#: unpack-trees.c:340 +#: unpack-trees.c:346 msgid "Checking out files" msgstr "S'estan agafant fitxers" @@ -3980,182 +4170,195 @@ msgstr "número de port no và lid" msgid "invalid '..' path segment" msgstr "segment de camà '..' no và lid" -#: worktree.c:285 +#: worktree.c:245 #, c-format msgid "failed to read '%s'" msgstr "s'ha produït un error en llegir '%s'" -#: wrapper.c:222 wrapper.c:392 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir '%s' per a escriptura" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 builtin/am.c:849 -#: builtin/commit.c:1700 builtin/merge.c:1015 builtin/pull.c:341 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 +#: builtin/am.c:849 builtin/merge.c:1014 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir '%s' per a lectura" -#: wrapper.c:581 wrapper.c:602 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "no s'ha pogut accedir a '%s'" -#: wrapper.c:610 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" -#: wrapper.c:634 +#: wrapper.c:656 #, c-format msgid "could not write to %s" msgstr "no s'ha pogut escriure a %s" -#: wrapper.c:636 +#: wrapper.c:658 #, c-format msgid "could not close %s" msgstr "no s'ha pogut tancar %s" -#: wt-status.c:151 +#: wt-status.c:152 msgid "Unmerged paths:" msgstr "Camins sense fusionar:" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:181 wt-status.c:208 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)" -#: wt-status.c:184 +#: wt-status.c:185 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:187 wt-status.c:191 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr " (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar resolució)" +msgstr "" +" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar " +"resolució)" -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)" -#: wt-status.c:199 wt-status.c:958 +#: wt-status.c:200 wt-status.c:981 msgid "Changes to be committed:" msgstr "Canvis a cometre:" -#: wt-status.c:217 wt-status.c:967 +#: wt-status.c:218 wt-status.c:990 msgid "Changes not staged for commit:" msgstr "Canvis no «staged» per a cometre:" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà )" -#: wt-status.c:223 +#: wt-status.c:224 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà )" -#: wt-status.c:224 -msgid " (use \"git checkout -- <file>...\" to discard changes in working directory)" +#: wt-status.c:225 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el directori de treball)" +" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el " +"directori de treball)" -#: wt-status.c:226 +#: wt-status.c:227 msgid " (commit or discard the untracked or modified content in submodules)" -msgstr " (cometeu o descarteu el contingut modificat o no seguit en els submòduls)" +msgstr "" +" (cometeu o descarteu el contingut modificat o no seguit en els submòduls)" -#: wt-status.c:238 +#: wt-status.c:239 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà )" +msgstr "" +" (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà )" -#: wt-status.c:253 +#: wt-status.c:254 msgid "both deleted:" msgstr "suprimit per ambdós:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "added by us:" msgstr "afegit per nosaltres:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "deleted by them:" msgstr "suprimit per ells:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by them:" msgstr "afegit per ells:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by us:" msgstr "suprimit per nosaltres:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both added:" msgstr "afegit per ambdós:" -#: wt-status.c:265 +#: wt-status.c:266 msgid "both modified:" msgstr "modificat per ambdós:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "new file:" msgstr "fitxer nou:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "copied:" msgstr "copiat:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "deleted:" msgstr "suprimit:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "modified:" msgstr "modificat:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "renamed:" msgstr "canviat de nom:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "typechange:" msgstr "canviat de tipus:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unknown:" msgstr "desconegut:" -#: wt-status.c:289 +#: wt-status.c:290 msgid "unmerged:" msgstr "sense fusionar:" -#: wt-status.c:371 +#: wt-status.c:372 msgid "new commits, " msgstr "comissions noves, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "modified content, " msgstr "contingut modificat, " -#: wt-status.c:375 +#: wt-status.c:376 msgid "untracked content, " msgstr "contingut no seguit, " -#: wt-status.c:831 +#: wt-status.c:821 +#, fuzzy, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "Actualment esteu fent «rebase»." +msgstr[1] "Actualment esteu fent «rebase»." + +#: wt-status.c:853 msgid "Submodules changed but not updated:" msgstr "Submòduls canviats però no actualitzats:" -#: wt-status.c:833 +#: wt-status.c:855 msgid "Submodule changes to be committed:" msgstr "Canvis de submòdul a cometre:" -#: wt-status.c:914 +#: wt-status.c:937 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -4163,221 +4366,243 @@ msgstr "" "No toqueu la lÃnia a dalt.\n" "Tot el que hi ha a sota s'eliminarà ." -#: wt-status.c:1026 +#: wt-status.c:1049 msgid "You have unmerged paths." msgstr "Teniu camins sense fusionar." -#: wt-status.c:1029 +#: wt-status.c:1052 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: wt-status.c:1031 +#: wt-status.c:1054 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (useu \"git merge --abort\" per a avortar la fusió)" -#: wt-status.c:1036 +#: wt-status.c:1059 msgid "All conflicts fixed but you are still merging." msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." -#: wt-status.c:1039 +#: wt-status.c:1062 msgid " (use \"git commit\" to conclude merge)" msgstr " (useu \"git commit\" per a concloure la fusió)" -#: wt-status.c:1049 +#: wt-status.c:1072 msgid "You are in the middle of an am session." msgstr "Esteu enmig d'una sessió am." -#: wt-status.c:1052 +#: wt-status.c:1075 msgid "The current patch is empty." msgstr "El pedaç actual està buit." -#: wt-status.c:1056 +#: wt-status.c:1079 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: wt-status.c:1058 +#: wt-status.c:1081 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" -#: wt-status.c:1060 +#: wt-status.c:1083 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#: wt-status.c:1189 +#: wt-status.c:1214 msgid "git-rebase-todo is missing." msgstr "Manca git-rebase-todo." -#: wt-status.c:1191 +#: wt-status.c:1216 msgid "No commands done." msgstr "No s'ha fet cap ordre." -#: wt-status.c:1194 +#: wt-status.c:1219 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Última ordre feta (%d ordre feta):" msgstr[1] "Últimes ordres fetes (%d ordres fetes):" -#: wt-status.c:1205 +#: wt-status.c:1230 #, c-format msgid " (see more in file %s)" msgstr " (vegeu més en el fitxer %s)" -#: wt-status.c:1210 +#: wt-status.c:1235 msgid "No commands remaining." msgstr "No manca cap ordre." -#: wt-status.c:1213 +#: wt-status.c:1238 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Ordre següent a fer (manca %d ordre):" msgstr[1] "Ordres següents a fer (manquen %d ordres):" -#: wt-status.c:1221 +#: wt-status.c:1246 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)" -#: wt-status.c:1234 +#: wt-status.c:1259 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "Actualment esteu rebasant la branca '%s' en '%s'." +msgstr "Actualment esteu fent «rebase» de la branca '%s' en '%s'." -#: wt-status.c:1239 +#: wt-status.c:1264 msgid "You are currently rebasing." -msgstr "Actualment esteu rebasant." +msgstr "Actualment esteu fent «rebase»." -#: wt-status.c:1253 +#: wt-status.c:1278 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " (arregleu els conflictes i després executeu \"git rebase --continue\")" +msgstr "" +" (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1255 +#: wt-status.c:1280 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)" -#: wt-status.c:1257 +#: wt-status.c:1282 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: wt-status.c:1263 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git rebase --continue\")" -msgstr " (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1267 +#: wt-status.c:1292 #, c-format -msgid "You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca " +"'%s' en '%s'." -#: wt-status.c:1272 +#: wt-status.c:1297 msgid "You are currently splitting a commit during a rebase." -msgstr "Actualment esteu dividint una comissió durant un rebasament." +msgstr "Actualment esteu dividint una comissió durant un «rebase»." -#: wt-status.c:1275 +#: wt-status.c:1300 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -" (Una vegada que el vostre directori de treball sigui net, executeu \"git rebase --continue\")" +" (Una vegada que el vostre directori de treball sigui net, executeu \"git " +"rebase --continue\")" -#: wt-status.c:1279 +#: wt-status.c:1304 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." -msgstr "Actualment esteu editant una comissió mentre es fa «rebase» de la branca '%s' en '%s'." +msgstr "" +"Actualment esteu editant una comissió mentre es fa «rebase» de la branca " +"'%s' en '%s'." -#: wt-status.c:1284 +#: wt-status.c:1309 msgid "You are currently editing a commit during a rebase." msgstr "Actualment esteu editant una comissió durant un «rebase»." -#: wt-status.c:1287 +#: wt-status.c:1312 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: wt-status.c:1289 -msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr " (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els vostres canvis)" +#: wt-status.c:1314 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" +" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els " +"vostres canvis)" -#: wt-status.c:1299 +#: wt-status.c:1324 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu fent «cherry pick» a la comissió %s." -#: wt-status.c:1304 +#: wt-status.c:1329 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1307 +#: wt-status.c:1332 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr " (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue" +"\")" -#: wt-status.c:1309 +#: wt-status.c:1334 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" -msgstr " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry pick»)" +msgstr "" +" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry " +"pick»)" -#: wt-status.c:1318 +#: wt-status.c:1343 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1323 +#: wt-status.c:1348 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1326 +#: wt-status.c:1351 msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1328 +#: wt-status.c:1353 msgid " (use \"git revert --abort\" to cancel the revert operation)" -msgstr " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" +msgstr "" +" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1339 +#: wt-status.c:1364 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." -#: wt-status.c:1343 +#: wt-status.c:1368 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1346 +#: wt-status.c:1371 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1543 +#: wt-status.c:1568 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1549 +#: wt-status.c:1574 msgid "interactive rebase in progress; onto " msgstr "«rebase» interactiu en progrés; sobre " -#: wt-status.c:1551 +#: wt-status.c:1576 msgid "rebase in progress; onto " msgstr "«rebase» en progrés; sobre " -#: wt-status.c:1556 +#: wt-status.c:1581 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.c:1558 +#: wt-status.c:1583 msgid "HEAD detached from " msgstr "HEAD separat de " -#: wt-status.c:1561 +#: wt-status.c:1586 msgid "Not currently on any branch." msgstr "Actualment no s'és en cap branca." -#: wt-status.c:1579 +#: wt-status.c:1606 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1593 +#: wt-status.c:1607 +#, fuzzy +msgid "No commits yet" +msgstr "no s'ha analitzat cap comissió." + +#: wt-status.c:1621 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1595 +#: wt-status.c:1623 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1599 +#: wt-status.c:1627 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4389,251 +4614,290 @@ msgstr "" "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" "'git help status')." -#: wt-status.c:1605 +#: wt-status.c:1633 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1607 +#: wt-status.c:1635 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1613 +#: wt-status.c:1641 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1618 +#: wt-status.c:1646 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" +msgstr "" +"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1621 +#: wt-status.c:1649 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1624 +#: wt-status.c:1652 #, c-format -msgid "nothing added to commit but untracked files present (use \"git add\" to track)\n" +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" msgstr "" -"no hi ha res afegit a cometre però existeixen fitxers no seguits (useu \"git add\" per a seguir-" -"los)\n" +"no hi ha res afegit a cometre però existeixen fitxers no seguits (useu \"git " +"add\" per a seguir-los)\n" -#: wt-status.c:1627 +#: wt-status.c:1655 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però existeixen fitxer no seguits\n" -#: wt-status.c:1630 +#: wt-status.c:1658 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-los)\n" +msgstr "" +"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" +"los)\n" -#: wt-status.c:1633 wt-status.c:1638 +#: wt-status.c:1661 wt-status.c:1666 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1636 +#: wt-status.c:1664 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" +msgstr "" +"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1640 +#: wt-status.c:1668 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "no hi ha res a cometre, l'arbre de treball està net\n" -#: wt-status.c:1749 -msgid "Initial commit on " -msgstr "Comissió inicial en " +#: wt-status.c:1780 +#, fuzzy +msgid "No commits yet on " +msgstr "No s'ha fet cap ordre." -#: wt-status.c:1753 +#: wt-status.c:1784 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1782 wt-status.c:1790 +#: wt-status.c:1813 wt-status.c:1821 msgid "behind " msgstr "darrere " -#: wt-status.c:1785 wt-status.c:1788 +#: wt-status.c:1816 wt-status.c:1819 msgid "ahead " msgstr "davant per " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2280 +#: wt-status.c:2311 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no es pot %s: Teniu canvis «unstaged»." -#: wt-status.c:2286 +#: wt-status.c:2317 msgid "additionally, your index contains uncommitted changes." msgstr "addicionalment, el vostre Ãndex conté canvis sense cometre." -#: wt-status.c:2288 +#: wt-status.c:2319 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre Ãndex conté canvis sense cometre." -#: compat/precompose_utf8.c:57 builtin/clone.c:432 +#: compat/precompose_utf8.c:58 builtin/clone.c:436 #, c-format msgid "failed to unlink '%s'" msgstr "s'ha produït un error en desenllaçar '%s'" -#: builtin/add.c:22 +#: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opcions>] [--] <especificació-de-camÃ>..." -#: builtin/add.c:80 +#: builtin/add.c:82 #, c-format msgid "unexpected diff status %c" msgstr "estat de diff inesperat %c" -#: builtin/add.c:85 builtin/commit.c:291 +#: builtin/add.c:87 builtin/commit.c:292 msgid "updating files failed" msgstr "s'ha produït un error en actualitzar els fitxers" -#: builtin/add.c:95 +#: builtin/add.c:97 #, c-format msgid "remove '%s'\n" msgstr "elimina '%s'\n" -#: builtin/add.c:149 +#: builtin/add.c:151 msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'Ãndex:" -#: builtin/add.c:209 builtin/rev-parse.c:872 +#: builtin/add.c:211 builtin/rev-parse.c:873 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'Ãndex" -#: builtin/add.c:220 +#: builtin/add.c:222 #, c-format msgid "Could not open '%s' for writing." msgstr "No s'ha pogut obrir '%s' per a escriptura." -#: builtin/add.c:224 +#: builtin/add.c:226 msgid "Could not write patch" msgstr "No s'ha pogut escriure el pedaç" -#: builtin/add.c:227 +#: builtin/add.c:229 msgid "editing patch failed" msgstr "l'edició del pedaç ha fallat" -#: builtin/add.c:230 +#: builtin/add.c:232 #, c-format msgid "Could not stat '%s'" msgstr "No s'ha pogut fer stat a '%s'" -#: builtin/add.c:232 +#: builtin/add.c:234 msgid "Empty patch. Aborted." msgstr "El pedaç és buit. S'ha avortat." -#: builtin/add.c:237 +#: builtin/add.c:239 #, c-format msgid "Could not apply '%s'" msgstr "No s'ha pogut aplicar '%s'" -#: builtin/add.c:247 +#: builtin/add.c:249 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" +msgstr "" +"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 builtin/remote.c:1328 -#: builtin/rm.c:241 builtin/send-pack.c:163 +#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:269 +#: builtin/add.c:272 msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 +#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" -#: builtin/add.c:271 +#: builtin/add.c:274 msgid "edit current diff and apply" msgstr "edita la diferència actual i aplica-la" -#: builtin/add.c:272 +#: builtin/add.c:275 msgid "allow adding otherwise ignored files" msgstr "permet afegir fitxers que d'altra manera s'ignoren" -#: builtin/add.c:273 +#: builtin/add.c:276 msgid "update tracked files" msgstr "actualitza els fitxers seguits" -#: builtin/add.c:274 +#: builtin/add.c:277 msgid "record only the fact that the path will be added later" msgstr "registra només el fet de que el camà s'afegirà més tard" -#: builtin/add.c:275 +#: builtin/add.c:278 msgid "add changes from all tracked and untracked files" msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" -#: builtin/add.c:278 +#: builtin/add.c:281 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)" +msgstr "" +"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)" -#: builtin/add.c:280 +#: builtin/add.c:283 msgid "don't add, only refresh the index" msgstr "no afegeixis, només actualitza l'Ãndex" -#: builtin/add.c:281 +#: builtin/add.c:284 msgid "just skip files which cannot be added because of errors" msgstr "només omet els fitxers que no es poden afegir a causa d'errors" -#: builtin/add.c:282 +#: builtin/add.c:285 msgid "check if - even missing - files are ignored in dry run" -msgstr "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" +msgstr "" +"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" -#: builtin/add.c:283 builtin/update-index.c:951 +#: builtin/add.c:286 builtin/update-index.c:952 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:952 +#: builtin/add.c:286 builtin/update-index.c:953 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/add.c:305 +#: builtin/add.c:288 +#, fuzzy +msgid "warn when adding an embedded repository" +msgstr "crea un dipòsit nu" + +#: builtin/add.c:303 +#, 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 "" + +#: builtin/add.c:331 +#, fuzzy, c-format +msgid "adding embedded git repository: %s" +msgstr "--stdin requereix d'un dipòsit git" + +#: builtin/add.c:349 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Useu -f si realment els voleu afegir.\n" -#: builtin/add.c:312 +#: builtin/add.c:357 msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" -#: builtin/add.c:348 +#: builtin/add.c:394 msgid "-A and -u are mutually incompatible" msgstr "-A i -u són mútuament incompatibles" -#: builtin/add.c:355 +#: builtin/add.c:401 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run" -#: builtin/add.c:359 +#: builtin/add.c:405 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "el parà metre --chmod '%s' ha de ser o -x o +x" -#: builtin/add.c:374 +#: builtin/add.c:420 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "No s'ha especificat res, no s'ha afegit res.\n" -#: builtin/add.c:375 +#: builtin/add.c:421 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Potser volÃeu dir 'git add .'?\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 builtin/checkout.c:491 -#: builtin/clean.c:920 builtin/commit.c:350 builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 +#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 +#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "fitxer d'Ãndex malmès" -#: builtin/am.c:412 +#: builtin/am.c:413 msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" @@ -4681,7 +4945,7 @@ msgstr "desplaçament de zona de temps no và lid" msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: builtin/am.c:991 builtin/clone.c:397 +#: builtin/am.c:991 builtin/clone.c:401 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produït un error en crear el directori '%s'" @@ -4690,48 +4954,54 @@ msgstr "s'ha produït un error en crear el directori '%s'" msgid "Failed to split patches." msgstr "S'ha produït un error en dividir els pedaços." -#: builtin/am.c:1127 builtin/commit.c:376 +#: builtin/am.c:1120 builtin/commit.c:377 msgid "unable to write index file" msgstr "no s'ha pogut escriure el fitxer d'Ãndex" -#: builtin/am.c:1178 +#: builtin/am.c:1171 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quan hà giu resolt aquest problema, executeu \"%s --continue\"." -#: builtin/am.c:1179 +#: builtin/am.c:1172 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." +msgstr "" +"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." -#: builtin/am.c:1180 +#: builtin/am.c:1173 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." -msgstr "Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort\"." +msgstr "" +"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort" +"\"." -#: builtin/am.c:1315 -msgid "Patch is empty. Was it split wrong?" -msgstr "El pedaç és buit. S'ha dividit malament?" +#: builtin/am.c:1304 +#, fuzzy +msgid "Patch is empty." +msgstr "El pedaç actual està buit." -#: builtin/am.c:1386 builtin/log.c:1557 -#, c-format -msgid "invalid ident line: %s" +#: builtin/am.c:1370 +#, fuzzy, c-format +msgid "invalid ident line: %.*s" msgstr "lÃnia d'identitat no và lida: %s" -#: builtin/am.c:1413 +#: builtin/am.c:1392 #, c-format msgid "unable to parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: builtin/am.c:1606 +#: builtin/am.c:1586 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 vies." +msgstr "" +"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 " +"vies." -#: builtin/am.c:1608 +#: builtin/am.c:1588 msgid "Using index info to reconstruct a base tree..." msgstr "S'està usant la informació d'Ãndex per a reconstruir un arbre base..." -#: builtin/am.c:1627 +#: builtin/am.c:1607 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4739,36 +5009,38 @@ msgstr "" "Heu editat el vostre pedaç a mà ?\n" "No s'aplica als blobs recordats en el seu Ãndex." -#: builtin/am.c:1633 +#: builtin/am.c:1613 msgid "Falling back to patching base and 3-way merge..." msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..." -#: builtin/am.c:1658 +#: builtin/am.c:1638 msgid "Failed to merge in the changes." msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1682 builtin/merge.c:631 +#: builtin/am.c:1662 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: builtin/am.c:1689 +#: builtin/am.c:1669 msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 builtin/merge.c:827 +#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 +#: builtin/merge.c:828 msgid "failed to write commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: builtin/am.c:1735 builtin/am.c:1739 +#: builtin/am.c:1715 builtin/am.c:1719 #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1755 +#: builtin/am.c:1735 msgid "cannot be interactive without stdin connected to a terminal." -msgstr "no es pot ser interactiu sense que stdin estigui connectada a un terminal." +msgstr "" +"no es pot ser interactiu sense que stdin estigui connectada a un terminal." -#: builtin/am.c:1760 +#: builtin/am.c:1740 msgid "Commit Body is:" msgstr "El cos de la comissió és:" @@ -4776,35 +5048,37 @@ msgstr "El cos de la comissió és:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1770 +#: builtin/am.c:1750 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -msgstr "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots: " +msgstr "" +"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls " +"tots: " -#: builtin/am.c:1820 +#: builtin/am.c:1800 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Ãndex brut: no es poden aplicar pedaços (bruts: %s)" -#: builtin/am.c:1860 builtin/am.c:1932 +#: builtin/am.c:1840 builtin/am.c:1912 #, c-format msgid "Applying: %.*s" msgstr "S'està aplicant: %.*s" -#: builtin/am.c:1876 +#: builtin/am.c:1856 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/am.c:1884 +#: builtin/am.c:1864 #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaç ha fallat a %s %.*s" -#: builtin/am.c:1890 +#: builtin/am.c:1870 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La còpia del pedaç que ha fallat es troba en: %s" -#: builtin/am.c:1935 +#: builtin/am.c:1915 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4814,24 +5088,25 @@ msgstr "" "Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n" "introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: builtin/am.c:1942 +#: builtin/am.c:1922 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +"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 "" -"Encara teniu camins sense fusionar en el vostre Ãndex.\n" -"Heu oblidat d'usar 'git add'?" -#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 builtin/reset.c:316 +#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 +#: builtin/reset.c:331 #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte '%s'." -#: builtin/am.c:2102 +#: builtin/am.c:2083 msgid "failed to clean index" msgstr "s'ha produït un error en netejar l'Ãndex" -#: builtin/am.c:2136 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -4839,130 +5114,136 @@ msgstr "" "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n" "No s'està rebobinant a ORIG_HEAD" -#: builtin/am.c:2199 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor no và lid per a --patch-format: %s" -#: builtin/am.c:2232 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]" -#: builtin/am.c:2233 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opcions>] (--continue | --skip | --abort)" -#: builtin/am.c:2239 +#: builtin/am.c:2220 msgid "run interactively" msgstr "executa interactivament" -#: builtin/am.c:2241 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "opció històrica -- no-op" -#: builtin/am.c:2243 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 builtin/repack.c:178 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:180 msgid "be quiet" msgstr "silenciós" -#: builtin/am.c:2246 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "afegeix una lÃnia Signed-off-by al missatge de comissió" -#: builtin/am.c:2249 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recodifica en utf8 (per defecte)" -#: builtin/am.c:2251 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "passa la bandera -k al git-mailinfo" -#: builtin/am.c:2253 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "passa la bandera -b al git-mailinfo" -#: builtin/am.c:2255 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "passa la bandera -m al git-mailinfo" -#: builtin/am.c:2257 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox" -#: builtin/am.c:2260 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr" +msgstr "" +"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr" -#: builtin/am.c:2263 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una lÃnia de tisores" -#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 -#: builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2292 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "passa-ho a través del git-apply" -#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:1045 -#: builtin/merge.c:201 builtin/pull.c:135 builtin/pull.c:194 builtin/repack.c:187 -#: builtin/repack.c:191 builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 +#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 +#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 +#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 +#: parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/replace.c:443 -#: builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2289 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "el format en el qual estan els pedaços" -#: builtin/am.c:2295 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" -msgstr "passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar" +msgstr "" +"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar" -#: builtin/am.c:2297 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "segueix aplicant pedaços després de resoldre un conflicte" -#: builtin/am.c:2300 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "sinònims de --continue" -#: builtin/am.c:2303 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "omet el pedaç actual" -#: builtin/am.c:2306 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "restaura la branca original i avorta l'operació d'apedaçament." -#: builtin/am.c:2310 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "menteix sobre la data del comitent" -#: builtin/am.c:2312 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 builtin/pull.c:165 -#: builtin/revert.c:111 builtin/tag.c:413 +#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 msgid "key-id" msgstr "ID de clau" -#: builtin/am.c:2315 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "signa les comissions amb GPG" -#: builtin/am.c:2318 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(ús intern per al git-rebase)" -#: builtin/am.c:2333 +#: builtin/am.c:2317 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." @@ -4970,16 +5251,18 @@ msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" "s'eliminarà . Si us plau, no l'useu més." -#: builtin/am.c:2340 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "S'ha produït un error en llegir l'Ãndex" -#: builtin/am.c:2355 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." -msgstr "un directori de rebasament anterior %s encara existeix però s'ha donat una bústia." +msgstr "" +"un directori de «rebase» anterior %s encara existeix però s'ha donat una " +"bústia." -#: builtin/am.c:2379 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -4988,7 +5271,7 @@ msgstr "" "S'ha trobat un directori %s extraviat.\n" "Useu \"git am --abort\" per a eliminar-lo." -#: builtin/am.c:2385 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "Una operació de resolució no està en curs; no reprenem." @@ -5038,190 +5321,173 @@ msgstr "realitza 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual" -#: builtin/blame.c:33 +#: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" -#: builtin/blame.c:38 +#: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" -#: builtin/blame.c:1777 -msgid "Blaming lines" -msgstr "S'està fent un «blame»" - -#: builtin/blame.c:2573 +#: builtin/blame.c:668 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment" -#: builtin/blame.c:2574 +#: builtin/blame.c:669 msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: desactivat)" +msgstr "" +"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " +"desactivat)" -#: builtin/blame.c:2575 +#: builtin/blame.c:670 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "No tractis les comissions d'arrel com a lÃmits (Per defecte: desactivat)" +msgstr "" +"No tractis les comissions d'arrel com a lÃmits (Per defecte: desactivat)" -#: builtin/blame.c:2576 +#: builtin/blame.c:671 msgid "Show work cost statistics" msgstr "Mostra les estadÃstiques de preu de treball" -#: builtin/blame.c:2577 +#: builtin/blame.c:672 msgid "Force progress reporting" msgstr "Força l'informe de progrés" -#: builtin/blame.c:2578 +#: builtin/blame.c:673 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades «blame»" -#: builtin/blame.c:2579 +#: builtin/blame.c:674 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automà tic)" -#: builtin/blame.c:2580 +#: builtin/blame.c:675 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de lÃnia original (Per defecte: desactivat)" -#: builtin/blame.c:2581 +#: builtin/blame.c:676 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per mà quina" -#: builtin/blame.c:2582 +#: builtin/blame.c:677 msgid "Show porcelain format with per-line commit information" msgstr "Mostra el format de porcellana amb informació de comissió per lÃnia" -#: builtin/blame.c:2583 +#: builtin/blame.c:678 msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" +msgstr "" +"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:2584 +#: builtin/blame.c:679 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:2585 +#: builtin/blame.c:680 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:2586 +#: builtin/blame.c:681 msgid "Suppress author name and timestamp (Default: off)" msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" -#: builtin/blame.c:2587 +#: builtin/blame.c:682 msgid "Show author email instead of name (Default: off)" -msgstr "Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per defecte: desactivat)" +msgstr "" +"Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per " +"defecte: desactivat)" -#: builtin/blame.c:2588 +#: builtin/blame.c:683 msgid "Ignore whitespace differences" msgstr "Ignora les diferències d'espai en blanc" -#: builtin/blame.c:2595 +#: builtin/blame.c:690 msgid "Use an experimental heuristic to improve diffs" msgstr "Usa un heurÃstic experimental per a millorar les diferències" -#: builtin/blame.c:2597 +#: builtin/blame.c:692 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:2598 +#: builtin/blame.c:693 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list" -#: builtin/blame.c:2599 +#: builtin/blame.c:694 msgid "Use <file>'s contents as the final image" msgstr "Usa els continguts de <fitxer> com a la imatge final" -#: builtin/blame.c:2600 builtin/blame.c:2601 +#: builtin/blame.c:695 builtin/blame.c:696 msgid "score" msgstr "puntuació" -#: builtin/blame.c:2600 +#: builtin/blame.c:695 msgid "Find line copies within and across files" msgstr "Troba còpies de lÃnia dins i a través dels fitxers" -#: builtin/blame.c:2601 +#: builtin/blame.c:696 msgid "Find line movements within and across files" msgstr "Troba moviments de lÃnia dins i a través dels fitxers" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "Process only line range n,m, counting from 1" msgstr "Processa només el rang de lÃnies n,m, comptant des d'1" -#: builtin/blame.c:2649 +#: builtin/blame.c:744 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "no es pot usar --progress amb els formats --incremental o de porcellana" - -#. TRANSLATORS: This string is used to tell us the maximum -#. display width for a relative timestamp in "git blame" -#. output. For C locale, "4 years, 11 months ago", which -#. takes 22 places, is the longest among various forms of -#. relative timestamps, but your language may need more or -#. fewer display columns. -#: builtin/blame.c:2697 +msgstr "" +"no es pot usar --progress amb els formats --incremental o de porcellana" + +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c:795 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:2777 -msgid "--contents and --reverse do not blend well." -msgstr "--contents i --reverse no funcionen bé juntes." - -#: builtin/blame.c:2797 -msgid "cannot use --contents with final commit object name" -msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" - -#: builtin/blame.c:2802 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "--reverse i --first-parent-together requereixen una última comissió especificada" - -#: builtin/blame.c:2829 -msgid "--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse --first-parent junts requereixen un rang de la cadena de mares primeres" - -#: builtin/blame.c:2840 -#, c-format -msgid "no such path %s in %s" -msgstr "no hi ha tal camà %s en %s" - -#: builtin/blame.c:2851 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "no es pot llegir el blob %s per al camà %s" - -#: builtin/blame.c:2870 +#: builtin/blame.c:882 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "el fitxer %s té només %lu lÃnia" msgstr[1] "el fitxer %s té només %lu lÃnies" -#: builtin/branch.c:26 +#: builtin/blame.c:928 +msgid "Blaming lines" +msgstr "S'està fent un «blame»" + +#: builtin/branch.c:27 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..." -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<opcions>] [-r | -a] [--points-at]" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<opcions>] [-r | -a] [--format]" -#: builtin/branch.c:144 +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5231,7 +5497,7 @@ msgstr "" " fusionat a '%s', però encara no\n" " s'ha fusionat a HEAD." -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5241,12 +5507,12 @@ msgstr "" " s'ha fusionat a '%s', encara que està \n" " fusionada a HEAD." -#: builtin/branch.c:162 +#: builtin/branch.c:163 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'" -#: builtin/branch.c:166 +#: builtin/branch.c:167 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5255,91 +5521,93 @@ msgstr "" "La branca '%s' no està totalment fusionada.\n" "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'." -#: builtin/branch.c:179 +#: builtin/branch.c:180 msgid "Update of config-file failed" msgstr "L'actualització del fitxer de configuració ha fallat" -#: builtin/branch.c:210 +#: builtin/branch.c:211 msgid "cannot use -a with -d" msgstr "no es pot usar -a amb -d" -#: builtin/branch.c:216 +#: builtin/branch.c:217 msgid "Couldn't look up commit object for HEAD" msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD" -#: builtin/branch.c:230 +#: builtin/branch.c:231 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "No es pot suprimir la branca '%s' agafada a '%s'" -#: builtin/branch.c:245 +#: builtin/branch.c:246 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "no s'ha trobat la branca amb seguiment remot '%s'." -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "branch '%s' not found." msgstr "no s'ha trobat la branca '%s'." -#: builtin/branch.c:261 +#: builtin/branch.c:262 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Error en suprimir la branca amb seguiment remot '%s'" -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting branch '%s'" msgstr "Error en suprimir la branca '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:270 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "S'ha suprimit la branca %s (era %s).\n" -#: builtin/branch.c:441 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being rebased at %s" msgstr "S'està fent «rebase» en la branca %s a %s" -#: builtin/branch.c:445 +#: builtin/branch.c:449 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branca %s s'està bisecant a %s" -#: builtin/branch.c:460 +#: builtin/branch.c:464 msgid "cannot rename the current branch while not on any." msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." -#: builtin/branch.c:470 +#: builtin/branch.c:474 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no và lid: '%s'" -#: builtin/branch.c:487 +#: builtin/branch.c:491 msgid "Branch rename failed" msgstr "El canvi de nom de branca ha fallat" -#: builtin/branch.c:490 +#: builtin/branch.c:494 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "S'ha canviat el nom de la branca mal anomenada '%s'" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!" -#: builtin/branch.c:502 +#: builtin/branch.c:506 msgid "Branch is renamed, but update of config-file failed" -msgstr "La branca està canviada de nom, però l'actualització del fitxer de configuració ha fallat" +msgstr "" +"La branca està canviada de nom, però l'actualització del fitxer de " +"configuració ha fallat" -#: builtin/branch.c:518 +#: builtin/branch.c:522 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5350,219 +5618,225 @@ msgstr "" " %s\n" "S'eliminaran les lÃnies que comencin amb '%c'.\n" -#: builtin/branch.c:551 +#: builtin/branch.c:555 msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:553 +#: builtin/branch.c:557 msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font" -#: builtin/branch.c:554 +#: builtin/branch.c:558 msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:555 +#: builtin/branch.c:559 msgid "set up tracking mode (see git-pull(1))" msgstr "configura el mode de seguiment (vegeu git-pull(1))" -#: builtin/branch.c:557 +#: builtin/branch.c:561 msgid "change upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "upstream" msgstr "font" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "change the upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:560 +#: builtin/branch.c:564 msgid "Unset the upstream info" msgstr "Desestableix la informació de font" -#: builtin/branch.c:561 +#: builtin/branch.c:565 msgid "use colored output" msgstr "usa sortida colorada" -#: builtin/branch.c:562 +#: builtin/branch.c:566 msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" -#: builtin/branch.c:564 builtin/branch.c:566 +#: builtin/branch.c:568 builtin/branch.c:570 msgid "print only branches that contain the commit" msgstr "imprimeix només les branques que continguin la comissió" -#: builtin/branch.c:565 builtin/branch.c:567 +#: builtin/branch.c:569 builtin/branch.c:571 msgid "print only branches that don't contain the commit" msgstr "imprimeix només les branques que no continguin la comissió" -#: builtin/branch.c:570 +#: builtin/branch.c:574 msgid "Specific git-branch actions:" msgstr "Accions de git-branch especÃfiques:" -#: builtin/branch.c:571 +#: builtin/branch.c:575 msgid "list both remote-tracking and local branches" msgstr "llista les branques amb seguiment remot i les locals" -#: builtin/branch.c:573 +#: builtin/branch.c:577 msgid "delete fully merged branch" msgstr "suprimeix la branca si està completament fusionada" -#: builtin/branch.c:574 +#: builtin/branch.c:578 msgid "delete branch (even if not merged)" msgstr "suprimeix la branca (encara que no estigui fusionada)" -#: builtin/branch.c:575 +#: builtin/branch.c:579 msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una branca i el seu registre de referència" -#: builtin/branch.c:576 +#: builtin/branch.c:580 msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destà existeixi" -#: builtin/branch.c:577 +#: builtin/branch.c:581 msgid "list branch names" msgstr "llista els noms de branca" -#: builtin/branch.c:578 +#: builtin/branch.c:582 msgid "create the branch's reflog" msgstr "crea el registre de referència de la branca" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "edit the description for the branch" msgstr "edita la descripció de la branca" -#: builtin/branch.c:581 +#: builtin/branch.c:585 msgid "force creation, move/rename, deletion" msgstr "força creació, moviment/canvi de nom, supressió" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "print only branches that are merged" msgstr "imprimeix només les branques que s'han fusionat" -#: builtin/branch.c:583 +#: builtin/branch.c:587 msgid "print only branches that are not merged" msgstr "imprimeix només les branques que no s'han fusionat" -#: builtin/branch.c:584 +#: builtin/branch.c:588 msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 +#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "key" msgstr "clau" -#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 msgid "field name to sort on" msgstr "nom del camp en el qual ordenar" -#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 builtin/notes.c:407 -#: builtin/notes.c:567 builtin/notes.c:570 builtin/tag.c:429 +#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 +#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 +#: builtin/tag.c:430 msgid "object" msgstr "objecte" -#: builtin/branch.c:589 +#: builtin/branch.c:593 msgid "print only branches of the object" msgstr "imprimeix només les branques de l'objecte" -#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 +#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 msgid "sorting and filtering are case insensitive" msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules" -#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/branch.c:611 +#: builtin/branch.c:615 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha produït un error en resoldre HEAD com a referència và lida." -#: builtin/branch.c:615 builtin/clone.c:724 +#: builtin/branch.c:619 builtin/clone.c:728 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:638 +#: builtin/branch.c:642 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:649 builtin/branch.c:701 +#: builtin/branch.c:653 builtin/branch.c:705 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:677 +#: builtin/branch.c:681 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:682 +#: builtin/branch.c:686 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#: builtin/branch.c:689 +#: builtin/branch.c:693 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha cap comissió en la branca '%s'." -#: builtin/branch.c:692 +#: builtin/branch.c:696 #, c-format msgid "No branch named '%s'." msgstr "No hi ha branca amb nom '%s'." -#: builtin/branch.c:707 +#: builtin/branch.c:711 msgid "too many branches for a rename operation" msgstr "hi ha massa branques per a una operació de canvi de nom" -#: builtin/branch.c:712 +#: builtin/branch.c:716 msgid "too many branches to set new upstream" msgstr "hi ha massa branques per a establir una nova font" -#: builtin/branch.c:716 +#: builtin/branch.c:720 #, c-format -msgid "could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" +"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." -#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 +#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 #, c-format msgid "no such branch '%s'" msgstr "no hi ha tal branca '%s'" -#: builtin/branch.c:723 +#: builtin/branch.c:727 #, c-format msgid "branch '%s' does not exist" msgstr "la branca '%s' no existeix" -#: builtin/branch.c:735 +#: builtin/branch.c:739 msgid "too many branches to unset upstream" msgstr "hi ha massa branques per a desestablir la font" -#: builtin/branch.c:739 +#: builtin/branch.c:743 msgid "could not unset upstream of HEAD when it does not point to any branch." -msgstr "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca." +msgstr "" +"no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca." -#: builtin/branch.c:745 +#: builtin/branch.c:749 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca '%s' no té informació de font" -#: builtin/branch.c:759 +#: builtin/branch.c:763 msgid "it does not make sense to create 'HEAD' manually" msgstr "no té sentit crear 'HEAD' manualment" -#: builtin/branch.c:765 +#: builtin/branch.c:769 msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" +msgstr "" +"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" -#: builtin/branch.c:768 +#: builtin/branch.c:772 #, c-format msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-" -"upstream-to\n" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" msgstr "" -"La bandera --set-upstream està en desús i s'eliminarà . Considereu usar --track o --set-upstream-" -"to\n" +"La bandera --set-upstream està en desús i s'eliminarà . Considereu usar --" +"track o --set-upstream-to\n" -#: builtin/branch.c:785 +#: builtin/branch.c:789 #, c-format msgid "" "\n" @@ -5586,311 +5860,322 @@ msgstr "Cal un dipòsit per a fer un farcell." msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/cat-file.c:513 +#: builtin/cat-file.c:519 msgid "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --" -"textconv | --filters) [--path=<path>] <object>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <tipus> | --" -"textconv | --filters [--path=<camÃ>]) <objecte>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <tipus> | --textconv | --filters [--path=<camÃ>]) <objecte>" -#: builtin/cat-file.c:514 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" +#: builtin/cat-file.c:520 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" -#: builtin/cat-file.c:551 +#: builtin/cat-file.c:557 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:552 +#: builtin/cat-file.c:558 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:553 +#: builtin/cat-file.c:559 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:555 +#: builtin/cat-file.c:561 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:556 +#: builtin/cat-file.c:562 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:564 msgid "for blob objects, run textconv on object's content" msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:566 msgid "for blob objects, run filters on object's content" -msgstr "en els objectes de blob, executa els filtres en el contingut de l'objecte" +msgstr "" +"en els objectes de blob, executa els filtres en el contingut de l'objecte" -#: builtin/cat-file.c:561 git-submodule.sh:943 +#: builtin/cat-file.c:567 git-submodule.sh:944 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:568 msgid "use a specific path for --textconv/--filters" msgstr "usa un camà especÃfic per a --textconv/--filters" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:570 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:571 msgid "buffer --batch output" msgstr "posa la sortida de --batch en memòria intermèdia" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:573 msgid "show info and content of objects fed from the standard input" -msgstr "mostra la informació i contingut dels objectes rebuts de l'entrada està ndard" +msgstr "" +"mostra la informació i contingut dels objectes rebuts de l'entrada està ndard" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:576 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada està ndard" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:579 msgid "follow in-tree symlinks (used with --batch or --batch-check)" -msgstr "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)" +msgstr "" +"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:581 msgid "show all objects with --batch or --batch-check" msgstr "mostra tots els objectes amb --batch o --batch-check" -#: builtin/check-attr.c:11 +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camÃ>..." -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "informa de tots els atributs establerts en el fitxer" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "usa .gitattributes només des de l'Ãndex" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 msgid "read file names from stdin" msgstr "llegeix els noms de fitxer d'stdin" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un carà cter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 +#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 msgid "suppress progress reporting" msgstr "omet els informes de progrés" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "mostra els camins d'entrada que no coincideixin" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "ignora l'Ãndex en comprovar" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:158 msgid "cannot specify pathnames with --stdin" msgstr "no es pot especificar noms de camà amb --stdin" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:161 msgid "-z only makes sense with --stdin" msgstr "-z només té sentit amb --stdin" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:163 msgid "no path specified" msgstr "cap camà especificat" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:167 msgid "--quiet is only valid with a single pathname" msgstr "--quiet només és và lid amb un sol nom de camÃ" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:169 msgid "cannot have both --quiet and --verbose" msgstr "no es pot tenir ambdós --quiet i --verbose" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:172 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching és và lid només amb --verbose" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<opcions>] <contacte>..." -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "també llegeix els contactes des d'stdin" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "no s'ha pogut analitzar el contacte: %s" -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "no hi ha contactes especificats" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:145 msgid "stage should be between 1 and 3 or all" msgstr "«stage» ha de ser entre 1 i 3 o all" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:161 msgid "check out all files in the index" msgstr "agafa tots els fitxers en l'Ãndex" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:162 msgid "force overwrite of existing files" msgstr "força la sobreescriptura de fitxers existents" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:164 msgid "no warning for existing files and files not in index" -msgstr "cap advertència per a fitxers existents i fitxers que no siguin a l'Ãndex" +msgstr "" +"cap advertència per a fitxers existents i fitxers que no siguin a l'Ãndex" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:166 msgid "don't checkout new files" msgstr "no agafis fitxers nous" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:168 msgid "update stat information in the index file" msgstr "actualitza la informació d'estadÃstiques en el fitxer d'Ãndex" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:172 msgid "read list of paths from the standard input" msgstr "llegeix la llista de camins des de l'entrada està ndard" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:174 msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" -#: builtin/checkout-index.c:174 builtin/column.c:30 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:477 +#: builtin/checkout-index.c:175 builtin/column.c:31 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 +#: builtin/worktree.c:478 msgid "string" msgstr "cadena" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:176 msgid "when creating files, prepend <string>" msgstr "en crear fitxers, anteposa <cadena>" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:178 msgid "copy out the files from named stage" msgstr "copia els fitxers des de «stage» amb nom" -#: builtin/checkout.c:27 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opcions>] <branca>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." -#: builtin/checkout.c:153 builtin/checkout.c:186 +#: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have our version" msgstr "el camà '%s' no té la nostra versió" -#: builtin/checkout.c:155 builtin/checkout.c:188 +#: builtin/checkout.c:137 builtin/checkout.c:170 #, c-format msgid "path '%s' does not have their version" msgstr "el camà '%s' no té la seva versió" -#: builtin/checkout.c:171 +#: builtin/checkout.c:153 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "el camà '%s' no té totes les versions necessà ries" -#: builtin/checkout.c:215 +#: builtin/checkout.c:197 #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camà '%s' no té les versions necessà ries" -#: builtin/checkout.c:232 +#: builtin/checkout.c:214 #, c-format msgid "path '%s': cannot merge" msgstr "camà '%s': no es pot fusionar" -#: builtin/checkout.c:249 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a '%s'" -#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 builtin/checkout.c:278 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no es pot usar amb actualització de camins" -#: builtin/checkout.c:281 builtin/checkout.c:284 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no es pot usar amb %s" -#: builtin/checkout.c:287 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada." +msgstr "" +"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada." -#: builtin/checkout.c:358 builtin/checkout.c:365 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "el camà '%s' està sense fusionar" -#: builtin/checkout.c:513 +#: builtin/checkout.c:497 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre Ãndex actual" -#: builtin/checkout.c:644 +#: builtin/checkout.c:628 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No es pot fer reflog per a '%s': %s\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:669 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:689 builtin/clone.c:678 +#: builtin/checkout.c:673 builtin/clone.c:682 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:693 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca '%s'\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Ja en '%s'\n" -#: builtin/checkout.c:700 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca '%s'\n" -#: builtin/checkout.c:702 builtin/checkout.c:1090 +#: builtin/checkout.c:686 builtin/checkout.c:1075 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova '%s'\n" -#: builtin/checkout.c:704 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca '%s'\n" -#: builtin/checkout.c:755 +#: builtin/checkout.c:739 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:745 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5913,7 +6198,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:780 +#: builtin/checkout.c:764 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5940,161 +6225,160 @@ msgstr[1] "" " git branch <nom-de-branca-nova> %s\n" "\n" -#: builtin/checkout.c:816 +#: builtin/checkout.c:800 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:820 +#: builtin/checkout.c:804 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:847 builtin/checkout.c:1085 +#: builtin/checkout.c:832 builtin/checkout.c:1070 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:991 +#: builtin/checkout.c:976 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1031 builtin/worktree.c:214 +#: builtin/checkout.c:1016 builtin/worktree.c:215 #, c-format msgid "invalid reference: %s" msgstr "referència no và lida: %s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1045 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1084 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1102 builtin/checkout.c:1106 +#: builtin/checkout.c:1087 builtin/checkout.c:1091 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no es pot usar amb canvi de branca" -#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 builtin/checkout.c:1121 +#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 +#: builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no es pot usar amb '%s'" -#: builtin/checkout.c:1126 +#: builtin/checkout.c:1111 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la branca a la no comissió '%s'" -#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 builtin/remote.c:165 -#: builtin/remote.c:167 builtin/worktree.c:329 builtin/worktree.c:331 +#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 +#: builtin/worktree.c:330 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1145 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1147 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1148 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1164 builtin/worktree.c:333 +#: builtin/checkout.c:1149 builtin/worktree.c:332 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1150 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1153 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1155 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1172 +#: builtin/checkout.c:1157 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1173 +#: builtin/checkout.c:1158 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1174 builtin/merge.c:234 +#: builtin/checkout.c:1159 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 +#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 msgid "style" msgstr "estil" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1161 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1179 +#: builtin/checkout.c:1164 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camà només a entrades disperses" -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1166 msgid "second guess 'git checkout <no-such-branch>'" msgstr "dubta 'git checkout <cap-branca-aixÃ>'" -#: builtin/checkout.c:1183 +#: builtin/checkout.c:1168 msgid "do not check if another worktree is holding the given ref" msgstr "no comprovis si altre arbre de treball té la referència donada" -#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 builtin/merge.c:231 -#: builtin/pull.c:117 builtin/push.c:539 builtin/send-pack.c:172 +#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 +#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1203 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mutualment exclusius" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1220 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1225 msgid "Missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1282 +#: builtin/checkout.c:1261 msgid "invalid path specification" msgstr "especificació de camà no và lida" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1268 #, c-format -msgid "" -"Cannot update paths and switch to branch '%s' at the same time.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n" -"VolÃeu agafar '%s', la qual no es pot resoldre com a comissió?" -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1272 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un parà metre de camà '%s'" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1276 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6102,36 +6386,38 @@ msgstr "" "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n" "agafar de l'Ãndex." -#: builtin/clean.c:25 -msgid "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..." +#: builtin/clean.c:26 +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..." -#: builtin/clean.c:29 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "S'està eliminant %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "Eliminaria %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "S'està ometent el dipòsit %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "Ometria el dipòsit %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "s'ha produït un error en eliminar %s" -#: builtin/clean.c:297 git-add--interactive.perl:614 +#: builtin/clean.c:298 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6144,7 +6430,7 @@ msgstr "" "foo - selecciona un Ãtem basat en un prefix únic\n" " - (buit) no seleccionis res\n" -#: builtin/clean.c:301 git-add--interactive.perl:623 +#: builtin/clean.c:302 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6165,37 +6451,38 @@ msgstr "" "* - tria tots els Ãtems\n" " - (buit) finalitza la selecció\n" -#: builtin/clean.c:517 git-add--interactive.perl:589 git-add--interactive.perl:594 +#: builtin/clean.c:518 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" -#: builtin/clean.c:659 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "Introduïu els patrons a ignorar>> " -#: builtin/clean.c:696 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ADVERTÈNCIA: No es poden trobar Ãtems que coincideixin amb: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "Selecciona els Ãtems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:759 #, c-format msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:783 git-add--interactive.perl:1660 +#: builtin/clean.c:784 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Adéu.\n" -#: builtin/clean.c:791 +#: builtin/clean.c:792 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6213,15 +6500,15 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avÃs" -#: builtin/clean.c:818 git-add--interactive.perl:1736 +#: builtin/clean.c:819 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: builtin/clean.c:819 git-add--interactive.perl:1733 +#: builtin/clean.c:820 git-add--interactive.perl:1689 msgid "What now" msgstr "I ara què" -#: builtin/clean.c:827 +#: builtin/clean.c:828 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminaria l'Ãtem següent:" @@ -6231,183 +6518,196 @@ msgstr[1] "Eliminaria els Ãtems següents:" msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; s'està sortint." -#: builtin/clean.c:875 +#: builtin/clean.c:906 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:877 +#: builtin/clean.c:908 msgid "force" msgstr "força" -#: builtin/clean.c:878 +#: builtin/clean.c:909 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:880 +#: builtin/clean.c:911 msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 builtin/grep.c:1063 -#: builtin/ls-files.c:546 builtin/name-rev.c:348 builtin/name-rev.c:350 builtin/show-ref.c:176 +#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 +#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "patró" -#: builtin/clean.c:882 +#: builtin/clean.c:913 msgid "add <pattern> to ignore rules" msgstr "afegiu <patró> per a ignorar les regles" -#: builtin/clean.c:883 +#: builtin/clean.c:914 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:885 +#: builtin/clean.c:916 msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:903 +#: builtin/clean.c:934 msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" -#: builtin/clean.c:907 -msgid "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean" +#: builtin/clean.c:938 +msgid "" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" msgstr "" -"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han indicat; refusant netejar" +"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han " +"indicat; refusant netejar" -#: builtin/clean.c:910 -msgid "clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean" +#: builtin/clean.c:941 +msgid "" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" msgstr "" -"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; refusant netejar" +"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; " +"refusant netejar" -#: builtin/clone.c:37 +#: builtin/clone.c:38 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]" -#: builtin/clone.c:80 +#: builtin/clone.c:82 msgid "don't create a checkout" msgstr "no facis cap agafament" -#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 +#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 msgid "create a bare repository" msgstr "crea un dipòsit nu" -#: builtin/clone.c:85 +#: builtin/clone.c:87 msgid "create a mirror repository (implies bare)" msgstr "crea un dipòsit mirall (implica bare)" -#: builtin/clone.c:87 +#: builtin/clone.c:89 msgid "to clone from a local repository" msgstr "per a clonar des d'un dipòsit local" -#: builtin/clone.c:89 +#: builtin/clone.c:91 msgid "don't use local hardlinks, always copy" msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:91 +#: builtin/clone.c:93 msgid "setup as shared repository" msgstr "configura com a dipòsit compartit" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "pathspec" msgstr "especificació de camÃ" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "initialize submodules in the clone" msgstr "inicialitza els submòduls en el clon" -#: builtin/clone.c:100 +#: builtin/clone.c:102 msgid "number of submodules cloned in parallel" msgstr "nombre de submòduls clonats en paral·lel" -#: builtin/clone.c:101 builtin/init-db.c:475 +#: builtin/clone.c:103 builtin/init-db.c:476 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:102 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "directori des del qual s'usaran les plantilles" -#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 #: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:108 +#: builtin/clone.c:110 msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" -#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 +#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:110 +#: builtin/clone.c:112 msgid "use <name> instead of 'origin' to track upstream" msgstr "usa <nom> en lloc de 'origin' per a seguir la font" -#: builtin/clone.c:112 +#: builtin/clone.c:114 msgid "checkout <branch> instead of the remote's HEAD" msgstr "agafa <branca> en lloc del HEAD del remot" -#: builtin/clone.c:114 +#: builtin/clone.c:116 msgid "path to git-upload-pack on the remote" msgstr "camà a git-upload-pack en el remot" -#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 builtin/pull.c:202 +#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/pull.c:205 msgid "depth" msgstr "profunditat" -#: builtin/clone.c:116 +#: builtin/clone.c:118 msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 parse-options.h:142 +#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 +#: parse-options.h:142 msgid "time" msgstr "hora" -#: builtin/clone.c:118 +#: builtin/clone.c:120 msgid "create a shallow clone since a specific time" msgstr "crea un clon superficial des d'una hora especÃfica" -#: builtin/clone.c:119 builtin/fetch.c:124 +#: builtin/clone.c:121 builtin/fetch.c:119 msgid "revision" msgstr "revisió" -#: builtin/clone.c:120 builtin/fetch.c:125 +#: builtin/clone.c:122 builtin/fetch.c:120 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial, excloent una revisió" -#: builtin/clone.c:122 +#: builtin/clone.c:124 msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" -#: builtin/clone.c:124 +#: builtin/clone.c:126 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "" + +#: builtin/clone.c:128 msgid "any cloned submodules will be shallow" msgstr "qualsevol submòdul clonat serà superficial" -#: builtin/clone.c:125 builtin/init-db.c:484 +#: builtin/clone.c:129 builtin/init-db.c:485 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:126 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "key=value" msgstr "clau=valor" -#: builtin/clone.c:128 +#: builtin/clone.c:132 msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "usa només adreces IPv4" -#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" -#: builtin/clone.c:268 +#: builtin/clone.c:272 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6415,42 +6715,42 @@ msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" "Si us plau, especifiqueu un directori en la lÃnia d'ordres" -#: builtin/clone.c:321 +#: builtin/clone.c:325 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No s'ha pogut afegir un alternatiu per a '%s': %s\n" -#: builtin/clone.c:393 +#: builtin/clone.c:397 #, c-format msgid "failed to open '%s'" msgstr "s'ha produït un error en obrir '%s'" -#: builtin/clone.c:401 +#: builtin/clone.c:405 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" -#: builtin/clone.c:415 +#: builtin/clone.c:419 #, c-format msgid "failed to stat %s\n" msgstr "s'ha produït un error en fer stat a '%s'\n" -#: builtin/clone.c:437 +#: builtin/clone.c:441 #, c-format msgid "failed to create link '%s'" msgstr "s'ha produït un error en crear l'enllaç '%s'" -#: builtin/clone.c:441 +#: builtin/clone.c:445 #, c-format msgid "failed to copy file to '%s'" msgstr "s'ha produït un error en copiar el fitxer a '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:470 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:478 +#: builtin/clone.c:482 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6461,177 +6761,185 @@ msgstr "" "'git status' i tornar a intentar l'agafament amb\n" "'git checkout -f HEAD'\n" -#: builtin/clone.c:555 +#: builtin/clone.c:559 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No s'ha pogut trobar la branca remota %s per a clonar." -#: builtin/clone.c:650 +#: builtin/clone.c:654 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: builtin/clone.c:666 +#: builtin/clone.c:670 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" -#: builtin/clone.c:715 +#: builtin/clone.c:719 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "el HEAD remot es refereix a una referència que no existeix; no s'ha pogut agafar.\n" +msgstr "" +"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut " +"agafar.\n" -#: builtin/clone.c:746 +#: builtin/clone.c:750 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:786 +#: builtin/clone.c:792 msgid "unable to write parameters to config file" msgstr "no s'ha pogut escriure els parà metres al fitxer de configuració" -#: builtin/clone.c:849 +#: builtin/clone.c:855 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:851 +#: builtin/clone.c:857 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:884 builtin/receive-pack.c:1900 +#: builtin/clone.c:890 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "Hi ha massa parà metres." -#: builtin/clone.c:888 +#: builtin/clone.c:894 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:901 +#: builtin/clone.c:907 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:904 +#: builtin/clone.c:910 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:917 +#: builtin/clone.c:923 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:923 builtin/fetch.c:1337 +#: builtin/clone.c:929 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:933 +#: builtin/clone.c:939 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "el camà destà '%s' ja existeix i no és un directori buit." -#: builtin/clone.c:943 +#: builtin/clone.c:949 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 builtin/worktree.c:221 -#: builtin/worktree.c:251 +#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 +#: builtin/worktree.c:222 builtin/worktree.c:252 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de '%s'" -#: builtin/clone.c:961 +#: builtin/clone.c:967 #, c-format msgid "could not create work tree dir '%s'" msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'" -#: builtin/clone.c:973 +#: builtin/clone.c:979 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al dipòsit nu '%s'...\n" -#: builtin/clone.c:975 +#: builtin/clone.c:981 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a '%s'...\n" -#: builtin/clone.c:999 -msgid "clone --recursive is not compatible with both --reference and --reference-if-able" -msgstr "clone --recursive no és compatible amb ambdós --reference i --reference-if-able" +#: builtin/clone.c:1005 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"clone --recursive no és compatible amb ambdós --reference i --reference-if-" +"able" -#: builtin/clone.c:1055 +#: builtin/clone.c:1067 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1057 +#: builtin/clone.c:1069 msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això." +msgstr "" +"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1059 +#: builtin/clone.c:1071 msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això." +msgstr "" +"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1062 +#: builtin/clone.c:1074 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, s'està ignorant --local" -#: builtin/clone.c:1067 +#: builtin/clone.c:1079 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1071 +#: builtin/clone.c:1083 #, c-format msgid "Don't know how to clone %s" msgstr "No se sap com clonar %s" -#: builtin/clone.c:1126 builtin/clone.c:1134 +#: builtin/clone.c:1138 builtin/clone.c:1146 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branca remota %s no es troba en la font %s" -#: builtin/clone.c:1137 +#: builtin/clone.c:1149 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<opcions>]" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "cerca les variables de configuració" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "disposició a usar" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "Amplada mà xima" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "Espai d'encoixinada en el marge esquerre" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "Espai d'encoixinada en el marge dret" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "Espai d'encoixinada entre columnes" -#: builtin/column.c:51 +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "--command ha de ser el primer parà metre" -#: builtin/commit.c:38 +#: builtin/commit.c:39 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<opcions>] [--] <especificació-de-camÃ>..." -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<opcions>] [--] <especificació-de-camÃ>..." -#: builtin/commit.c:48 +#: builtin/commit.c:49 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6658,7 +6966,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6684,7 +6992,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:73 +#: builtin/commit.c:74 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" @@ -6694,7 +7002,7 @@ msgstr "" "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n" "podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n" -#: builtin/commit.c:78 +#: builtin/commit.c:79 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -6702,17 +7010,18 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" -"El «cherry pick» previ ja està buit, possiblement a causa de resolució de conflicte.\n" +"El «cherry pick» previ ja està buit, possiblement a causa de resolució de " +"conflicte.\n" "Si el voleu cometre de totes maneres, useu:\n" "\n" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:85 +#: builtin/commit.c:86 msgid "Otherwise, please use 'git reset'\n" msgstr "D'altra manera, si us plau, useu 'git reset'\n" -#: builtin/commit.c:88 +#: builtin/commit.c:89 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6728,61 +7037,61 @@ msgstr "" "Llavors \"git cherry-pick --continue\" reprendrà \n" "com a «cherry pick» les comissions restants.\n" -#: builtin/commit.c:318 +#: builtin/commit.c:319 msgid "failed to unpack HEAD tree object" msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:359 +#: builtin/commit.c:360 msgid "unable to create temporary index" msgstr "no s'ha pogut crear un Ãndex temporal" -#: builtin/commit.c:365 +#: builtin/commit.c:366 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:378 +#: builtin/commit.c:379 msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'Ãndex temporal" -#: builtin/commit.c:380 +#: builtin/commit.c:381 msgid "Failed to update main cache tree" msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau" -#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 +#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 msgid "unable to write new_index file" msgstr "no s'ha pogut escriure el fitxer new_index" -#: builtin/commit.c:458 +#: builtin/commit.c:459 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:460 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a cherry-pick." msgstr "no es pot fer una comissió parcial durant un «cherry pick»." -#: builtin/commit.c:469 +#: builtin/commit.c:470 msgid "cannot read the index" msgstr "no es pot llegir l'Ãndex" -#: builtin/commit.c:488 +#: builtin/commit.c:489 msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'Ãndex temporal" -#: builtin/commit.c:582 +#: builtin/commit.c:583 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió '%s' li manca la capçalera d'autor" -#: builtin/commit.c:584 +#: builtin/commit.c:585 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió '%s' té una lÃnia d'autor mal formada" -#: builtin/commit.c:603 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "parà metre --author mal format" -#: builtin/commit.c:655 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -6790,38 +7099,38 @@ msgstr "" "no es pot seleccionar un carà cter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:704 builtin/shortlog.c:294 +#: builtin/commit.c:705 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(s'està llegint el missatge de registre des de l'entrada està ndard)\n" -#: builtin/commit.c:706 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "no s'ha pogut llegir el registre des de l'entrada està ndard" -#: builtin/commit.c:710 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre '%s'" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogut llegir SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:743 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:814 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -6836,7 +7145,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:819 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -6851,7 +7160,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6861,7 +7170,7 @@ msgstr "" "S'ignoraran les lÃnies començant amb '%c', i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6872,339 +7181,352 @@ msgstr "" "Es retindran les lÃnies començants amb '%c'; podeu eliminar-les vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:859 +#: builtin/commit.c:857 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:865 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:874 +#: builtin/commit.c:872 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:889 msgid "Cannot read index" msgstr "No es pot llegir l'Ãndex" -#: builtin/commit.c:954 +#: builtin/commit.c:951 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:968 builtin/tag.c:273 +#: builtin/commit.c:965 builtin/tag.c:274 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Si us plau, proveïu el missatge usant l'opció -m o l'opció -F.\n" -#: builtin/commit.c:1071 +#: builtin/commit.c:1068 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n" "cap autor existent" -#: builtin/commit.c:1086 builtin/commit.c:1325 +#: builtin/commit.c:1083 builtin/commit.c:1328 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no và lid '%s'" -#: builtin/commit.c:1124 +#: builtin/commit.c:1121 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1154 +#: builtin/commit.c:1151 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambdós --reset-author i --author no té sentit" -#: builtin/commit.c:1163 +#: builtin/commit.c:1160 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1166 +#: builtin/commit.c:1163 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1168 +#: builtin/commit.c:1165 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar." -#: builtin/commit.c:1171 +#: builtin/commit.c:1168 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1181 +#: builtin/commit.c:1178 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Només un de -c/-C/-F/--fixup es pot usar." -#: builtin/commit.c:1183 +#: builtin/commit.c:1180 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup." -#: builtin/commit.c:1191 +#: builtin/commit.c:1188 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author només es pot usar amb -C, -c o --amend." -#: builtin/commit.c:1208 +#: builtin/commit.c:1205 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar." -#: builtin/commit.c:1210 +#: builtin/commit.c:1207 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense camÃ." -#: builtin/commit.c:1212 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "S'han especificat camins explÃcits sense -i o -o; s'està presumint --only camins..." - -#: builtin/commit.c:1224 builtin/tag.c:551 +#: builtin/commit.c:1219 builtin/tag.c:552 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no và lid %s" -#: builtin/commit.c:1229 +#: builtin/commit.c:1224 msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1339 builtin/commit.c:1612 +#: builtin/commit.c:1342 builtin/commit.c:1617 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1341 builtin/commit.c:1614 +#: builtin/commit.c:1344 builtin/commit.c:1619 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1343 +#: builtin/commit.c:1346 +#, fuzzy +msgid "show stash information" +msgstr "mostra la informació de branca" + +#: builtin/commit.c:1348 msgid "version" msgstr "versió" -#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 builtin/worktree.c:448 +#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 +#: builtin/worktree.c:449 msgid "machine-readable output" msgstr "sortida llegible per mà quina" -#: builtin/commit.c:1346 builtin/commit.c:1618 +#: builtin/commit.c:1351 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1349 builtin/commit.c:1621 +#: builtin/commit.c:1354 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 builtin/fast-export.c:984 -#: builtin/tag.c:411 +#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 +#: builtin/fast-export.c:986 builtin/tag.c:412 msgid "mode" msgstr "mode" -#: builtin/commit.c:1352 builtin/commit.c:1624 +#: builtin/commit.c:1357 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" -msgstr "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per defecte: all)" +msgstr "" +"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per " +"defecte: all)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1360 msgid "show ignored files" msgstr "mostra els fitxers ignorats" -#: builtin/commit.c:1356 parse-options.h:155 +#: builtin/commit.c:1361 parse-options.h:155 msgid "when" msgstr "quan" -#: builtin/commit.c:1357 -msgid "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)" -msgstr "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per defecte: all)" +#: builtin/commit.c:1362 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " +"defecte: all)" -#: builtin/commit.c:1359 +#: builtin/commit.c:1364 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1435 +#: builtin/commit.c:1440 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: builtin/commit.c:1437 +#: builtin/commit.c:1442 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "detached HEAD" msgstr "HEAD separat" -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: builtin/commit.c:1582 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1583 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1585 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1586 builtin/tag.c:409 +#: builtin/commit.c:1591 builtin/tag.c:410 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "author" msgstr "autor" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1588 builtin/gc.c:357 +#: builtin/commit.c:1593 builtin/gc.c:358 msgid "date" msgstr "data" -#: builtin/commit.c:1588 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 builtin/notes.c:561 -#: builtin/tag.c:407 +#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 +#: builtin/notes.c:564 builtin/tag.c:408 msgid "message" msgstr "missatge" -#: builtin/commit.c:1589 +#: builtin/commit.c:1594 msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 builtin/commit.c:1593 -#: parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "comissió" -#: builtin/commit.c:1590 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1592 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" -msgstr "usa el missatge formatat de «squash» automà tic per a corregir la comissió especificada" +msgstr "" +"usa el missatge formatat de «squash» automà tic per a corregir la comissió " +"especificada" -#: builtin/commit.c:1593 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" -msgstr "usa el missatge formatat de «squash» automà tic per a «squash» a la comissió especificada" +msgstr "" +"usa el missatge formatat de «squash» automà tic per a «squash» a la comissió " +"especificada" -#: builtin/commit.c:1594 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 +#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1596 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1597 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1598 builtin/tag.c:412 +#: builtin/commit.c:1603 builtin/tag.c:413 msgid "how to strip spaces and #comments from message" msgstr "com suprimir els espais i #comentaris del missatge" -#: builtin/commit.c:1599 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 builtin/revert.c:112 +#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" -#: builtin/commit.c:1604 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1605 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1606 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'Ãndex per a cometre" -#: builtin/commit.c:1607 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1608 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1609 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1610 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els ganxos de precomissió i missatge de comissió" -#: builtin/commit.c:1611 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1622 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1623 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "evita el ganxo de post escriptura" -#: builtin/commit.c:1628 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1630 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1659 +#: builtin/commit.c:1665 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1707 +#: builtin/commit.c:1710 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmès (%s)" -#: builtin/commit.c:1714 +#: builtin/commit.c:1717 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1733 +#: builtin/commit.c:1736 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1744 +#: builtin/commit.c:1747 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "S'està avortant la comissió; no heu editat el missatge.\n" -#: builtin/commit.c:1749 +#: builtin/commit.c:1752 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1797 +#: builtin/commit.c:1800 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7215,143 +7537,146 @@ msgstr "" "que la quota no estigui excedida, i després\n" "\"git reset HEAD\" per a recuperar." -#: builtin/config.c:9 +#: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<opcions>]" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "Config file location" msgstr "Ubicació del fitxer de configuració" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use global config file" msgstr "usa el fitxer de configuració global" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use system config file" msgstr "usa el fitxer de configuració del sistema" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use repository config file" msgstr "usa el fitxer de configuració del dipòsit" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use given config file" msgstr "usa el fitxer de configuració donat" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "blob-id" msgstr "ID de blob" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "read config from given blob object" msgstr "llegeix la configuració de l'objecte de blob donat" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "Action" msgstr "Acció" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get value: name [value-regex]" msgstr "obtén valor: nom [regex-de-valors]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get all values: key [value-regex]" msgstr "obtén tots els valors: clau [regex-de-valors]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get value specific for the URL: section[.var] URL" msgstr "obtén el valor especÃfic per a l'URL: secció[.variable] URL" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "replace all matching variables: name value [value_regex]" -msgstr "reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]" +msgstr "" +"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "add a new variable: name value" msgstr "afegeix una variable nova: nom valor" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove a variable: name [value-regex]" msgstr "elimina una variable: nom [regex-de-valors]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove all matches: name [value-regex]" msgstr "elimina totes les coincidències: nom [regex-de-valors]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "rename section: old-name new-name" msgstr "canvia el nom de secció: nom-antic nom-nou" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "remove a section: name" msgstr "elimina una secció: nom" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "list all" msgstr "llista tots" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "open an editor" msgstr "obre un editor" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color configured: slot [default]" msgstr "troba el color configurat: ranura [per defecte]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color setting: slot [stdout-is-tty]" msgstr "troba l'ajust de color: ranura [stdout-és-tty]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "Type" msgstr "Tipus" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is \"true\" or \"false\"" msgstr "el valor és \"true\" o \"false\"" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is decimal number" msgstr "el valor és un nombre decimal" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is --bool or --int" msgstr "el valor és --bool o --int" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is a path (file or directory name)" msgstr "el valor és un camà (nom de fitxer o directori)" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "Other" msgstr "Altre" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "terminate values with NUL byte" msgstr "acaba els valors amb un octet NUL" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "show variable names only" msgstr "mostra només els noms de variable" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusió en cercar" -#: builtin/config.c:86 +#: builtin/config.c:87 msgid "show origin of config (file, standard input, blob, command line)" -msgstr "mostra l'origen de la configuració (fitxer, entrada està ndard, blob, lÃnia d'ordres)" +msgstr "" +"mostra l'origen de la configuració (fitxer, entrada està ndard, blob, lÃnia " +"d'ordres)" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "no s'ha pogut analitzar el valor de color per defecte" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7366,12 +7691,17 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:615 +#: builtin/config.c:499 +#, fuzzy +msgid "--local can only be used inside a git repository" +msgstr "--cached fora d'un dipòsit" + +#: builtin/config.c:621 #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració '%s'" -#: builtin/config.c:627 +#: builtin/config.c:633 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7380,75 +7710,75 @@ msgstr "" "no es pot sobreescriure múltiples valors amb un sol valor\n" " Useu una expressió regular, --add o --replace-all per a canviar %s." -#: builtin/count-objects.c:86 +#: builtin/count-objects.c:87 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:96 +#: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible pels humans" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opcions>] [<comissió>...]" -#: builtin/describe.c:19 +#: builtin/describe.c:20 msgid "git describe [<options>] --dirty" msgstr "git describe [<opcions>] --dirty" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "head" msgstr "davant per" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "lightweight" msgstr "lleuger" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "annotated" msgstr "anotat" -#: builtin/describe.c:250 +#: builtin/describe.c:253 #, c-format msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no és disponible" -#: builtin/describe.c:254 +#: builtin/describe.c:257 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'etiqueta anotada %s no té nom incrustat" -#: builtin/describe.c:256 +#: builtin/describe.c:259 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'etiqueta '%s' realment és '%s' aquÃ" -#: builtin/describe.c:283 builtin/log.c:487 +#: builtin/describe.c:286 builtin/log.c:489 #, c-format msgid "Not a valid object name %s" msgstr "%s no és un nom d'objecte và lid" -#: builtin/describe.c:286 +#: builtin/describe.c:289 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no és un objecte de '%s' và lid" -#: builtin/describe.c:303 +#: builtin/describe.c:306 #, c-format msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb '%s'" -#: builtin/describe.c:305 +#: builtin/describe.c:308 #, c-format msgid "searching to describe %s\n" msgstr "s'està cercant per a descriure %s\n" -#: builtin/describe.c:352 +#: builtin/describe.c:355 #, c-format msgid "finished search at %s\n" msgstr "s'ha finalitzat la cerca a %s\n" -#: builtin/describe.c:379 +#: builtin/describe.c:382 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7457,7 +7787,7 @@ msgstr "" "Cap etiqueta anotada pot descriure '%s'.\n" "No obstant, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:383 +#: builtin/describe.c:386 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7466,12 +7796,12 @@ msgstr "" "Cap etiqueta pot descriure '%s'.\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:413 +#: builtin/describe.c:416 #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions travessades\n" -#: builtin/describe.c:416 +#: builtin/describe.c:419 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7480,75 +7810,75 @@ msgstr "" "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n" "s'ha renunciat la cerca a %s\n" -#: builtin/describe.c:438 +#: builtin/describe.c:441 msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui després de la comissió" -#: builtin/describe.c:439 +#: builtin/describe.c:442 msgid "debug search strategy on stderr" msgstr "estratègia de cerca de depuració en stderr" -#: builtin/describe.c:440 +#: builtin/describe.c:443 msgid "use any ref" msgstr "usa qualsevol referència" -#: builtin/describe.c:441 +#: builtin/describe.c:444 msgid "use any tag, even unannotated" msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" -#: builtin/describe.c:442 +#: builtin/describe.c:445 msgid "always use long format" msgstr "sempre usa el format llarg" -#: builtin/describe.c:443 +#: builtin/describe.c:446 msgid "only follow first parent" msgstr "només segueix la primera mare" -#: builtin/describe.c:446 +#: builtin/describe.c:449 msgid "only output exact matches" msgstr "emet només coincidències exactes" -#: builtin/describe.c:448 +#: builtin/describe.c:451 msgid "consider <n> most recent tags (default: 10)" msgstr "considera les <n> etiquetes més recents (per defecte: 10)" -#: builtin/describe.c:450 +#: builtin/describe.c:453 msgid "only consider tags matching <pattern>" msgstr "només considera les etiquetes que coincideixen amb <patró>" -#: builtin/describe.c:452 +#: builtin/describe.c:455 msgid "do not consider tags matching <pattern>" msgstr "no consideris les etiquetes que no coincideixen amb <patró>" -#: builtin/describe.c:454 builtin/name-rev.c:357 +#: builtin/describe.c:457 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu" -#: builtin/describe.c:455 builtin/describe.c:458 +#: builtin/describe.c:458 builtin/describe.c:461 msgid "mark" msgstr "marca" -#: builtin/describe.c:456 +#: builtin/describe.c:459 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")" -#: builtin/describe.c:459 +#: builtin/describe.c:462 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")" -#: builtin/describe.c:477 +#: builtin/describe.c:480 msgid "--long is incompatible with --abbrev=0" msgstr "--long és incompatible amb --abbrev=0" -#: builtin/describe.c:506 +#: builtin/describe.c:509 msgid "No names found, cannot describe anything." msgstr "No s'ha trobat cap nom, no es pot descriure res." -#: builtin/describe.c:549 +#: builtin/describe.c:552 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty és incompatible amb les comissions" -#: builtin/describe.c:551 +#: builtin/describe.c:554 msgid "--broken is incompatible with commit-ishes" msgstr "--broken és incompatible amb les comissions" @@ -7557,345 +7887,352 @@ msgstr "--broken és incompatible amb les comissions" msgid "'%s': not a regular file or symlink" msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "opció no và lida: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:359 msgid "Not a git repository" msgstr "No és un dipòsit de git" -#: builtin/diff.c:401 +#: builtin/diff.c:402 #, c-format msgid "invalid object '%s' given." msgstr "s'ha donat un objecte no và lid '%s'." -#: builtin/diff.c:410 +#: builtin/diff.c:411 #, c-format msgid "more than two blobs given: '%s'" msgstr "s'ha donat més de dos blobs: '%s" -#: builtin/diff.c:417 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "s'ha donat l'objecte no gestionat '%s'." -#: builtin/difftool.c:28 +#: builtin/difftool.c:29 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camÃ>...]" -#: builtin/difftool.c:241 +#: builtin/difftool.c:249 #, c-format msgid "failed: %d" msgstr "ha fallat: %d" -#: builtin/difftool.c:283 +#: builtin/difftool.c:291 #, c-format msgid "could not read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: builtin/difftool.c:285 +#: builtin/difftool.c:293 #, c-format msgid "could not read symlink file %s" msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:301 #, c-format msgid "could not read object %s for symlink %s" msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s" -#: builtin/difftool.c:395 +#: builtin/difftool.c:403 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:609 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "s'han modificat ambdós fitxers: '%s' i '%s'." -#: builtin/difftool.c:611 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "s'ha deixat un fitxer de l'arbre de treball." -#: builtin/difftool.c:622 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "existeix un fitxer temporal a %s'." -#: builtin/difftool.c:623 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "podeu netejar o recuperar-los." -#: builtin/difftool.c:669 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utilitza `diff.guitool` en comptes de `diff.tool`" -#: builtin/difftool.c:671 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "fes un diff de tot el directori" -#: builtin/difftool.c:673 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "no preguntis abans d'executar l'eina diff" -#: builtin/difftool.c:679 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "utilitza enllaços simbòlics en mode dir-diff" -#: builtin/difftool.c:680 +#: builtin/difftool.c:700 msgid "<tool>" msgstr "<tool>" -#: builtin/difftool.c:681 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "utilitza l'eina de diff especificada" -#: builtin/difftool.c:683 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" -msgstr "imprimeix una llista de totes les eines diff que podeu usar amb `--tool`" +msgstr "" +"imprimeix una llista de totes les eines diff que podeu usar amb `--tool`" -#: builtin/difftool.c:686 -msgid "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit code" +#: builtin/difftool.c:706 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" msgstr "" -#: builtin/difftool.c:688 +#: builtin/difftool.c:708 msgid "<command>" msgstr "<command>" -#: builtin/difftool.c:689 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "especifiqueu una ordre personalitzada per veure diffs" -#: builtin/difftool.c:713 +#: builtin/difftool.c:733 msgid "no <tool> given for --tool=<tool>" msgstr "no s'ha proporcionat <tool> per --tool=<tool>" -#: builtin/difftool.c:720 +#: builtin/difftool.c:740 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>" -#: builtin/fast-export.c:25 +#: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opcions-de-llista-de-revisions]" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:982 msgid "show progress after <n> objects" msgstr "mostra el progrés després de <n> objectes" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:984 msgid "select handling of signed tags" msgstr "selecciona la gestió de les etiquetes signades" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:987 msgid "select handling of tags that tag filtered objects" msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:990 msgid "Dump marks to this file" msgstr "Bolca les marques a aquest fitxer" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:992 msgid "Import marks from this file" msgstr "Importa les marques d'aquest fitxer" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:994 msgid "Fake a tagger when tags lack one" msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:996 msgid "Output full tree for each commit" msgstr "Imprimeix l'arbre complet de cada comissió" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:998 msgid "Use the done feature to terminate the stream" msgstr "Usa la caracterÃstica done per a acabar el corrent" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:999 msgid "Skip output of blob data" msgstr "Omet l'emissió de dades de blob" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "refspec" msgstr "especificació de referència" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1001 msgid "Apply refspec to exported refs" msgstr "Aplica l'especificació de referència a les referències exportades" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "anonymize output" msgstr "anonimitza la sortida" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opcions>] <grup>" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opcions>]" -#: builtin/fetch.c:95 builtin/pull.c:175 +#: builtin/fetch.c:90 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:97 builtin/pull.c:178 +#: builtin/fetch.c:92 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:99 builtin/pull.c:181 +#: builtin/fetch.c:94 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "camà al qual pujar el paquet al costat remot" -#: builtin/fetch.c:100 builtin/pull.c:183 +#: builtin/fetch.c:95 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "força la sobreescriptura de la branca local" -#: builtin/fetch.c:102 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:104 builtin/pull.c:185 +#: builtin/fetch.c:99 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:106 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:108 +#: builtin/fetch.c:103 msgid "number of submodules fetched in parallel" msgstr "nombre de submòduls obtinguts en paral·lel" -#: builtin/fetch.c:110 builtin/pull.c:188 +#: builtin/fetch.c:105 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" -#: builtin/fetch.c:111 builtin/pull.c:191 +#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:112 builtin/pull.c:192 +#: builtin/fetch.c:107 msgid "control recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/fetch.c:116 builtin/pull.c:200 +#: builtin/fetch.c:111 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "retén el paquet baixat" -#: builtin/fetch.c:118 +#: builtin/fetch.c:113 msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 +#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" -#: builtin/fetch.c:123 +#: builtin/fetch.c:118 msgid "deepen history of shallow repository based on time" msgstr "aprofundeix la història d'un clon superficial basat en temps" -#: builtin/fetch.c:129 builtin/pull.c:206 +#: builtin/fetch.c:124 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:131 builtin/log.c:1440 +#: builtin/fetch.c:126 builtin/log.c:1450 msgid "dir" msgstr "directori" -#: builtin/fetch.c:132 +#: builtin/fetch.c:127 msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camà del submòdul" -#: builtin/fetch.c:135 -msgid "default mode for recursion" -msgstr "mode de recursivitat per defecte" +#: builtin/fetch.c:130 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" -#: builtin/fetch.c:137 builtin/pull.c:209 +#: builtin/fetch.c:134 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:138 builtin/pull.c:211 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:139 builtin/pull.c:212 +#: builtin/fetch.c:136 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "mostra el mapa de referències d'obtenció" -#: builtin/fetch.c:395 +#: builtin/fetch.c:394 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:513 +#: builtin/fetch.c:512 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuració fetch.output conté un valor no và lid %s" -#: builtin/fetch.c:606 +#: builtin/fetch.c:605 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:610 +#: builtin/fetch.c:609 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:623 builtin/fetch.c:703 +#: builtin/fetch.c:622 builtin/fetch.c:702 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:624 +#: builtin/fetch.c:623 msgid "can't fetch in current branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:633 +#: builtin/fetch.c:632 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 builtin/fetch.c:698 +#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 +#: builtin/fetch.c:697 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:653 +#: builtin/fetch.c:652 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:656 +#: builtin/fetch.c:655 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:659 +#: builtin/fetch.c:658 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:698 +#: builtin/fetch.c:697 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:703 +#: builtin/fetch.c:702 msgid "non-fast-forward" msgstr "sense avanç rà pid" -#: builtin/fetch.c:748 +#: builtin/fetch.c:747 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:768 +#: builtin/fetch.c:767 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" +msgstr "" +"rebutja %s perquè no es permet que les arrels superficials s'actualitzin" #: builtin/fetch.c:855 builtin/fetch.c:951 #, c-format @@ -7926,7 +8263,7 @@ msgstr " (%s s'ha tornat penjant)" msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:955 builtin/remote.c:1022 +#: builtin/fetch.c:955 builtin/remote.c:1023 msgid "(none)" msgstr "(cap)" @@ -7955,7 +8292,7 @@ msgstr "No se sap com obtenir de %s" msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" @@ -7988,100 +8325,104 @@ msgstr "--depth i --unshallow no es poden usar junts" msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1349 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un parà metre de dipòsit" -#: builtin/fetch.c:1354 +#: builtin/fetch.c:1351 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1365 +#: builtin/fetch.c:1362 #, c-format msgid "No such remote or remote group: %s" msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1373 +#: builtin/fetch.c:1370 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" -#: builtin/fmt-merge-msg.c:14 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" -msgstr "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" +#: builtin/fmt-merge-msg.c:15 +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "emplena el registre amb <n> entrades del registre curt com a mà xim" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "à lies per --log (en desús)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "usa <text> com a inici de missatge" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "fitxer del qual llegir" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<opcions>] [<patró>]" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objecte>]" -#: builtin/for-each-ref.c:11 +#: builtin/for-each-ref.c:12 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]" -#: builtin/for-each-ref.c:12 +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]" +msgstr "" +"git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" -msgstr "posa els marcadors de posició de forma adequada per a intèrprets d'ordres" +msgstr "" +"posa els marcadors de posició de forma adequada per a intèrprets d'ordres" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "posa els marcadors de posició entre cometes adequades per al perl" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "posa els marcadors de posició entre cometes adequades per al python" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "posa els marcadors de posició entre cometes adequades per al Tcl" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "imprimeix només les referències que assenyalin l'objecte donat" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "imprimeix només les referències que s'han fusionat" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "imprimeix només les referències que no s'han fusionat" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "imprimeix només les referències que continguin la comissió" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "imprimeix només les referències que no continguin la comissió" @@ -8145,21 +8486,21 @@ msgstr "mostra els noms detallats dels objectes abastables" msgid "Checking objects" msgstr "S'estan comprovant els objectes" -#: builtin/gc.c:25 +#: builtin/gc.c:26 msgid "git gc [<options>]" msgstr "git gc [<opcions>]" -#: builtin/gc.c:78 +#: builtin/gc.c:79 #, c-format msgid "Failed to fstat %s: %s" msgstr "S'ha produït un error en fer fstat %s: %s" -#: builtin/gc.c:310 +#: builtin/gc.c:311 #, c-format msgid "Can't stat %s" msgstr "No es pot fer stat en %s" -#: builtin/gc.c:319 +#: builtin/gc.c:320 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8174,391 +8515,422 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:358 +#: builtin/gc.c:359 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:360 +#: builtin/gc.c:361 msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automà tica" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "force running gc even if there may be another gc running" msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant" -#: builtin/gc.c:379 +#: builtin/gc.c:380 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" -#: builtin/gc.c:407 +#: builtin/gc.c:408 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" -msgstr "S'està empaquetant el dipòsit automà ticament en el fons per rendiment òptim.\n" +msgstr "" +"S'està empaquetant el dipòsit automà ticament en el fons per rendiment " +"òptim.\n" -#: builtin/gc.c:409 +#: builtin/gc.c:410 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "S'està empaquetant automà ticament el dipòsit per rendiment òptim.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vegeu \"git help gc\" per neteja manual.\n" -#: builtin/gc.c:431 +#: builtin/gc.c:436 #, c-format -msgid "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" -msgstr "gc ja s'està executant en la mà quina '%s' pid %<PRIuMAX> (useu --force si no)" +msgid "" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" +msgstr "" +"gc ja s'està executant en la mà quina '%s' pid %<PRIuMAX> (useu --force si no)" -#: builtin/gc.c:475 -msgid "There are too many unreachable loose objects; run 'git prune' to remove them." -msgstr "Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-los." +#: builtin/gc.c:480 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-" +"los." -#: builtin/grep.c:25 +#: builtin/grep.c:27 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camÃ>...]" -#: builtin/grep.c:232 +#: builtin/grep.c:235 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: s'ha produït un error en crear fil: %s" -#: builtin/grep.c:290 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "s'ha especificat un nombre de fils no và lid (%d) per a %s" -#: builtin/grep.c:769 builtin/grep.c:810 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "no hi ha suport de fils, s'està ignorant %s" + +#: builtin/grep.c:788 builtin/grep.c:829 #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:829 +#: builtin/grep.c:848 #, c-format msgid "unable to grep from object of type %s" msgstr "no es pot fer grep des d'un objecte de tipus %s" -#: builtin/grep.c:893 +#: builtin/grep.c:912 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció `%c' espera un valor numèric" -#: builtin/grep.c:980 +#: builtin/grep.c:999 msgid "search in index instead of in the work tree" msgstr "cerca en l'Ãndex en lloc de l'arbre de treball" -#: builtin/grep.c:982 +#: builtin/grep.c:1001 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:984 +#: builtin/grep.c:1003 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:986 +#: builtin/grep.c:1005 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant '.gitignore'" -#: builtin/grep.c:988 +#: builtin/grep.c:1007 msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submòdul" -#: builtin/grep.c:990 +#: builtin/grep.c:1009 msgid "basename" msgstr "nom base" -#: builtin/grep.c:991 +#: builtin/grep.c:1010 msgid "prepend parent project's basename to output" msgstr "anteposa això a la sortida del nom base del projecte pare" -#: builtin/grep.c:994 +#: builtin/grep.c:1013 msgid "show non-matching lines" msgstr "mostra les lÃnies no coincidents" -#: builtin/grep.c:996 +#: builtin/grep.c:1015 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:998 +#: builtin/grep.c:1017 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als lÃmits de paraula" -#: builtin/grep.c:1000 +#: builtin/grep.c:1019 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:1002 +#: builtin/grep.c:1021 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:1005 +#: builtin/grep.c:1024 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:1007 +#: builtin/grep.c:1026 msgid "descend at most <depth> levels" msgstr "descendeix com a mà xim <profunditat> nivells" -#: builtin/grep.c:1011 +#: builtin/grep.c:1030 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX esteses" -#: builtin/grep.c:1014 +#: builtin/grep.c:1033 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bà siques (per defecte)" -#: builtin/grep.c:1017 +#: builtin/grep.c:1036 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:1020 +#: builtin/grep.c:1039 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:1023 +#: builtin/grep.c:1042 msgid "show line numbers" msgstr "mostra els números de lÃnia" -#: builtin/grep.c:1024 +#: builtin/grep.c:1043 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:1025 +#: builtin/grep.c:1044 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:1027 +#: builtin/grep.c:1046 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:1029 +#: builtin/grep.c:1048 msgid "show only filenames instead of matching lines" msgstr "mostra només els noms de fitxer en lloc de les lÃnies coincidents" -#: builtin/grep.c:1031 +#: builtin/grep.c:1050 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:1034 +#: builtin/grep.c:1053 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:1036 +#: builtin/grep.c:1055 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:1038 +#: builtin/grep.c:1057 msgid "show the number of matches instead of matching lines" msgstr "mostra el nombre de coincidències en lloc de les lÃnies coincidents" -#: builtin/grep.c:1039 +#: builtin/grep.c:1058 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:1041 +#: builtin/grep.c:1060 msgid "print empty line between matches from different files" msgstr "imprimeix una lÃnia buida entre coincidències de fitxers distints" -#: builtin/grep.c:1043 +#: builtin/grep.c:1062 msgid "show filename only once above matches from same file" -msgstr "mostra el nom de fitxer només una vegada a dalt de les coincidències del mateix fitxer" +msgstr "" +"mostra el nom de fitxer només una vegada a dalt de les coincidències del " +"mateix fitxer" -#: builtin/grep.c:1046 +#: builtin/grep.c:1065 msgid "show <n> context lines before and after matches" msgstr "mostra <n> lÃnies de context abans i després d'una coincidència" -#: builtin/grep.c:1049 +#: builtin/grep.c:1068 msgid "show <n> context lines before matches" msgstr "mostra <n> lÃnies de context abans d'una coincidència" -#: builtin/grep.c:1051 +#: builtin/grep.c:1070 msgid "show <n> context lines after matches" msgstr "mostra <n> lÃnies de context després d'una coincidència" -#: builtin/grep.c:1053 +#: builtin/grep.c:1072 msgid "use <n> worker threads" msgstr "usa <n> fils de treball" -#: builtin/grep.c:1054 +#: builtin/grep.c:1073 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:1057 +#: builtin/grep.c:1076 msgid "show a line with the function name before matches" msgstr "mostra una lÃnia amb el nom de funció abans de les coincidències" -#: builtin/grep.c:1059 +#: builtin/grep.c:1078 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:1062 +#: builtin/grep.c:1081 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:1064 +#: builtin/grep.c:1083 msgid "match <pattern>" msgstr "coincideix amb <patró>" -#: builtin/grep.c:1066 +#: builtin/grep.c:1085 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:1078 +#: builtin/grep.c:1097 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:1080 +#: builtin/grep.c:1099 msgid "show only matches from files that match all patterns" -msgstr "mostra només les coincidències dels fitxers que coincideixin amb tots els patrons" +msgstr "" +"mostra només les coincidències dels fitxers que coincideixin amb tots els " +"patrons" -#: builtin/grep.c:1082 +#: builtin/grep.c:1101 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anà lisis de l'expressió de grep" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "pager" msgstr "paginador" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:1089 +#: builtin/grep.c:1108 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:1153 +#: builtin/grep.c:1172 msgid "no pattern given." msgstr "cap patró donat." -#: builtin/grep.c:1189 +#: builtin/grep.c:1204 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no es pot usar amb revisions" -#: builtin/grep.c:1195 +#: builtin/grep.c:1211 #, c-format msgid "unable to resolve revision: %s" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/grep.c:1228 builtin/index-pack.c:1485 +#: builtin/grep.c:1245 builtin/index-pack.c:1490 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no và lid (%d)" -#: builtin/grep.c:1251 +#: builtin/grep.c:1250 +#, fuzzy +msgid "no threads support, ignoring --threads" +msgstr "no hi ha suport de fils, s'està ignorant %s" + +#: builtin/grep.c:1281 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager només funciona en l'arbre de treball" -#: builtin/grep.c:1274 +#: builtin/grep.c:1304 msgid "option not supported with --recurse-submodules." msgstr "opció no admesa amb --recurse-submodules." -#: builtin/grep.c:1280 +#: builtin/grep.c:1310 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached o --untracked no es pot usar amb --no-index." -#: builtin/grep.c:1286 +#: builtin/grep.c:1316 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." -#: builtin/grep.c:1294 +#: builtin/grep.c:1324 msgid "both --cached and trees are given." msgstr "s'han donat ambdós --caches i arbres." -#: builtin/hash-object.c:81 -msgid "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..." +#: builtin/hash-object.c:82 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." msgstr "" -"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] [--] <fitxer>..." +"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] " +"[--] <fitxer>..." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "type" msgstr "tipus" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "object type" msgstr "tipus d'objecte" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "write the object into the object database" msgstr "escriu l'objecte a la base de dades d'objectes" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "read the object from stdin" msgstr "llegeix l'objecte des d'stdin" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "store file as is without filters" msgstr "emmagatzema el fitxer tal com és sense filtres" -#: builtin/hash-object.c:100 -msgid "just hash any random garbage to create corrupt objects for debugging Git" -msgstr "només suma qualsevol brossa aleatòria per a crear objectes malmesos per a depurar al Git" - #: builtin/hash-object.c:101 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "" +"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a " +"depurar al Git" + +#: builtin/hash-object.c:102 msgid "process file as it were from this path" msgstr "processa el fitxer com si fos d'aquest camÃ" -#: builtin/help.c:42 +#: builtin/help.c:43 msgid "print all available commands" msgstr "imprimeix totes les ordres disponibles" -#: builtin/help.c:43 +#: builtin/help.c:44 msgid "exclude guides" msgstr "exclou guies" -#: builtin/help.c:44 +#: builtin/help.c:45 msgid "print list of useful guides" msgstr "imprimeix la llista de guies útils" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "show man page" msgstr "mostra la pà gina de manual" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "show manual in web browser" msgstr "mostra la pà gina de manual en el navegador web" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "show info page" msgstr "mostra la pà gina d'informació" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]" -#: builtin/help.c:66 +#: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'ajuda no reconegut '%s'" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "S'ha produït un error en analitzar la versió d'emacsclient." -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versió d'emacsclient '%d' és massa vella (< 22)." -#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 +#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 #, c-format msgid "failed to exec '%s'" msgstr "s'ha produït un error en executar '%s'" -#: builtin/help.c:207 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8567,7 +8939,7 @@ msgstr "" "'%s': camà a un visualitzador de manuals no compatible.\n" "Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això." -#: builtin/help.c:219 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8576,132 +8948,132 @@ msgstr "" "'%s': ordre per a un visualitzador de manuals compatible.\n" "Si us plau, considereu usar 'man.<eina>.path' en lloc d'això." -#: builtin/help.c:336 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualitzador de manuals desconegut." -#: builtin/help.c:353 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "cap visualitzador de manuals ha gestionat la sol·licitud" -#: builtin/help.c:361 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "cap visualitzador d'informació ha gestionat la sol·licitud" -#: builtin/help.c:403 +#: builtin/help.c:404 msgid "Defining attributes per path" msgstr "La definició d'atributs per camÃ" -#: builtin/help.c:404 +#: builtin/help.c:405 msgid "Everyday Git With 20 Commands Or So" msgstr "Git quotidià amb més o menys 20 ordres" -#: builtin/help.c:405 +#: builtin/help.c:406 msgid "A Git glossary" msgstr "Un glossari de Git" -#: builtin/help.c:406 +#: builtin/help.c:407 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica els fitxers intencionalment no seguits a ignorar" -#: builtin/help.c:407 +#: builtin/help.c:408 msgid "Defining submodule properties" msgstr "La definició de les propietats de submòduls" -#: builtin/help.c:408 +#: builtin/help.c:409 msgid "Specifying revisions and ranges for Git" msgstr "L'especificació de revisions i rangs per al Git" -#: builtin/help.c:409 +#: builtin/help.c:410 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)" -#: builtin/help.c:410 +#: builtin/help.c:411 msgid "An overview of recommended workflows with Git" msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git" -#: builtin/help.c:422 +#: builtin/help.c:423 msgid "The common Git guides are:\n" msgstr "Les guies de Git comunes són:\n" -#: builtin/help.c:440 +#: builtin/help.c:441 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' és un à lies de `%s'" -#: builtin/help.c:462 builtin/help.c:479 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "ús: %s%s" -#: builtin/index-pack.c:154 +#: builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "object type mismatch at %s" msgstr "hi ha una discordança de tipus d'objecte a %s" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, c-format msgid "did not receive expected object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objecte %s: tipus %s esperat, %s trobat" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:270 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no es pot omplir %d octet" msgstr[1] "no es pot omplir %d octets" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "early EOF" msgstr "EOF prematur" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "read error on input" msgstr "error de lectura d'entrada" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:293 msgid "used more bytes than were available" msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:299 +#: builtin/index-pack.c:300 msgid "pack too large for current definition of off_t" msgstr "paquet massa gran per a la definició actual d'off_t" -#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "el paquet supera la mida mà xima permesa" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "unable to create '%s'" msgstr "no s'ha pogut crear '%s'" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:324 #, c-format msgid "cannot open packfile '%s'" msgstr "no es pot obrir el fitxer de paquet '%s'" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:338 msgid "pack signature mismatch" msgstr "hi ha una discordança de signatura de paquet" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:340 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la versió de paquet %<PRIu32> no és compatible" -#: builtin/index-pack.c:357 +#: builtin/index-pack.c:358 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s" @@ -8713,7 +9085,8 @@ msgstr "la inflació ha retornat %d" #: builtin/index-pack.c:528 msgid "offset value overflow for delta base object" -msgstr "desbordament de valor de desplaçament per a l'objecte base de diferències" +msgstr "" +"desbordament de valor de desplaçament per a l'objecte base de diferències" #: builtin/index-pack.c:536 msgid "delta base offset is out of bound" @@ -8733,19 +9106,21 @@ msgstr "no es pot fer pread en el fitxer de paquet" msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "el final del fitxer de paquet és prematur, manca %<PRIuMAX> octet" -msgstr[1] "el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets" +msgstr[1] "" +"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets" #: builtin/index-pack.c:603 msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 #: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:164 builtin/pack-objects.c:257 +#: builtin/index-pack.c:751 builtin/pack-objects.c:167 +#: builtin/pack-objects.c:261 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" @@ -8765,293 +9140,291 @@ msgstr "no es pot llegir l'objecte existent %s" msgid "invalid blob object %s" msgstr "objecte de blob no và lid %s" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:851 #, c-format msgid "invalid %s" msgstr "%s no và lid" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:854 msgid "Error in object" msgstr "Error en objecte" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c:856 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No tots els objectes fills de %s són abastables" -#: builtin/index-pack.c:927 builtin/index-pack.c:958 +#: builtin/index-pack.c:928 builtin/index-pack.c:959 msgid "failed to apply delta" msgstr "s'ha produït un error en aplicar la diferència" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1164 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és malmès (discordança SHA1)" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1169 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1168 +#: builtin/index-pack.c:1172 msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1179 +#: builtin/index-pack.c:1184 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1202 +#: builtin/index-pack.c:1207 msgid "Resolving deltas" msgstr "S'estan resolent les diferències" -#: builtin/index-pack.c:1213 +#: builtin/index-pack.c:1218 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1260 msgid "confusion beyond insanity" msgstr "confusió més enllà de la bogeria" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "s'ha completat amb %d objecte local" msgstr[1] "s'ha completat amb %d objectes locals" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1278 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)" -#: builtin/index-pack.c:1277 +#: builtin/index-pack.c:1282 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet té %d diferència no resolta" msgstr[1] "El paquet té %d diferències no resoltes" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1306 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1377 +#: builtin/index-pack.c:1382 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és malmès" -#: builtin/index-pack.c:1403 +#: builtin/index-pack.c:1408 msgid "error while closing pack file" msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1420 #, c-format msgid "cannot write keep file '%s'" msgstr "no es pot escriure el fitxer a retenir '%s'" -#: builtin/index-pack.c:1423 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot close written keep file '%s'" msgstr "no es pot tancar el fitxer escrit a retenir '%s'" -#: builtin/index-pack.c:1433 +#: builtin/index-pack.c:1438 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1446 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'Ãndex" -#: builtin/index-pack.c:1479 +#: builtin/index-pack.c:1484 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> dolent" -#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "no hi ha suport de fils, s'està ignorant %s" - -#: builtin/index-pack.c:1547 +#: builtin/index-pack.c:1552 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer de paquet existent '%s'" -#: builtin/index-pack.c:1549 +#: builtin/index-pack.c:1554 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'Ãndex de paquets existent de '%s'" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1602 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "sense diferències: %d objecte" msgstr[1] "sense diferències: %d objectes" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1609 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1616 +#: builtin/index-pack.c:1622 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom del fitxer de paquet '%s' no acaba amb '.pack'" -#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 builtin/index-pack.c:1717 -#: builtin/index-pack.c:1721 +#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 +#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 #, c-format msgid "bad %s" msgstr "%s dolent" -#: builtin/index-pack.c:1737 +#: builtin/index-pack.c:1743 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1745 msgid "--stdin requires a git repository" msgstr "--stdin requereix d'un dipòsit git" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1753 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" -#: builtin/init-db.c:54 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "no es pot fer stat en '%s'" -#: builtin/init-db.c:60 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "no es pot fer stat en la plantilla '%s'" -#: builtin/init-db.c:65 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "no es pot fer opendir en el directori '%s'" -#: builtin/init-db.c:76 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "no es pot fer readlink en '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "no es pot fer symlink en '%s' '%s'" -#: builtin/init-db.c:84 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "no es pot copiar '%s' a '%s'" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "s'està ignorant la plantilla %s" -#: builtin/init-db.c:119 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "no s'han trobat les plantilles %s" -#: builtin/init-db.c:134 +#: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "no s'està copiant plantilles de '%s': %s" -#: builtin/init-db.c:327 +#: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "no s'ha pogut gestionar el tipus de fitxer %d" -#: builtin/init-db.c:330 +#: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "no s'ha pogut moure %s a %s" -#: builtin/init-db.c:347 builtin/init-db.c:350 +#: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "%s ja existeix" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n" -#: builtin/init-db.c:457 +#: builtin/init-db.c:458 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] " -"[<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--shared[=<permisos>]] " -"[<directori>]" +"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" +"shared[=<permisos>]] [<directori>]" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris" -#: builtin/init-db.c:515 builtin/init-db.c:520 +#: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "no es pot mkdir %s" -#: builtin/init-db.c:524 +#: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "no es pot canviar de directori a %s" -#: builtin/init-db.c:545 +#: builtin/init-db.c:546 #, c-format msgid "" -"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)" -msgstr "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-dir=<directori>)" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-" +"dir=<directori>)" -#: builtin/init-db.c:573 +#: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "No es pot accedir a l'arbre de treball '%s'" #: builtin/interpret-trailers.c:15 msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " -"[<file>...]" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<value>])...] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <testimoni>[(=|:)<valor>])...] " -"[<fitxer>...]" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<testimoni>[(=|:)<valor>])...] [<fitxer>...]" #: builtin/interpret-trailers.c:26 msgid "edit files in place" @@ -9073,333 +9446,343 @@ msgstr "remolcs a afegir" msgid "no input file given for in-place editing" msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camÃ>...]" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git show [<options>] <object>..." msgstr "git show [<opcions>] <objecte>..." -#: builtin/log.c:89 +#: builtin/log.c:90 #, c-format msgid "invalid --decorate option: %s" msgstr "opció --decorate no và lida: %s" -#: builtin/log.c:144 +#: builtin/log.c:147 msgid "suppress diff output" msgstr "omet la sortida de diferències" -#: builtin/log.c:145 +#: builtin/log.c:148 msgid "show source" msgstr "mostra la font" -#: builtin/log.c:146 +#: builtin/log.c:149 msgid "Use mail map file" msgstr "Usa el fitxer de mapa de correu" -#: builtin/log.c:147 +#: builtin/log.c:150 msgid "decorate options" msgstr "opcions de decoració" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Process line range n,m in file, counting from 1" msgstr "Processa el rang de lÃnies n,m en el fitxer, comptant des d'1" -#: builtin/log.c:246 +#: builtin/log.c:249 #, c-format msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:493 +#: builtin/log.c:497 #, c-format msgid "git show %s: bad file" msgstr "git show %s: fitxer dolent" -#: builtin/log.c:507 builtin/log.c:601 +#: builtin/log.c:512 builtin/log.c:606 #, c-format msgid "Could not read object %s" msgstr "No es pot llegir l'objecte %s" -#: builtin/log.c:625 +#: builtin/log.c:630 #, c-format msgid "Unknown type: %d" msgstr "Tipus desconegut: %d" -#: builtin/log.c:746 +#: builtin/log.c:751 msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:846 +#: builtin/log.c:852 msgid "name of output directory is too long" msgstr "el nom del directori de sortida és massa llarg" -#: builtin/log.c:861 +#: builtin/log.c:868 #, c-format msgid "Cannot open patch file %s" msgstr "No es pot obrir el fitxer de pedaç %s" -#: builtin/log.c:875 +#: builtin/log.c:885 msgid "Need exactly one range." msgstr "Cal exactament un rang." -#: builtin/log.c:885 +#: builtin/log.c:895 msgid "Not a range." msgstr "No és un rang." -#: builtin/log.c:991 +#: builtin/log.c:1001 msgid "Cover letter needs email format" msgstr "La carta de presentació necessita el format de correu electrònic" -#: builtin/log.c:1071 +#: builtin/log.c:1081 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1098 +#: builtin/log.c:1108 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]" -#: builtin/log.c:1148 +#: builtin/log.c:1158 msgid "Two output directories?" msgstr "Hi ha dos directoris de sortida?" -#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 +#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 #, c-format msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 +#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "S'ha produït un error en resoldre '%s' com a referència và lida." -#: builtin/log.c:1270 +#: builtin/log.c:1280 msgid "Could not find exact merge base." msgstr "No s'ha pogut trobar la base exacta de fusió." -#: builtin/log.c:1274 +#: builtin/log.c:1284 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 "" -"S'ha produït un error en obtenir la font. Si voleu registrar la comissió base\n" +"S'ha produït un error en obtenir la font. Si voleu registrar la comissió " +"base\n" "automà ticament, si us plau, useu git branch --set-upstream-to per a\n" "seguir una branca remota. O podeu especificar la comissió base manualment\n" "amb --base=<id-de-comissió-base>." -#: builtin/log.c:1294 +#: builtin/log.c:1304 msgid "Failed to find exact merge base" msgstr "S'ha produït un error en trobar la base exacta de fusió." -#: builtin/log.c:1305 +#: builtin/log.c:1315 msgid "base commit should be the ancestor of revision list" msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions" -#: builtin/log.c:1309 +#: builtin/log.c:1319 msgid "base commit shouldn't be in revision list" msgstr "la comissió base no ha de ser en la llista de revisions" -#: builtin/log.c:1358 +#: builtin/log.c:1368 msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaç" -#: builtin/log.c:1415 +#: builtin/log.c:1425 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç" -#: builtin/log.c:1418 +#: builtin/log.c:1428 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb múltiples pedaços" -#: builtin/log.c:1422 +#: builtin/log.c:1432 msgid "print patches to standard out" msgstr "imprimeix els pedaços a la sortida està ndard" -#: builtin/log.c:1424 +#: builtin/log.c:1434 msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:1426 +#: builtin/log.c:1436 msgid "use simple number sequence for output file names" msgstr "usa una seqüència de números per als noms dels fitxers de sortida" -#: builtin/log.c:1427 +#: builtin/log.c:1437 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1428 +#: builtin/log.c:1438 msgid "use <sfx> instead of '.patch'" msgstr "usa <sufix> en lloc de '.patch'" -#: builtin/log.c:1430 +#: builtin/log.c:1440 msgid "start numbering patches at <n> instead of 1" msgstr "comença numerant els pedaços a <n> en lloc d'1" -#: builtin/log.c:1432 +#: builtin/log.c:1442 msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" -#: builtin/log.c:1434 +#: builtin/log.c:1444 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] en lloc de [PATCH]" -#: builtin/log.c:1437 +#: builtin/log.c:1447 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefix>] en lloc de [PATCH]" -#: builtin/log.c:1440 +#: builtin/log.c:1450 msgid "store resulting files in <dir>" msgstr "emmagatzema els fitxers resultants a <directori>" -#: builtin/log.c:1443 +#: builtin/log.c:1453 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1446 +#: builtin/log.c:1456 msgid "don't output binary diffs" msgstr "no emetis diferències binà ries" -#: builtin/log.c:1448 +#: builtin/log.c:1458 msgid "output all-zero hash in From header" msgstr "emet un hash de tots zeros en la capçalera From" -#: builtin/log.c:1450 +#: builtin/log.c:1460 msgid "don't include a patch matching a commit upstream" msgstr "no incloguis pedaços que coincideixin amb comissions a la font" -#: builtin/log.c:1452 +#: builtin/log.c:1462 msgid "show patch format instead of default (patch + stat)" -msgstr "mostra el format de pedaç en lloc del per defecte (pedaç + estadÃstiques)" +msgstr "" +"mostra el format de pedaç en lloc del per defecte (pedaç + estadÃstiques)" -#: builtin/log.c:1454 +#: builtin/log.c:1464 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1455 +#: builtin/log.c:1465 msgid "header" msgstr "capçalera" -#: builtin/log.c:1456 +#: builtin/log.c:1466 msgid "add email header" msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:1457 builtin/log.c:1459 +#: builtin/log.c:1467 builtin/log.c:1469 msgid "email" msgstr "correu electrònic" -#: builtin/log.c:1457 +#: builtin/log.c:1467 msgid "add To: header" msgstr "afegeix la capçalera To:" -#: builtin/log.c:1459 +#: builtin/log.c:1469 msgid "add Cc: header" msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:1461 +#: builtin/log.c:1471 msgid "ident" msgstr "identitat" -#: builtin/log.c:1462 +#: builtin/log.c:1472 msgid "set From address to <ident> (or committer ident if absent)" -msgstr "estableix l'adreça From a <identitat> (o la identitat del comitent si manca)" +msgstr "" +"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)" -#: builtin/log.c:1464 +#: builtin/log.c:1474 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1465 +#: builtin/log.c:1475 msgid "make first mail a reply to <message-id>" msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>" -#: builtin/log.c:1466 builtin/log.c:1469 +#: builtin/log.c:1476 builtin/log.c:1479 msgid "boundary" msgstr "lÃmit" -#: builtin/log.c:1467 +#: builtin/log.c:1477 msgid "attach the patch" msgstr "ajunta el pedaç" -#: builtin/log.c:1470 +#: builtin/log.c:1480 msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:1474 +#: builtin/log.c:1484 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1476 +#: builtin/log.c:1486 msgid "signature" msgstr "signatura" -#: builtin/log.c:1477 +#: builtin/log.c:1487 msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:1478 +#: builtin/log.c:1488 msgid "base-commit" msgstr "comissió base" -#: builtin/log.c:1479 +#: builtin/log.c:1489 msgid "add prerequisite tree info to the patch series" msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços" -#: builtin/log.c:1481 +#: builtin/log.c:1491 msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:1482 +#: builtin/log.c:1492 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:1572 +#: builtin/log.c:1567 +#, c-format +msgid "invalid ident line: %s" +msgstr "lÃnia d'identitat no và lida: %s" + +#: builtin/log.c:1582 msgid "-n and -k are mutually exclusive." msgstr "-n i -k són mutualment exclusius." -#: builtin/log.c:1574 +#: builtin/log.c:1584 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc i -k són mutualment exclusius." -#: builtin/log.c:1582 +#: builtin/log.c:1592 msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:1584 +#: builtin/log.c:1594 msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:1586 +#: builtin/log.c:1596 msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:1616 +#: builtin/log.c:1626 msgid "standard output, or directory, which one?" msgstr "sortida està ndard o directori, quin dels dos?" -#: builtin/log.c:1618 +#: builtin/log.c:1628 #, c-format msgid "Could not create directory '%s'" msgstr "No s'ha pogut crear el directori '%s'" -#: builtin/log.c:1712 +#: builtin/log.c:1722 #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura '%s'" -#: builtin/log.c:1784 +#: builtin/log.c:1794 msgid "Failed to create output files" msgstr "S'ha produït un error en crear els fitxers de sortida" -#: builtin/log.c:1833 +#: builtin/log.c:1843 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<font> [<cap> [<lÃmit>]]]" -#: builtin/log.c:1887 +#: builtin/log.c:1897 #, c-format -msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu <font> manualment.\n" +"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu " +"<font> manualment.\n" #: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" @@ -9415,7 +9798,8 @@ msgstr "usa lletres minúscules per als fitxers 'assume unchanged'" #: builtin/ls-files.c:521 msgid "show cached files in the output (default)" -msgstr "mostra en la sortida els fitxers desats en la memòria cau (per defecte)" +msgstr "" +"mostra en la sortida els fitxers desats en la memòria cau (per defecte)" #: builtin/ls-files.c:523 msgid "show deleted files in the output" @@ -9495,7 +9879,8 @@ msgstr "arbre" #: builtin/ls-files.c:565 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "pretén que els camins eliminats després de <arbre> encara siguin presents" +msgstr "" +"pretén que els camins eliminats després de <arbre> encara siguin presents" #: builtin/ls-files.c:567 msgid "show debugging data" @@ -9548,211 +9933,221 @@ msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident" msgid "show underlying ref in addition to the object pointed by it" msgstr "mostra la referència subjacent a més de l'objecte que senyali" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<opcions>] <arbre> [<camÃ>...]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "mostra només els arbres" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "inclou recursivament als subarbres" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" -msgstr "mostra els arbres en recursar" +msgstr "mostra els arbres quan es treballa recursivament" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "acaba les entrades amb un octet NUL" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "mida de l'objecte d'inclusió" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "llista només els noms de fitxer" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "usa els noms de camà complets" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" -msgstr "llista l'arbre sencer; no només el directori actual (implica --full-name)" +msgstr "" +"llista l'arbre sencer; no només el directori actual (implica --full-name)" -#: builtin/merge.c:46 +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "" + +#: builtin/merge.c:47 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opcions>] [<comissió>...]" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:103 +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "l'opció `m' requereix un valor" -#: builtin/merge.c:140 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:196 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "no mostris les estadÃstiques de diferència al final de la fusió" -#: builtin/merge.c:199 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "mostra les estadÃstiques de diferència al final de la fusió" -#: builtin/merge.c:200 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:202 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" -msgstr "afegeix (com a mà xim <n>) entrades del registre curt al missatge de comissió de fusió" +msgstr "" +"afegeix (com a mà xim <n>) entrades del registre curt al missatge de comissió " +"de fusió" -#: builtin/merge.c:205 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:207 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:209 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:152 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:210 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "permet l'avanç rà pid (per defecte)" -#: builtin/merge.c:212 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç rà pid no és possible" -#: builtin/merge.c:216 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "verifica que la comissió anomenada tingui una signatura GPG và lida" -#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 builtin/revert.c:108 +#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/revert.c:109 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:218 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:166 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:169 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:220 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge.c:222 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "missatge de comissió de fusió (per a una fusió no d'avanç rà pid)" -#: builtin/merge.c:226 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:228 +#: builtin/merge.c:229 msgid "continue the current in-progress merge" msgstr "continua la fusió en curs actual" -#: builtin/merge.c:230 builtin/pull.c:170 +#: builtin/merge.c:231 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" -#: builtin/merge.c:258 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "no s'ha pogut executar stash." -#: builtin/merge.c:263 +#: builtin/merge.c:264 msgid "stash failed" msgstr "l'emmagatzemament ha fallat" -#: builtin/merge.c:268 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "no és un objecte và lid: %s" -#: builtin/merge.c:287 builtin/merge.c:304 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:334 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (res a fer «squash»)" -#: builtin/merge.c:345 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:395 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:446 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no assenyala una comissió" -#: builtin/merge.c:536 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions dolenta: %s" -#: builtin/merge.c:656 +#: builtin/merge.c:657 msgid "Not handling anything other than two heads merge." msgstr "No s'està gestionant res a part de la fusió de dos caps." -#: builtin/merge.c:670 +#: builtin/merge.c:671 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:685 +#: builtin/merge.c:686 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:737 +#: builtin/merge.c:738 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de '%s'" -#: builtin/merge.c:746 +#: builtin/merge.c:747 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n" +msgstr "" +"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n" -#: builtin/merge.c:752 +#: builtin/merge.c:753 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9768,73 +10163,70 @@ msgstr "" "S'ignoraran les lÃnies que comencin amb '%c', i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:776 +#: builtin/merge.c:777 msgid "Empty commit message." msgstr "El missatge de comissió és buit." -#: builtin/merge.c:796 +#: builtin/merge.c:797 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:851 +#: builtin/merge.c:850 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" -msgstr "La fusió automà tica ha fallat; arregleu els conflictes i després cometeu el resultat.\n" +msgstr "" +"La fusió automà tica ha fallat; arregleu els conflictes i després cometeu el " +"resultat.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:889 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:892 +#: builtin/merge.c:891 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:894 +#: builtin/merge.c:893 msgid "No default upstream defined for the current branch." msgstr "No hi ha cap font per defecte definida per a la branca actual." -#: builtin/merge.c:899 +#: builtin/merge.c:898 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" -#: builtin/merge.c:946 +#: builtin/merge.c:945 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor dolent '%s' en l'entorn '%s'" -#: builtin/merge.c:1020 -#, c-format -msgid "could not close '%s'" -msgstr "no s'ha pogut tancar '%s'" - -#: builtin/merge.c:1047 +#: builtin/merge.c:1046 #, c-format msgid "not something we can merge in %s: %s" msgstr "no és quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1081 +#: builtin/merge.c:1080 msgid "not something we can merge" msgstr "no és quelcom que puguem fusionar" -#: builtin/merge.c:1146 +#: builtin/merge.c:1145 msgid "--abort expects no arguments" msgstr "--abort no accepta parà metres" -#: builtin/merge.c:1150 +#: builtin/merge.c:1149 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1162 +#: builtin/merge.c:1161 msgid "--continue expects no arguments" msgstr "--continue no accepta parà metres" -#: builtin/merge.c:1166 +#: builtin/merge.c:1165 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)." -#: builtin/merge.c:1182 +#: builtin/merge.c:1181 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9842,7 +10234,7 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1189 +#: builtin/merge.c:1188 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9850,192 +10242,198 @@ msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Si us plau, cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1192 +#: builtin/merge.c:1191 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1201 +#: builtin/merge.c:1200 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1209 +#: builtin/merge.c:1208 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "No hi ha una comissió especificada i merge.defaultToUpstream no està establert." +msgstr "" +"No hi ha una comissió especificada i merge.defaultToUpstream no està " +"establert." -#: builtin/merge.c:1226 +#: builtin/merge.c:1225 msgid "Squash commit into empty head not supported yet" msgstr "Una comissió «squash» a un HEAD buit encara no es permet" -#: builtin/merge.c:1228 +#: builtin/merge.c:1227 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Una comissió no d'avanç rà pid no té sentit a un HEAD buit" -#: builtin/merge.c:1233 +#: builtin/merge.c:1232 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1235 +#: builtin/merge.c:1234 msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar només una comissió a un HEAD buit" -#: builtin/merge.c:1269 +#: builtin/merge.c:1268 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s." -#: builtin/merge.c:1272 +#: builtin/merge.c:1271 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s." -#: builtin/merge.c:1275 +#: builtin/merge.c:1274 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té signatura GPG." -#: builtin/merge.c:1278 +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una signatura GPG bona de %s\n" -#: builtin/merge.c:1340 +#: builtin/merge.c:1339 msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge.c:1349 +#: builtin/merge.c:1348 msgid "Already up-to-date." msgstr "Ja està al dia." -#: builtin/merge.c:1359 +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1400 +#: builtin/merge.c:1399 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "S'està intentant una fusió molt trivial en l'Ãndex...\n" -#: builtin/merge.c:1407 +#: builtin/merge.c:1406 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1432 +#: builtin/merge.c:1431 msgid "Already up-to-date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1438 +#: builtin/merge.c:1437 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar rà pidament, s'està avortant." -#: builtin/merge.c:1461 builtin/merge.c:1540 +#: builtin/merge.c:1460 builtin/merge.c:1539 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1465 +#: builtin/merge.c:1464 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1530 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1533 +#: builtin/merge.c:1532 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1541 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "S'està usant el %s per a preparar la resolució a mà .\n" -#: builtin/merge.c:1554 +#: builtin/merge.c:1553 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" -msgstr "La fusió automà tica ha sortit bé; s'ha aturat abans de cometre com s'havia demanat\n" +msgstr "" +"La fusió automà tica ha sortit bé; s'ha aturat abans de cometre com s'havia " +"demanat\n" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <comissió> <comissió>..." -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <comissió>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <comissió>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <comissió> <comissió>" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <referència> [<comissió>]" -#: builtin/merge-base.c:217 +#: builtin/merge-base.c:218 msgid "output all common ancestors" msgstr "emet tots els avantpassats comuns" -#: builtin/merge-base.c:219 +#: builtin/merge-base.c:220 msgid "find ancestors for a single n-way merge" msgstr "troba els avantpassats per a una sola fusió d'n vies" -#: builtin/merge-base.c:221 +#: builtin/merge-base.c:222 msgid "list revs not reachable from others" msgstr "llista les revisions no abastables d'altres" -#: builtin/merge-base.c:223 +#: builtin/merge-base.c:224 msgid "is the first one ancestor of the other?" msgstr "és la primera un avantpassat de l'altre?" -#: builtin/merge-base.c:225 +#: builtin/merge-base.c:226 msgid "find where <commit> forked from reflog of <ref>" -msgstr "troba on <comissió> s'ha bifurcat del registre de referències de <referència>" +msgstr "" +"troba on <comissió> s'ha bifurcat del registre de referències de <referència>" -#: builtin/merge-file.c:8 +#: builtin/merge-file.c:9 msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" msgstr "" -"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> <fitxer-original> " -"<fitxer2>" +"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> " +"<fitxer-original> <fitxer2>" -#: builtin/merge-file.c:32 +#: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "envia els resultats a la sortida està ndard" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "usa una fusió basada en diff3" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "en conflictes, usa la nostra versió" -#: builtin/merge-file.c:36 +#: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "en conflictes, usa la seva versió" -#: builtin/merge-file.c:38 +#: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "en conflictes, usa una versió d'unió" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "en conflictes, usa aquesta mida de marcador" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "no avisis de conflictes" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:45 msgid "set labels for file1/orig-file/file2" msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" @@ -10074,416 +10472,429 @@ msgstr "S'està fusionant %s amb %s\n" msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:152 +#: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "l'entrada és acabada amb NUL" -#: builtin/mktree.c:153 builtin/write-tree.c:24 +#: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "permet els objectes absents" -#: builtin/mktree.c:154 +#: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "permet la creació de més d'un arbre" -#: builtin/mv.c:16 +#: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<opcions>] <font>... <destÃ>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "El directori %s és en l'Ãndex i no hi ha cap submòdul?" -#: builtin/mv.c:84 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stage» dels mateixos per a procedir" +"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stage» dels " +"mateixos per a procedir" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s és en l'Ãndex" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "força el moviment / canvi de nom encara que el destà existeixi" -#: builtin/mv.c:125 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "omet els errors de moviment / canvi de nom" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "el destà '%s' no és un directori" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "S'està comprovant el canvi de nom de '%s' a '%s'\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "font dolenta" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "no es pot moure un directori a dins d'ell mateix" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "no es pot moure un directori sobre un fitxer" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "el directori font està buit" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "no està sota control de versions" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "el destà existeix" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "s'està sobreescrivint '%s'" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "No es pot sobreescriure" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "múltiples fonts per al mateix destÃ" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "el directori destà no existeix" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, origen=%s, destÃ=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "S'està canviant el nom de %s a %s\n" -#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 +#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" -#: builtin/name-rev.c:289 +#: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opcions>] <comissió>..." -#: builtin/name-rev.c:290 +#: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opcions>] --all" -#: builtin/name-rev.c:291 +#: builtin/name-rev.c:340 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opcions>] --stdin" -#: builtin/name-rev.c:346 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "imprimeix només els noms (sense SHA-1)" -#: builtin/name-rev.c:347 +#: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "només usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:349 +#: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" msgstr "només usa les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:351 +#: builtin/name-rev.c:400 msgid "ignore refs matching <pattern>" msgstr "ignora les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:403 msgid "read from stdin" msgstr "llegeix d'stdin" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "permet imprimir els noms `undefined` (per defecte)" -#: builtin/name-rev.c:361 +#: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "dereferencia les etiquetes en l'entrada (ús intern)" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "" -"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) " -"<object>] [<object>]" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"| (-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m <missatge> | -F <fitxer> | " -"(-c | -C) <objecte>] [<objecte>]" +"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m " +"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" -msgstr "git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>" +msgstr "" +"git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "" -"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] " -"[<object>]" +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"(-c | -C) <object>] [<object>]" msgstr "" -"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m <missatge> | -F <fitxer> | (-" -"c | -C) <objecte>] [<objecte>]" +"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m " +"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" -msgstr "git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]" +msgstr "" +"git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]" -#: builtin/notes.c:31 -msgid "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] <referència-de-notes>" +"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] " +"<referència-de-notes>" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <referència-de-notes>] prune [-n | -v]" -#: builtin/notes.c:36 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <referència-de-notes>] get-ref" -#: builtin/notes.c:41 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" msgstr "git notes [llista [<objecte>]]" -#: builtin/notes.c:46 +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<opcions>] [<objecte>]" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<opcions>] <d'objecte> <a-objecte>" -#: builtin/notes.c:52 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<d'objecte> <a-objecte>]..." -#: builtin/notes.c:57 +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<opcions>] [<objecte>]" -#: builtin/notes.c:62 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" msgstr "git notes edit [<objecte>]" -#: builtin/notes.c:67 +#: builtin/notes.c:68 msgid "git notes show [<object>]" msgstr "git notes show [<objecte>]" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<opcions>] <referència-de-notes>" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<opcions>]" -#: builtin/notes.c:74 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<opcions>]" -#: builtin/notes.c:79 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" msgstr "git notes remove [<objecte>]" -#: builtin/notes.c:84 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" msgstr "git notes prune [<opcions>]" -#: builtin/notes.c:89 +#: builtin/notes.c:90 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:94 +#: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "Escriviu/editeu les notes per l'objecte següent:" -#: builtin/notes.c:147 +#: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "no s'ha pogut iniciar 'show' per a l'objecte '%s'" -#: builtin/notes.c:151 +#: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "no s'ha pogut llegir la sortida de 'show'" -#: builtin/notes.c:159 +#: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte '%s'" -#: builtin/notes.c:194 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" -msgstr "si us plau, proveïu els continguts de la nota fent servir l'opció -m o l'opció -F" +msgstr "" +"si us plau, proveïu els continguts de la nota fent servir l'opció -m o " +"l'opció -F" -#: builtin/notes.c:203 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/notes.c:205 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "s'han deixat els continguts de la nota en %s" -#: builtin/notes.c:233 builtin/tag.c:516 +#: builtin/notes.c:234 builtin/tag.c:517 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir '%s'" -#: builtin/notes.c:235 builtin/tag.c:519 +#: builtin/notes.c:236 builtin/tag.c:520 #, c-format msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir o llegir '%s'" -#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 builtin/notes.c:372 -#: builtin/notes.c:427 builtin/notes.c:513 builtin/notes.c:518 builtin/notes.c:596 -#: builtin/notes.c:658 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 +#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "s'ha produït un error en resoldre '%s' com a referència và lida." -#: builtin/notes.c:257 +#: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "s'ha produït un error en llegir l'objecte '%s'." -#: builtin/notes.c:261 +#: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "no es pot llegir les dades de node de l'objecte no de blob '%s'." -#: builtin/notes.c:301 +#: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "lÃnia d'entrada mal formada: '%s'." -#: builtin/notes.c:316 +#: builtin/notes.c:317 #, c-format msgid "failed to copy notes from '%s' to '%s'" 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. -#: builtin/notes.c:345 +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. +#: builtin/notes.c:348 #, 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/)" -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 builtin/notes.c:508 -#: builtin/notes.c:584 builtin/notes.c:651 builtin/notes.c:801 builtin/notes.c:948 -#: builtin/notes.c:969 +#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 +#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 +#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 msgid "too many parameters" msgstr "massa parà metres" -#: builtin/notes.c:378 builtin/notes.c:664 +#: builtin/notes.c:381 builtin/notes.c:667 #, c-format msgid "no note found for object %s." msgstr "no s'ha trobat cap nota per a l'objecte %s." -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents as a string" msgstr "anota els continguts com a cadena" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents in a file" msgstr "anota els continguts en un fitxer" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse and edit specified note object" msgstr "reusa i edita l'objecte de nota especificat" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse specified note object" msgstr "reusa l'objecte de nota especificat" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "allow storing empty note" msgstr "permet l'emmagatzematge d'una nota buida" -#: builtin/notes.c:412 builtin/notes.c:483 +#: builtin/notes.c:415 builtin/notes.c:486 msgid "replace existing notes" msgstr "reemplaça les notes existents" -#: builtin/notes.c:437 +#: builtin/notes.c:440 #, c-format -msgid "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" msgstr "" -"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. Useu '-f' per a " -"sobreescriure les notes existents." +"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. " +"Useu '-f' per a sobreescriure les notes existents." -#: builtin/notes.c:452 builtin/notes.c:531 +#: builtin/notes.c:455 builtin/notes.c:534 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n" -#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 +#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 #, c-format msgid "Removing note for object %s\n" msgstr "S'està eliminant la nota de l'objecte %s\n" -#: builtin/notes.c:484 +#: builtin/notes.c:487 msgid "read objects from stdin" msgstr "llegeix els objectes des d'stdin" -#: builtin/notes.c:486 +#: builtin/notes.c:489 msgid "load rewriting config for <command> (implies --stdin)" -msgstr "carrega la configuració de reescriptura per a <ordre> (implica --stdin)" +msgstr "" +"carrega la configuració de reescriptura per a <ordre> (implica --stdin)" -#: builtin/notes.c:504 +#: builtin/notes.c:507 msgid "too few parameters" msgstr "hi ha massa pocs parà metres" -#: builtin/notes.c:525 +#: builtin/notes.c:528 #, c-format -msgid "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" msgstr "" -"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. Useu '-f' per a " -"sobreescriure les notes existents." +"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. " +"Useu '-f' per a sobreescriure les notes existents." -#: builtin/notes.c:537 +#: builtin/notes.c:540 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "manquen notes a l'objecte font %s. No es pot copiar." -#: builtin/notes.c:589 +#: builtin/notes.c:592 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10492,318 +10903,342 @@ msgstr "" "Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" "Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n" -#: builtin/notes.c:684 +#: builtin/notes.c:687 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL" -#: builtin/notes.c:686 +#: builtin/notes.c:689 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF" -#: builtin/notes.c:688 +#: builtin/notes.c:691 msgid "failed to remove 'git notes merge' worktree" -msgstr "s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'" +msgstr "" +"s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'" -#: builtin/notes.c:708 +#: builtin/notes.c:711 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL" -#: builtin/notes.c:710 +#: builtin/notes.c:713 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:712 +#: builtin/notes.c:715 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:725 +#: builtin/notes.c:728 msgid "failed to resolve NOTES_MERGE_REF" msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF" -#: builtin/notes.c:728 +#: builtin/notes.c:731 msgid "failed to finalize notes merge" msgstr "s'ha produït un error en finalitzar la fusió de notes" -#: builtin/notes.c:754 +#: builtin/notes.c:757 #, c-format msgid "unknown notes merge strategy %s" msgstr "estratègia de fusió de notes desconeguda %s" -#: builtin/notes.c:770 +#: builtin/notes.c:773 msgid "General options" msgstr "Opcions generals" -#: builtin/notes.c:772 +#: builtin/notes.c:775 msgid "Merge options" msgstr "Opcions de fusió" -#: builtin/notes.c:774 -msgid "resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)" +#: builtin/notes.c:777 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" msgstr "" -"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/union/cat_sort_uniq)" +"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/" +"union/cat_sort_uniq)" -#: builtin/notes.c:776 +#: builtin/notes.c:779 msgid "Committing unmerged notes" msgstr "S'estan cometent les notes sense fusionar" -#: builtin/notes.c:778 +#: builtin/notes.c:781 msgid "finalize notes merge by committing unmerged notes" msgstr "finalitza la fusió de notes cometent les notes sense fusionar" -#: builtin/notes.c:780 +#: builtin/notes.c:783 msgid "Aborting notes merge resolution" msgstr "S'està avortant la resolució de fusió de notes" -#: builtin/notes.c:782 +#: builtin/notes.c:785 msgid "abort notes merge" msgstr "avorta la fusió de notes" -#: builtin/notes.c:793 +#: builtin/notes.c:796 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "no es pot combinar --commit, --abort i -s/--strategy" -#: builtin/notes.c:798 +#: builtin/notes.c:801 msgid "must specify a notes ref to merge" msgstr "cal especificar una referència de notes a fusionar" -#: builtin/notes.c:822 +#: builtin/notes.c:825 #, c-format msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy desconeguda: %s" -#: builtin/notes.c:859 +#: builtin/notes.c:862 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "una fusió de notes a %s ja està en curs a %s" -#: builtin/notes.c:862 +#: builtin/notes.c:865 #, c-format msgid "failed to store link to current notes ref (%s)" -msgstr "s'ha produït un error en emmagatzemar l'enllaç a la referència de notes actual (%s)" +msgstr "" +"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes " +"actual (%s)" -#: builtin/notes.c:864 +#: builtin/notes.c:867 #, 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" +"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 "" -"La fusió de notes automà tica ha fallat. Arregleu els conflictes en %s i cometeu el resultat amb " -"'git notes merge --commit', o avorteu la fusió amb 'git notes merge --abort'.\n" +"La fusió de notes automà tica ha fallat. Arregleu els conflictes en %s i " +"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb " +"'git notes merge --abort'.\n" -#: builtin/notes.c:886 +#: builtin/notes.c:889 #, c-format msgid "Object %s has no note\n" msgstr "L'objecte %s no té cap nota\n" -#: builtin/notes.c:898 +#: builtin/notes.c:901 msgid "attempt to remove non-existent note is not an error" msgstr "l'intent d'eliminar una nota no existent no és un error" -#: builtin/notes.c:901 +#: builtin/notes.c:904 msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada està ndard" -#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 msgid "do not remove, show only" msgstr "no eliminis, només mostra" -#: builtin/notes.c:940 +#: builtin/notes.c:943 msgid "report pruned notes" msgstr "informa de notes podades" -#: builtin/notes.c:982 +#: builtin/notes.c:985 msgid "notes-ref" msgstr "referència de notes" -#: builtin/notes.c:983 +#: builtin/notes.c:986 msgid "use notes from <notes-ref>" msgstr "usa les notes de <referència-de-notes>" -#: builtin/notes.c:1018 +#: builtin/notes.c:1021 #, c-format msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" -#: builtin/pack-objects.c:29 -msgid "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +#: builtin/pack-objects.c:30 +msgid "" +"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < <llista-de-objectes>]" +"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < " +"<llista-de-objectes>]" -#: builtin/pack-objects.c:30 -msgid "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" +#: builtin/pack-objects.c:31 +msgid "" +"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < <llista-de-objectes>]" +"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < " +"<llista-de-objectes>]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: builtin/pack-objects.c:770 +#: builtin/pack-objects.c:776 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets a causa de pack." -"packSizeLimit" +"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets " +"a causa de pack.packSizeLimit" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:789 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:1063 +#: builtin/pack-objects.c:1069 msgid "disabling bitmap writing, as some objects are not being packed" -msgstr "s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no s'empaqueten" +msgstr "" +"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " +"s'empaqueten" -#: builtin/pack-objects.c:2426 +#: builtin/pack-objects.c:2434 msgid "Compressing objects" msgstr "S'estan comprimint objectes" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2843 #, c-format msgid "unsupported index version %s" msgstr "versió d'Ãndex no compatible %s" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2847 #, c-format msgid "bad index version '%s'" msgstr "versió d'Ãndex dolenta '%s'" -#: builtin/pack-objects.c:2863 +#: builtin/pack-objects.c:2877 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2865 +#: builtin/pack-objects.c:2879 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2867 +#: builtin/pack-objects.c:2881 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2870 +#: builtin/pack-objects.c:2884 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" -#: builtin/pack-objects.c:2871 +#: builtin/pack-objects.c:2885 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2872 +#: builtin/pack-objects.c:2886 msgid "write the pack index file in the specified idx format version" -msgstr "escriu el fitxer d'Ãndex de paquet en la versió de format d'Ãndex especificada" +msgstr "" +"escriu el fitxer d'Ãndex de paquet en la versió de format d'Ãndex " +"especificada" -#: builtin/pack-objects.c:2875 +#: builtin/pack-objects.c:2889 msgid "maximum size of each output pack file" msgstr "mida mà xima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2891 msgid "ignore borrowed objects from alternate object store" -msgstr "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" +msgstr "" +"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2893 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2895 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2897 msgid "limit pack window by memory in addition to object limit" -msgstr "limita la finestra d'empaquetament per memòria a més del lÃmit d'objectes" +msgstr "" +"limita la finestra d'empaquetament per memòria a més del lÃmit d'objectes" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2899 msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "longitud mà xima de la cadena de diferències permesa en el paquet resultant" +msgstr "" +"longitud mà xima de la cadena de diferències permesa en el paquet resultant" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2901 msgid "reuse existing deltas" msgstr "reusa les diferències existents" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2903 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2905 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2907 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de diferències" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2909 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2911 msgid "read revision arguments from standard input" msgstr "llegeix els parà metres de revisió des de l'entrada està ndard" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2913 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als quals encara no s'hagin empaquetat" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:2916 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2919 msgid "include objects referred by reflog entries" -msgstr "inclou els objectes als quals facin referència les entrades del registre de referències" +msgstr "" +"inclou els objectes als quals facin referència les entrades del registre de " +"referències" -#: builtin/pack-objects.c:2908 +#: builtin/pack-objects.c:2922 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'Ãndex" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2925 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2927 msgid "include tag objects that refer to objects to be packed" -msgstr "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" +msgstr "" +"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2929 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2931 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2933 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2936 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:2924 +#: builtin/pack-objects.c:2938 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per a les obtencions superficials" -#: builtin/pack-objects.c:2926 +#: builtin/pack-objects.c:2940 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2942 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:2930 +#: builtin/pack-objects.c:2944 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2946 msgid "use a bitmap index if available to speed up counting objects" -msgstr "usa un Ãndex de mapa de bits, si està disponible, per a accelerar el recompte d'objectes" +msgstr "" +"usa un Ãndex de mapa de bits, si està disponible, per a accelerar el " +"recompte d'objectes" -#: builtin/pack-objects.c:2934 +#: builtin/pack-objects.c:2948 msgid "write a bitmap index together with the pack index" msgstr "escriu un Ãndex de mapa de bits junt amb l'Ãndex de paquet" -#: builtin/pack-objects.c:3061 +#: builtin/pack-objects.c:3075 msgid "Counting objects" msgstr "S'estan comptant els objectes" @@ -10843,53 +11278,64 @@ msgstr "fes caducar els objectes més vells que <hora>" msgid "cannot prune in a precious-objects repo" msgstr "no es pot podar en un dipòsit d'objectes preciosos" -#: builtin/pull.c:51 builtin/pull.c:53 +#: builtin/pull.c:54 builtin/pull.c:56 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor no và lid per a %s: %s" -#: builtin/pull.c:73 +#: builtin/pull.c:76 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/pull.c:121 +#: builtin/pull.c:124 +#, fuzzy +msgid "control for recursive fetching of submodules" +msgstr "controla l'obtenció recursiva de submòduls" + +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "Opcions relacionades amb fusionar" -#: builtin/pull.c:124 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" -msgstr "incorpora els canvis per rebasar en lloc de fusionar" +msgstr "incorpora els canvis fent «rebase» en lloc de fusionar" -#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 +#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 msgid "allow fast-forward" msgstr "permet l'avanç rà pid" -#: builtin/pull.c:157 +#: builtin/pull.c:164 msgid "automatically stash/stash pop before and after rebase" msgstr "automà ticament emmagatzema/desempila abans i després de fer «rebase»" -#: builtin/pull.c:173 +#: builtin/pull.c:180 msgid "Options related to fetching" msgstr "Opcions relacionades amb obtenir" -#: builtin/pull.c:195 +#: builtin/pull.c:198 msgid "number of submodules pulled in parallel" msgstr "nombre de submòduls baixats en paral·lel" -#: builtin/pull.c:284 +#: builtin/pull.c:287 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor no và lid per a pull.ff: %s" -#: builtin/pull.c:397 -msgid "There is no candidate for rebasing against among the refs that you just fetched." -msgstr "No hi ha cap candidat sobre el qual rebasar entre les referències que acabeu d'obtenir." - #: builtin/pull.c:399 -msgid "There are no candidates for merging among the refs that you just fetched." -msgstr "No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir." +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +msgstr "" +"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que " +"acabeu d'obtenir." -#: builtin/pull.c:400 +#: builtin/pull.c:401 +msgid "" +"There are no candidates for merging among the refs that you just fetched." +msgstr "" +"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir." + +#: builtin/pull.c:402 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -10897,7 +11343,7 @@ msgstr "" "Generalment això vol dir que heu proveït una especificació de\n" "referència de comodà que no tenia cap coincidència en el costat remot." -#: builtin/pull.c:403 +#: builtin/pull.c:405 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10908,40 +11354,44 @@ msgstr "" "Perquè aquest no és el remot configurat per defecte per a la vostra\n" "branca actual, heu d'especificar una branca en la lÃnia d'ordres." -#: builtin/pull.c:408 git-parse-remote.sh:73 +#: builtin/pull.c:410 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Actualment no sou en cap branca." -#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Si us plau, especifiqueu sobre què branca voleu fer «rebase»." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 +#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Si us plau, especifiqueu amb què branca voleu fusionar." -#: builtin/pull.c:413 builtin/pull.c:428 +#: builtin/pull.c:415 builtin/pull.c:430 msgid "See git-pull(1) for details." msgstr "Vegeu git-pull(1) per detalls." -#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 git-parse-remote.sh:64 +#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 +#: git-parse-remote.sh:64 msgid "<remote>" msgstr "<remot>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 +#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branca>" -#: builtin/pull.c:423 git-parse-remote.sh:75 +#: builtin/pull.c:425 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hi ha cap informació de seguiment per a la branca actual." -#: builtin/pull.c:432 git-parse-remote.sh:95 -msgid "If you wish to set tracking information for this branch you can do so with:" -msgstr "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:" +#: builtin/pull.c:434 git-parse-remote.sh:95 +msgid "" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "" +"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho " +"amb:" -#: builtin/pull.c:437 +#: builtin/pull.c:439 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -10950,27 +11400,28 @@ msgstr "" "La vostra configuració especifica fusionar amb la referència '%s'\n" "del remot, però no s'ha obtingut tal referència." -#: builtin/pull.c:754 +#: builtin/pull.c:792 msgid "ignoring --verify-signatures for rebase" msgstr "s'està ignorant --verify-signatures en fer «rebase»" -#: builtin/pull.c:801 +#: builtin/pull.c:840 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'opció --[no-]-autostash és và lid només amb --rebase." -#: builtin/pull.c:809 +#: builtin/pull.c:848 msgid "Updating an unborn branch with changes added to the index." -msgstr "S'està actualitzant una branca no nascuda amb canvis afegits a l'Ãndex." +msgstr "" +"S'està actualitzant una branca no nascuda amb canvis afegits a l'Ãndex." -#: builtin/pull.c:812 +#: builtin/pull.c:851 msgid "pull with rebase" msgstr "baixar fent «rebase»" -#: builtin/pull.c:813 +#: builtin/pull.c:852 msgid "please commit or stash them." msgstr "si us plau, cometeu-los o emmagatzemeu-los." -#: builtin/pull.c:838 +#: builtin/pull.c:877 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10981,7 +11432,7 @@ msgstr "" "s'està avançant rà pidament el vostre arbre de treball des de\n" "la comissió %s." -#: builtin/pull.c:843 +#: builtin/pull.c:882 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10992,41 +11443,47 @@ msgid "" "to recover." msgstr "" "No es pot avançar rà pidament el vostre arbre de treball.\n" -"Després d'assegurar que hà giu desat qualsevol cosa preciosa de la sortida de\n" +"Després d'assegurar que hà giu desat qualsevol cosa preciosa de la sortida " +"de\n" "$ git diff %s\n" "executeu\n" "$ git reset --hard\n" "per a recuperar." -#: builtin/pull.c:858 +#: builtin/pull.c:897 msgid "Cannot merge multiple branches into empty head." msgstr "No es poden fusionar múltiples branques a un HEAD buit." -#: builtin/pull.c:862 +#: builtin/pull.c:901 msgid "Cannot rebase onto multiple branches." msgstr "No es pot fer «rebase» sobre múltiples branques." -#: builtin/push.c:16 +#: builtin/pull.c:908 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "" + +#: builtin/push.c:17 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/push.c:89 +#: builtin/push.c:90 msgid "tag shorthand without <tag>" msgstr "abreviatura d'etiqueta sense <tag>" -#: builtin/push.c:99 +#: builtin/push.c:100 msgid "--delete only accepts plain target ref names" msgstr "--delete només accepta noms de referència de destà senzills" -#: builtin/push.c:143 +#: builtin/push.c:144 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help config'." +"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help " +"config'." -#: builtin/push.c:146 +#: builtin/push.c:147 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11051,7 +11508,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:161 +#: builtin/push.c:162 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11066,7 +11523,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-branca-remota>\n" -#: builtin/push.c:175 +#: builtin/push.c:176 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11079,12 +11536,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:183 +#: builtin/push.c:184 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "La branca actual %s té múltiples branques fonts, s'està refusant pujar." +msgstr "" +"La branca actual %s té múltiples branques fonts, s'està refusant pujar." -#: builtin/push.c:186 +#: builtin/push.c:187 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11095,11 +11553,14 @@ msgstr "" "branca actual '%s', sense dir-me què pujar per a actualitzar\n" "quina branca remota." -#: builtin/push.c:245 -msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "No heu especificat cap especificació de referència a pujar, i push.default és \"nothing\"." +#: builtin/push.c:246 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"No heu especificat cap especificació de referència a pujar, i push.default " +"és \"nothing\"." -#: builtin/push.c:252 +#: builtin/push.c:253 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11111,7 +11572,7 @@ msgstr "" "els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n" "Vegeu la 'Nota sobre avanços rà pids' a 'git push --help' per detalls." -#: builtin/push.c:258 +#: builtin/push.c:259 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" @@ -11124,7 +11585,7 @@ msgstr "" "abans de pujar de nou.\n" "Vegeu la 'Nota sobre avanços rà pids' a 'git push --help' per detalls." -#: builtin/push.c:264 +#: builtin/push.c:265 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" @@ -11139,11 +11600,12 @@ msgstr "" "pujar de nou.\n" "Vegeu la 'Nota sobre avanços rà pids' a 'git push --help' per detalls." -#: builtin/push.c:271 +#: builtin/push.c:272 msgid "Updates were rejected because the tag already exists in the remote." -msgstr "S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot." +msgstr "" +"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot." -#: builtin/push.c:274 +#: builtin/push.c:275 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" @@ -11154,25 +11616,26 @@ msgstr "" "fer que assenyali un objecte no de comissió, sense usar l'opció\n" "'--force'.\n" -#: builtin/push.c:334 +#: builtin/push.c:335 #, c-format msgid "Pushing to %s\n" msgstr "S'està pujant a %s\n" -#: builtin/push.c:338 +#: builtin/push.c:339 #, c-format msgid "failed to push some refs to '%s'" msgstr "s'ha produït un error en pujar algunes referències a '%s'" -#: builtin/push.c:369 +#: builtin/push.c:370 #, c-format msgid "bad repository '%s'" msgstr "dipòsit dolent '%s'" -#: builtin/push.c:370 +#: builtin/push.c:371 msgid "" "No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote repository using\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" "\n" " git remote add <name> <url>\n" "\n" @@ -11181,7 +11644,8 @@ msgid "" " git push <name>\n" msgstr "" "No hi ha cap destà de pujada configurat.\n" -"Especifiqueu l'URL des de la lÃnia d'ordres o bé configureu un dipòsit remot fent servir\n" +"Especifiqueu l'URL des de la lÃnia d'ordres o bé configureu un dipòsit remot " +"fent servir\n" "\n" " git remote add <nom> <url>\n" "\n" @@ -11189,205 +11653,206 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:388 +#: builtin/push.c:389 msgid "--all and --tags are incompatible" msgstr "--all i --tags són incompatibles" -#: builtin/push.c:389 +#: builtin/push.c:390 msgid "--all can't be combined with refspecs" msgstr "--all no es pot combinar amb especificacions de referència" -#: builtin/push.c:394 +#: builtin/push.c:395 msgid "--mirror and --tags are incompatible" msgstr "--mirror i --tags són incompatibles" -#: builtin/push.c:395 +#: builtin/push.c:396 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no es pot combinar amb especificacions de referència" -#: builtin/push.c:400 +#: builtin/push.c:401 msgid "--all and --mirror are incompatible" msgstr "--all i --mirror són incompatibles" -#: builtin/push.c:518 +#: builtin/push.c:523 msgid "repository" msgstr "dipòsit" -#: builtin/push.c:519 builtin/send-pack.c:162 +#: builtin/push.c:524 builtin/send-pack.c:163 msgid "push all refs" msgstr "puja totes les referències" -#: builtin/push.c:520 builtin/send-pack.c:164 +#: builtin/push.c:525 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "reflecteix totes les referències" -#: builtin/push.c:522 +#: builtin/push.c:527 msgid "delete refs" msgstr "suprimeix les referències" -#: builtin/push.c:523 +#: builtin/push.c:528 msgid "push tags (can't be used with --all or --mirror)" msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:526 builtin/send-pack.c:165 +#: builtin/push.c:531 builtin/send-pack.c:166 msgid "force updates" msgstr "força les actualitzacions" -#: builtin/push.c:528 builtin/send-pack.c:179 +#: builtin/push.c:533 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "nom-de-referència>:<esperat" -#: builtin/push.c:529 builtin/send-pack.c:180 +#: builtin/push.c:534 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" -#: builtin/push.c:532 +#: builtin/push.c:537 msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:534 builtin/send-pack.c:173 +#: builtin/push.c:539 builtin/send-pack.c:174 msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 builtin/send-pack.c:160 +#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:537 +#: builtin/push.c:542 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:540 +#: builtin/push.c:545 msgid "prune locally removed refs" msgstr "poda les referències eliminades localment" -#: builtin/push.c:542 +#: builtin/push.c:547 msgid "bypass pre-push hook" msgstr "evita el ganxo de prepujada" -#: builtin/push.c:543 +#: builtin/push.c:548 msgid "push missing but relevant tags" msgstr "puja les etiquetes absents però rellevants" -#: builtin/push.c:546 builtin/send-pack.c:167 +#: builtin/push.c:551 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "signa la pujada amb GPG" -#: builtin/push.c:548 builtin/send-pack.c:174 +#: builtin/push.c:553 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "demana una transacció atòmica al costat remot" -#: builtin/push.c:549 builtin/send-pack.c:170 +#: builtin/push.c:554 builtin/send-pack.c:171 msgid "server-specific" msgstr "especÃfic al servidor" -#: builtin/push.c:549 builtin/send-pack.c:171 +#: builtin/push.c:554 builtin/send-pack.c:172 msgid "option to transmit" msgstr "opció a transmetre" -#: builtin/push.c:563 +#: builtin/push.c:568 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete és incompatible amb --all, --mirror i --tags" -#: builtin/push.c:565 +#: builtin/push.c:570 msgid "--delete doesn't make sense without any refs" msgstr "--delete no té sentit sense referències" -#: builtin/push.c:584 +#: builtin/push.c:589 msgid "push options must not have new line characters" msgstr "les opcions de pujada no han de tenir carà cters de lÃnia nova" #: builtin/read-tree.c:40 msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-" -"directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-" -"directory=<ignoral-de-git>] | -i]] [--no-sparse-checkout] [--index-output=<fitxer>] (--empty | " -"<arbre1> [<arbre2> [<arbre3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:121 msgid "write resulting index to <file>" msgstr "escriu l'Ãndex resultant al <fitxer>" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:124 msgid "only empty the index" msgstr "només buida l'Ãndex" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:126 msgid "Merging" msgstr "S'està fusionant" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:128 msgid "perform a merge in addition to a read" msgstr "realitza una fusió a més d'una lectura" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:130 msgid "3-way merge if no file level merging required" msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:132 msgid "3-way merge in presence of adds and removes" msgstr "fusió de 3 vies en presència d'afegiments i eliminacions" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c:134 msgid "same as -m, but discard unmerged entries" msgstr "el mateix que -m, però descarta les entrades no fusionades" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:135 msgid "<subdirectory>/" msgstr "<subdirectori>/" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:136 msgid "read the tree into the index under <subdirectory>/" msgstr "llegiu l'arbre a l'Ãndex sota <subdirectori>/" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:139 msgid "update working tree with merge result" msgstr "actualitza l'arbre de treball amb el resultat de fusió" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:141 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:151 +#: builtin/read-tree.c:142 msgid "allow explicitly ignored files to be overwritten" msgstr "permet que els fitxers explÃcitament ignorats se sobreescriguin" -#: builtin/read-tree.c:154 +#: builtin/read-tree.c:145 msgid "don't check the working tree after merging" msgstr "no comprovis l'arbre de treball després de fusionar" -#: builtin/read-tree.c:155 +#: builtin/read-tree.c:146 msgid "don't update the index or the work tree" msgstr "no actualitzis l'Ãndex ni l'arbre de treball" -#: builtin/read-tree.c:157 +#: builtin/read-tree.c:148 msgid "skip applying sparse checkout filter" msgstr "omet l'aplicació del filtre d'agafament parcial" -#: builtin/read-tree.c:159 +#: builtin/read-tree.c:150 msgid "debug unpack-trees" msgstr "depura unpack-trees" -#: builtin/rebase--helper.c:7 +#: builtin/rebase--helper.c:8 msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<opcions>]" -#: builtin/rebase--helper.c:19 +#: builtin/rebase--helper.c:20 msgid "continue rebase" msgstr "continua el «rebase»" -#: builtin/rebase--helper.c:21 +#: builtin/rebase--helper.c:22 msgid "abort rebase" msgstr "avorta el «rebase»" -#: builtin/receive-pack.c:27 +#: builtin/receive-pack.c:28 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:795 +#: builtin/receive-pack.c:838 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" @@ -11418,7 +11883,7 @@ msgstr "" "predeterminat, establiu la variable de configuració\n" "'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:815 +#: builtin/receive-pack.c:858 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" @@ -11440,110 +11905,112 @@ msgstr "" "\n" "Per a silenciar aquest missatge, podeu establir-la a 'refuse'." -#: builtin/receive-pack.c:1888 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "silenciós" -#: builtin/receive-pack.c:1902 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Heu d'especificar un directori." -#: builtin/reflog.c:423 +#: builtin/reflog.c:424 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' per a '%s' no és una marca de temps và lida" -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:541 builtin/reflog.c:546 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no és una marca de temps và lida" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] " -"<name> <url>" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <name> <url>" msgstr "" -"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] " -"<nom> <url>" +"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:15 builtin/remote.c:35 msgid "git remote rename <old> <new>" msgstr "git remote rename <antic> <nou>" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:16 builtin/remote.c:40 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:17 builtin/remote.c:45 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:19 -msgid "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" -msgstr "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]" - #: builtin/remote.c:20 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]" + +#: builtin/remote.c:21 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branca>..." -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:22 builtin/remote.c:71 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <url-nou>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <url>" -#: builtin/remote.c:29 +#: builtin/remote.c:30 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opcions>] <nom> <url>" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branca>..." -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branca>..." -#: builtin/remote.c:55 +#: builtin/remote.c:56 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opcions>] <nom>" -#: builtin/remote.c:60 +#: builtin/remote.c:61 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opcions>] <nom>" -#: builtin/remote.c:65 +#: builtin/remote.c:66 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opcions>] [<grup> | <remot>]..." -#: builtin/remote.c:94 +#: builtin/remote.c:95 #, c-format msgid "Updating %s" msgstr "S'està actualitzant %s" -#: builtin/remote.c:126 +#: builtin/remote.c:127 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -11552,107 +12019,110 @@ msgstr "" "\t plau, useu --mirror=fetch o\n" "\t --mirror=push en lloc d'això" -#: builtin/remote.c:143 +#: builtin/remote.c:144 #, c-format msgid "unknown mirror argument: %s" msgstr "parà metre de reflexió desconegut: %s" -#: builtin/remote.c:159 +#: builtin/remote.c:160 msgid "fetch the remote branches" msgstr "obtén les branques remotes" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "import all tags and associated objects when fetching" msgstr "en obtenir, importa totes les etiquetes i tots els objectes" -#: builtin/remote.c:164 +#: builtin/remote.c:165 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o no obtinguis cap etiqueta (--no-tags)" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "branch(es) to track" msgstr "branques a seguir" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "master branch" msgstr "branca mestra" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "set up remote as a mirror to push to or fetch from" msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir" -#: builtin/remote.c:181 +#: builtin/remote.c:182 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar una branca mestra no té sentit amb --mirror" -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "especificar les branques a seguir té sentit només amb miralls d'obtenció" +msgstr "" +"especificar les branques a seguir té sentit només amb miralls d'obtenció" -#: builtin/remote.c:190 builtin/remote.c:629 +#: builtin/remote.c:191 builtin/remote.c:630 #, c-format msgid "remote %s already exists." msgstr "el remot %s ja existeix." -#: builtin/remote.c:194 builtin/remote.c:633 +#: builtin/remote.c:195 builtin/remote.c:634 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no és un nom de remot và lid" -#: builtin/remote.c:234 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "No s'ha pogut configurar la mestra '%s'" -#: builtin/remote.c:336 +#: builtin/remote.c:337 #, c-format msgid "Could not get fetch map for refspec %s" -msgstr "No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s" +msgstr "" +"No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:438 builtin/remote.c:446 msgid "(matching)" msgstr "(coincident)" -#: builtin/remote.c:449 +#: builtin/remote.c:450 msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 +#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 #, c-format msgid "No such remote: %s" msgstr "No hi ha tal remot: %s" -#: builtin/remote.c:639 +#: builtin/remote.c:640 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No s'ha pogut canviar el nom de la secció de configuració '%s' a '%s'" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "Not updating non-default fetch refspec\n" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" -"No s'està actualitzant l'especificació de referències d'obtenció no per defecte\n" +"No s'està actualitzant l'especificació de referències d'obtenció no per " +"defecte\n" "\t%s\n" "\tSi us plau, actualitzeu la configuració manualment si és necessari." -#: builtin/remote.c:695 +#: builtin/remote.c:696 #, c-format msgid "deleting '%s' failed" msgstr "la supressió de '%s' ha fallat" -#: builtin/remote.c:729 +#: builtin/remote.c:730 #, c-format msgid "creating '%s' failed" msgstr "la creació de '%s' ha fallat" -#: builtin/remote.c:794 +#: builtin/remote.c:795 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11663,631 +12133,650 @@ msgstr[0] "" "Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n" "per a suprimir-la, useu:" msgstr[1] "" -"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han eliminat;\n" +"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han " +"eliminat;\n" "per a suprimir-les, useu:" -#: builtin/remote.c:808 +#: builtin/remote.c:809 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut eliminar la secció de configuració '%s'" -#: builtin/remote.c:909 +#: builtin/remote.c:910 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)" -#: builtin/remote.c:912 +#: builtin/remote.c:913 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:914 +#: builtin/remote.c:915 msgid " stale (use 'git remote prune' to remove)" msgstr " estancat (useu 'git remote prune' per a eliminar)" -#: builtin/remote.c:916 +#: builtin/remote.c:917 msgid " ???" msgstr " ???" -#: builtin/remote.c:957 +#: builtin/remote.c:958 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge no và lid; no es pot fer «rebase» sobre > 1 branca" -#: builtin/remote.c:965 +#: builtin/remote.c:966 #, c-format msgid "rebases interactively onto remote %s" msgstr "es fa «rebase» interactivament sobre el remot %s" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases onto remote %s" msgstr "es fa «rebase» sobre el remot %s" -#: builtin/remote.c:969 +#: builtin/remote.c:970 #, c-format msgid " merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:972 +#: builtin/remote.c:973 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:975 +#: builtin/remote.c:976 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s i amb el remot %s\n" -#: builtin/remote.c:1018 +#: builtin/remote.c:1019 msgid "create" msgstr "crea" -#: builtin/remote.c:1021 +#: builtin/remote.c:1022 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1025 +#: builtin/remote.c:1026 msgid "up to date" msgstr "al dia" -#: builtin/remote.c:1028 +#: builtin/remote.c:1029 msgid "fast-forwardable" msgstr "avanç rà pid possible" -#: builtin/remote.c:1031 +#: builtin/remote.c:1032 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1038 +#: builtin/remote.c:1039 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força a %-*s (%s)" -#: builtin/remote.c:1041 +#: builtin/remote.c:1042 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1045 +#: builtin/remote.c:1046 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força a %s" -#: builtin/remote.c:1048 +#: builtin/remote.c:1049 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1116 +#: builtin/remote.c:1117 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1143 +#: builtin/remote.c:1144 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obtenció: %s" -#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 +#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 msgid "(no URL)" msgstr "(sense URL)" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1156 builtin/remote.c:1158 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 +#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 #, c-format msgid " HEAD branch: %s" msgstr " Branca de HEAD: %s" -#: builtin/remote.c:1160 +#: builtin/remote.c:1164 msgid "(not queried)" msgstr "(no consultat)" -#: builtin/remote.c:1162 +#: builtin/remote.c:1166 msgid "(unknown)" msgstr "(desconegut)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1170 #, c-format -msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" -msgstr " Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n" +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n" -#: builtin/remote.c:1178 +#: builtin/remote.c:1182 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branca remota:%s" msgstr[1] " Branques remotes:%s" -#: builtin/remote.c:1181 builtin/remote.c:1207 +#: builtin/remote.c:1185 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1190 +#: builtin/remote.c:1194 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branca local configurada per a 'git pull':" msgstr[1] " Branques locals configurades per a 'git pull':" -#: builtin/remote.c:1198 +#: builtin/remote.c:1202 msgid " Local refs will be mirrored by 'git push'" msgstr " 'git push' reflectirà les referències locals" -#: builtin/remote.c:1204 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referència local configurada per a 'git push'%s:" msgstr[1] " Referències locals configurades per a 'git push'%s:" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "estableix refs/remotes/<name>/HEAD segons el remot" -#: builtin/remote.c:1227 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "suprimeix refs/remotes/<name>/HEAD" -#: builtin/remote.c:1242 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar el HEAD remot" -#: builtin/remote.c:1244 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" -msgstr "Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explÃcitament amb:" +msgstr "" +"Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explÃcitament " +"amb:" -#: builtin/remote.c:1254 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "No és una referència và lida: %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarà penjant!" -#: builtin/remote.c:1283 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat penjant!" -#: builtin/remote.c:1293 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "S'està podant %s" -#: builtin/remote.c:1294 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1313 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "No hi ha tal remot '%s'" -#: builtin/remote.c:1437 +#: builtin/remote.c:1441 msgid "add branch" msgstr "afegeix branca" -#: builtin/remote.c:1444 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1461 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "consulta els URL de pujada en lloc dels URL d'obtenció" -#: builtin/remote.c:1463 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "retorna tots els URL" -#: builtin/remote.c:1491 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "cap URL configurat per al remot '%s'" -#: builtin/remote.c:1517 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1519 +#: builtin/remote.c:1523 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "suprimeix URLs" -#: builtin/remote.c:1528 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete no té sentit" -#: builtin/remote.c:1569 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patró d'URL antic no và lid: %s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "No se suprimiran tots els URL no de pujada" -#: builtin/remote.c:1593 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" -#: builtin/remote.c:1624 +#: builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Subordre desconeguda: %s" -#: builtin/repack.c:17 +#: builtin/repack.c:18 msgid "git repack [<options>]" msgstr "git repack [<opcions>]" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:166 +#: builtin/repack.c:168 msgid "pack everything in a single pack" msgstr "empaqueta-ho tot en un únic paquet" -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "same as -a, and turn unreachable objects loose" msgstr "el mateix que -a, i solta els objectes inabastables" -#: builtin/repack.c:171 +#: builtin/repack.c:173 msgid "remove redundant packs, and run git-prune-packed" msgstr "elimina els paquets redundants, i executeu git-prune-packed" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passa --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passa --no-reuse-object a git-pack-objects" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "do not run git-update-server-info" msgstr "no executis git-update-server-info" -#: builtin/repack.c:180 +#: builtin/repack.c:182 msgid "pass --local to git-pack-objects" msgstr "passa --local a git-pack-objects" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "write bitmap index" msgstr "escriu Ãndex de mapa de bits" -#: builtin/repack.c:183 +#: builtin/repack.c:185 msgid "approxidate" msgstr "data aproximada" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "with -A, do not loosen objects older than this" msgstr "amb -A, no soltis els objectes més vells que aquest" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -a, repack unreachable objects" msgstr "amb -a, reempaqueta els objectes inabastables" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "size of the window used for delta compression" msgstr "mida de la finestra que s'usa per a compressió de diferències" -#: builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:191 builtin/repack.c:197 msgid "bytes" msgstr "octets" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "same as the above, but limit memory size instead of entries count" -msgstr "el mateix que l'anterior, però limita la mida de memòria en lloc del nombre d'entrades" +msgstr "" +"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre " +"d'entrades" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "limits the maximum delta depth" msgstr "limita la profunditat mà xima de les diferències" -#: builtin/repack.c:194 +#: builtin/repack.c:196 +#, fuzzy +msgid "limits the maximum number of threads" +msgstr "limita la profunditat mà xima de les diferències" + +#: builtin/repack.c:198 msgid "maximum size of each packfile" msgstr "mida mà xima de cada fitxer de paquet" -#: builtin/repack.c:196 +#: builtin/repack.c:200 msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:206 +#: builtin/repack.c:210 msgid "cannot delete packs in a precious-objects repo" msgstr "no es pot suprimir paquets en un dipòsit d'objectes preciosos" -#: builtin/repack.c:210 +#: builtin/repack.c:214 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable i -A són incompatibles" -#: builtin/repack.c:400 builtin/worktree.c:115 +#: builtin/repack.c:406 builtin/worktree.c:116 #, c-format msgid "failed to remove '%s'" msgstr "s'ha produït un error en eliminar '%s'" -#: builtin/replace.c:19 +#: builtin/replace.c:20 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objecte> <reemplaçament>" -#: builtin/replace.c:20 +#: builtin/replace.c:21 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <objecte>" -#: builtin/replace.c:21 +#: builtin/replace.c:22 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <comissió> [<mare>...]" -#: builtin/replace.c:22 +#: builtin/replace.c:23 msgid "git replace -d <object>..." msgstr "git replace -d <objecte>..." -#: builtin/replace.c:23 +#: builtin/replace.c:24 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<patró>]]" -#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 +#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 #, c-format msgid "Not a valid object name: '%s'" msgstr "No és un nom d'objecte và lid: '%s'" -#: builtin/replace.c:360 +#: builtin/replace.c:361 #, c-format msgid "bad mergetag in commit '%s'" msgstr "etiqueta de fusió dolenta en la comissió '%s'" -#: builtin/replace.c:362 +#: builtin/replace.c:363 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "etiqueta de fusió mal formada en la comissió '%s'" -#: builtin/replace.c:373 +#: builtin/replace.c:374 #, c-format msgid "" -"original commit '%s' contains mergetag '%s' that is discarded; use --edit instead of --graft" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" msgstr "" -"la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; useu --edit en lloc de " -"--graft" +"la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; " +"useu --edit en lloc de --graft" -#: builtin/replace.c:406 +#: builtin/replace.c:407 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "la comissió original '%s' té una signatura gpg." -#: builtin/replace.c:407 +#: builtin/replace.c:408 msgid "the signature will be removed in the replacement commit!" msgstr "s'eliminarà la signatura en la comissió de reemplaçament!" -#: builtin/replace.c:413 +#: builtin/replace.c:414 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: '%s'" -#: builtin/replace.c:437 +#: builtin/replace.c:438 msgid "list replace refs" msgstr "llista les referències reemplaçades" -#: builtin/replace.c:438 +#: builtin/replace.c:439 msgid "delete replace refs" msgstr "suprimeix les referències reemplaçades" -#: builtin/replace.c:439 +#: builtin/replace.c:440 msgid "edit existing object" msgstr "edita un objecte existent" -#: builtin/replace.c:440 +#: builtin/replace.c:441 msgid "change a commit's parents" msgstr "canvia les mares d'una comissió" -#: builtin/replace.c:441 +#: builtin/replace.c:442 msgid "replace the ref if it exists" msgstr "reemplaça la referència si existeix" -#: builtin/replace.c:442 +#: builtin/replace.c:443 msgid "do not pretty-print contents for --edit" msgstr "no imprimeixis bellament els continguts per a --edit" -#: builtin/replace.c:443 +#: builtin/replace.c:444 msgid "use this format" msgstr "usa aquest format" -#: builtin/rerere.c:12 +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <camÃ>... | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "registra les resolucions netes en l'Ãndex" -#: builtin/reset.c:26 -msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]" +#: builtin/reset.c:29 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]" -#: builtin/reset.c:27 +#: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<arbre>] [--] <camins>..." -#: builtin/reset.c:28 +#: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<arbre>] [--] [<camins>...]" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "mixed" msgstr "mixt" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "soft" msgstr "suau" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "hard" msgstr "dur" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "merge" msgstr "fusió" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "keep" msgstr "reteniment" -#: builtin/reset.c:74 +#: builtin/reset.c:77 msgid "You do not have a valid HEAD." msgstr "No teniu un HEAD và lid." -#: builtin/reset.c:76 +#: builtin/reset.c:79 msgid "Failed to find tree of HEAD." msgstr "S'ha produït un error en trobar l'arbre de HEAD." -#: builtin/reset.c:82 +#: builtin/reset.c:85 #, c-format msgid "Failed to find tree of %s." msgstr "S'ha produït un error en cercar l'arbre de %s." -#: builtin/reset.c:100 +#: builtin/reset.c:103 #, c-format msgid "HEAD is now at %s" msgstr "HEAD ara és a %s" -#: builtin/reset.c:183 +#: builtin/reset.c:186 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "No es pot fer un restabliment de %s enmig d'una fusió." -#: builtin/reset.c:276 +#: builtin/reset.c:286 msgid "be quiet, only report errors" msgstr "sigues silenciós, només informa d'errors" -#: builtin/reset.c:278 +#: builtin/reset.c:288 msgid "reset HEAD and index" msgstr "restableix HEAD i l'Ãndex" -#: builtin/reset.c:279 +#: builtin/reset.c:289 msgid "reset only HEAD" msgstr "restableix només HEAD" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:291 builtin/reset.c:293 msgid "reset HEAD, index and working tree" msgstr "restableix HEAD, l'Ãndex i l'arbre de treball" -#: builtin/reset.c:285 +#: builtin/reset.c:295 msgid "reset HEAD but keep local changes" msgstr "restableix HEAD però retén els canvis locals" -#: builtin/reset.c:288 +#: builtin/reset.c:301 msgid "record only the fact that removed paths will be added later" msgstr "registra només el fet de que els camins eliminats s'afegiran després" -#: builtin/reset.c:305 +#: builtin/reset.c:320 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "S'ha produït un error en resoldre '%s' com a revisió và lida." -#: builtin/reset.c:313 +#: builtin/reset.c:328 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "S'ha produït un error en resoldre '%s' com a arbre và lid." -#: builtin/reset.c:322 +#: builtin/reset.c:337 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch és incompatible amb --{hard,mixed,soft}" -#: builtin/reset.c:331 +#: builtin/reset.c:346 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc d'això." +msgstr "" +"--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc " +"d'això." -#: builtin/reset.c:333 +#: builtin/reset.c:348 #, c-format msgid "Cannot do %s reset with paths." msgstr "No es pot restablir de %s amb camins." -#: builtin/reset.c:343 +#: builtin/reset.c:358 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "el restabliment de %s no es permet en un dipòsit nu" -#: builtin/reset.c:347 +#: builtin/reset.c:362 msgid "-N can only be used with --mixed" msgstr "-N només es pot usar amb --mixed" -#: builtin/reset.c:364 +#: builtin/reset.c:379 msgid "Unstaged changes after reset:" msgstr "Canvis «unstaged» després del restabliment:" -#: builtin/reset.c:370 +#: builtin/reset.c:385 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "No s'ha pogut restablir el fitxer d'Ãndex a la revisió '%s'." -#: builtin/reset.c:374 +#: builtin/reset.c:389 msgid "Could not write new index file." msgstr "No s'ha pogut escriure el fitxer d'Ãndex nou." -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:358 msgid "rev-list does not support display of notes" msgstr "el rev-list no permet mostrar notes" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:394 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opcions>] -- [<parà metres>...]" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:399 msgid "keep the `--` passed as an arg" msgstr "retén el `--` passat com a parà metre" -#: builtin/rev-parse.c:400 +#: builtin/rev-parse.c:401 msgid "stop parsing after the first non-option argument" msgstr "deixa d'analitzar després del primer parà metre no d'opció" -#: builtin/rev-parse.c:403 +#: builtin/rev-parse.c:404 msgid "output in stuck long form" msgstr "emet en forma llarga enganxada" -#: builtin/rev-parse.c:534 +#: builtin/rev-parse.c:535 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12299,98 +12788,99 @@ msgstr "" " or: git rev-parse --sq-quote [<parà metre>...]\n" " or: git rev-parse [<opcions>] [<parà metre>...]\n" "\n" -"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús inicial." +"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús " +"inicial." -#: builtin/revert.c:22 +#: builtin/revert.c:23 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<opcions>] <comissió>..." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert <subcommand>" msgstr "git revert <subordre>" -#: builtin/revert.c:28 +#: builtin/revert.c:29 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<opcions>] <comissió>..." -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <subordre>" -#: builtin/revert.c:89 +#: builtin/revert.c:90 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s no es pot usar amb %s" -#: builtin/revert.c:98 +#: builtin/revert.c:99 msgid "end revert or cherry-pick sequence" msgstr "acaba la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "resume revert or cherry-pick sequence" msgstr "reprèn la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "cancel revert or cherry-pick sequence" msgstr "cancel·la la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "don't automatically commit" msgstr "no cometis automà ticament" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "edit the commit message" msgstr "edita el missatge de comissió" -#: builtin/revert.c:105 +#: builtin/revert.c:106 msgid "parent-number" msgstr "número del pare" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "select mainline parent" msgstr "selecciona la lÃnia principal del pare" -#: builtin/revert.c:108 +#: builtin/revert.c:109 msgid "merge strategy" msgstr "estratègia de fusió" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "option" msgstr "opció" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option for merge strategy" msgstr "opció d'estratègia de fusió" -#: builtin/revert.c:119 +#: builtin/revert.c:120 msgid "append commit name" msgstr "nom de la comissió a annexar" -#: builtin/revert.c:121 +#: builtin/revert.c:122 msgid "preserve initially empty commits" msgstr "preserva les comissions inicialment buides" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "allow commits with empty messages" msgstr "permet les comissions amb missatges buits" -#: builtin/revert.c:123 +#: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "retén les comissions redundants i buides" -#: builtin/revert.c:211 +#: builtin/revert.c:212 msgid "revert failed" msgstr "la reversió ha fallat" -#: builtin/revert.c:224 +#: builtin/revert.c:225 msgid "cherry-pick failed" msgstr "el «cherry pick» ha fallat" -#: builtin/rm.c:17 +#: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<opcions>] [--] <fitxer>..." -#: builtin/rm.c:205 +#: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -12404,7 +12894,7 @@ msgstr[1] "" "els fitxers següents tenen contingut «stage» diferent d'ambdós\n" "el fitxer i el HEAD:" -#: builtin/rm.c:210 +#: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" @@ -12412,13 +12902,13 @@ msgstr "" "\n" "(useu -f per a forçar l'eliminació)" -#: builtin/rm.c:214 +#: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "el fitxer següent té canvis «staged» en l'Ãndex:" msgstr[1] "els fitxers següents tenen canvis «staged» en l'Ãndex:" -#: builtin/rm.c:218 builtin/rm.c:227 +#: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -12426,29 +12916,29 @@ msgstr "" "\n" "(useu --cached per a retenir el fitxer, o -f per a forçar l'eliminació)" -#: builtin/rm.c:224 +#: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "el fitxer següent té modificacions locals:" msgstr[1] "els fitxers següents tenen modificacions locals:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "no llistis els fitxers eliminats" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "només elimina de l'Ãndex" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "passa per alt la comprovació d'actualitat" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "permet l'eliminació recursiva" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "surt amb estat zero encara que res hagi coincidit" @@ -12467,61 +12957,64 @@ msgstr "git rm: no s'ha pogut eliminar %s" msgid "could not remove '%s'" msgstr "no s'ha pogut suprimir '%s'" -#: builtin/send-pack.c:18 +#: builtin/send-pack.c:19 msgid "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--" -"verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " +"[<ref>...]\n" " --all and explicit <ref> specification are mutually exclusive." msgstr "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<paquet-del-git-receive>] " -"[--verbose] [--thin] [--atomic] [<mà quina>:]<directori> [<referència>...]\n" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-" +"pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] " +"[<mà quina>:]<directori> [<referència>...]\n" " --all i especificació <referència> explÃcita són mutualment exclusius." -#: builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "remote name" msgstr "nom del remot" -#: builtin/send-pack.c:175 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "usa el protocol RPC sense estat" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "llegeix les referències des d'stdin" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "imprimeix l'estat des de l'ajudant remot" -#: builtin/shortlog.c:13 +#: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camÃ>...]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:249 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:250 +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "ordena la sortida segons el nombre de comissions per autor" -#: builtin/shortlog.c:252 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" -msgstr "Omet les descripcions de comissió, només proveeix el recompte de comissions" +msgstr "" +"Omet les descripcions de comissió, només proveeix el recompte de comissions" -#: builtin/shortlog.c:254 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "Mostra l'adreça de correu electrònic de cada autor" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "Ajusta les lÃnies de la sortida" -#: builtin/show-branch.c:10 +#: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -12533,134 +13026,136 @@ msgstr "" "\t\t [--more=<n> | --list | --independent | --merge-base]\n" "\t\t [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]" -#: builtin/show-branch.c:374 +#: builtin/show-branch.c:376 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència" msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències" -#: builtin/show-branch.c:536 +#: builtin/show-branch.c:530 #, c-format msgid "no matching refs with %s" msgstr "no hi ha referències coincidents amb %s" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:626 msgid "show remote-tracking and local branches" msgstr "mostra les branques amb seguiment remot i les locals" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:628 msgid "show remote-tracking branches" msgstr "mostra les branques amb seguiment remot" -#: builtin/show-branch.c:636 +#: builtin/show-branch.c:630 msgid "color '*!+-' corresponding to the branch" msgstr "colora '*!+-' corresponent a la branca" -#: builtin/show-branch.c:638 +#: builtin/show-branch.c:632 msgid "show <n> more commits after the common ancestor" msgstr "mostra <n> comissions després de l'avantpassat comú" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:634 msgid "synonym to more=-1" msgstr "sinònim de more=-1" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:635 msgid "suppress naming strings" msgstr "omet l'anomenar cadenes" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:637 msgid "include the current branch" msgstr "inclou la branca actual" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:639 msgid "name commits with their object names" msgstr "anomena les comissions amb els seus noms d'objecte" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:641 msgid "show possible merge bases" msgstr "mostra les bases de fusió possibles" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:643 msgid "show refs unreachable from any other ref" msgstr "mostra les referències inabastables de qualsevol altra referència" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:645 msgid "show commits in topological order" msgstr "mostra les comissions en ordre topològic" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:648 msgid "show only commits not on the first branch" msgstr "mostra només les comissions que no siguin en la primera branca" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:650 msgid "show merges reachable from only one tip" msgstr "mostra les fusions abastables de només una punta" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:652 msgid "topologically sort, maintaining date order where possible" msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:655 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostra les <n> entrades més recents començant a la base" -#: builtin/show-branch.c:696 -msgid "--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "--reflog és incompatible amb --all, --remotes, --independent o --merge-base" +#: builtin/show-branch.c:690 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"--reflog és incompatible amb --all, --remotes, --independent o --merge-base" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" msgstr "no s'ha donat cap branca, i HEAD no és và lid" -#: builtin/show-branch.c:723 +#: builtin/show-branch.c:717 msgid "--reflog option needs one branch name" msgstr "l'opció --reflog necessita un nom de branca" -#: builtin/show-branch.c:726 +#: builtin/show-branch.c:720 #, 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] "es pot mostrar només %d entrada a la vegada." msgstr[1] "es poden mostrar només %d entrades a la vegada." -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:724 #, c-format msgid "no such ref %s" msgstr "no hi ha tal referència %s" -#: builtin/show-branch.c:814 +#: builtin/show-branch.c:808 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "no es pot gestionar més d'%d revisió." msgstr[1] "no es poden gestionar més de %d revisions." -#: builtin/show-branch.c:818 +#: builtin/show-branch.c:812 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' no és una referència và lida." -#: builtin/show-branch.c:821 +#: builtin/show-branch.c:815 #, c-format msgid "cannot find commit %s (%s)" msgstr "no es pot trobar la comissió %s (%s)" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--" -"abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--" -"abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=<pattern>]" @@ -12676,7 +13171,9 @@ msgstr "mostra només els caps (es pot combinar amb tags)" #: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" -msgstr "comprovació de referència més estricta, requereix el camà de referència exacte" +msgstr "" +"comprovació de referència més estricta, requereix el camà de referència " +"exacte" #: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" @@ -12698,33 +13195,34 @@ msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències d'stdin que no siguin en el dipòsit local" -#: builtin/stripspace.c:17 +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" -msgstr "omet i elimina totes les lÃnies que comencin amb el carà cter de comentari" +msgstr "" +"omet i elimina totes les lÃnies que comencin amb el carà cter de comentari" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "anteposa el carà cter de comentari i un espai a cada lÃnia" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "No hi ha tal referència: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "S'espera un nom de referència ple, s'ha rebut %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:72 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no es pot despullar un component de l'url '%s'" @@ -12745,7 +13243,8 @@ msgstr "No s'ha trobat cap url per al camà de submòdul '%s' a .gitmodules" #: builtin/submodule--helper.c:395 #, c-format msgid "" -"could not lookup configuration '%s'. Assuming this repository is its own authoritative upstream." +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." msgstr "" #: builtin/submodule--helper.c:406 @@ -12761,12 +13260,16 @@ msgstr "S'ha registrat el submòdul '%s' (%s) per al camà '%s'\n" #: builtin/submodule--helper.c:420 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" -msgstr "advertència: se suggereix el mode d'actualització per ordre per al submòdul '%s'\n" +msgstr "" +"advertència: se suggereix el mode d'actualització per ordre per al submòdul " +"'%s'\n" #: builtin/submodule--helper.c:427 #, c-format msgid "Failed to register update mode for submodule path '%s'" -msgstr "S'ha produït un error en registrar el mode d'actualització per al camà de submòdul '%s'" +msgstr "" +"S'ha produït un error en registrar el mode d'actualització per al camà de " +"submòdul '%s'" #: builtin/submodule--helper.c:443 msgid "Suppress output for initializing a submodule" @@ -12822,11 +13325,11 @@ msgstr "força el progrés del clonatge" #: builtin/submodule--helper.c:653 msgid "" -"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference <repository>] [--name " -"<name>] [--depth <depth>] --url <url> --path <path>" +"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -"git submodule--helper clone [--prefix=<camÃ>] [--quiet] [--reference <dipòsit>] [--name <nom>] " -"[--depth <profunditat>] --url <url> --path <camÃ>" +"git submodule--helper clone [--prefix=<camÃ>] [--quiet] [--reference " +"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camÃ>" #: builtin/submodule--helper.c:684 #, c-format @@ -12906,11 +13409,11 @@ msgstr "valor dolent per al parà metre update" #: builtin/submodule--helper.c:1079 #, c-format msgid "" -"Submodule (%s) branch configured to inherit branch from superproject, but the superproject is " -"not on any branch" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" msgstr "" -"La branca de submòdul (%s) està configurada per a heretar la branca del superprojecte, però el " -"superprojecte no és en cap branca" +"La branca de submòdul (%s) està configurada per a heretar la branca del " +"superprojecte, però el superprojecte no és en cap branca" #: builtin/submodule--helper.c:1163 msgid "recurse into submodules" @@ -12920,81 +13423,81 @@ msgstr "inclou recursivament als submòduls" msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<camÃ>]" -#: builtin/submodule--helper.c:1226 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "s'ha d'executar la subordre submodule--helper amb una subordre" - -#: builtin/submodule--helper.c:1233 +#: builtin/submodule--helper.c:1232 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no admet --super-prefix" -#: builtin/submodule--helper.c:1239 +#: builtin/submodule--helper.c:1238 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no és una subordre và lida de submodule--helper" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <nom>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:41 msgid "suppress error message for non-symbolic (detached) refs" msgstr "omet el missatge d'error de referències no simbòliques (separades)" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:42 msgid "delete symbolic ref" msgstr "suprimeix la referència simbòlica" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:43 msgid "shorten ref output" msgstr "escurça la sortida de referències" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason" msgstr "raó" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason of the update" msgstr "raó de l'actualització" -#: builtin/tag.c:23 -msgid "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]" +#: builtin/tag.c:24 +msgid "" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " +"[<head>]" msgstr "" -"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-d'etiqueta> [<cap>]" +"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-" +"d'etiqueta> [<cap>]" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "git tag -d <tagname>..." msgstr "git tag -d <nom-d'etiqueta>..." -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] [--points-at " -"<objecte>]\n" +"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] " +"[--points-at <objecte>]\n" "\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]" -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..." -#: builtin/tag.c:83 +#: builtin/tag.c:84 #, c-format msgid "tag '%s' not found." msgstr "no s'ha trobat l'etiqueta '%s'." -#: builtin/tag.c:99 +#: builtin/tag.c:100 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n" -#: builtin/tag.c:128 +#: builtin/tag.c:129 #, c-format msgid "" "\n" @@ -13007,605 +13510,626 @@ msgstr "" " %s\n" "Les lÃnies que comencin amb '%c' s'ignoraran.\n" -#: builtin/tag.c:132 +#: builtin/tag.c:133 #, 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" +"Lines starting with '%c' will be kept; you may remove them yourself if you " +"want to.\n" msgstr "" "\n" "Escriviu el missatge de l'etiqueta:\n" " %s\n" -"Les lÃnies que comencin amb '%c' es retindran; podeu eliminar-les per vós mateix si voleu.\n" +"Les lÃnies que comencin amb '%c' es retindran; podeu eliminar-les per vós " +"mateix si voleu.\n" -#: builtin/tag.c:210 +#: builtin/tag.c:211 msgid "unable to sign the tag" msgstr "no s'ha pogut signar l'etiqueta" -#: builtin/tag.c:212 +#: builtin/tag.c:213 msgid "unable to write tag file" msgstr "no s'ha pogut escriure el fitxer d'etiqueta" -#: builtin/tag.c:236 +#: builtin/tag.c:237 msgid "bad object type." msgstr "el tipus d'objecte és dolent." -#: builtin/tag.c:282 +#: builtin/tag.c:283 msgid "no tag message?" msgstr "no hi ha cap missatge d'etiqueta?" -#: builtin/tag.c:289 +#: builtin/tag.c:290 #, c-format msgid "The tag message has been left in %s\n" msgstr "S'ha deixat el missatge de l'etiqueta en %s\n" -#: builtin/tag.c:397 +#: builtin/tag.c:398 msgid "list tag names" msgstr "llista els noms d'etiqueta" -#: builtin/tag.c:399 +#: builtin/tag.c:400 msgid "print <n> lines of each tag message" msgstr "imprimeix <n> lÃnies de cada missatge d'etiqueta" -#: builtin/tag.c:401 +#: builtin/tag.c:402 msgid "delete tags" msgstr "suprimeix les etiquetes" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "verify tags" msgstr "verifica les etiquetes" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "Tag creation options" msgstr "Opcions de creació d'etiquetes" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "annotated tag, needs a message" msgstr "etiqueta anotada, necessita un missatge" -#: builtin/tag.c:408 +#: builtin/tag.c:409 msgid "tag message" msgstr "missatge d'etiqueta" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "annotated and GPG-signed tag" msgstr "etiqueta anotada i signada per GPG" -#: builtin/tag.c:414 +#: builtin/tag.c:415 msgid "use another key to sign the tag" msgstr "usa una altra clau per a signar l'etiqueta" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "replace the tag if exists" msgstr "reemplaça l'etiqueta si existeix" -#: builtin/tag.c:416 builtin/update-ref.c:368 +#: builtin/tag.c:417 builtin/update-ref.c:369 msgid "create a reflog" msgstr "crea un registre de referències" -#: builtin/tag.c:418 +#: builtin/tag.c:419 msgid "Tag listing options" msgstr "Opcions de llistat d'etiquetes" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "show tag list in columns" msgstr "mostra la llista d'etiquetes en columnes" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:421 builtin/tag.c:423 msgid "print only tags that contain the commit" msgstr "imprimeix només les etiquetes que continguin la comissió" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:422 builtin/tag.c:424 msgid "print only tags that don't contain the commit" msgstr "imprimeix només les etiquetes que no continguin la comissió" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "print only tags that are merged" msgstr "imprimeix només les etiquetes que s'han fusionat" -#: builtin/tag.c:425 +#: builtin/tag.c:426 msgid "print only tags that are not merged" msgstr "imprimeix només les etiquetes que no s'han fusionat" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags of the object" msgstr "imprimeix només les etiquetes de l'objecte" -#: builtin/tag.c:469 +#: builtin/tag.c:470 msgid "--column and -n are incompatible" msgstr "--column i -n són incompatibles" -#: builtin/tag.c:491 +#: builtin/tag.c:492 msgid "-n option is only allowed in list mode" msgstr "es permet l'opció -n només amb mode llista" -#: builtin/tag.c:493 +#: builtin/tag.c:494 msgid "--contains option is only allowed in list mode" msgstr "es permet l'opció --contains només amb mode llista" -#: builtin/tag.c:495 +#: builtin/tag.c:496 msgid "--no-contains option is only allowed in list mode" msgstr "es permet l'opció --no-contains només amb mode llista" -#: builtin/tag.c:497 +#: builtin/tag.c:498 msgid "--points-at option is only allowed in list mode" msgstr "es permet --points-at option només amb mode llista" -#: builtin/tag.c:499 +#: builtin/tag.c:500 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "es permeten les opcions --merged i --no-merged només amb mode llista" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "only one -F or -m option is allowed." msgstr "només es permet una opció -F o -m." -#: builtin/tag.c:529 +#: builtin/tag.c:530 msgid "too many params" msgstr "massa parà metres" -#: builtin/tag.c:535 +#: builtin/tag.c:536 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no és un nom d'etiqueta và lid." -#: builtin/tag.c:540 +#: builtin/tag.c:541 #, c-format msgid "tag '%s' already exists" msgstr "l'etiqueta '%s' ja existeix" -#: builtin/tag.c:570 +#: builtin/tag.c:571 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualitzada (era %s)\n" -#: builtin/unpack-objects.c:493 +#: builtin/unpack-objects.c:494 msgid "Unpacking objects" msgstr "S'estan desempaquetant els objectes" -#: builtin/update-index.c:79 +#: builtin/update-index.c:80 #, c-format msgid "failed to create directory %s" msgstr "s'ha produït un error en crear el directori %s" -#: builtin/update-index.c:85 +#: builtin/update-index.c:86 #, c-format msgid "failed to stat %s" msgstr "s'ha produït un error en fer stat a %s" -#: builtin/update-index.c:95 +#: builtin/update-index.c:96 #, c-format msgid "failed to create file %s" msgstr "s'ha produït un error en crear el fitxer %s" -#: builtin/update-index.c:103 +#: builtin/update-index.c:104 #, c-format msgid "failed to delete file %s" msgstr "s'ha produït un error en suprimir el fitxer %s" -#: builtin/update-index.c:110 builtin/update-index.c:216 +#: builtin/update-index.c:111 builtin/update-index.c:217 #, c-format msgid "failed to delete directory %s" msgstr "s'ha produït un error en suprimir el directori %s" -#: builtin/update-index.c:135 +#: builtin/update-index.c:136 #, c-format msgid "Testing mtime in '%s' " msgstr "S'està provant mtime en '%s' " -#: builtin/update-index.c:149 +#: builtin/update-index.c:150 msgid "directory stat info does not change after adding a new file" -msgstr "la informació d'stat de directori no canvia després d'afegir un fitxer nou" +msgstr "" +"la informació d'stat de directori no canvia després d'afegir un fitxer nou" -#: builtin/update-index.c:162 +#: builtin/update-index.c:163 msgid "directory stat info does not change after adding a new directory" -msgstr "la informació d'stat de directori no canvia després d'afegir un directori nou" +msgstr "" +"la informació d'stat de directori no canvia després d'afegir un directori nou" -#: builtin/update-index.c:175 +#: builtin/update-index.c:176 msgid "directory stat info changes after updating a file" -msgstr "la informació d'stat de directori canvia després d'actualitzar un fitxer" +msgstr "" +"la informació d'stat de directori canvia després d'actualitzar un fitxer" -#: builtin/update-index.c:186 +#: builtin/update-index.c:187 msgid "directory stat info changes after adding a file inside subdirectory" -msgstr "la informació d'stat de directori canvia després d'afegir un fitxer dins d'un subdirectori" +msgstr "" +"la informació d'stat de directori canvia després d'afegir un fitxer dins " +"d'un subdirectori" -#: builtin/update-index.c:197 +#: builtin/update-index.c:198 msgid "directory stat info does not change after deleting a file" -msgstr "la informació d'stat de directori no canvia després de suprimir un fitxer" +msgstr "" +"la informació d'stat de directori no canvia després de suprimir un fitxer" -#: builtin/update-index.c:210 +#: builtin/update-index.c:211 msgid "directory stat info does not change after deleting a directory" -msgstr "la informació d'stat de directori no canvia després de suprimir un directori" +msgstr "" +"la informació d'stat de directori no canvia després de suprimir un directori" -#: builtin/update-index.c:217 +#: builtin/update-index.c:218 msgid " OK" msgstr " D'acord" -#: builtin/update-index.c:568 +#: builtin/update-index.c:569 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opcions>] [--] [<fitxer>...]" -#: builtin/update-index.c:923 +#: builtin/update-index.c:924 msgid "continue refresh even when index needs update" -msgstr "continua l'actualització encara que l'Ãndex necessiti una actualització" +msgstr "" +"continua l'actualització encara que l'Ãndex necessiti una actualització" -#: builtin/update-index.c:926 +#: builtin/update-index.c:927 msgid "refresh: ignore submodules" msgstr "actualitza: ignora els submòduls" -#: builtin/update-index.c:929 +#: builtin/update-index.c:930 msgid "do not ignore new files" msgstr "no ignoris els fitxers nous" -#: builtin/update-index.c:931 +#: builtin/update-index.c:932 msgid "let files replace directories and vice-versa" msgstr "deixa que els fitxers reemplacin els directoris i viceversa" -#: builtin/update-index.c:933 +#: builtin/update-index.c:934 msgid "notice files missing from worktree" msgstr "tingues en compte els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:935 +#: builtin/update-index.c:936 msgid "refresh even if index contains unmerged entries" msgstr "actualitza encara que l'Ãndex contingui entrades no fusionades" -#: builtin/update-index.c:938 +#: builtin/update-index.c:939 msgid "refresh stat information" msgstr "actualitza la informació d'estadÃstiques" -#: builtin/update-index.c:942 +#: builtin/update-index.c:943 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "com --refresh, però ignora l'ajust assume-unchanged" -#: builtin/update-index.c:946 +#: builtin/update-index.c:947 msgid "<mode>,<object>,<path>" msgstr "<mode>,<objecte>,<camÃ>" -#: builtin/update-index.c:947 +#: builtin/update-index.c:948 msgid "add the specified entry to the index" msgstr "afegeix l'entrada especificada a l'Ãndex" -#: builtin/update-index.c:956 +#: builtin/update-index.c:957 msgid "mark files as \"not changing\"" msgstr "marca els fitxers com a \"no canviant\"" -#: builtin/update-index.c:959 +#: builtin/update-index.c:960 msgid "clear assumed-unchanged bit" msgstr "neteja el bit assumed-unchanged" -#: builtin/update-index.c:962 +#: builtin/update-index.c:963 msgid "mark files as \"index-only\"" msgstr "marca els fitxers com a \"només Ãndex\"" -#: builtin/update-index.c:965 +#: builtin/update-index.c:966 msgid "clear skip-worktree bit" msgstr "neteja el bit skip-worktree" -#: builtin/update-index.c:968 +#: builtin/update-index.c:969 msgid "add to index only; do not add content to object database" -msgstr "només afegeix a l'Ãndex; no afegeixis el contingut a la base de dades d'objectes" +msgstr "" +"només afegeix a l'Ãndex; no afegeixis el contingut a la base de dades " +"d'objectes" -#: builtin/update-index.c:970 +#: builtin/update-index.c:971 msgid "remove named paths even if present in worktree" -msgstr "elimina els camins anomenats encara que estiguin presents en l'arbre de treball" +msgstr "" +"elimina els camins anomenats encara que estiguin presents en l'arbre de " +"treball" -#: builtin/update-index.c:972 +#: builtin/update-index.c:973 msgid "with --stdin: input lines are terminated by null bytes" msgstr "amb --stdin: les lÃnies d'entrada acaben amb octets nuls" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "read list of paths to be updated from standard input" msgstr "llegeix la llista de camins a actualitzar des de l'entrada està ndard" -#: builtin/update-index.c:978 +#: builtin/update-index.c:979 msgid "add entries from standard input to the index" msgstr "afegeix les entrades de l'entrada està ndard a l'Ãndex" -#: builtin/update-index.c:982 +#: builtin/update-index.c:983 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "reemplena les «stage» #2 i #3 per als camins llistats" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "only update entries that differ from HEAD" msgstr "només actualitza les entrades que difereixin de HEAD" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "ignore files missing from worktree" msgstr "ignora els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:993 +#: builtin/update-index.c:994 msgid "report actions to standard output" msgstr "informa de les accions en la sortida està ndard" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1000 msgid "write index in this format" msgstr "escriu l'Ãndex en aquest format" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1002 msgid "enable or disable split index" msgstr "habilita o inhabilita l'Ãndex dividit" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1004 msgid "enable/disable untracked cache" msgstr "habilita/inhabilita la memòria cau no seguida" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "test if the filesystem supports untracked cache" msgstr "prova si el sistema de fitxers admet la memòria cau no seguida" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1008 msgid "enable untracked cache without testing the filesystem" msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1108 msgid "" -"core.splitIndex is set to false; remove or change it, if you really want to enable split index" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" msgstr "" -"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment voleu habilitar " -"l'Ãndex dividit" +"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment " +"voleu habilitar l'Ãndex dividit" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1117 msgid "" -"core.splitIndex is set to true; remove or change it, if you really want to disable split index" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" msgstr "" -"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment voleu inhabilitar " -"l'Ãndex dividit" +"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment " +"voleu inhabilitar l'Ãndex dividit" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1128 +#, fuzzy msgid "" -"core.untrackedCache is set to true; remove or change it, if you e want to disable the untracked " -"cache" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" msgstr "" -"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si realment voleu " -"inhabilitar el cau no seguit" +"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si " +"realment voleu inhabilitar el cau no seguit" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "Untracked cache disabled" msgstr "La memòria cau no seguida està inhabilitada" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1140 msgid "" -"core.untrackedCache is set to false; remove or change it, if you really want to enable the " -"untracked cache" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" msgstr "" -"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si realment voleu habilitar " -"el cau no seguit" +"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si " +"realment voleu habilitar el cau no seguit" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1144 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "La memòria cau no seguida està habilitada per a '%s'" -#: builtin/update-ref.c:9 +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" -msgstr "git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-antic>]" +msgstr "" +"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-antic>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opcions>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "suprimeix la referència" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "actualitza <nom de referència>, no la que assenyali" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "stdin té parà metres acabats amb NUL" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "llegeix les actualitzacions des d'stdin" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "actualitza els fitxers d'informació des de zero" -#: builtin/verify-commit.c:17 +#: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <comissió>..." -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:73 msgid "print commit contents" msgstr "imprimeix els continguts de la comissió" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "imprimeix la sortida crua de l'estat gpg" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..." -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "detallat" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "mostra només estadÃstiques" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..." -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "imprimeix els continguts de l'etiqueta" -#: builtin/worktree.c:15 +#: builtin/worktree.c:16 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<opcions>] <camÃ> [<branca>]" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree list [<options>]" msgstr "git worktree list [<opcions>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opcions>] <camÃ>" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opcions>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree unlock <path>" msgstr "git worktree unlock <camÃ>" -#: builtin/worktree.c:43 +#: builtin/worktree.c:44 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Eliminació de worktrees/%s: no és un directori và lid" -#: builtin/worktree.c:49 +#: builtin/worktree.c:50 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix" -#: builtin/worktree.c:54 +#: builtin/worktree.c:55 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)" -#: builtin/worktree.c:65 +#: builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Eliminació de worktrees/%s: fitxer gitdir no và lid" -#: builtin/worktree.c:81 +#: builtin/worktree.c:82 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" -msgstr "Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no existent" +msgstr "" +"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no " +"existent" -#: builtin/worktree.c:128 +#: builtin/worktree.c:129 msgid "report pruned working trees" msgstr "informa dels arbres de treball podats" -#: builtin/worktree.c:130 +#: builtin/worktree.c:131 msgid "expire working trees older than <time>" msgstr "fes caducar els arbres de treball més vells que <hora>" -#: builtin/worktree.c:204 +#: builtin/worktree.c:205 #, c-format msgid "'%s' already exists" msgstr "'%s' ja existeix" -#: builtin/worktree.c:235 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "no s'ha pogut crear directori de '%s'" -#: builtin/worktree.c:274 +#: builtin/worktree.c:275 #, c-format msgid "Preparing %s (identifier %s)" msgstr "S'està preparant %s (identificador %s)" -#: builtin/worktree.c:328 +#: builtin/worktree.c:327 msgid "checkout <branch> even if already checked out in other worktree" msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball" -#: builtin/worktree.c:330 +#: builtin/worktree.c:329 msgid "create a new branch" msgstr "crea una branca nova" -#: builtin/worktree.c:332 +#: builtin/worktree.c:331 msgid "create or reset a branch" msgstr "crea o restableix una branca" -#: builtin/worktree.c:334 +#: builtin/worktree.c:333 msgid "populate the new working tree" msgstr "emplena l'arbre de treball nou" -#: builtin/worktree.c:335 +#: builtin/worktree.c:334 msgid "keep the new working tree locked" msgstr "mantén l'arbre de treball nou bloquejat" -#: builtin/worktree.c:343 +#: builtin/worktree.c:342 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B i --detach són mutualment exclusius" -#: builtin/worktree.c:478 +#: builtin/worktree.c:479 msgid "reason for locking" msgstr "raó per bloquejar" -#: builtin/worktree.c:490 builtin/worktree.c:523 +#: builtin/worktree.c:491 builtin/worktree.c:524 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no és un arbre de treball" -#: builtin/worktree.c:492 builtin/worktree.c:525 +#: builtin/worktree.c:493 builtin/worktree.c:526 msgid "The main working tree cannot be locked or unlocked" msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal" -#: builtin/worktree.c:497 +#: builtin/worktree.c:498 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ja està bloquejat, raó: '%s'" -#: builtin/worktree.c:499 +#: builtin/worktree.c:500 #, c-format msgid "'%s' is already locked" msgstr "'%s' ja està bloquejat" -#: builtin/worktree.c:527 +#: builtin/worktree.c:528 #, c-format msgid "'%s' is not locked" msgstr "'%s' no està bloquejat" -#: builtin/write-tree.c:13 +#: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "<prefix>/" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "només útil per a la depuració" -#: upload-pack.c:22 +#: upload-pack.c:23 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opcions>] <directori>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "surt després d'un sol intercanvi de sol·licitud/resposta" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "surt immediatament després de l'anunci inicial de referència" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "no intentis <directori>/.git/ si <directori> no és cap directori del Git" +msgstr "" +"no intentis <directori>/.git/ si <directori> no és cap directori del Git" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interromp la transferència després de <n> segons d'inactivitat" -#: credential-cache--daemon.c:223 +#: credential-cache--daemon.c:224 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13619,11 +14143,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "imprimeix els missatges de depuració a stderr" -#: git.c:14 +#: git.c:15 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" @@ -13633,20 +14157,20 @@ msgstr "" "algunes guies de concepte. Vegeu 'git help <ordre>' o\n" "'git help <concepte>' per a llegir sobre una subordre o concepte especÃfic." -#: http.c:336 +#: http.c:337 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: http.c:357 +#: http.c:358 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "No s'admet el control de delegació amb el cURL < 7.22.0" -#: http.c:366 +#: http.c:367 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0" -#: http.c:1766 +#: http.c:1764 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13657,7 +14181,7 @@ msgstr "" " petició: %s\n" " redirecció: %s" -#: remote-curl.c:323 +#: remote-curl.c:324 #, c-format msgid "redirecting to %s" msgstr "s'està redirigint a %s" @@ -13708,7 +14232,8 @@ msgstr "Registra els canvis al dipòsit" #: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" -msgstr "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." +msgstr "" +"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." #: common-cmds.h:24 msgid "Download objects and refs from another repository" @@ -13740,7 +14265,8 @@ msgstr "Obtén i integra amb un altre dipòsit o una branca local" #: common-cmds.h:31 msgid "Update remote refs along with associated objects" -msgstr "Actualitza les referències remotes juntament amb els objectes associats" +msgstr "" +"Actualitza les referències remotes juntament amb els objectes associats" #: common-cmds.h:32 msgid "Reapply commits on top of another base tip" @@ -13764,7 +14290,8 @@ msgstr "Mostra l'estat de l'arbre de treball" #: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG" +msgstr "" +"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG" #: parse-options.h:145 msgid "expiry-date" @@ -13788,7 +14315,8 @@ msgstr "usa <n> xifres per presentar els SHA-1" #: rerere.h:40 msgid "update the index with reused conflict resolution if possible" -msgstr "actualitza l'Ãndex amb la resolució de conflicte reusada si és possible" +msgstr "" +"actualitza l'Ãndex amb la resolució de conflicte reusada si és possible" #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" @@ -13817,8 +14345,11 @@ msgstr "HEAD dolent - Cal un HEAD" #: git-bisect.sh:167 #, sh-format -msgid "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." -msgstr "L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-và lida>'." +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." +msgstr "" +"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-" +"và lida>'." #: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" @@ -13969,7 +14500,8 @@ msgstr "no es pot canviar el significat del terme '$term'" #: git-bisect.sh:606 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." -msgstr "Ordre no và lida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD." +msgstr "" +"Ordre no và lida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD." #: git-bisect.sh:636 msgid "no terms defined" @@ -13985,8 +14517,12 @@ msgstr "" "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new." #: git-merge-octopus.sh:46 -msgid "Error: Your local changes to the following files would be overwritten by merge" -msgstr "Error: Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar" +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "" +"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per " +"fusionar" #: git-merge-octopus.sh:61 msgid "Automated merge did not work." @@ -14018,23 +14554,31 @@ msgstr "S'està intentant una fusió simple amb $pretty_name" #: git-merge-octopus.sh:102 msgid "Simple merge did not work, trying automatic merge." -msgstr "La fusió simple no ha funcionat, s'està intentant una fusió automà tica." +msgstr "" +"La fusió simple no ha funcionat, s'està intentant una fusió automà tica." #: git-rebase.sh:58 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort\"." +"To check out the original branch and stop rebasing, run \"git rebase --abort" +"\"." msgstr "" "Quan hà giu resolt aquest problema, executeu \"git rebase --continue\".\n" -"Si preferiu ometre aquest pedaç, executeu \"git rebase --skip\" en lloc d'això.\n" -"Per a agafar la branca original i deixar de fer «rebase», executeu \"git rebase --abort\"." +"Si preferiu ometre aquest pedaç, executeu \"git rebase --skip\" en lloc " +"d'això.\n" +"Per a agafar la branca original i deixar de fer «rebase», executeu \"git " +"rebase --abort\"." #: git-rebase.sh:158 git-rebase.sh:397 #, sh-format msgid "Could not move back to $head_name" msgstr "No s'ha pogut tornar a $head_name" +#: git-rebase.sh:169 +msgid "Applied autostash." +msgstr "S'ha aplicat el magatzem automà tic." + #: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" @@ -14050,7 +14594,7 @@ msgstr "Sembla que git-am està en curs. No es pot fer «rebase»." #: git-rebase.sh:358 msgid "No rebase in progress?" -msgstr "No hi ha rebasament en curs?" +msgstr "No hi ha un «rebase» en curs?" #: git-rebase.sh:369 msgid "The --edit-todo action can only be used during interactive rebase." @@ -14081,7 +14625,7 @@ msgid "" "valuable there." msgstr "" "Sembla que ja hi ha un directori $state_dir_base, i\n" -"em pregunto si esteu enmig d'un altre rebasament. Si aquest és el\n" +"em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n" "cas, si us plau, proveu\n" "\t$cmd_live_rebase\n" "Si no és el cas, si us plau,\n" @@ -14144,46 +14688,48 @@ msgstr "Canvis de $mb a $onto:" #: git-rebase.sh:615 msgid "First, rewinding head to replay your work on top of it..." -msgstr "Primer, s'està rebobinant el cap per a reproduir el vostre treball al damunt..." +msgstr "" +"Primer, s'està rebobinant el cap per a reproduir el vostre treball al " +"damunt..." #: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "S'ha avançat $branch_name rà pidament a $onto_name." -#: git-stash.sh:53 +#: git-stash.sh:54 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear amb parà metres no està implementat" -#: git-stash.sh:94 +#: git-stash.sh:95 msgid "You do not have the initial commit yet" msgstr "Encara no teniu la comissió inicial" -#: git-stash.sh:109 +#: git-stash.sh:110 msgid "Cannot save the current index state" msgstr "No es pot desar l'estat d'Ãndex actual" -#: git-stash.sh:124 +#: git-stash.sh:125 msgid "Cannot save the untracked files" msgstr "No es pot desar els fitxers no seguits" -#: git-stash.sh:144 git-stash.sh:157 +#: git-stash.sh:145 git-stash.sh:158 msgid "Cannot save the current worktree state" msgstr "No es pot desar l'estat d'arbre de treball actual" -#: git-stash.sh:161 +#: git-stash.sh:162 msgid "No changes selected" msgstr "No hi ha canvis seleccionats" -#: git-stash.sh:164 +#: git-stash.sh:165 msgid "Cannot remove temporary index (can't happen)" msgstr "No es pot eliminar l'Ãndex temporal (això no pot passar)" -#: git-stash.sh:177 +#: git-stash.sh:178 msgid "Cannot record working tree state" msgstr "No es pot registrar l'estat de l'arbre de treball" -#: git-stash.sh:209 +#: git-stash.sh:210 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "No es pot actualitzar $ref_stash amb $w_commit" @@ -14198,7 +14744,7 @@ msgstr "No es pot actualitzar $ref_stash amb $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:265 +#: git-stash.sh:266 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14207,113 +14753,118 @@ msgstr "" "error: opció desconeguda de 'stash save': $option\n" " Per a proveir un missatge, useu git stash save -- '$option'" -#: git-stash.sh:278 +#: git-stash.sh:281 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No es poden usar --patch i --include-untracked o --all a la vegada." -#: git-stash.sh:286 +#: git-stash.sh:289 msgid "No local changes to save" msgstr "No hi ha canvis locals a desar" -#: git-stash.sh:291 +#: git-stash.sh:294 msgid "Cannot initialize stash" msgstr "No es pot inicialitzar el magatzem" -#: git-stash.sh:295 +#: git-stash.sh:298 msgid "Cannot save the current status" msgstr "No es pot desar l'estat actual" -#: git-stash.sh:296 +#: git-stash.sh:299 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "S'han desat el directori de treball i l'estat d'Ãndex $stash_msg" -#: git-stash.sh:323 +#: git-stash.sh:326 msgid "Cannot remove worktree changes" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: git-stash.sh:471 +#: git-stash.sh:474 #, sh-format msgid "unknown option: $opt" msgstr "opció desconeguda: $opt" -#: git-stash.sh:484 -msgid "No stash found." +#: git-stash.sh:487 +#, fuzzy +msgid "No stash entries found." msgstr "No s'ha trobat cap magatzem." -#: git-stash.sh:491 +#: git-stash.sh:494 #, sh-format msgid "Too many revisions specified: $REV" msgstr "S'han especificat massa revisions: $REV" -#: git-stash.sh:506 +#: git-stash.sh:509 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no és una referència và lida" -#: git-stash.sh:534 +#: git-stash.sh:537 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no és una comissió de tipus magatzem" -#: git-stash.sh:545 +#: git-stash.sh:548 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no és una referència de magatzem" -#: git-stash.sh:553 +#: git-stash.sh:556 msgid "unable to refresh index" msgstr "no s'ha pogut actualitzar l'Ãndex" -#: git-stash.sh:557 +#: git-stash.sh:560 msgid "Cannot apply a stash in the middle of a merge" msgstr "No es pot aplicar un magatzem enmig d'una fusió" -#: git-stash.sh:565 +#: git-stash.sh:568 msgid "Conflicts in index. Try without --index." msgstr "Hi ha conflictes en l'Ãndex. Proveu-ho sense --index." -#: git-stash.sh:567 +#: git-stash.sh:570 msgid "Could not save index tree" msgstr "No s'ha pogut desar l'arbre d'Ãndex" -#: git-stash.sh:576 -msgid "Could not restore untracked files from stash" +#: git-stash.sh:579 +#, fuzzy +msgid "Could not restore untracked files from stash entry" msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge" -#: git-stash.sh:601 +#: git-stash.sh:604 msgid "Cannot unstage modified files" msgstr "No es pot fer «unstage» dels fitxers modificats" -#: git-stash.sh:616 +#: git-stash.sh:619 msgid "Index was not unstashed." msgstr "L'Ãndex no estava sense emmagatzemar." -#: git-stash.sh:630 -msgid "The stash is kept in case you need it again." +#: git-stash.sh:633 +#, fuzzy +msgid "The stash entry is kept in case you need it again." msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada." -#: git-stash.sh:639 +#: git-stash.sh:642 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ($s) descartada" -#: git-stash.sh:640 +#: git-stash.sh:643 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" -#: git-stash.sh:648 +#: git-stash.sh:651 msgid "No branch name specified" msgstr "Cap nom de branca especificat" -#: git-stash.sh:727 +#: git-stash.sh:730 msgid "(To restore them type \"git stash apply\")" msgstr "(Per restaurar-les teclegeu \"git stash apply\")" #: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" -msgstr "El camà relatiu només es pot usar des del nivell superior de l'arbre de treball" +msgstr "" +"El camà relatiu només es pot usar des del nivell superior de l'arbre de " +"treball" #: git-submodule.sh:191 #, sh-format @@ -14330,7 +14881,7 @@ msgstr "'$sm_path' ja existeix en l'Ãndex" msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ja existeix en l'Ãndex i no és submòdul" -#: git-submodule.sh:218 +#: git-submodule.sh:219 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -14341,75 +14892,82 @@ msgstr "" "$sm_path\n" "Useu -f si realment voleu afegir-lo." -#: git-submodule.sh:236 +#: git-submodule.sh:237 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'Ãndex" -#: git-submodule.sh:238 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ja existeix i no és un dipòsit de git và lid" -#: git-submodule.sh:246 +#: git-submodule.sh:247 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "Es troba un directori de git per a '$sm_name' localment amb els remots:" +msgstr "" +"Es troba un directori de git per a '$sm_name' localment amb els remots:" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" " $realrepo\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." +"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 "" "Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n" " $realrepo\n" -"useu l'opció '--force'. Si el directori de git local no és el dipòsit correcte\n" -"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--name'." +"useu l'opció '--force'. Si el directori de git local no és el dipòsit " +"correcte\n" +"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--" +"name'." -#: git-submodule.sh:254 +#: git-submodule.sh:255 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "S'està reactivant el directori de git local per al submòdul '$sm_name'." +msgstr "" +"S'està reactivant el directori de git local per al submòdul '$sm_name'." -#: git-submodule.sh:266 +#: git-submodule.sh:267 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No s'ha pogut agafar el submòdul '$sm_path'" -#: git-submodule.sh:271 +#: git-submodule.sh:272 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "S'ha produït un error en afegir el submòdul '$sm_path'" -#: git-submodule.sh:280 +#: git-submodule.sh:281 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "S'ha produït un error en registrar el submòdul '$sm_path'" -#: git-submodule.sh:341 +#: git-submodule.sh:342 #, sh-format msgid "Entering '$displaypath'" msgstr "S'està entrant '$displaypath'" -#: git-submodule.sh:361 +#: git-submodule.sh:362 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "S'està aturant a '$displaypath'; l'script ha retornat un estat no zero." +msgstr "" +"S'està aturant a '$displaypath'; l'script ha retornat un estat no zero." -#: git-submodule.sh:432 +#: git-submodule.sh:433 #, sh-format msgid "pathspec and --all are incompatible" msgstr "--pathspec i --all són incompatibles" -#: git-submodule.sh:437 +#: git-submodule.sh:438 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls" -#: git-submodule.sh:457 +#: git-submodule.sh:458 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14418,139 +14976,150 @@ msgstr "" "L'arbre de treball de submòdul '$displaypath' conté un directori .git\n" "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)" -#: git-submodule.sh:465 +#: git-submodule.sh:466 #, sh-format -msgid "Submodule work tree '$displaypath' contains local modifications; use '-f' to discard them" +msgid "" +"Submodule work tree '$displaypath' contains local modifications; use '-f' to " +"discard them" msgstr "" -"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; useu '-f' per a " -"descartar-les" +"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; " +"useu '-f' per a descartar-les" -#: git-submodule.sh:468 +#: git-submodule.sh:469 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "S'ha netejat el directori '$displaypath'" -#: git-submodule.sh:469 +#: git-submodule.sh:470 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'" -#: git-submodule.sh:472 +#: git-submodule.sh:473 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'" -#: git-submodule.sh:481 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Submòdul '$name' ($url) no registrat per al camà '$displaypath'" -#: git-submodule.sh:637 +#: git-submodule.sh:638 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" -msgstr "No s'ha pogut trobar la revisió actual en el camà de submòdul '$displaypath'" +msgstr "" +"No s'ha pogut trobar la revisió actual en el camà de submòdul '$displaypath'" -#: git-submodule.sh:647 +#: git-submodule.sh:648 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No s'ha pogut obtenir en el camà de submòdul '$sm_path'" -#: git-submodule.sh:652 +#: git-submodule.sh:653 #, sh-format -msgid "Unable to find current ${remote_name}/${branch} revision in submodule path '$sm_path'" -msgstr "" -"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el camà de submòdul " +msgid "" +"Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" +msgstr "" +"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el " +"camà de submòdul '$sm_path'" -#: git-submodule.sh:670 +#: git-submodule.sh:671 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "No s'ha pogut obtenir en el camà de submòdul '$displaypath'" -#: git-submodule.sh:676 +#: git-submodule.sh:677 #, sh-format msgid "" -"Fetched in submodule path '$displaypath', but it did not contain $sha1. Direct fetching of that " -"commit failed." +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." msgstr "" -"S'ha obtingut en el camà de submòdul '$displaypath', però no contenia $sha1. L'obtenció directa " -"d'aquella comissió ha fallat." +"S'ha obtingut en el camà de submòdul '$displaypath', però no contenia $sha1. " +"L'obtenció directa d'aquella comissió ha fallat." -#: git-submodule.sh:683 +#: git-submodule.sh:684 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut agafar '$sha1' en el camà de submòdul '$displaypath'" -#: git-submodule.sh:684 +#: git-submodule.sh:685 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Camà de submòdul '$displaypath': s'ha agafat '$sha1'" -#: git-submodule.sh:688 +#: git-submodule.sh:689 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" -msgstr "No s'ha pogut fer «rebase» '$sha1' en el camà de submòdul '$displaypath'" +msgstr "" +"No s'ha pogut fer «rebase» '$sha1' en el camà de submòdul '$displaypath'" -#: git-submodule.sh:689 +#: git-submodule.sh:690 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Camà de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'" -#: git-submodule.sh:694 +#: git-submodule.sh:695 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut fusionar '$sha1' en el camà de submòdul '$displaypath'" -#: git-submodule.sh:695 +#: git-submodule.sh:696 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Camà de submòdul '$displaypath': s'ha fusionat en '$sha1'" -#: git-submodule.sh:700 +#: git-submodule.sh:701 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" -msgstr "L'execució de '$command $sha1' ha fallat en el camà de submòdul '$displaypath'" +msgstr "" +"L'execució de '$command $sha1' ha fallat en el camà de submòdul " +"'$displaypath'" -#: git-submodule.sh:701 +#: git-submodule.sh:702 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Camà de submòdul '$displaypath': '$command $sha1'" -#: git-submodule.sh:732 +#: git-submodule.sh:733 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" -msgstr "S'ha produït un error en recorre recursivament dins del camà de submòdul '$displaypath'" +msgstr "" +"S'ha produït un error en recorre recursivament dins del camà de submòdul " +"'$displaypath'" -#: git-submodule.sh:840 +#: git-submodule.sh:841 msgid "The --cached option cannot be used with the --files option" msgstr "L'opció --cached no es pot usar amb l'opció --files" -#: git-submodule.sh:892 +#: git-submodule.sh:893 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode inesperat $mod_dst" -#: git-submodule.sh:912 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " AvÃs: $display_name no conté la comissió $sha1_src" -#: git-submodule.sh:915 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " AvÃs: $display_name no conté la comissió $sha1_dst" -#: git-submodule.sh:918 +#: git-submodule.sh:919 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " AvÃs: $display_name no conté les comissions $sha1_src i $sha1_dst" -#: git-submodule.sh:1064 +#: git-submodule.sh:1065 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "S'ha produït un error en cercar recursivament al camà de submòdul '$sm_path'" +msgstr "" +"S'ha produït un error en cercar recursivament al camà de submòdul '$sm_path'" -#: git-submodule.sh:1136 +#: git-submodule.sh:1137 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'" @@ -14585,8 +15154,10 @@ msgstr "" " r, reword = usa la comissió, però edita el missatge de comissió\n" " e, edit = usa la comissió, però atura't per a esmenar\n" " s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n" -" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta comissió\n" -" x, exec = executa l'ordre (el reste de la lÃnia) usant l'intèrpret d'ordres\n" +" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta " +"comissió\n" +" x, exec = executa l'ordre (el reste de la lÃnia) usant l'intèrpret " +"d'ordres\n" " d, drop = elimina la comissió\n" "\n" "Es pot canviar l'ordre d'aquestes lÃnies; s'executen de dalt a baix.\n" @@ -14597,7 +15168,8 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"No elimineu cap lÃnia. Useu 'drop' explÃcitament per a eliminar una comissió.\n" +"No elimineu cap lÃnia. Useu 'drop' explÃcitament per a eliminar una " +"comissió.\n" #: git-rebase--interactive.sh:175 msgid "" @@ -14696,7 +15268,8 @@ msgstr "No es pot escriure $fixup_msg" msgid "This is a combination of 2 commits." msgstr "Això és una combinació de 2 comissions." -#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 git-rebase--interactive.sh:531 +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No s'ha pogut aplicar $sha1... $rest" @@ -14706,10 +15279,12 @@ msgstr "No s'ha pogut aplicar $sha1... $rest" msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" "This is most likely due to an empty commit message, or the pre-commit hook\n" -"failed. If the pre-commit hook failed, you may need to resolve the issue before\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue " +"before\n" "you are able to reword the commit." msgstr "" -"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... $rest\n" +"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... " +"$rest\n" "Això és probablement a causa d'un missatge de comissió buit, o el ganxo de\n" "precomissió ha fallat. Si el ganxo de precomissió ha fallat, pot ser que\n" "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n" @@ -14777,7 +15352,7 @@ msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'." #: git-rebase--interactive.sh:703 #, sh-format msgid "Successfully rebased and updated $head_name." -msgstr "S'ha rebasat i actualitzat $head_name amb èxit." +msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit." #: git-rebase--interactive.sh:750 msgid "Could not skip unnecessary pick commands" @@ -14810,34 +15385,45 @@ msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" msgstr "" -"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n" +"Advertència: pot ser que algunes comissions s'hagin descartat " +"accidentalment.\n" "Les comissions descartades (més nova a més vella):" #: git-rebase--interactive.sh:1026 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" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" "The possible behaviours are: ignore, warn, error." msgstr "" -"Per a evitar aquest missatge, useu \"drop\" per a eliminar explÃcitament una comissió.\n" +"Per a evitar aquest missatge, useu \"drop\" per a eliminar explÃcitament una " +"comissió.\n" "\n" -"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell d'advertències.\n" +"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell " +"d'advertències.\n" "Els comportaments possibles són: ignore, warn, error." #: git-rebase--interactive.sh:1037 #, sh-format -msgid "Unrecognized setting $check_level for option rebase.missingCommitsCheck. Ignoring." +msgid "" +"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " +"Ignoring." msgstr "" -"No s'ha reconegut l'ajust $check_level per a l'opció rebase.missingCommitsCheck. S'està ignorant." +"No s'ha reconegut l'ajust $check_level per a l'opció rebase." +"missingCommitsCheck. S'està ignorant." #: git-rebase--interactive.sh:1054 -msgid "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'." -msgstr "Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --continue'." +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'." +msgstr "" +"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --" +"continue'." #: git-rebase--interactive.sh:1055 msgid "Or you can abort the rebase with 'git rebase --abort'." -msgstr "O podeu avortar el rebasament amb 'git rebase --abort'." +msgstr "O podeu avortar el «rebase» amb 'git rebase --abort'." #: git-rebase--interactive.sh:1083 msgid "Could not remove CHERRY_PICK_HEAD" @@ -14876,7 +15462,9 @@ msgstr "" #: git-rebase--interactive.sh:1105 msgid "Error trying to find the author identity to amend commit" -msgstr "Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar la comissió" +msgstr "" +"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar " +"la comissió" #: git-rebase--interactive.sh:1110 msgid "" @@ -14899,8 +15487,8 @@ msgid "" "\n" msgstr "" "\n" -"Esteu editant el fitxer de coses a fer d'un rebasament interactiu en marxa.\n" -"Per a continuar el rebasament després d'editar, executeu:\n" +"Esteu editant el fitxer de coses a fer d'un «rebase» interactiu en marxa.\n" +"Per a continuar el «rebase» després d'editar, executeu:\n" " git rebase --continue\n" "\n" @@ -14944,7 +15532,7 @@ msgid "" "\n" msgstr "" "\n" -"No obstant, si elimineu tot, s'avortarà el rebasament.\n" +"No obstant, si elimineu tot, s'avortarà el «rebase».\n" "\n" #: git-rebase--interactive.sh:1303 @@ -14959,7 +15547,9 @@ msgstr "ús: $dashless $USAGE" #: git-sh-setup.sh:190 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" -msgstr "No es pot canviar de directori a $cdup, el nivell superior de l'arbre de treball" +msgstr "" +"No es pot canviar de directori a $cdup, el nivell superior de l'arbre de " +"treball" #: git-sh-setup.sh:199 git-sh-setup.sh:206 #, sh-format @@ -14968,7 +15558,7 @@ msgstr "fatal: no es pot usar $program_name sense un arbre de treball." #: git-sh-setup.sh:220 msgid "Cannot rebase: You have unstaged changes." -msgstr "No es pot rebasar: Teniu canvis «unstaged»." +msgstr "No es pot fer «rebase»: teniu canvis «unstaged»." #: git-sh-setup.sh:223 msgid "Cannot rewrite branches: You have unstaged changes." @@ -14989,7 +15579,8 @@ msgstr "No es pot fer «rebase»: El vostre Ãndex conté canvis sense cometre." #: git-sh-setup.sh:245 msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "No es pot baixar fent «rebase»: El vostre Ãndex conté canvis sense cometre." +msgstr "" +"No es pot baixar fent «rebase»: El vostre Ãndex conté canvis sense cometre." #: git-sh-setup.sh:248 #, sh-format @@ -15002,88 +15593,89 @@ msgstr "Addicionalment, el vostre Ãndex conté canvis sense cometre." #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." -msgstr "Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball." +msgstr "" +"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball." #: git-sh-setup.sh:377 msgid "Unable to determine absolute path of git directory" msgstr "No s'ha pogut determinar el camà absolut del directori de git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:238 +#: git-add--interactive.perl:196 #, perl-format msgid "%12s %12s %s" msgstr "" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "staged" msgstr "staged" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "unstaged" msgstr "unstaged" -#: git-add--interactive.perl:288 git-add--interactive.perl:313 +#: git-add--interactive.perl:246 git-add--interactive.perl:271 msgid "binary" msgstr "binari" -#: git-add--interactive.perl:297 git-add--interactive.perl:351 +#: git-add--interactive.perl:255 git-add--interactive.perl:309 msgid "nothing" msgstr "res" -#: git-add--interactive.perl:333 git-add--interactive.perl:348 +#: git-add--interactive.perl:291 git-add--interactive.perl:306 msgid "unchanged" msgstr "sense canvis" -#: git-add--interactive.perl:644 +#: git-add--interactive.perl:602 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "afegit %d camÃ\n" msgstr[1] "afegits %d camins\n" -#: git-add--interactive.perl:647 +#: git-add--interactive.perl:605 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualitzat %d camÃ\n" msgstr[1] "actualitzats %d camins\n" -#: git-add--interactive.perl:650 +#: git-add--interactive.perl:608 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertit %d camÃ\n" msgstr[1] "revertits %d camins\n" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:611 #, 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" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:620 msgid "Update" msgstr "Actualitza" -#: git-add--interactive.perl:674 +#: git-add--interactive.perl:632 msgid "Revert" msgstr "Reverteix" -#: git-add--interactive.perl:697 +#: git-add--interactive.perl:655 #, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s està ara sense seguiment.\n" -#: git-add--interactive.perl:708 +#: git-add--interactive.perl:666 msgid "Add untracked" msgstr "Afegeix sense seguiment" -#: git-add--interactive.perl:714 +#: git-add--interactive.perl:672 msgid "No untracked files.\n" msgstr "Sense fitxers no seguits.\n" -#: git-add--interactive.perl:1030 +#: git-add--interactive.perl:985 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -15091,7 +15683,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «staging»." -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:988 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -15099,7 +15691,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «stashing»." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:991 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -15107,7 +15699,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «unstaging»." -#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 +#: git-add--interactive.perl:994 git-add--interactive.perl:1003 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -15115,7 +15707,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per aplicar-se." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 +#: git-add--interactive.perl:997 git-add--interactive.perl:1000 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -15123,16 +15715,17 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per descartar-se." -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1013 #, 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" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1014 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Mode d'edició de trossos manual - vegeu més avall per una guia rà pida.\n" +msgstr "" +"Mode d'edició de trossos manual - vegeu més avall per una guia rà pida.\n" -#: git-add--interactive.perl:1065 +#: git-add--interactive.perl:1020 #, perl-format msgid "" "---\n" @@ -15146,17 +15739,18 @@ msgstr "" "Les lÃnies que comencin per %s seran suprimides.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1073 +#: git-add--interactive.perl:1028 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 "" "Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n" -"de nou. Si totes les lÃnies del tros se suprimeixen, llavors l'edició s'avorta\n" +"de nou. Si totes les lÃnies del tros se suprimeixen, llavors l'edició " +"s'avorta\n" "i el tros es deixa sense cap canvi.\n" -#: git-add--interactive.perl:1087 +#: git-add--interactive.perl:1042 #, 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" @@ -15167,11 +15761,14 @@ msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" #. 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:1178 -msgid "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es descartarà ) [y/n]? " +#: git-add--interactive.perl:1134 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es " +"descartarà ) [y/n]? " -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1143 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15185,7 +15782,7 @@ msgstr "" "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" -#: git-add--interactive.perl:1193 +#: git-add--interactive.perl:1149 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15199,7 +15796,7 @@ msgstr "" "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" -#: git-add--interactive.perl:1199 +#: git-add--interactive.perl:1155 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15213,7 +15810,7 @@ msgstr "" "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" -#: git-add--interactive.perl:1205 +#: git-add--interactive.perl:1161 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15222,7 +15819,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1211 +#: git-add--interactive.perl:1167 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15231,7 +15828,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1217 +#: git-add--interactive.perl:1173 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15240,7 +15837,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15249,7 +15846,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1188 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15262,280 +15859,289 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1219 msgid "The selected hunks do not apply to the index!\n" msgstr "Els trossos seleccionats no apliquen a l'Ãndex\n" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " msgstr "Voleu aplicar-los igualment a l'arbre de treball" -#: git-add--interactive.perl:1267 +#: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" msgstr "No s'ha aplicat res.\n" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1234 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "s'està ignorant %s no fusionat\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1243 msgid "Only binary files changed.\n" msgstr "Només s'han canviat els fitxers binaris.\n" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl:1245 msgid "No changes.\n" msgstr "Sense canvis.\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1253 msgid "Patch update" msgstr "Actualització del pedaç" -#: git-add--interactive.perl:1349 +#: git-add--interactive.perl:1305 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "Canvia el mode de «stage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1350 +#: git-add--interactive.perl:1306 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1351 +#: git-add--interactive.perl:1307 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1354 +#: git-add--interactive.perl:1310 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "Canvia el mode de «stash» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1311 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1356 +#: git-add--interactive.perl:1312 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1315 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "Canvia el mode de «unstage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1316 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "Suprimeix «Unstage» [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1361 +#: git-add--interactive.perl:1317 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1320 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "Aplica el canvi de mode a l'Ãndex [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1321 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "Aplica l'esborrat a l'Ãndex [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1366 +#: git-add--interactive.perl:1322 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "Aplica aquest tros a l'Ãndex [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1325 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d,/%s,?]? " +msgstr "" +"Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1326 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1371 +#: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1330 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descarta el canvi de mode des de l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " +msgstr "" +"Descarta el canvi de mode des de l'Ãndex i l'arbre de treball [y,n,q,a,d,/" +"%s,?]? " -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1331 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descarta la supressió des de l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " +msgstr "" +"Descarta la supressió des de l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1376 +#: git-add--interactive.perl:1332 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Descarta aquest tros des de l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " +msgstr "" +"Descarta aquest tros des de l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1335 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Aplica el canvi de mode a l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " +msgstr "" +"Aplica el canvi de mode a l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1336 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Aplica la supressió a l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1381 +#: git-add--interactive.perl:1337 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Aplica aquest tros a l'Ãndex i l'arbre de treball [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " msgstr "vés a quin tros (<ret> per veure'n més)? " -#: git-add--interactive.perl:1486 +#: git-add--interactive.perl:1442 msgid "go to which hunk? " msgstr "vés a quin tros? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1451 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Número no và lid: '%s'\n" -#: git-add--interactive.perl:1500 +#: git-add--interactive.perl:1456 #, 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" -#: git-add--interactive.perl:1526 +#: git-add--interactive.perl:1482 msgid "search for regex? " msgstr "Cerca per expressió regular? " -#: git-add--interactive.perl:1539 +#: git-add--interactive.perl:1495 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Expressió regular de cerca mal formada %s: %s\n" -#: git-add--interactive.perl:1549 +#: git-add--interactive.perl:1505 msgid "No hunk matches the given pattern\n" msgstr "No hi ha trossos que coincideixin amb el patró donat\n" -#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 +#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 msgid "No previous hunk\n" msgstr "Sense tros previ\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 +#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 msgid "No next hunk\n" msgstr "No hi ha tros següent\n" -#: git-add--interactive.perl:1597 +#: git-add--interactive.perl:1553 #, 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" -#: git-add--interactive.perl:1649 +#: git-add--interactive.perl:1605 msgid "Review diff" msgstr "Reviseu les diferències" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1668 +#: git-add--interactive.perl:1624 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" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" msgstr "" -#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 git-add--interactive.perl:1693 -#: git-add--interactive.perl:1700 git-add--interactive.perl:1704 git-add--interactive.perl:1710 +#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 +#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 +#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 msgid "missing --" msgstr "manca --" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1662 #, perl-format msgid "unknown --patch mode: %s" msgstr "desconegut --patch mode: %s" -#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument %s no và lid, s'esperava --" -#: git-send-email.perl:121 +#: git-send-email.perl:126 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "la zona local difereix de GMT per un interval que no és de minuts\n" -#: git-send-email.perl:128 git-send-email.perl:134 +#: git-send-email.perl:133 git-send-email.perl:139 msgid "local time offset greater than or equal to 24 hours\n" msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n" -#: git-send-email.perl:202 git-send-email.perl:208 +#: git-send-email.perl:208 git-send-email.perl:214 msgid "the editor exited uncleanly, aborting everything" msgstr "l'editor no ha sortit correctament, avortant-ho tot" -#: git-send-email.perl:282 +#: git-send-email.perl:291 #, perl-format -msgid "'%s' contains an intermediate version of the email you were composing.\n" +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' conté una versió intermèdia del correu que està veu redactant.\n" -#: git-send-email.perl:287 +#: git-send-email.perl:296 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' conté el correu redactat.\n" -#: git-send-email.perl:305 +#: git-send-email.perl:314 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases és incompatible amb altres opcions\n" -#: git-send-email.perl:368 git-send-email.perl:623 +#: git-send-email.perl:379 git-send-email.perl:634 msgid "Cannot run git format-patch from outside a repository\n" msgstr "No es pot executar git format-patch des de fora del dipòsit\n" -#: git-send-email.perl:437 +#: git-send-email.perl:448 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Camp --suppress-cc desconegut: '%s'\n" -#: git-send-email.perl:466 +#: git-send-email.perl:477 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "--confirm setting desconegut: '%s'\n" -#: git-send-email.perl:498 +#: git-send-email.perl:509 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "avÃs: el sobrenom de sendmail amb cometes no està suportat: %s\n" -#: git-send-email.perl:500 +#: git-send-email.perl:511 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "avÃs: `:include:` no està suportat: %s\n" -#: git-send-email.perl:502 +#: git-send-email.perl:513 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "avÃs: les redireccions `/file` or `|pipe no són admeses: %s\n" -#: git-send-email.perl:507 +#: git-send-email.perl:518 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "avÃs: no es pot reconèixer la lÃnia sendmail: %s\n" -#: git-send-email.perl:589 +#: git-send-email.perl:600 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15550,12 +16156,12 @@ msgstr "" " * Dient \"./%s\" si volÃeu especificar aquest fitxer; o\n" " * Proporcionant l'opció --format-patch si volÃeu especificar un rang.\n" -#: git-send-email.perl:610 +#: git-send-email.perl:621 #, perl-format msgid "Failed to opendir %s: %s" msgstr "S'ha produït un error a l'obrir el directori %s: %s" -#: git-send-email.perl:634 +#: git-send-email.perl:645 #, perl-format msgid "" "fatal: %s: %s\n" @@ -15564,7 +16170,7 @@ msgstr "" "fatal: %s: %s\n" "avÃs: no s'han enviat pedaços\n" -#: git-send-email.perl:645 +#: git-send-email.perl:656 msgid "" "\n" "No patch files specified!\n" @@ -15574,17 +16180,17 @@ msgstr "" "No s'han especificat fitxers de pedaç\n" "\n" -#: git-send-email.perl:658 +#: git-send-email.perl:669 #, perl-format msgid "No subject line in %s?" msgstr "Sense assumpte a %s?" -#: git-send-email.perl:668 +#: git-send-email.perl:679 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "S'ha produït un error en obrir per escriptura %s: %s" -#: git-send-email.perl:678 +#: git-send-email.perl:689 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15598,60 +16204,68 @@ msgstr "" "\n" "Netegeu el contingut del cos si no voleu enviar un resum.\n" -#: git-send-email.perl:701 +#: git-send-email.perl:712 #, perl-format msgid "Failed to open %s.final: %s" msgstr "S'ha produït un error en obrir %s.final: %s" -#: git-send-email.perl:704 +#: git-send-email.perl:715 #, perl-format msgid "Failed to open %s: %s" msgstr "S'ha produït un error en obrir %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:750 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "Els camps A/Cc/Bcc no s'interpreten encara, s'ignoraran\n" -#: git-send-email.perl:748 +#: git-send-email.perl:759 msgid "Summary email is empty, skipping it\n" msgstr "El correu electrònic de resum està buit, s'omet\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:780 +#: git-send-email.perl:791 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Esteu segur que voleu usar <%s> [y/N]? " -#: git-send-email.perl:809 -msgid "The following files are 8bit, but do not declare a Content-Transfer-Encoding.\n" -msgstr "Els fitxers següents són 8bit, però no declaren un Content-Transfer-Encoding.\n" +#: git-send-email.perl:820 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" +"Els fitxers següents són 8bit, però no declaren un Content-Transfer-" +"Encoding.\n" -#: git-send-email.perl:814 +#: git-send-email.perl:825 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? " -#: git-send-email.perl:822 +#: git-send-email.perl:833 #, 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" +"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " +"want to send.\n" msgstr "" -#: git-send-email.perl:841 +#: git-send-email.perl:852 msgid "To whom should the emails be sent (if anyone)?" -msgstr "A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?" +msgstr "" +"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?" -#: git-send-email.perl:859 +#: git-send-email.perl:870 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: l'à lias '%s' s'espandeix a si mateix\n" -#: git-send-email.perl:871 +#: git-send-email.perl:882 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " -msgstr "S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha cap)? " +msgstr "" +"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha " +"cap)? " -#: git-send-email.perl:921 git-send-email.perl:929 +#: git-send-email.perl:932 git-send-email.perl:940 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "error: no s'ha pogut extreure una adreça và lida de: %s\n" @@ -15659,16 +16273,16 @@ msgstr "error: no s'ha pogut extreure una adreça và lida de: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:933 +#: git-send-email.perl:944 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Què fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): " -#: git-send-email.perl:1234 +#: git-send-email.perl:1245 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "el camà CA \"%s\" no existeix" -#: git-send-email.perl:1309 +#: git-send-email.perl:1320 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15695,128 +16309,175 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1324 +#: git-send-email.perl:1335 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Voleu enviar aquest correu electrònic? ([y]sÃ|[n]o|[q]surt|[a]tot): " -#: git-send-email.perl:1327 +#: git-send-email.perl:1338 msgid "Send this email reply required" msgstr "Requereix contestació a l'enviar correu" -#: git-send-email.perl:1353 +#: git-send-email.perl:1364 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP requerit no està correctament definit." -#: git-send-email.perl:1397 +#: git-send-email.perl:1411 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "El servidor no admet STARTTLS! %s" -#: git-send-email.perl:1403 +#: git-send-email.perl:1416 git-send-email.perl:1420 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "" + +#: git-send-email.perl:1430 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i useu --smtp-debug." +"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i " +"useu --smtp-debug." -#: git-send-email.perl:1421 +#: git-send-email.perl:1448 #, perl-format msgid "Failed to send %s\n" msgstr "S'ha produït un error en enviar %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Dry-Sent %s\n" msgstr "Simulació d'enviament %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Sent %s\n" msgstr "Enviat %s\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "Dry-OK. Log says:\n" msgstr "Simulació de correcte. El registre diu:\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "OK. Log says:\n" msgstr "Correcte. El registre diu: \n" -#: git-send-email.perl:1438 +#: git-send-email.perl:1465 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1441 +#: git-send-email.perl:1468 msgid "Result: OK\n" msgstr "Resultat: correcte\n" -#: git-send-email.perl:1454 +#: git-send-email.perl:1481 #, perl-format msgid "can't open file %s" msgstr "no es pot obrir el fitxer %s" -#: git-send-email.perl:1501 git-send-email.perl:1521 +#: git-send-email.perl:1528 git-send-email.perl:1548 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) S'està afegint cc: %s des de la lÃnia '%s'\n" -#: git-send-email.perl:1507 +#: git-send-email.perl:1534 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) S'està afegint a: %s des de la lÃnia '%s'\n" -#: git-send-email.perl:1555 +#: git-send-email.perl:1582 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) S'està afegint cc: %s des de la lÃnia '%s'\n" -#: git-send-email.perl:1578 +#: git-send-email.perl:1605 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(cos) S'està afegint cc: %s des de la lÃnia '%s'\n" -#: git-send-email.perl:1676 +#: git-send-email.perl:1711 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no s'ha pogut executar '%s'" -#: git-send-email.perl:1683 +#: git-send-email.perl:1718 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) S'està afegint %s: %s des de: '%s'\n" -#: git-send-email.perl:1687 +#: git-send-email.perl:1722 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) s'ha produït un error en tancar el conducte '%s'" -#: git-send-email.perl:1714 +#: git-send-email.perl:1749 msgid "cannot send message as 7bit" msgstr "no es pot enviar el missatge en 7 bits" -#: git-send-email.perl:1722 +#: git-send-email.perl:1757 msgid "invalid transfer encoding" msgstr "codificació de transferència invà lida" -#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 #, perl-format msgid "unable to open %s: %s\n" msgstr "no s'ha pogut obrir %s: %s\n" -#: git-send-email.perl:1744 +#: git-send-email.perl:1798 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: el pedaç conté una lÃnia més gran de 998 carà cters" -#: git-send-email.perl:1760 +#: git-send-email.perl:1814 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "S'està ometent %s amb el sufix de còpia de seguretat '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1764 +#: git-send-email.perl:1818 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " +#~ msgid "Could not open file '%s'" +#~ msgstr "No s'ha pogut obrir el fitxer '%s'" + +#~ msgid "in %0.1f seconds automatically..." +#~ msgstr "en %0.1f segons automà ticament..." + +#~ msgid "dup2(%d,%d) failed" +#~ msgstr "dup2(%d,%d) ha fallat" + +#~ msgid "Initial commit on " +#~ msgstr "Comissió inicial en " + +#~ msgid "Patch is empty. Was it split wrong?" +#~ msgstr "El pedaç és buit. S'ha dividit malament?" + +#~ msgid "" +#~ "You still have unmerged paths in your index.\n" +#~ "Did you forget to use 'git add'?" +#~ msgstr "" +#~ "Encara teniu camins sense fusionar en el vostre Ãndex.\n" +#~ "Heu oblidat d'usar 'git add'?" + +#~ msgid "" +#~ "Cannot update paths and switch to branch '%s' at the same time.\n" +#~ "Did you intend to checkout '%s' which can not be resolved as commit?" +#~ msgstr "" +#~ "No es poden actualitzar els camins i canviar a la branca '%s' a la " +#~ "vegada.\n" +#~ "VolÃeu agafar '%s', la qual no es pot resoldre com a comissió?" + +#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..." +#~ msgstr "" +#~ "S'han especificat camins explÃcits sense -i o -o; s'està presumint --only " +#~ "camins..." + +#~ msgid "default mode for recursion" +#~ msgstr "mode de recursivitat per defecte" + +#~ msgid "submodule--helper subcommand must be called with a subcommand" +#~ msgstr "s'ha d'executar la subordre submodule--helper amb una subordre" + #, fuzzy #~ msgid "object of unknown type" #~ msgstr "tipus d'objecte" @@ -15899,11 +16560,14 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: " #~ "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" +#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " +#~ "immediatament\n" #~ "per descartar-se." #~ msgid "Use an experimental blank-line-based heuristic to improve diffs" -#~ msgstr "Usa un heurÃstic experimental basat en lÃnies en blanc per a millorar les diferències" +#~ msgstr "" +#~ "Usa un heurÃstic experimental basat en lÃnies en blanc per a millorar les " +#~ "diferències" #~ msgid "Clever... amending the last one with dirty index." #~ msgstr "Intel·ligent... s'està esmenant l'últim amb Ãndex brut." @@ -15923,7 +16587,9 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: " #~ msgid "" #~ "\n" -#~ "(use 'rm -rf' if you really want to remove it including all of its history)" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" #~ msgstr "" #~ "\n" -#~ "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)" +#~ "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva " +#~ "història)" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-05-05 09:35+0800\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" "PO-Revision-Date: 2016-11-28 18:10+0100\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -17,43 +17,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: advice.c:55 +#: advice.c:58 #, c-format msgid "hint: %.*s\n" msgstr "Hinweis: %.*s\n" -#: advice.c:83 +#: advice.c:86 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien " "haben." -#: advice.c:85 +#: advice.c:88 msgid "Committing is not possible because you have unmerged files." msgstr "" "Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:87 +#: advice.c:90 msgid "Merging is not possible because you have unmerged files." msgstr "" "Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:89 +#: advice.c:92 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:91 +#: advice.c:94 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:93 +#: advice.c:96 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:101 +#: advice.c:104 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." @@ -62,23 +62,23 @@ msgstr "" "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n" "und zu committen." -#: advice.c:109 +#: advice.c:112 msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelöstem Konflikt." -#: advice.c:114 builtin/merge.c:1185 +#: advice.c:117 builtin/merge.c:1184 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: advice.c:116 +#: advice.c:119 msgid "Please, commit your changes before merging." msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen." -#: advice.c:117 +#: advice.c:120 msgid "Exiting because of unfinished merge." msgstr "Beende wegen nicht abgeschlossenem Merge." -#: advice.c:123 +#: advice.c:126 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -109,89 +109,99 @@ msgstr "" " git checkout -b <neuer-Branchname>\n" "\n" -#: apply.c:57 +#: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "nicht erkannte Whitespace-Option: '%s'" -#: apply.c:73 +#: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'" -#: apply.c:125 +#: apply.c:126 msgid "--reject and --3way cannot be used together." msgstr "--reject und --3way können nicht gemeinsam verwendet werden." -#: apply.c:127 +#: apply.c:128 msgid "--cached and --3way cannot be used together." msgstr "--cached und --3way können nicht gemeinsam verwendet werden." -#: apply.c:130 +#: apply.c:131 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:141 +#: apply.c:142 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:144 +#: apply.c:145 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:845 +#: apply.c:836 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" -#: apply.c:854 +#: apply.c:845 #, c-format msgid "regexec returned %d for input: %s" msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" -#: apply.c:938 +#: apply.c:929 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: apply.c:977 +#: apply.c:967 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: apply.c:983 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: apply.c:984 +#: apply.c:974 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: apply.c:990 +#: apply.c:979 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: apply.c:1488 +#: apply.c:1008 +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "Ungültiger Modus in Zeile %d: %s" + +#: apply.c:1326 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "Inkonsistente Kopfzeilen %d und %d." + +#: apply.c:1498 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: apply.c:1557 +#: apply.c:1567 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: apply.c:1577 +#: apply.c:1587 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -206,72 +216,72 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: apply.c:1589 +#: apply.c:1600 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile " "%d)" -#: apply.c:1759 +#: apply.c:1770 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: apply.c:1761 +#: apply.c:1772 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: apply.c:1795 +#: apply.c:1806 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: apply.c:1832 +#: apply.c:1843 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: apply.c:1834 +#: apply.c:1845 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: apply.c:1837 +#: apply.c:1848 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: apply.c:1984 +#: apply.c:1995 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" -#: apply.c:2021 +#: apply.c:2032 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: apply.c:2182 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: apply.c:2265 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: apply.c:2269 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: apply.c:2922 +#: apply.c:2933 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: apply.c:3041 +#: apply.c:3052 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -279,12 +289,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" msgstr[1] "" "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" -#: apply.c:3053 +#: apply.c:3064 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden" -#: apply.c:3059 +#: apply.c:3070 #, c-format msgid "" "while searching for:\n" @@ -293,25 +303,25 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: apply.c:3081 +#: apply.c:3092 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: apply.c:3089 +#: apply.c:3100 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n" "umgekehrten Patch-Block auf '%s'" -#: apply.c:3135 +#: apply.c:3146 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden" -#: apply.c:3145 +#: apply.c:3156 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -319,558 +329,558 @@ msgstr "" "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n" "entspricht" -#: apply.c:3153 +#: apply.c:3164 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist" -#: apply.c:3171 +#: apply.c:3182 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden" -#: apply.c:3184 +#: apply.c:3195 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: apply.c:3190 +#: apply.c:3201 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" -#: apply.c:3211 +#: apply.c:3222 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: apply.c:3333 +#: apply.c:3344 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 +#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" -#: apply.c:3389 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' ist hinter einer symbolischen Verknüpfung" -#: apply.c:3418 apply.c:3658 +#: apply.c:3429 apply.c:3669 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: apply.c:3501 apply.c:3672 +#: apply.c:3512 apply.c:3683 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht im Index" -#: apply.c:3510 apply.c:3680 +#: apply.c:3521 apply.c:3691 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version im Index" -#: apply.c:3545 +#: apply.c:3556 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n" "zurückzufallen." -#: apply.c:3548 +#: apply.c:3559 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Falle zurück auf 3-Wege-Merge ...\n" -#: apply.c:3564 apply.c:3568 +#: apply.c:3575 apply.c:3579 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kann aktuelle Inhalte von '%s' nicht lesen" -#: apply.c:3580 +#: apply.c:3591 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n" -#: apply.c:3594 +#: apply.c:3605 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch auf '%s' mit Konflikten angewendet.\n" -#: apply.c:3599 +#: apply.c:3610 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch auf '%s' sauber angewendet.\n" -#: apply.c:3625 +#: apply.c:3636 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: apply.c:3697 +#: apply.c:3708 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: apply.c:3699 +#: apply.c:3710 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: apply.c:3850 apply.c:3852 +#: apply.c:3860 apply.c:3862 #, c-format msgid "invalid path '%s'" msgstr "Ungültiger Pfad '%s'" -#: apply.c:3908 +#: apply.c:3918 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: apply.c:3911 +#: apply.c:3921 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: apply.c:3931 +#: apply.c:3941 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" -#: apply.c:3936 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" -#: apply.c:3956 +#: apply.c:3966 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung" -#: apply.c:3960 +#: apply.c:3970 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: apply.c:3975 +#: apply.c:3985 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s ..." -#: apply.c:4066 +#: apply.c:4076 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s" -#: apply.c:4073 +#: apply.c:4083 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet" -#: apply.c:4076 +#: apply.c:4086 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)." -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 +#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" -#: apply.c:4085 +#: apply.c:4095 #, c-format msgid "could not add %s to temporary index" msgstr "konnte %s nicht zum temporären Index hinzufügen" -#: apply.c:4095 +#: apply.c:4105 #, c-format msgid "could not write temporary index to %s" msgstr "konnte temporären Index nicht nach %s schreiben" -#: apply.c:4233 +#: apply.c:4243 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus dem Index entfernen" -#: apply.c:4268 +#: apply.c:4278 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: apply.c:4274 +#: apply.c:4284 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" -#: apply.c:4288 apply.c:4432 +#: apply.c:4298 apply.c:4442 #, c-format msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: apply.c:4329 +#: apply.c:4339 #, c-format msgid "failed to write to '%s'" msgstr "Fehler beim Schreiben nach '%s'" -#: apply.c:4333 +#: apply.c:4343 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: apply.c:4403 +#: apply.c:4413 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: apply.c:4501 +#: apply.c:4511 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: apply.c:4509 +#: apply.c:4519 msgid "internal error" msgstr "interner Fehler" -#: apply.c:4512 +#: apply.c:4522 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." -#: apply.c:4523 +#: apply.c:4533 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 +#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "kann '%s' nicht öffnen" -#: apply.c:4545 +#: apply.c:4555 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: apply.c:4549 +#: apply.c:4559 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: apply.c:4659 +#: apply.c:4669 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ausgelassen." -#: apply.c:4667 +#: apply.c:4677 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: apply.c:4686 +#: apply.c:4696 msgid "unable to read index file" msgstr "Konnte Index-Datei nicht lesen" -#: apply.c:4823 +#: apply.c:4833 #, c-format msgid "can't open patch '%s': %s" msgstr "kann Patch '%s' nicht öffnen: %s" -#: apply.c:4850 +#: apply.c:4860 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Whitespace-Fehler" msgstr[1] "unterdrückte %d Whitespace-Fehler" -#: apply.c:4856 apply.c:4871 +#: apply.c:4866 apply.c:4881 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu." msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu." -#: apply.c:4864 +#: apply.c:4874 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet." msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet." -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "path" msgstr "Pfad" -#: apply.c:4912 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: apply.c:4915 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: apply.c:4917 builtin/am.c:2285 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "Anzahl" -#: apply.c:4918 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: apply.c:4921 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: apply.c:4923 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: apply.c:4927 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: apply.c:4929 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "" "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " "ausgeben" -#: apply.c:4931 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: apply.c:4933 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann" -#: apply.c:4935 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: apply.c:4937 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" -#: apply.c:4939 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: apply.c:4941 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: apply.c:4943 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "" "einen temporären Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 +#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: apply.c:4948 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: apply.c:4949 builtin/am.c:2264 +#: apply.c:4959 builtin/am.c:2245 msgid "action" msgstr "Aktion" -#: apply.c:4950 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: apply.c:4953 apply.c:4956 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: apply.c:4959 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: apply.c:4961 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: apply.c:4963 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: apply.c:4965 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 +#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 +#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 +#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: apply.c:4968 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: apply.c:4971 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: apply.c:4973 builtin/am.c:2273 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "Wurzelverzeichnis" -#: apply.c:4974 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" -#: archive.c:12 +#: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:14 +#: archive.c:15 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-" "Referenz> [<Pfad>...]" -#: archive.c:15 +#: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" -#: archive.c:417 +#: archive.c:418 msgid "fmt" msgstr "Format" -#: archive.c:417 +#: archive.c:418 msgid "archive format" msgstr "Archivformat" -#: archive.c:418 builtin/log.c:1436 +#: archive.c:419 builtin/log.c:1446 msgid "prefix" msgstr "Präfix" -#: archive.c:419 +#: archive.c:420 msgid "prepend prefix to each pathname in the archive" msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 +#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 +#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "Datei" -#: archive.c:421 builtin/archive.c:89 +#: archive.c:422 builtin/archive.c:89 msgid "write the archive to this file" msgstr "das Archiv in diese Datei schreiben" -#: archive.c:423 +#: archive.c:424 msgid "read .gitattributes in working directory" msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen" -#: archive.c:424 +#: archive.c:425 msgid "report archived files on stderr" msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben" -#: archive.c:425 +#: archive.c:426 msgid "store only" msgstr "nur speichern" -#: archive.c:426 +#: archive.c:427 msgid "compress faster" msgstr "schneller komprimieren" -#: archive.c:434 +#: archive.c:435 msgid "compress better" msgstr "besser komprimieren" -#: archive.c:437 +#: archive.c:438 msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "Repository" -#: archive.c:440 builtin/archive.c:91 +#: archive.c:441 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "Archiv vom Remote-Repository <Repository> abrufen" -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 msgid "command" msgstr "Programm" -#: archive.c:442 builtin/archive.c:93 +#: archive.c:443 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" -#: archive.c:449 +#: archive.c:450 msgid "Unexpected option --remote" msgstr "Unerwartete Option --remote" -#: archive.c:451 +#: archive.c:452 msgid "Option --exec can only be used together with --remote" msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden." -#: archive.c:453 +#: archive.c:454 msgid "Unexpected option --output" msgstr "Unerwartete Option --output" -#: archive.c:475 +#: archive.c:476 #, c-format msgid "Unknown archive format '%s'" msgstr "Unbekanntes Archivformat '%s'" -#: archive.c:482 +#: archive.c:483 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument für Format '%s' nicht unterstützt: -%d" -#: attr.c:212 +#: attr.c:214 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s ist kein gültiger Attributname" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -878,27 +888,22 @@ msgstr "" "Verneinende Muster werden in Git-Attributen ignoriert.\n" "Benutzen Sie '\\!' für führende Ausrufezeichen." -#: bisect.c:444 -#, c-format -msgid "Could not open file '%s'" -msgstr "Konnte Datei '%s' nicht öffnen" - -#: bisect.c:449 +#: bisect.c:447 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s" -#: bisect.c:657 +#: bisect.c:655 #, c-format msgid "We cannot bisect more!\n" msgstr "Keine binäre Suche mehr möglich!\n" -#: bisect.c:710 +#: bisect.c:708 #, c-format msgid "Not a valid commit name %s" msgstr "%s ist kein gültiger Commit-Name" -#: bisect.c:734 +#: bisect.c:732 #, c-format msgid "" "The merge base %s is bad.\n" @@ -907,7 +912,7 @@ msgstr "" "Die Merge-Basis %s ist fehlerhaft.\n" "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n" -#: bisect.c:739 +#: bisect.c:737 #, c-format msgid "" "The merge base %s is new.\n" @@ -916,7 +921,7 @@ msgstr "" "Die Merge-Basis %s ist neu.\n" "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n" -#: bisect.c:744 +#: bisect.c:742 #, c-format msgid "" "The merge base %s is %s.\n" @@ -925,7 +930,7 @@ msgstr "" "Die Merge-Basis %s ist %s.\n" "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n" -#: bisect.c:752 +#: bisect.c:750 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -936,7 +941,7 @@ msgstr "" "git bisect kann in diesem Fall nicht richtig arbeiten.\n" "Vielleicht verwechselten Sie %s und %s Commits?\n" -#: bisect.c:765 +#: bisect.c:763 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -948,36 +953,36 @@ msgstr "" "erste %s Commit zwischen %s und %s befindet.\n" "Es wird dennoch fortgesetzt." -#: bisect.c:800 +#: bisect.c:798 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n" -#: bisect.c:851 +#: bisect.c:849 #, c-format msgid "a %s revision is needed" msgstr "ein %s Commit wird benötigt" -#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: bisect.c:919 +#: bisect.c:917 #, c-format msgid "could not read file '%s'" msgstr "Konnte Datei '%s' nicht lesen" -#: bisect.c:949 +#: bisect.c:947 msgid "reading bisect refs failed" msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen" -#: bisect.c:969 +#: bisect.c:967 #, c-format msgid "%s was both %s and %s\n" msgstr "%s war sowohl %s als auch %s\n" -#: bisect.c:977 +#: bisect.c:975 #, c-format msgid "" "No testable commit found.\n" @@ -986,15 +991,16 @@ msgstr "" "Kein testbarer Commit gefunden.\n" "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n" -#: bisect.c:996 +#: bisect.c:994 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "(ungefähr %d Schritt)" msgstr[1] "(ungefähr %d Schritte)" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. #: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" @@ -1002,6 +1008,46 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n" msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n" +#: blame.c:1757 +msgid "--contents and --reverse do not blend well." +msgstr "--contents und --reverse funktionieren gemeinsam nicht." + +#: blame.c:1768 +msgid "cannot use --contents with final commit object name" +msgstr "" +"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen" + +#: blame.c:1788 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse und --first-parent zusammen erfordern die Angabe eines " +"endgültigen\n" +"Commits" + +#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 +#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 +#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 +#: builtin/shortlog.c:177 +msgid "revision walk setup failed" +msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" + +#: blame.c:1815 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n" +"\"first-parent\"-Kette" + +#: blame.c:1826 +#, c-format +msgid "no such path %s in %s" +msgstr "Pfad %s nicht in %s" + +#: blame.c:1837 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "kann Blob %s für Pfad '%s' nicht lesen" + #: branch.c:53 #, c-format msgid "" @@ -1141,7 +1187,7 @@ msgstr "Ungültiger Branchpunkt: '%s'" msgid "'%s' is already checked out at '%s'" msgstr "'%s' ist bereits in '%s' ausgecheckt" -#: branch.c:364 +#: branch.c:366 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert." @@ -1151,92 +1197,85 @@ msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert." msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" -#: bundle.c:61 +#: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 +#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" -#: bundle.c:139 +#: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 -#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 -#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 -#: builtin/merge.c:359 builtin/shortlog.c:176 -msgid "revision walk setup failed" -msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" - -#: bundle.c:185 +#: bundle.c:186 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Das Paket enthält diese Referenz:" msgstr[1] "Das Paket enthält diese %d Referenzen:" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "Das Paket speichert eine komplette Historie." -#: bundle.c:194 +#: bundle.c:195 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Das Paket benötigt diese Referenz:" msgstr[1] "Das Paket benötigt diese %d Referenzen:" -#: bundle.c:253 +#: bundle.c:254 msgid "Could not spawn pack-objects" msgstr "Konnte Paketobjekte nicht erstellen" -#: bundle.c:264 +#: bundle.c:265 msgid "pack-objects died" msgstr "Erstellung der Paketobjekte abgebrochen" -#: bundle.c:304 +#: bundle.c:307 msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:353 +#: bundle.c:356 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 +#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:451 +#: bundle.c:454 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." -#: bundle.c:463 +#: bundle.c:466 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:491 +#: bundle.c:494 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" -#: color.c:300 +#: color.c:301 #, c-format msgid "invalid color value: %.*s" msgstr "Ungültiger Farbwert: %.*s" -#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 -#: builtin/am.c:1489 builtin/am.c:2126 +#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 +#: builtin/am.c:1469 builtin/am.c:2107 #, c-format msgid "could not parse %s" msgstr "konnte %s nicht parsen" -#: commit.c:42 +#: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ist kein Commit!" @@ -1248,7 +1287,7 @@ msgid "" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" "Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n" -"Sie können das Nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n" +"Sie können das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n" "oder Sie setzen die Konfigurationsvariable i18n.commitencoding auf das " "Encoding,\n" "welches von ihrem Projekt verwendet wird.\n" @@ -1257,178 +1296,178 @@ msgstr "" msgid "memory exhausted" msgstr "Speicher verbraucht" -#: config.c:191 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" "Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden " "müssen\n" "aus Dateien kommen." -#: config.c:711 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "Ungültige Konfigurationszeile %d in Blob %s" -#: config.c:715 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "Ungültige Konfigurationszeile %d in Datei %s" -#: config.c:719 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe" -#: config.c:723 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s" -#: config.c:727 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s" -#: config.c:731 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "Ungültige Konfigurationszeile %d in %s" -#: config.c:859 +#: config.c:868 msgid "out of range" msgstr "Außerhalb des Bereichs" -#: config.c:859 +#: config.c:868 msgid "invalid unit" msgstr "Ungültige Einheit" -#: config.c:865 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" -#: config.c:870 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s" -#: config.c:873 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s" -#: config.c:876 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: " "%s" -#: config.c:879 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: " "%s" -#: config.c:882 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: " "%s" -#: config.c:885 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s" -#: config.c:980 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:1075 config.c:1086 +#: config.c:1084 config.c:1095 #, c-format msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -#: config.c:1203 +#: config.c:1212 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungültiger Modus für Objekterstellung: %s" -#: config.c:1359 +#: config.c:1368 #, c-format msgid "bad pack compression level %d" msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung" -#: config.c:1557 +#: config.c:1564 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:1611 +#: config.c:1894 msgid "unknown error occurred while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:1970 +#: config.c:2064 #, c-format msgid "Invalid %s: '%s'" msgstr "Ungültiger %s: '%s'" -#: config.c:1991 +#: config.c:2085 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'" -#: config.c:2017 +#: config.c:2111 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 " "liegen." -#: config.c:2028 +#: config.c:2122 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n" "nicht parsen." -#: config.c:2030 +#: config.c:2124 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" -#: config.c:2089 +#: config.c:2183 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2423 config.c:2648 +#: config.c:2517 config.c:2745 #, c-format msgid "fstat on %s failed" msgstr "fstat auf %s fehlgeschlagen" -#: config.c:2541 +#: config.c:2635 #, c-format msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." -#: config.c:2543 builtin/remote.c:774 +#: config.c:2637 builtin/remote.c:775 #, c-format msgid "could not unset '%s'" msgstr "Konnte '%s' nicht aufheben." -#: connect.c:49 +#: connect.c:50 msgid "The remote end hung up upon initial contact" -msgstr "Die Gegenseite hat sich nach dem erstmaligen Kontakt aufgehangen." +msgstr "Die Gegenseite hat nach dem ersten Kontakt abgebrochen." -#: connect.c:51 +#: connect.c:52 msgid "" "Could not read from remote repository.\n" "\n" @@ -1441,7 +1480,7 @@ msgstr "" "bestehen\n" "und das Repository existiert." -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" @@ -1457,7 +1496,7 @@ msgstr "Fehler beim Schreiben nach rev-list" msgid "failed to close rev-list's stdin" msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe" -#: convert.c:201 +#: convert.c:205 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -1467,12 +1506,12 @@ msgstr "" "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:205 +#: convert.c:209 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "CRLF würde in %s durch LF ersetzt werden." -#: convert.c:211 +#: convert.c:215 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -1482,78 +1521,78 @@ msgstr "" "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:215 +#: convert.c:219 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF würde in %s durch CRLF ersetzt werden." -#: date.c:97 +#: date.c:116 msgid "in the future" msgstr "in der Zukunft" -#: date.c:103 +#: date.c:122 #, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" -msgstr[0] "vor %lu Sekunde" -msgstr[1] "vor %lu Sekunden" +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "vor %<PRIuMAX> Sekunde" +msgstr[1] "vor %<PRIuMAX> Sekunden" -#: date.c:110 +#: date.c:129 #, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" -msgstr[0] "vor %lu Minute" -msgstr[1] "vor %lu Minuten" +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "vor %<PRIuMAX> Minute" +msgstr[1] "vor %<PRIuMAX> Minuten" -#: date.c:117 +#: date.c:136 #, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" -msgstr[0] "vor %lu Stunde" -msgstr[1] "vor %lu Stunden" +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "vor %<PRIuMAX> Stunde" +msgstr[1] "vor %<PRIuMAX> Stunden" -#: date.c:124 +#: date.c:143 #, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" -msgstr[0] "vor %lu Tag" -msgstr[1] "vor %lu Tagen" +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "vor %<PRIuMAX> Tag" +msgstr[1] "vor %<PRIuMAX> Tagen" -#: date.c:130 +#: date.c:149 #, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" -msgstr[0] "vor %lu Woche" -msgstr[1] "vor %lu Wochen" +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "vor %<PRIuMAX> Woche" +msgstr[1] "vor %<PRIuMAX> Wochen" -#: date.c:137 +#: date.c:156 #, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" -msgstr[0] "vor %lu Monat" -msgstr[1] "vor %lu Monaten" +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "vor %<PRIuMAX> Monat" +msgstr[1] "vor %<PRIuMAX> Monaten" -#: date.c:148 +#: date.c:167 #, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "vor %lu Jahr" -msgstr[1] "vor %lu Jahren" +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "vor %<PRIuMAX> Jahr" +msgstr[1] "vor %<PRIuMAX> Jahren" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:151 +#: date.c:170 #, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "%s, und %lu Monat" -msgstr[1] "%s, und %lu Monaten" +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s, und %<PRIuMAX> Monat" +msgstr[1] "%s, und %<PRIuMAX> Monaten" -#: date.c:156 date.c:161 +#: date.c:175 date.c:180 #, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "vor %lu Jahr" -msgstr[1] "vor %lu Jahren" +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "vor %<PRIuMAX> Jahr" +msgstr[1] "vor %<PRIuMAX> Jahren" #: diffcore-order.c:24 #, c-format @@ -1564,28 +1603,28 @@ msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" -#: diff.c:62 +#: diff.c:63 #, c-format msgid "option '%s' requires a value" msgstr "Option '%s' erfordert einen Wert." -#: diff.c:124 +#: diff.c:125 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:129 +#: diff.c:130 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:281 +#: diff.c:282 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:344 +#: diff.c:342 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1594,21 +1633,21 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:3102 +#: diff.c:3101 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:3428 +#: diff.c:3427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "--name-only, --name-status, --check und -s schließen sich gegenseitig aus" -#: diff.c:3518 +#: diff.c:3517 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:3681 +#: diff.c:3680 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1617,22 +1656,22 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3695 +#: diff.c:3694 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: diff.c:4719 +#: diff.c:4716 msgid "inexact rename detection was skipped due to too many files." msgstr "" "Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n" "übersprungen." -#: diff.c:4722 +#: diff.c:4719 msgid "only found copies from modified paths due to too many files." msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden" -#: diff.c:4725 +#: diff.c:4722 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1640,260 +1679,260 @@ msgstr "" "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n" "erneut versuchen." -#: dir.c:1899 +#: dir.c:1948 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2018 +#: dir.c:2067 msgid "Untracked cache is disabled on this system or location." msgstr "" "Cache für unversionierte Dateien ist auf diesem System oder\n" "für dieses Verzeichnis deaktiviert." -#: dir.c:2776 dir.c:2781 +#: dir.c:2846 dir.c:2851 #, c-format msgid "could not create directories for %s" msgstr "Konnte Verzeichnisse für '%s' nicht erstellen." -#: dir.c:2806 +#: dir.c:2876 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren." -#: entry.c:280 +#: entry.c:281 #, c-format msgid "could not stat file '%s'" msgstr "konnte Datei '%s' nicht lesen" -#: fetch-pack.c:249 +#: fetch-pack.c:251 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: erwartete shallow-Liste" -#: fetch-pack.c:261 +#: fetch-pack.c:263 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen" -#: fetch-pack.c:280 builtin/archive.c:63 +#: fetch-pack.c:282 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "Fehler am anderen Ende: %s" -#: fetch-pack.c:281 +#: fetch-pack.c:283 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen" -#: fetch-pack.c:333 +#: fetch-pack.c:335 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc benötigt multi_ack_detailed" -#: fetch-pack.c:419 +#: fetch-pack.c:421 #, c-format msgid "invalid shallow line: %s" msgstr "Ungültige shallow-Zeile: %s" -#: fetch-pack.c:425 +#: fetch-pack.c:427 #, c-format msgid "invalid unshallow line: %s" msgstr "Ungültige unshallow-Zeile: %s" -#: fetch-pack.c:427 +#: fetch-pack.c:429 #, c-format msgid "object not found: %s" msgstr "Objekt nicht gefunden: %s" -#: fetch-pack.c:430 +#: fetch-pack.c:432 #, c-format msgid "error in object: %s" msgstr "Fehler in Objekt: %s" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "no shallow found: %s" msgstr "Kein shallow-Objekt gefunden: %s" -#: fetch-pack.c:435 +#: fetch-pack.c:437 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow erwartet, %s bekommen" -#: fetch-pack.c:474 +#: fetch-pack.c:476 #, c-format msgid "got %s %d %s" msgstr "%s %d %s bekommen" -#: fetch-pack.c:488 +#: fetch-pack.c:490 #, c-format msgid "invalid commit %s" msgstr "Ungültiger Commit %s" -#: fetch-pack.c:521 +#: fetch-pack.c:523 msgid "giving up" msgstr "Gebe auf" -#: fetch-pack.c:531 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "Fertig" -#: fetch-pack.c:543 +#: fetch-pack.c:545 #, c-format msgid "got %s (%d) %s" msgstr "%s (%d) %s bekommen" -#: fetch-pack.c:589 +#: fetch-pack.c:591 #, c-format msgid "Marking %s as complete" msgstr "Markiere %s als vollständig" -#: fetch-pack.c:737 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "habe %s (%s) bereits" -#: fetch-pack.c:775 +#: fetch-pack.c:813 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer" -#: fetch-pack.c:783 +#: fetch-pack.c:821 msgid "protocol error: bad pack header" msgstr "Protokollfehler: ungültiger Pack-Header" -#: fetch-pack.c:839 +#: fetch-pack.c:877 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: konnte %s nicht starten" -#: fetch-pack.c:855 +#: fetch-pack.c:893 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: fetch-pack.c:857 +#: fetch-pack.c:895 msgid "error in sideband demultiplexer" msgstr "Fehler in sideband demultiplexer" -#: fetch-pack.c:884 +#: fetch-pack.c:922 msgid "Server does not support shallow clients" msgstr "Server unterstützt keine shallow-Clients" -#: fetch-pack.c:888 +#: fetch-pack.c:926 msgid "Server supports multi_ack_detailed" msgstr "Server unterstützt multi_ack_detailed" -#: fetch-pack.c:891 +#: fetch-pack.c:929 msgid "Server supports no-done" msgstr "Server unterstützt no-done" -#: fetch-pack.c:897 +#: fetch-pack.c:935 msgid "Server supports multi_ack" msgstr "Server unterstützt multi_ack" -#: fetch-pack.c:901 +#: fetch-pack.c:939 msgid "Server supports side-band-64k" msgstr "Server unterstützt side-band-64k" -#: fetch-pack.c:905 +#: fetch-pack.c:943 msgid "Server supports side-band" msgstr "Server unterstützt side-band" -#: fetch-pack.c:909 +#: fetch-pack.c:947 msgid "Server supports allow-tip-sha1-in-want" msgstr "Server unterstützt allow-tip-sha1-in-want" -#: fetch-pack.c:913 +#: fetch-pack.c:951 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Server unterstützt allow-reachable-sha1-in-want" -#: fetch-pack.c:923 +#: fetch-pack.c:961 msgid "Server supports ofs-delta" msgstr "Server unterstützt ofs-delta" -#: fetch-pack.c:930 +#: fetch-pack.c:968 #, c-format msgid "Server version is %.*s" msgstr "Server-Version ist %.*s" -#: fetch-pack.c:936 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "Server unterstützt kein --shallow-since" -#: fetch-pack.c:940 +#: fetch-pack.c:978 msgid "Server does not support --shallow-exclude" msgstr "Server unterstützt kein --shallow-exclude" -#: fetch-pack.c:942 +#: fetch-pack.c:980 msgid "Server does not support --deepen" msgstr "Server unterstützt kein --deepen" -#: fetch-pack.c:953 +#: fetch-pack.c:991 msgid "no common commits" msgstr "keine gemeinsamen Commits" -#: fetch-pack.c:965 +#: fetch-pack.c:1003 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: Abholen fehlgeschlagen." -#: fetch-pack.c:1127 +#: fetch-pack.c:1165 msgid "no matching remote head" msgstr "kein übereinstimmender Remote-Branch" -#: fetch-pack.c:1149 +#: fetch-pack.c:1187 #, c-format msgid "no such remote ref %s" msgstr "keine solche Remote-Referenz %s" -#: fetch-pack.c:1152 +#: fetch-pack.c:1190 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab." -#: gpg-interface.c:185 +#: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" -#: gpg-interface.c:215 +#: gpg-interface.c:211 msgid "could not create temporary file" msgstr "konnte temporäre Datei nicht erstellen" -#: gpg-interface.c:217 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" -#: graph.c:96 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors" -#: grep.c:1796 +#: grep.c:1981 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: grep.c:1824 +#: grep.c:2009 #, c-format msgid "'%s': short read" msgstr "'%s': read() zu kurz" -#: help.c:218 +#: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "Vorhandene Git-Befehle in '%s'" -#: help.c:225 +#: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH" -#: help.c:256 +#: help.c:217 msgid "These are common Git commands used in various situations:" msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:" -#: help.c:321 +#: help.c:281 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1902,30 +1941,50 @@ msgstr "" "'%s' scheint ein git-Befehl zu sein, konnte aber\n" "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?" -#: help.c:376 +#: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden." -#: help.c:398 +#: help.c:358 #, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" -msgstr "" -"Warnung: Sie haben den nicht existierenden Git-Befehl '%s' ausgeführt.\n" -"Setze fort unter der Annahme, dass Sie '%s' gemeint haben." +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert." -#: help.c:403 +#: help.c:363 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "Automatische Ausführung in %0.1f Sekunden ..." +msgid "Continuing under the assumption that you meant '%s'." +msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten." -#: help.c:410 +#: help.c:368 +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten." + +#: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'." -#: help.c:414 help.c:480 +#: help.c:380 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "\nDer ähnlichste Befehl ist" +msgstr[1] "\nDie ähnlichsten Befehle sind" + +#: help.c:395 +msgid "git version [<options>]" +msgstr "git version [<Optionen>]" + +#: help.c:456 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s - %s" + +#: help.c:460 msgid "" "\n" "Did you mean this?" @@ -1939,12 +1998,7 @@ msgstr[1] "" "\n" "Haben Sie eines von diesen gemeint?" -#: help.c:476 -#, c-format -msgid "%s: %s - %s" -msgstr "%s: %s - %s" - -#: ident.c:343 +#: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1970,35 +2024,35 @@ msgstr "" "Lassen Sie die Option \"--global\" weg, um die Identität nur\n" "für dieses Repository zu setzen.\n" -#: ident.c:367 +#: ident.c:366 msgid "no email was given and auto-detection is disabled" msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert" -#: ident.c:372 +#: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)" -#: ident.c:382 +#: ident.c:381 msgid "no name was given and auto-detection is disabled" msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert" -#: ident.c:388 +#: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)" -#: ident.c:396 +#: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt." -#: ident.c:402 +#: ident.c:401 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s" -#: ident.c:417 builtin/commit.c:611 +#: ident.c:416 builtin/commit.c:612 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" @@ -2032,78 +2086,78 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s" msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 -#: builtin/checkout.c:607 builtin/clone.c:749 +#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 +#: builtin/checkout.c:591 builtin/clone.c:753 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: merge-recursive.c:209 +#: merge-recursive.c:210 msgid "(bad commit)\n" msgstr "(ungültiger Commit)\n" -#: merge-recursive.c:231 merge-recursive.c:239 +#: merge-recursive.c:232 merge-recursive.c:240 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen" -#: merge-recursive.c:303 +#: merge-recursive.c:304 msgid "error building trees" msgstr "Fehler beim Erstellen der \"Tree\"-Objekte" -#: merge-recursive.c:727 +#: merge-recursive.c:728 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:738 +#: merge-recursive.c:739 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n" -#: merge-recursive.c:752 merge-recursive.c:771 +#: merge-recursive.c:753 merge-recursive.c:772 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:761 +#: merge-recursive.c:762 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:803 builtin/cat-file.c:34 +#: merge-recursive.c:804 builtin/cat-file.c:36 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:805 +#: merge-recursive.c:806 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:829 +#: merge-recursive.c:830 #, c-format msgid "failed to open '%s': %s" msgstr "Fehler beim Öffnen von '%s': %s" -#: merge-recursive.c:840 +#: merge-recursive.c:841 #, c-format msgid "failed to symlink '%s': %s" msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s" -#: merge-recursive.c:845 +#: merge-recursive.c:846 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" -#: merge-recursive.c:985 +#: merge-recursive.c:986 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung des internen Merges" -#: merge-recursive.c:989 +#: merge-recursive.c:990 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:1092 +#: merge-recursive.c:1093 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2112,7 +2166,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich gelassen." -#: merge-recursive.c:1097 +#: merge-recursive.c:1098 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2121,7 +2175,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich gelassen." -#: merge-recursive.c:1104 +#: merge-recursive.c:1105 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2130,7 +2184,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1109 +#: merge-recursive.c:1110 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2139,20 +2193,20 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1200 +#: merge-recursive.c:1201 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" -#: merge-recursive.c:1225 +#: merge-recursive.c:1226 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2161,139 +2215,139 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1231 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1293 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " "in %s" -#: merge-recursive.c:1325 +#: merge-recursive.c:1326 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Benenne stattdessen %s nach %s und %s nach %s um" -#: merge-recursive.c:1528 +#: merge-recursive.c:1529 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:1543 +#: merge-recursive.c:1544 #, c-format msgid "Adding merged %s" msgstr "Füge zusammengeführte Datei %s hinzu" -#: merge-recursive.c:1550 merge-recursive.c:1780 +#: merge-recursive.c:1551 merge-recursive.c:1781 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:1607 +#: merge-recursive.c:1608 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:1610 +#: merge-recursive.c:1611 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modify" msgstr "ändern" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modified" msgstr "geändert" -#: merge-recursive.c:1689 +#: merge-recursive.c:1690 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:1696 +#: merge-recursive.c:1697 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:1732 +#: merge-recursive.c:1733 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:1746 +#: merge-recursive.c:1747 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1750 git-submodule.sh:944 +#: merge-recursive.c:1751 git-submodule.sh:945 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:1751 +#: merge-recursive.c:1752 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:1871 +#: merge-recursive.c:1872 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:1877 +#: merge-recursive.c:1878 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:1883 +#: merge-recursive.c:1884 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:1892 +#: merge-recursive.c:1893 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:1929 +#: merge-recursive.c:1930 msgid "Already up-to-date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:1938 +#: merge-recursive.c:1939 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:2021 +#: merge-recursive.c:2022 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:2034 +#: merge-recursive.c:2035 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:2136 +#: merge-recursive.c:2137 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." @@ -2317,25 +2371,27 @@ msgstr "" msgid "You have not concluded your notes merge (%s exists)." msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)." -#: notes-utils.c:41 +#: notes-utils.c:42 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "Kann uninitialisiertes/unreferenzierte Notiz-Verzeichnis nicht committen." -#: notes-utils.c:100 +#: notes-utils.c:101 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Ungültiger notes.rewriteMode Wert: '%s'" -#: notes-utils.c:110 +#: notes-utils.c:111 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" "Umschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c:141 #, c-format msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" @@ -2345,28 +2401,29 @@ msgstr "Ungültiger %s Wert: '%s'" msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." -#: parse-options.c:572 +#: parse-options.c:573 msgid "..." msgstr "..." -#: parse-options.c:590 +#: parse-options.c:591 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#. +#: parse-options.c:597 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:597 +#: parse-options.c:600 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:631 +#: parse-options.c:634 msgid "-NUM" msgstr "-NUM" @@ -2375,35 +2432,35 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: path.c:810 +#: path.c:890 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." -#: pathspec.c:125 +#: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt" -#: pathspec.c:143 +#: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." msgstr "Es ist nur eine Angabe von 'attr:' erlaubt." -#: pathspec.c:146 +#: pathspec.c:150 msgid "attr spec must not be empty" msgstr "Angabe von 'attr:' darf nicht leer sein" -#: pathspec.c:189 +#: pathspec.c:193 #, c-format msgid "invalid attribute name %s" msgstr "Ungültiger Attributname %s" -#: pathspec.c:254 +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind " "inkompatibel." -#: pathspec.c:261 +#: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2411,52 +2468,47 @@ msgstr "" "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n" "mit allen anderen Optionen." -#: pathspec.c:301 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'" -#: pathspec.c:322 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'" -#: pathspec.c:327 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'" -#: pathspec.c:365 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'" -#: pathspec.c:421 pathspec.c:443 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" - -#: pathspec.c:483 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' und 'glob' sind inkompatibel" -#: pathspec.c:496 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: '%s' liegt außerhalb des Repositories" -#: pathspec.c:584 +#: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (Kürzel: '%c')" -#: pathspec.c:594 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s" -#: pathspec.c:644 +#: pathspec.c:575 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2465,16 +2517,16 @@ msgstr "" "ungültig.\n" "Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen." -#: pathspec.c:668 +#: pathspec.c:599 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung" -#: pretty.c:982 +#: pretty.c:963 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." -#: read-cache.c:1442 +#: read-cache.c:1443 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2483,7 +2535,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1452 +#: read-cache.c:1453 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2492,46 +2544,53 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#: read-cache.c:2308 builtin/merge.c:1019 +#, c-format +msgid "could not close '%s'" +msgstr "Konnte '%s' nicht schließen" + +#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 #, c-format msgid "could not stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:2388 +#: read-cache.c:2396 #, c-format msgid "unable to open git dir: %s" msgstr "konnte Git-Verzeichnis nicht öffnen: %s" -#: read-cache.c:2400 +#: read-cache.c:2408 #, c-format msgid "unable to unlink: %s" msgstr "Konnte '%s' nicht entfernen." -#: refs.c:620 builtin/merge.c:844 +#: refs.c:622 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: refs.c:1667 +#: refs.c:1769 msgid "ref updates forbidden inside quarantine environment" -msgstr "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung verboten." +msgstr "" +"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung " +"verboten." -#: refs/files-backend.c:1631 +#: refs/files-backend.c:1664 #, c-format msgid "could not delete reference %s: %s" msgstr "Konnte Referenz %s nicht entfernen: %s" -#: refs/files-backend.c:1634 +#: refs/files-backend.c:1667 #, c-format msgid "could not delete references: %s" msgstr "Konnte Referenzen nicht entfernen: %s" -#: refs/files-backend.c:1643 +#: refs/files-backend.c:1676 #, c-format msgid "could not remove reference %s" msgstr "Konnte Referenz %s nicht löschen" -#: ref-filter.c:35 wt-status.c:1780 +#: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "entfernt" @@ -2550,304 +2609,306 @@ msgstr "%d hinterher" msgid "ahead %d, behind %d" msgstr "%d voraus, %d hinterher" -#: ref-filter.c:104 +#: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" msgstr "Erwartetes Format: %%(color:<Farbe>)" -#: ref-filter.c:106 +#: ref-filter.c:107 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "nicht erkannte Farbe: %%(color:%s)" -#: ref-filter.c:120 +#: ref-filter.c:121 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Positiver Wert erwartet refname:lstrip=%s" -#: ref-filter.c:124 +#: ref-filter.c:125 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Positiver Wert erwartet refname:rstrip=%s" -#: ref-filter.c:126 +#: ref-filter.c:127 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "nicht erkanntes %%(%s) Argument: %s" -#: ref-filter.c:166 +#: ref-filter.c:167 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) akzeptiert keine Argumente" -#: ref-filter.c:173 +#: ref-filter.c:174 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) akzeptiert keine Argumente" -#: ref-filter.c:180 +#: ref-filter.c:181 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) akzeptiert keine Argumente" -#: ref-filter.c:199 +#: ref-filter.c:200 #, c-format msgid "positive value expected contents:lines=%s" msgstr "Positiver Wert erwartet contents:lines=%s" -#: ref-filter.c:201 +#: ref-filter.c:202 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "nicht erkanntes %%(contents) Argument: %s" -#: ref-filter.c:214 +#: ref-filter.c:215 #, c-format msgid "positive value expected objectname:short=%s" msgstr "Positiver Wert erwartet objectname:short=%s" -#: ref-filter.c:218 +#: ref-filter.c:219 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "nicht erkanntes %%(objectname) Argument: %s" -#: ref-filter.c:245 +#: ref-filter.c:246 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)" -#: ref-filter.c:257 +#: ref-filter.c:258 #, c-format msgid "unrecognized position:%s" msgstr "nicht erkannte Position:%s" -#: ref-filter.c:261 +#: ref-filter.c:262 #, c-format msgid "unrecognized width:%s" msgstr "nicht erkannte Breite:%s" -#: ref-filter.c:267 +#: ref-filter.c:268 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "nicht erkanntes %%(align) Argument: %s" -#: ref-filter.c:271 +#: ref-filter.c:272 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "Positive Breitenangabe für %%(align) erwartet" -#: ref-filter.c:286 +#: ref-filter.c:287 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "nicht erkanntes %%(if) Argument: %s" -#: ref-filter.c:371 +#: ref-filter.c:378 #, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" -#: ref-filter.c:397 +#: ref-filter.c:404 #, c-format msgid "unknown field name: %.*s" msgstr "Unbekannter Feldname: %.*s" -#: ref-filter.c:501 +#: ref-filter.c:508 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:561 +#: ref-filter.c:568 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:563 +#: ref-filter.c:570 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: %%(then) Atom mehr als einmal verwendet" -#: ref-filter.c:565 +#: ref-filter.c:572 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: %%(then) Atom nach %%(else) verwendet" -#: ref-filter.c:591 +#: ref-filter.c:598 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:593 +#: ref-filter.c:600 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:595 +#: ref-filter.c:602 #, c-format msgid "format: %%(else) atom used more than once" msgstr "Format: %%(end) Atom mehr als einmal verwendet" -#: ref-filter.c:608 +#: ref-filter.c:615 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet" -#: ref-filter.c:663 +#: ref-filter.c:670 #, c-format msgid "malformed format string %s" msgstr "Fehlerhafter Formatierungsstring %s" -#: ref-filter.c:1247 +#: ref-filter.c:1254 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: ref-filter.c:1250 +#: ref-filter.c:1257 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: ref-filter.c:1256 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1265 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD losgelöst bei %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: ref-filter.c:1261 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1272 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD losgelöst von %s)" -#: ref-filter.c:1265 +#: ref-filter.c:1276 msgid "(no branch)" msgstr "(kein Branch)" -#: ref-filter.c:1420 ref-filter.c:1451 +#: ref-filter.c:1426 ref-filter.c:1457 #, c-format msgid "missing object %s for %s" msgstr "Objekt %s fehlt für %s" -#: ref-filter.c:1423 ref-filter.c:1454 +#: ref-filter.c:1429 ref-filter.c:1460 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer bei %s für %s fehlgeschlagen" -#: ref-filter.c:1692 +#: ref-filter.c:1760 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: ref-filter.c:1759 +#: ref-filter.c:1827 #, c-format msgid "ignoring ref with broken name %s" msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" -#: ref-filter.c:1764 +#: ref-filter.c:1832 #, c-format msgid "ignoring broken ref %s" msgstr "Ignoriere fehlerhafte Referenz %s" -#: ref-filter.c:2028 +#: ref-filter.c:2095 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:2109 +#: ref-filter.c:2176 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: remote.c:754 +#: remote.c:747 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen." -#: remote.c:758 +#: remote.c:751 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt üblicherweise %s, nicht %s" -#: remote.c:762 +#: remote.c:755 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:770 +#: remote.c:763 msgid "Internal error" msgstr "Interner Fehler" -#: remote.c:1685 remote.c:1787 +#: remote.c:1680 remote.c:1782 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: remote.c:1694 +#: remote.c:1689 #, c-format msgid "no such branch: '%s'" msgstr "Kein solcher Branch: '%s'" -#: remote.c:1697 +#: remote.c:1692 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." -#: remote.c:1703 +#: remote.c:1698 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert" -#: remote.c:1718 +#: remote.c:1713 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten " "Branch" -#: remote.c:1730 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: remote.c:1741 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'" -#: remote.c:1754 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "kein Ziel für \"push\" (push.default ist 'nothing')" -#: remote.c:1776 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen" -#: remote.c:2081 +#: remote.c:2076 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n" -#: remote.c:2085 +#: remote.c:2080 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:2088 +#: remote.c:2083 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n" -#: remote.c:2092 +#: remote.c:2087 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n" msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n" -#: remote.c:2098 +#: remote.c:2093 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2101 +#: remote.c:2096 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2857,12 +2918,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" -#: remote.c:2109 +#: remote.c:2104 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2112 +#: remote.c:2107 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2877,54 +2938,49 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2122 +#: remote.c:2117 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzuführen)\n" -#: revision.c:2158 +#: revision.c:2187 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2161 +#: revision.c:2190 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2355 +#: revision.c:2384 msgid "--first-parent is incompatible with --bisect" msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." -#: run-command.c:125 +#: run-command.c:644 msgid "open /dev/null failed" msgstr "Öffnen von /dev/null fehlgeschlagen" -#: run-command.c:127 -#, c-format -msgid "dup2(%d,%d) failed" -msgstr "dup2(%d,%d) fehlgeschlagen" - -#: send-pack.c:150 +#: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s" -#: send-pack.c:152 +#: send-pack.c:153 #, c-format msgid "remote unpack failed: %s" msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s" -#: send-pack.c:315 +#: send-pack.c:316 msgid "failed to sign the push certificate" msgstr "Fehler beim Signieren des \"push\"-Zertifikates" -#: send-pack.c:428 +#: send-pack.c:429 msgid "the receiving end does not support --signed push" msgstr "" "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")" -#: send-pack.c:430 +#: send-pack.c:431 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -2932,107 +2988,107 @@ msgstr "" "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n" "Versand (\"--signed push\") unterstützt" -#: send-pack.c:442 +#: send-pack.c:443 msgid "the receiving end does not support --atomic push" msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" -#: send-pack.c:447 +#: send-pack.c:448 msgid "the receiving end does not support push options" msgstr "die Gegenseite unterstützt keine Push-Optionen" -#: sequencer.c:215 +#: sequencer.c:216 msgid "revert" msgstr "Revert" -#: sequencer.c:217 +#: sequencer.c:218 msgid "cherry-pick" msgstr "Cherry-Pick" -#: sequencer.c:219 +#: sequencer.c:220 msgid "rebase -i" msgstr "interaktives Rebase" -#: sequencer.c:221 +#: sequencer.c:222 #, c-format msgid "Unknown action: %d" msgstr "Unbekannte Aktion: %d" -#: sequencer.c:278 +#: sequencer.c:279 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n" +"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:281 +#: sequencer.c:282 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n" -"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" +"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n" +"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:294 sequencer.c:1682 +#: sequencer.c:295 sequencer.c:1685 #, c-format msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" -#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 #, c-format msgid "could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." -#: sequencer.c:301 +#: sequencer.c:302 #, c-format msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." -#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 #, c-format msgid "failed to finalize '%s'." msgstr "Fehler beim Fertigstellen von '%s'." -#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 -#: builtin/commit.c:749 builtin/merge.c:1018 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 +#: builtin/commit.c:750 builtin/merge.c:1017 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: sequencer.c:355 +#: sequencer.c:356 #, c-format msgid "your local changes would be overwritten by %s." msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden." -#: sequencer.c:359 +#: sequencer.c:360 msgid "commit your changes or stash them to proceed." msgstr "" "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren." -#: sequencer.c:388 +#: sequencer.c:389 #, c-format msgid "%s: fast-forward" msgstr "%s: Vorspulen" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". +#. "rebase -i". #. -#: sequencer.c:470 +#: sequencer.c:472 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Index-Datei nicht schreiben" -#: sequencer.c:489 +#: sequencer.c:491 msgid "could not resolve HEAD commit\n" msgstr "Konnte HEAD-Commit nicht auflösen\n" -#: sequencer.c:509 +#: sequencer.c:511 msgid "unable to update cache tree\n" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n" -#: sequencer.c:592 +#: sequencer.c:595 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3063,17 +3119,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:694 +#: sequencer.c:697 #, c-format msgid "could not parse commit %s\n" msgstr "Konnte Commit %s nicht parsen\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse parent commit %s\n" msgstr "Konnte Eltern-Commit %s nicht parsen\n" -#: sequencer.c:821 +#: sequencer.c:824 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3084,7 +3140,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:827 +#: sequencer.c:830 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3095,231 +3151,230 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:833 sequencer.c:858 +#: sequencer.c:836 sequencer.c:861 #, c-format msgid "This is a combination of %d commits." msgstr "Das ist eine Kombination aus %d Commits." -#: sequencer.c:842 +#: sequencer.c:845 msgid "need a HEAD to fixup" msgstr "benötige HEAD für fixup" -#: sequencer.c:844 +#: sequencer.c:847 msgid "could not read HEAD" msgstr "Konnte HEAD nicht lesen" -#: sequencer.c:846 +#: sequencer.c:849 msgid "could not read HEAD's commit message" msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen" -#: sequencer.c:852 +#: sequencer.c:855 #, c-format msgid "cannot write '%s'" msgstr "kann '%s' nicht schreiben" -#: sequencer.c:861 git-rebase--interactive.sh:445 +#: sequencer.c:864 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "Das ist die erste Commit-Beschreibung:" -#: sequencer.c:869 +#: sequencer.c:872 #, c-format msgid "could not read commit message of %s" msgstr "Konnte Commit-Beschreibung von %s nicht lesen." -#: sequencer.c:876 +#: sequencer.c:879 #, c-format msgid "This is the commit message #%d:" msgstr "Das ist Commit-Beschreibung #%d:" -#: sequencer.c:881 +#: sequencer.c:884 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Die Commit-Beschreibung #%d wird ausgelassen:" -#: sequencer.c:886 +#: sequencer.c:889 #, c-format msgid "unknown command: %d" msgstr "Unbekannter Befehl: %d" -#: sequencer.c:952 +#: sequencer.c:955 msgid "your index file is unmerged." msgstr "Ihre Index-Datei ist nicht zusammengeführt." -#: sequencer.c:970 +#: sequencer.c:973 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben." -#: sequencer.c:978 +#: sequencer.c:981 #, c-format msgid "commit %s does not have parent %d" msgstr "Commit %s hat keinen Eltern-Commit %d" -#: sequencer.c:982 +#: sequencer.c:985 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge." -#: sequencer.c:988 +#: sequencer.c:991 #, c-format msgid "cannot get commit message for %s" msgstr "Kann keine Commit-Beschreibung für %s bekommen." #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1009 +#: sequencer.c:1012 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:1071 sequencer.c:1827 +#: sequencer.c:1075 sequencer.c:1830 #, c-format msgid "could not rename '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' umbenennen." -#: sequencer.c:1122 +#: sequencer.c:1126 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:1123 +#: sequencer.c:1127 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:1165 +#: sequencer.c:1169 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:1175 +#: sequencer.c:1179 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen des Index" -#: sequencer.c:1182 +#: sequencer.c:1186 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" -#: sequencer.c:1303 +#: sequencer.c:1306 #, c-format msgid "invalid line %d: %.*s" msgstr "Ungültige Zeile %d: %.*s" -#: sequencer.c:1311 +#: sequencer.c:1314 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen" -#: sequencer.c:1344 +#: sequencer.c:1347 #, c-format msgid "could not read '%s'." msgstr "Konnte '%s' nicht lesen." -#: sequencer.c:1356 +#: sequencer.c:1359 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen." -#: sequencer.c:1358 +#: sequencer.c:1361 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Unbenutzbares Instruktionsblatt: '%s'" -#: sequencer.c:1363 +#: sequencer.c:1366 msgid "no commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:1374 +#: sequencer.c:1377 msgid "cannot cherry-pick during a revert." msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen." -#: sequencer.c:1376 +#: sequencer.c:1379 msgid "cannot revert during a cherry-pick." msgstr "Kann Revert nicht während eines Cherry-Picks ausführen." -#: sequencer.c:1439 +#: sequencer.c:1442 #, c-format msgid "invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:1442 +#: sequencer.c:1445 #, c-format msgid "invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:1499 +#: sequencer.c:1502 #, c-format msgid "malformed options sheet: '%s'" msgstr "Fehlerhaftes Optionsblatt: '%s'" -#: sequencer.c:1537 +#: sequencer.c:1540 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:1538 +#: sequencer.c:1541 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1541 +#: sequencer.c:1544 #, c-format msgid "could not create sequencer directory '%s'" msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen." -#: sequencer.c:1555 +#: sequencer.c:1558 msgid "could not lock HEAD" msgstr "Konnte HEAD nicht sperren" -#: sequencer.c:1611 sequencer.c:2181 +#: sequencer.c:1614 sequencer.c:2188 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:1613 +#: sequencer.c:1616 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:1615 sequencer.c:1649 +#: sequencer.c:1618 sequencer.c:1652 msgid "cannot abort from a branch yet to be born" -msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird" +msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist" -#: sequencer.c:1635 builtin/grep.c:910 +#: sequencer.c:1638 builtin/grep.c:929 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: sequencer.c:1637 +#: sequencer.c:1640 #, c-format msgid "cannot read '%s': %s" msgstr "Kann '%s' nicht lesen: %s" -#: sequencer.c:1638 +#: sequencer.c:1641 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:1644 +#: sequencer.c:1647 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:1655 +#: sequencer.c:1658 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "" -"Sie scheinen HEAD verschoben zu haben. Keine Zurücksetzung, prüfen Sie HEAD." +msgstr "Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD." -#: sequencer.c:1792 sequencer.c:2080 +#: sequencer.c:1795 sequencer.c:2086 msgid "cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: sequencer.c:1832 builtin/difftool.c:616 +#: sequencer.c:1835 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:1848 +#: sequencer.c:1851 msgid "could not read index" msgstr "Konnte den Index nicht lesen." -#: sequencer.c:1853 +#: sequencer.c:1856 #, c-format msgid "" "execution failed: %s\n" @@ -3335,11 +3390,11 @@ msgstr "" "\n" "ausführen.\n" -#: sequencer.c:1859 +#: sequencer.c:1862 msgid "and made changes to the index and/or the working tree\n" msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n" -#: sequencer.c:1865 +#: sequencer.c:1868 #, c-format msgid "" "execution succeeded: %s\n" @@ -3357,17 +3412,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1920 git-rebase.sh:169 +#: sequencer.c:1925 #, c-format -msgid "Applied autostash." -msgstr "Automatischen Stash angewendet." +msgid "Applied autostash.\n" +msgstr "Automatischen Stash angewendet.\n" -#: sequencer.c:1932 +#: sequencer.c:1937 #, c-format msgid "cannot store %s" msgstr "kann %s nicht speichern" -#: sequencer.c:1934 git-rebase.sh:173 +#: sequencer.c:1940 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3378,59 +3433,59 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: sequencer.c:2016 +#: sequencer.c:2022 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Angehalten bei %s... %.*s\n" -#: sequencer.c:2058 +#: sequencer.c:2064 #, c-format msgid "unknown command %d" msgstr "Unbekannter Befehl %d" -#: sequencer.c:2088 +#: sequencer.c:2094 msgid "could not read orig-head" msgstr "Konnte orig-head nicht lesen." -#: sequencer.c:2092 +#: sequencer.c:2099 msgid "could not read 'onto'" msgstr "Konnte 'onto' nicht lesen." -#: sequencer.c:2099 +#: sequencer.c:2106 #, c-format msgid "could not update %s" msgstr "Konnte %s nicht aktualisieren." -#: sequencer.c:2106 +#: sequencer.c:2113 #, c-format msgid "could not update HEAD to %s" msgstr "Konnte HEAD nicht auf %s aktualisieren." -#: sequencer.c:2190 +#: sequencer.c:2197 msgid "cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: sequencer.c:2195 +#: sequencer.c:2202 msgid "could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen." -#: sequencer.c:2204 +#: sequencer.c:2211 msgid "cannot amend non-existing commit" msgstr "Kann nicht existierenden Commit nicht nachbessern." -#: sequencer.c:2206 +#: sequencer.c:2213 #, c-format msgid "invalid file: '%s'" msgstr "Ungültige Datei: '%s'" -#: sequencer.c:2208 +#: sequencer.c:2215 #, c-format msgid "invalid contents: '%s'" msgstr "Ungültige Inhalte: '%s'" -#: sequencer.c:2211 +#: sequencer.c:2218 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3441,25 +3496,25 @@ msgstr "" "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n" "erneut aus." -#: sequencer.c:2221 +#: sequencer.c:2228 msgid "could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: sequencer.c:2301 +#: sequencer.c:2308 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:2305 +#: sequencer.c:2312 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:2338 +#: sequencer.c:2345 msgid "can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: setup.c:165 +#: setup.c:171 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3469,7 +3524,7 @@ msgstr "" "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n" "nicht existieren." -#: setup.c:178 +#: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3481,7 +3536,7 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:228 +#: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3492,34 +3547,34 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:475 +#: setup.c:504 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden" -#: setup.c:483 +#: setup.c:512 msgid "unknown repository extensions found:" msgstr "Unbekannte Repository-Erweiterungen gefunden:" -#: setup.c:776 +#: setup.c:810 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s" -#: setup.c:778 builtin/index-pack.c:1646 +#: setup.c:812 builtin/index-pack.c:1652 msgid "Cannot come back to cwd" -msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" +msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln" -#: setup.c:1010 +#: setup.c:1050 msgid "Unable to read current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen." -#: setup.c:1022 setup.c:1028 +#: setup.c:1062 setup.c:1068 #, c-format msgid "Cannot change to '%s'" msgstr "Kann nicht nach '%s' wechseln." -#: setup.c:1041 +#: setup.c:1081 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3529,7 +3584,7 @@ msgstr "" "%s)\n" "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)." -#: setup.c:1106 +#: setup.c:1173 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3538,30 +3593,30 @@ msgstr "" "Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n" "Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben." -#: sha1_file.c:559 +#: sha1_file.c:560 #, c-format msgid "path '%s' does not exist" msgstr "Pfad '%s' existiert nicht" -#: sha1_file.c:585 +#: sha1_file.c:586 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Referenziertes Repository '%s' wird noch nicht als verknüpftes\n" "Arbeitsverzeichnis unterstützt." -#: sha1_file.c:591 +#: sha1_file.c:592 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: sha1_file.c:597 +#: sha1_file.c:598 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." -#: sha1_file.c:605 +#: sha1_file.c:606 #, c-format msgid "reference repository '%s' is grafted" msgstr "" @@ -3572,26 +3627,26 @@ msgstr "" msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: sha1_file.c:2721 +#: sha1_file.c:2729 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)" -#: sha1_file.c:2725 +#: sha1_file.c:2733 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)" -#: sha1_name.c:409 +#: sha1_name.c:419 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "Kurzer SHA-1 %s ist mehrdeutig." -#: sha1_name.c:420 +#: sha1_name.c:430 msgid "The candidates are:" msgstr "Die Kandidaten sind:" -#: sha1_name.c:580 +#: sha1_name.c:589 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" @@ -3616,56 +3671,66 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausführen." -#: submodule.c:67 submodule.c:101 +#: submodule.c:70 submodule.c:104 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n" "Sie zuerst die Konflikte auf" -#: submodule.c:71 submodule.c:105 +#: submodule.c:74 submodule.c:108 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden" -#: submodule.c:79 +#: submodule.c:82 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" -#: submodule.c:112 +#: submodule.c:115 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" -#: submodule.c:123 +#: submodule.c:126 msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" -#: submodule.c:161 +#: submodule.c:165 msgid "negative values not allowed for submodule.fetchJobs" msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt" -#: submodule.c:1194 +#: submodule.c:376 +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "In nicht ausgechecktem Submodul '%s'." + +#: submodule.c:407 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" + +#: submodule.c:1337 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' nicht als Git-Repository erkannt" -#: submodule.c:1332 +#: submodule.c:1475 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht starten." -#: submodule.c:1345 +#: submodule.c:1488 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen." -#: submodule.c:1421 +#: submodule.c:1581 #, c-format msgid "submodule '%s' has dirty index" msgstr "Submodul '%s' hat einen geänderten Index." -#: submodule.c:1678 +#: submodule.c:1845 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3673,18 +3738,18 @@ msgstr "" "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n" "wird nicht unterstützt" -#: submodule.c:1690 submodule.c:1746 +#: submodule.c:1857 submodule.c:1913 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "konnte Name für Submodul '%s' nicht nachschlagen" -#: submodule.c:1694 builtin/submodule--helper.c:678 +#: submodule.c:1861 builtin/submodule--helper.c:678 #: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: submodule.c:1697 +#: submodule.c:1864 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3695,94 +3760,94 @@ msgstr "" "'%s' nach\n" "'%s'\n" -#: submodule.c:1781 +#: submodule.c:1948 #, c-format msgid "could not recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" -#: submodule.c:1825 +#: submodule.c:1992 msgid "could not start ls-files in .." msgstr "Konnte 'ls-files' nicht in .. starten" -#: submodule.c:1845 +#: submodule.c:2012 msgid "BUG: returned path string doesn't match cwd?" msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?" -#: submodule.c:1864 +#: submodule.c:2031 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" -#: submodule-config.c:380 +#: submodule-config.c:420 #, c-format msgid "invalid value for %s" msgstr "Ungültiger Wert für %s" -#: trailer.c:240 +#: trailer.c:241 #, c-format msgid "running trailer command '%s' failed" msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen" -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 -#: trailer.c:543 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 +#: trailer.c:544 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "unbekannter Wert '%s' für Schlüssel %s" -#: trailer.c:525 trailer.c:530 builtin/remote.c:289 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "mehr als ein %s" -#: trailer.c:702 +#: trailer.c:703 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "leerer Anhang-Token in Anhang '%.*s'" -#: trailer.c:722 +#: trailer.c:723 #, c-format msgid "could not read input file '%s'" msgstr "Konnte Eingabe-Datei '%s' nicht lesen" -#: trailer.c:725 +#: trailer.c:726 msgid "could not read from stdin" msgstr "konnte nicht von der Standard-Eingabe lesen" -#: trailer.c:949 builtin/am.c:44 +#: trailer.c:950 builtin/am.c:45 #, c-format msgid "could not stat %s" msgstr "Konnte '%s' nicht lesen" -#: trailer.c:951 +#: trailer.c:952 #, c-format msgid "file %s is not a regular file" msgstr "Datei '%s' ist keine reguläre Datei" -#: trailer.c:953 +#: trailer.c:954 #, c-format msgid "file %s is not writable by user" msgstr "Datei %s ist vom Benutzer nicht beschreibbar." -#: trailer.c:965 +#: trailer.c:966 msgid "could not open temporary file" msgstr "konnte temporäre Datei '%s' nicht öffnen" -#: trailer.c:1001 +#: trailer.c:1002 #, c-format msgid "could not rename temporary file to %s" msgstr "konnte temporäre Datei nicht zu %s umbenennen" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ungültige --depth Option '%s'" -#: transport.c:889 +#: transport.c:890 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3791,7 +3856,7 @@ msgstr "" "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n" "Remote-Repository gefunden wurden:\n" -#: transport.c:893 +#: transport.c:894 #, c-format msgid "" "\n" @@ -3818,11 +3883,11 @@ msgstr "" "zum Versenden zu einem Remote-Repository.\n" "\n" -#: transport.c:901 +#: transport.c:902 msgid "Aborting." msgstr "Abbruch." -#: transport-helper.c:1080 +#: transport-helper.c:1071 #, c-format msgid "Could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." @@ -3843,7 +3908,7 @@ msgstr "leerer Dateiname in Tree-Eintrag" msgid "too-short tree file" msgstr "zu kurze Tree-Datei" -#: unpack-trees.c:104 +#: unpack-trees.c:105 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3854,7 +3919,7 @@ msgstr "" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n" "wechseln." -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3864,7 +3929,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3872,9 +3937,9 @@ msgid "" msgstr "" "Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n" "überschrieben werden:\n" -"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen." +"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen." -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3884,7 +3949,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:114 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3894,7 +3959,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen." -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3903,7 +3968,7 @@ msgstr "" "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:122 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3913,7 +3978,7 @@ msgstr "" "Dateien in diesen Verzeichnissen verloren gehen:\n" "%s" -#: unpack-trees.c:125 +#: unpack-trees.c:126 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3923,7 +3988,7 @@ msgstr "" "den Checkout entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3934,7 +3999,7 @@ msgstr "" "Checkout entfernt werden:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3944,7 +4009,7 @@ msgstr "" "den Merge entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen." -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3955,7 +4020,7 @@ msgstr "" "Merge entfernt werden:\n" "%%s" -#: unpack-trees.c:135 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3965,7 +4030,7 @@ msgstr "" "den %s entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3975,7 +4040,7 @@ msgstr "" "den %s entfernt werden:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3986,7 +4051,7 @@ msgstr "" "den Checkout überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3998,7 +4063,7 @@ msgstr "" "Checkout überschrieben werden:\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4008,7 +4073,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen." -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4018,7 +4083,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4028,7 +4093,7 @@ msgstr "" "den %s überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4039,12 +4104,12 @@ msgstr "" "%s überschrieben werden:\n" "%%s" -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden." -#: unpack-trees.c:164 +#: unpack-trees.c:165 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -4055,7 +4120,7 @@ msgstr "" "aktuell:\n" "%s" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4066,7 +4131,7 @@ msgstr "" "über einen partiellen Checkout überschrieben werden:\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4077,7 +4142,7 @@ msgstr "" "über einen partiellen Checkout entfernt werden:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "Cannot update submodule:\n" @@ -4086,19 +4151,19 @@ msgstr "" "Kann Submodul nicht aktualisieren:\n" "%s" -#: unpack-trees.c:247 +#: unpack-trees.c:248 #, c-format msgid "Aborting\n" msgstr "Abbruch\n" -#: unpack-trees.c:272 +#: unpack-trees.c:277 #, c-format msgid "submodule update strategy not supported for submodule '%s'" msgstr "" "Strategie zur Aktualisierung von Submodulen für Submodul '%s' nicht " "unterstützt." -#: unpack-trees.c:340 +#: unpack-trees.c:346 msgid "Checking out files" msgstr "Checke Dateien aus" @@ -4131,201 +4196,207 @@ msgstr "ungültige Portnummer" msgid "invalid '..' path segment" msgstr "ungültiges '..' Pfadsegment" -#: worktree.c:285 +#: worktree.c:245 #, c-format msgid "failed to read '%s'" msgstr "Fehler beim Lesen von '%s'" -#: wrapper.c:222 wrapper.c:392 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen." -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 -#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 -#: builtin/pull.c:341 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 +#: builtin/am.c:849 builtin/merge.c:1014 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: wrapper.c:581 wrapper.c:602 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:610 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." -#: wrapper.c:634 +#: wrapper.c:656 #, c-format msgid "could not write to %s" msgstr "Konnte nicht nach '%s' schreiben." -#: wrapper.c:636 +#: wrapper.c:658 #, c-format msgid "could not close %s" msgstr "Konnte '%s' nicht schließen." -#: wt-status.c:151 +#: wt-status.c:152 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:181 wt-status.c:208 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:184 +#: wt-status.c:185 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:187 wt-status.c:191 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu " "markieren)" -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:199 wt-status.c:958 +#: wt-status.c:200 wt-status.c:981 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Änderungen:" -#: wt-status.c:217 wt-status.c:967 +#: wt-status.c:218 wt-status.c:990 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:223 +#: wt-status.c:224 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:224 +#: wt-status.c:225 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im " "Arbeitsverzeichnis zu verwerfen)" -#: wt-status.c:226 +#: wt-status.c:227 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt " "in den Submodulen)" -#: wt-status.c:238 +#: wt-status.c:239 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:253 +#: wt-status.c:254 msgid "both deleted:" msgstr "beide gelöscht:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "added by us:" msgstr "von uns hinzugefügt:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "deleted by them:" msgstr "von denen gelöscht:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by them:" msgstr "von denen hinzugefügt:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by us:" msgstr "von uns gelöscht:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both added:" msgstr "von beiden hinzugefügt:" -#: wt-status.c:265 +#: wt-status.c:266 msgid "both modified:" msgstr "von beiden geändert:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "new file:" msgstr "neue Datei:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "copied:" msgstr "kopiert:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "deleted:" msgstr "gelöscht:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "modified:" msgstr "geändert:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "renamed:" msgstr "umbenannt:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "typechange:" msgstr "Typänderung:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unknown:" msgstr "unbekannt:" -#: wt-status.c:289 +#: wt-status.c:290 msgid "unmerged:" msgstr "nicht gemerged:" -#: wt-status.c:371 +#: wt-status.c:372 msgid "new commits, " msgstr "neue Commits, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "modified content, " msgstr "geänderter Inhalt, " -#: wt-status.c:375 +#: wt-status.c:376 msgid "untracked content, " msgstr "unversionierter Inhalt, " -#: wt-status.c:831 +#: wt-status.c:821 +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "Ihr Stash hat gerade %d Eintrag" +msgstr[1] "Ihr Stash hat gerade %d Einträge" + +#: wt-status.c:853 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:833 +#: wt-status.c:855 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:914 +#: wt-status.c:937 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -4333,114 +4404,114 @@ msgstr "" "Ändern Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird entfernt." -#: wt-status.c:1026 +#: wt-status.c:1049 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:1029 +#: wt-status.c:1052 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:1031 +#: wt-status.c:1054 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)" -#: wt-status.c:1036 +#: wt-status.c:1059 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:1039 +#: wt-status.c:1062 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:1049 +#: wt-status.c:1072 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:1052 +#: wt-status.c:1075 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:1056 +#: wt-status.c:1079 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)" -#: wt-status.c:1058 +#: wt-status.c:1081 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1060 +#: wt-status.c:1083 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\", um den ursprünglichen Branch " "wiederherzustellen)" -#: wt-status.c:1189 +#: wt-status.c:1214 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo fehlt." -#: wt-status.c:1191 +#: wt-status.c:1216 msgid "No commands done." msgstr "Keine Befehle ausgeführt." -#: wt-status.c:1194 +#: wt-status.c:1219 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):" msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):" -#: wt-status.c:1205 +#: wt-status.c:1230 #, c-format msgid " (see more in file %s)" msgstr " (mehr Informationen in Datei %s)" -#: wt-status.c:1210 +#: wt-status.c:1235 msgid "No commands remaining." msgstr "Keine Befehle verbleibend." -#: wt-status.c:1213 +#: wt-status.c:1238 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):" msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):" -#: wt-status.c:1221 +#: wt-status.c:1246 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)" -#: wt-status.c:1234 +#: wt-status.c:1259 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'." -#: wt-status.c:1239 +#: wt-status.c:1264 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1253 +#: wt-status.c:1278 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" " "aus)" -#: wt-status.c:1255 +#: wt-status.c:1280 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1257 +#: wt-status.c:1282 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch " "auszuchecken)" -#: wt-status.c:1263 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1267 +#: wt-status.c:1292 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4448,134 +4519,138 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1272 +#: wt-status.c:1297 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1275 +#: wt-status.c:1300 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --" "continue\" aus)" -#: wt-status.c:1279 +#: wt-status.c:1304 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf " "'%s'." -#: wt-status.c:1284 +#: wt-status.c:1309 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1287 +#: wt-status.c:1312 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1289 +#: wt-status.c:1314 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen " "abgeschlossen sind)" -#: wt-status.c:1299 +#: wt-status.c:1324 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1304 +#: wt-status.c:1329 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue" "\" aus)" -#: wt-status.c:1307 +#: wt-status.c:1332 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1309 +#: wt-status.c:1334 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation " "abzubrechen)" -#: wt-status.c:1318 +#: wt-status.c:1343 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade an einem Revert von Commit '%s'." -#: wt-status.c:1323 +#: wt-status.c:1348 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" " "aus)" -#: wt-status.c:1326 +#: wt-status.c:1351 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1328 +#: wt-status.c:1353 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1339 +#: wt-status.c:1364 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'." -#: wt-status.c:1343 +#: wt-status.c:1368 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1346 +#: wt-status.c:1371 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch " "zurückzukehren)" -#: wt-status.c:1543 +#: wt-status.c:1568 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1549 +#: wt-status.c:1574 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1551 +#: wt-status.c:1576 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1556 +#: wt-status.c:1581 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1558 +#: wt-status.c:1583 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1561 +#: wt-status.c:1586 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1579 +#: wt-status.c:1606 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1593 +#: wt-status.c:1607 +msgid "No commits yet" +msgstr "Noch keine Commits" + +#: wt-status.c:1621 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1595 +#: wt-status.c:1623 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1599 +#: wt-status.c:1627 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4586,32 +4661,32 @@ msgstr "" "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." -#: wt-status.c:1605 +#: wt-status.c:1633 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1607 +#: wt-status.c:1635 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1613 +#: wt-status.c:1641 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1618 +#: wt-status.c:1646 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder " "\"git commit -a\")\n" -#: wt-status.c:1621 +#: wt-status.c:1649 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1624 +#: wt-status.c:1652 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4620,235 +4695,276 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" "(benutzen Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1627 +#: wt-status.c:1655 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" -#: wt-status.c:1630 +#: wt-status.c:1658 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen\n" "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1633 wt-status.c:1638 +#: wt-status.c:1661 wt-status.c:1666 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1636 +#: wt-status.c:1664 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien " "anzuzeigen)\n" -#: wt-status.c:1640 +#: wt-status.c:1668 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1749 -msgid "Initial commit on " -msgstr "Initialer Commit auf " +#: wt-status.c:1780 +msgid "No commits yet on " +msgstr "Noch keine Commits in " -#: wt-status.c:1753 +#: wt-status.c:1784 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1782 wt-status.c:1790 +#: wt-status.c:1813 wt-status.c:1821 msgid "behind " msgstr "hinterher " -#: wt-status.c:1785 wt-status.c:1788 +#: wt-status.c:1816 wt-status.c:1819 msgid "ahead " msgstr "voraus " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2280 +#: wt-status.c:2311 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind." -#: wt-status.c:2286 +#: wt-status.c:2317 msgid "additionally, your index contains uncommitted changes." msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen." -#: wt-status.c:2288 +#: wt-status.c:2319 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen." -#: compat/precompose_utf8.c:57 builtin/clone.c:432 +#: compat/precompose_utf8.c:58 builtin/clone.c:436 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." -#: builtin/add.c:22 +#: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." -#: builtin/add.c:80 +#: builtin/add.c:82 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:85 builtin/commit.c:291 +#: builtin/add.c:87 builtin/commit.c:292 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" -#: builtin/add.c:95 +#: builtin/add.c:97 #, c-format msgid "remove '%s'\n" msgstr "lösche '%s'\n" -#: builtin/add.c:149 +#: builtin/add.c:151 msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:209 builtin/rev-parse.c:872 +#: builtin/add.c:211 builtin/rev-parse.c:873 msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" -#: builtin/add.c:220 +#: builtin/add.c:222 #, c-format msgid "Could not open '%s' for writing." msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: builtin/add.c:224 +#: builtin/add.c:226 msgid "Could not write patch" msgstr "Konnte Patch nicht schreiben" -#: builtin/add.c:227 +#: builtin/add.c:229 msgid "editing patch failed" msgstr "Bearbeitung des Patches fehlgeschlagen" -#: builtin/add.c:230 +#: builtin/add.c:232 #, c-format msgid "Could not stat '%s'" msgstr "Konnte Verzeichnis '%s' nicht lesen" -#: builtin/add.c:232 +#: builtin/add.c:234 msgid "Empty patch. Aborted." msgstr "Leerer Patch. Abgebrochen." -#: builtin/add.c:237 +#: builtin/add.c:239 #, c-format msgid "Could not apply '%s'" msgstr "Konnte '%s' nicht anwenden." -#: builtin/add.c:247 +#: builtin/add.c:249 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 +#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:269 +#: builtin/add.c:272 msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 +#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" -#: builtin/add.c:271 +#: builtin/add.c:274 msgid "edit current diff and apply" msgstr "aktuelle Unterschiede editieren und anwenden" -#: builtin/add.c:272 +#: builtin/add.c:275 msgid "allow adding otherwise ignored files" msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben" -#: builtin/add.c:273 +#: builtin/add.c:276 msgid "update tracked files" msgstr "versionierte Dateien aktualisieren" -#: builtin/add.c:274 +#: builtin/add.c:277 msgid "record only the fact that the path will be added later" msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll" -#: builtin/add.c:275 +#: builtin/add.c:278 msgid "add changes from all tracked and untracked files" msgstr "" "Änderungen von allen versionierten und unversionierten Dateien hinzufügen" -#: builtin/add.c:278 +#: builtin/add.c:281 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)" -#: builtin/add.c:280 +#: builtin/add.c:283 msgid "don't add, only refresh the index" msgstr "nichts hinzufügen, nur den Index aktualisieren" -#: builtin/add.c:281 +#: builtin/add.c:284 msgid "just skip files which cannot be added because of errors" msgstr "" "Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden " "konnten" -#: builtin/add.c:282 +#: builtin/add.c:285 msgid "check if - even missing - files are ignored in dry run" msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden" -#: builtin/add.c:283 builtin/update-index.c:951 +#: builtin/add.c:286 builtin/update-index.c:952 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:952 +#: builtin/add.c:286 builtin/update-index.c:953 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" -#: builtin/add.c:305 +#: builtin/add.c:288 +msgid "warn when adding an embedded repository" +msgstr "warnen wenn eingebettetes Repository hinzugefügt wird" + +#: builtin/add.c:303 +#, 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 "" +"Sie haben ein Git-Repository innerhalb ihres aktuellen Repositories hinzugefügt.\n" +"Klone des äußeren Repositories werden die Inhalte des eingebetteten Repositories\n" +"weder enthalten, noch wissen, wie diese zu beschaffen sind.\n" +"Wenn Sie ein Submodul hinzufügen wollten, benutzen Sie:\n" +"\n" +"\tgit submodule add <URL> %s\n" +"\n" +"Wenn Sie diesen Pfad aus Versehen hinzugefügt haben, können Sie diesen mit\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"vom Index entfernen.\n" +"\n" +"Siehe \"git help submodule\" für weitere Informationen." + +#: builtin/add.c:331 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "Füge eingebettetes Repository hinzu: %s" + +#: builtin/add.c:349 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n" -#: builtin/add.c:312 +#: builtin/add.c:357 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:348 +#: builtin/add.c:394 msgid "-A and -u are mutually incompatible" msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:355 +#: builtin/add.c:401 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden." -#: builtin/add.c:359 +#: builtin/add.c:405 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein" -#: builtin/add.c:374 +#: builtin/add.c:420 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" -#: builtin/add.c:375 +#: builtin/add.c:421 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Meinten Sie vielleicht 'git add .'?\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 -#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 +#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 +#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "Index-Datei beschädigt" -#: builtin/am.c:412 +#: builtin/am.c:413 msgid "could not parse author script" msgstr "konnte Autor-Skript nicht parsen" @@ -4896,7 +5012,7 @@ msgstr "Ungültiger Offset in der Zeitzone" msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:991 builtin/clone.c:397 +#: builtin/am.c:991 builtin/clone.c:401 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" @@ -4905,57 +5021,57 @@ msgstr "Fehler beim Erstellen von Verzeichnis '%s'" msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1127 builtin/commit.c:376 +#: builtin/am.c:1120 builtin/commit.c:377 msgid "unable to write index file" msgstr "Konnte Index-Datei nicht schreiben." -#: builtin/am.c:1178 +#: builtin/am.c:1171 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus." -#: builtin/am.c:1179 +#: builtin/am.c:1172 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip" "\" aus." -#: builtin/am.c:1180 +#: builtin/am.c:1173 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der " "Patches abzubrechen, führen Sie \"%s --abort\" aus." -#: builtin/am.c:1315 -msgid "Patch is empty. Was it split wrong?" -msgstr "Patch ist leer. War dessen Aufteilung falsch?" +#: builtin/am.c:1304 +msgid "Patch is empty." +msgstr "Patch ist leer." -#: builtin/am.c:1386 builtin/log.c:1557 +#: builtin/am.c:1370 #, c-format -msgid "invalid ident line: %s" -msgstr "Ungültige Identifikationszeile: %s" +msgid "invalid ident line: %.*s" +msgstr "Ungültige Identifikationszeile: %.*s" -#: builtin/am.c:1413 +#: builtin/am.c:1392 #, c-format msgid "unable to parse commit %s" msgstr "Konnte Commit '%s' nicht parsen." -#: builtin/am.c:1606 +#: builtin/am.c:1586 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge " "zurückzufallen." -#: builtin/am.c:1608 +#: builtin/am.c:1588 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: builtin/am.c:1627 +#: builtin/am.c:1607 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4963,39 +5079,39 @@ msgstr "" "Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: builtin/am.c:1633 +#: builtin/am.c:1613 msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." -#: builtin/am.c:1658 +#: builtin/am.c:1638 msgid "Failed to merge in the changes." msgstr "Merge der Änderungen fehlgeschlagen." -#: builtin/am.c:1682 builtin/merge.c:631 +#: builtin/am.c:1662 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: builtin/am.c:1689 +#: builtin/am.c:1669 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" -#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 -#: builtin/merge.c:827 +#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 +#: builtin/merge.c:828 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: builtin/am.c:1735 builtin/am.c:1739 +#: builtin/am.c:1715 builtin/am.c:1719 #, c-format msgid "cannot resume: %s does not exist." msgstr "Kann nicht fortsetzen: %s existiert nicht" -#: builtin/am.c:1755 +#: builtin/am.c:1735 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " "Terminal verbunden ist." -#: builtin/am.c:1760 +#: builtin/am.c:1740 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" @@ -5003,35 +5119,35 @@ msgstr "Commit-Beschreibung ist:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1770 +#: builtin/am.c:1750 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1820 +#: builtin/am.c:1800 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)" -#: builtin/am.c:1860 builtin/am.c:1932 +#: builtin/am.c:1840 builtin/am.c:1912 #, c-format msgid "Applying: %.*s" msgstr "Wende an: %.*s" -#: builtin/am.c:1876 +#: builtin/am.c:1856 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." -#: builtin/am.c:1884 +#: builtin/am.c:1864 #, c-format msgid "Patch failed at %s %.*s" msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s" -#: builtin/am.c:1890 +#: builtin/am.c:1870 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s" -#: builtin/am.c:1935 +#: builtin/am.c:1915 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5042,25 +5158,30 @@ msgstr "" "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n" "auslassen." -#: builtin/am.c:1942 +#: builtin/am.c:1922 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +"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 "" -"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n" -"Haben Sie vergessen 'git add' zu benutzen?" +"Sie haben noch immer nicht zusammengeführte Pfade in Ihrem Index.\n" +"Sie sollten 'git add' für jede Datei mit aufgelösten Konflikten ausführen,\n" +"um diese als solche zu markieren.\n" +"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n" +"diese zu akzeptieren." -#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 -#: builtin/reset.c:316 +#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 +#: builtin/reset.c:331 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/am.c:2102 +#: builtin/am.c:2083 msgid "failed to clean index" msgstr "Fehler beim Bereinigen des Index" -#: builtin/am.c:2136 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5068,134 +5189,135 @@ msgstr "" "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n" "Keine Zurücksetzung zu ORIG_HEAD." -#: builtin/am.c:2199 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Ungültiger Wert für --patch-format: %s" -#: builtin/am.c:2232 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]" -#: builtin/am.c:2233 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<Optionen>] (--continue | --skip | --abort)" -#: builtin/am.c:2239 +#: builtin/am.c:2220 msgid "run interactively" msgstr "interaktiv ausführen" -#: builtin/am.c:2241 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "historische Option -- kein Effekt" -#: builtin/am.c:2243 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge" -#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:178 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:180 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/am.c:2246 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen" -#: builtin/am.c:2249 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "nach UTF-8 umkodieren (Standard)" -#: builtin/am.c:2251 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "-k an git-mailinfo übergeben" -#: builtin/am.c:2253 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "-b an git-mailinfo übergeben" -#: builtin/am.c:2255 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "-m an git-mailinfo übergeben" -#: builtin/am.c:2257 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben" -#: builtin/am.c:2260 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr" -#: builtin/am.c:2263 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "alles vor einer Scheren-Zeile entfernen" -#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 -#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 -#: builtin/am.c:2292 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "an git-apply übergeben" -#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 +#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 +#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 +#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 +#: parse-options.h:245 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 -#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 msgid "format" msgstr "Format" -#: builtin/am.c:2289 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "Patch-Format" -#: builtin/am.c:2295 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben" -#: builtin/am.c:2297 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen" -#: builtin/am.c:2300 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "Synonyme für --continue" -#: builtin/am.c:2303 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "den aktuellen Patch auslassen" -#: builtin/am.c:2306 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen" -#: builtin/am.c:2310 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "Autor-Datum als Commit-Datum verwenden" -#: builtin/am.c:2312 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 -#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 +#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/am.c:2315 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "Commits mit GPG signieren" -#: builtin/am.c:2318 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(intern für git-rebase verwendet)" -#: builtin/am.c:2333 +#: builtin/am.c:2317 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." @@ -5203,16 +5325,16 @@ msgstr "" "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" "entfernt. Bitte verwenden Sie diese nicht mehr." -#: builtin/am.c:2340 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "Fehler beim Lesen des Index" -#: builtin/am.c:2355 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben." -#: builtin/am.c:2379 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -5221,7 +5343,7 @@ msgstr "" "Stray %s Verzeichnis gefunden.\n" "Benutzen Sie \"git am --abort\", um es zu entfernen." -#: builtin/am.c:2385 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." @@ -5271,204 +5393,173 @@ msgstr "'git bisect next' ausführen" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken" -#: builtin/blame.c:33 +#: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" -#: builtin/blame.c:38 +#: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:1777 -msgid "Blaming lines" -msgstr "Verarbeite Zeilen" - -#: builtin/blame.c:2573 +#: builtin/blame.c:668 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:2574 +#: builtin/blame.c:669 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:2575 +#: builtin/blame.c:670 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)" +msgstr "Ursprungs-Commits nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:2576 +#: builtin/blame.c:671 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:2577 +#: builtin/blame.c:672 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:2578 +#: builtin/blame.c:673 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:2579 +#: builtin/blame.c:674 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:2580 +#: builtin/blame.c:675 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:2581 +#: builtin/blame.c:676 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:2582 +#: builtin/blame.c:677 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:2583 +#: builtin/blame.c:678 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:2584 +#: builtin/blame.c:679 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:2585 +#: builtin/blame.c:680 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:2586 +#: builtin/blame.c:681 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:2587 +#: builtin/blame.c:682 msgid "Show author email instead of name (Default: off)" msgstr "" "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:2588 +#: builtin/blame.c:683 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:2595 +#: builtin/blame.c:690 msgid "Use an experimental heuristic to improve diffs" msgstr "" "eine experimentelle Heuristik zur Verbesserung der Darstellung\n" "von Unterschieden verwenden" -#: builtin/blame.c:2597 +#: builtin/blame.c:692 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Ãœbereinstimmungen zu finden" -#: builtin/blame.c:2598 +#: builtin/blame.c:693 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:2599 +#: builtin/blame.c:694 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:2600 builtin/blame.c:2601 +#: builtin/blame.c:695 builtin/blame.c:696 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:2600 +#: builtin/blame.c:695 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2601 +#: builtin/blame.c:696 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" -#: builtin/blame.c:2649 +#: builtin/blame.c:744 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n" "verwendet werden" -#. TRANSLATORS: This string is used to tell us the maximum -#. display width for a relative timestamp in "git blame" -#. output. For C locale, "4 years, 11 months ago", which -#. takes 22 places, is the longest among various forms of -#. relative timestamps, but your language may need more or -#. fewer display columns. -#: builtin/blame.c:2697 +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c:795 msgid "4 years, 11 months ago" -msgstr "vor 4 Jahren, und 11 Monaten" - -#: builtin/blame.c:2777 -msgid "--contents and --reverse do not blend well." -msgstr "--contents und --reverse funktionieren gemeinsam nicht." +msgstr "vor 4 Jahren und 11 Monaten" -#: builtin/blame.c:2797 -msgid "cannot use --contents with final commit object name" -msgstr "" -"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen" - -#: builtin/blame.c:2802 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "" -"--reverse und --first-parent zusammen erfordern die Angabe eines " -"endgültigen\n" -"Commits" - -#: builtin/blame.c:2829 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "" -"--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n" -"\"first-parent\"-Kette" - -#: builtin/blame.c:2840 -#, c-format -msgid "no such path %s in %s" -msgstr "Pfad %s nicht in %s" - -#: builtin/blame.c:2851 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "kann Blob %s für Pfad '%s' nicht lesen" - -#: builtin/blame.c:2870 +#: builtin/blame.c:882 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "Datei %s hat nur %lu Zeile" msgstr[1] "Datei %s hat nur %lu Zeilen" -#: builtin/branch.c:26 +#: builtin/blame.c:928 +msgid "Blaming lines" +msgstr "Verarbeite Zeilen" + +#: builtin/branch.c:27 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..." -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<Optionen>] [-r | -a] [--points-at]" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<Optionen>] [-r | -a] [--format]" -#: builtin/branch.c:144 +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5477,7 +5568,7 @@ msgstr "" "entferne Branch '%s', der zusammengeführt wurde mit\n" " '%s', aber noch nicht mit HEAD zusammengeführt wurde." -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5486,12 +5577,12 @@ msgstr "" "entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n" " '%s', obwohl er mit HEAD zusammengeführt wurde." -#: builtin/branch.c:162 +#: builtin/branch.c:163 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen." -#: builtin/branch.c:166 +#: builtin/branch.c:167 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5501,94 +5592,94 @@ msgstr "" "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D " "%s' aus." -#: builtin/branch.c:179 +#: builtin/branch.c:180 msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:210 +#: builtin/branch.c:211 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:216 +#: builtin/branch.c:217 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen." -#: builtin/branch.c:230 +#: builtin/branch.c:231 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'." -#: builtin/branch.c:245 +#: builtin/branch.c:246 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "Remote-Tracking-Branch '%s' nicht gefunden" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." -#: builtin/branch.c:261 +#: builtin/branch.c:262 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'" -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting branch '%s'" msgstr "Fehler beim Entfernen des Branches '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:270 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:441 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Branch %s wird auf %s umgesetzt" -#: builtin/branch.c:445 +#: builtin/branch.c:449 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Binäre Suche von Branch %s zu %s im Gange" -#: builtin/branch.c:460 +#: builtin/branch.c:464 msgid "cannot rename the current branch while not on any." msgstr "" "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." -#: builtin/branch.c:470 +#: builtin/branch.c:474 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:487 +#: builtin/branch.c:491 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:490 +#: builtin/branch.c:494 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!" -#: builtin/branch.c:502 +#: builtin/branch.c:506 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:518 +#: builtin/branch.c:522 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5599,177 +5690,177 @@ msgstr "" " %s\n" "Zeilen, die mit '%c' beginnen, werden entfernt.\n" -#: builtin/branch.c:551 +#: builtin/branch.c:555 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:553 +#: builtin/branch.c:557 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:554 +#: builtin/branch.c:558 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:555 +#: builtin/branch.c:559 msgid "set up tracking mode (see git-pull(1))" msgstr "den Ãœbernahmemodus einstellen (siehe git-pull(1))" -#: builtin/branch.c:557 +#: builtin/branch.c:561 msgid "change upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "upstream" msgstr "Upstream" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "change the upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:560 +#: builtin/branch.c:564 msgid "Unset the upstream info" msgstr "Informationen zum Upstream-Branch entfernen" -#: builtin/branch.c:561 +#: builtin/branch.c:565 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:562 +#: builtin/branch.c:566 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:564 builtin/branch.c:566 +#: builtin/branch.c:568 builtin/branch.c:570 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, die diesen Commit enthalten" -#: builtin/branch.c:565 builtin/branch.c:567 +#: builtin/branch.c:569 builtin/branch.c:571 msgid "print only branches that don't contain the commit" msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten" -#: builtin/branch.c:570 +#: builtin/branch.c:574 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:571 +#: builtin/branch.c:575 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:573 +#: builtin/branch.c:577 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:574 +#: builtin/branch.c:578 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:575 +#: builtin/branch.c:579 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:576 +#: builtin/branch.c:580 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:577 +#: builtin/branch.c:581 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:578 +#: builtin/branch.c:582 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:581 +#: builtin/branch.c:585 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "print only branches that are merged" msgstr "nur zusammengeführte Branches ausgeben" -#: builtin/branch.c:583 +#: builtin/branch.c:587 msgid "print only branches that are not merged" msgstr "nur nicht zusammengeführte Branches ausgeben" -#: builtin/branch.c:584 +#: builtin/branch.c:588 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 +#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "key" msgstr "Schüssel" -#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 -#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:429 +#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 +#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 +#: builtin/tag.c:430 msgid "object" msgstr "Objekt" -#: builtin/branch.c:589 +#: builtin/branch.c:593 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 +#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 msgid "sorting and filtering are case insensitive" msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung" -#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 -#: builtin/verify-tag.c:38 +#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/branch.c:611 +#: builtin/branch.c:615 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: builtin/branch.c:615 builtin/clone.c:724 +#: builtin/branch.c:619 builtin/clone.c:728 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:638 +#: builtin/branch.c:642 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:649 builtin/branch.c:701 +#: builtin/branch.c:653 builtin/branch.c:705 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:677 +#: builtin/branch.c:681 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:682 +#: builtin/branch.c:686 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:689 +#: builtin/branch.c:693 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:692 +#: builtin/branch.c:696 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:707 +#: builtin/branch.c:711 msgid "too many branches for a rename operation" msgstr "zu viele Branches für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:712 +#: builtin/branch.c:716 msgid "too many branches to set new upstream" msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:716 +#: builtin/branch.c:720 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5777,43 +5868,43 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 +#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:723 +#: builtin/branch.c:727 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:735 +#: builtin/branch.c:739 msgid "too many branches to unset upstream" msgstr "" "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" -#: builtin/branch.c:739 +#: builtin/branch.c:743 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n" "auf keinen Branch zeigt." -#: builtin/branch.c:745 +#: builtin/branch.c:749 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:759 +#: builtin/branch.c:763 msgid "it does not make sense to create 'HEAD' manually" msgstr "'HEAD' darf nicht manuell erstellt werden" -#: builtin/branch.c:765 +#: builtin/branch.c:769 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " "Branchnamen verwendet werden." -#: builtin/branch.c:768 +#: builtin/branch.c:772 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5822,7 +5913,7 @@ msgstr "" "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" "track oder --set-upstream-to\n" -#: builtin/branch.c:785 +#: builtin/branch.c:789 #, c-format msgid "" "\n" @@ -5846,7 +5937,7 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." -#: builtin/cat-file.c:513 +#: builtin/cat-file.c:519 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5854,7 +5945,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>" -#: builtin/cat-file.c:514 +#: builtin/cat-file.c:520 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5862,311 +5953,311 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:551 +#: builtin/cat-file.c:557 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:552 +#: builtin/cat-file.c:558 msgid "show object type" msgstr "Objektart anzeigen" -#: builtin/cat-file.c:553 +#: builtin/cat-file.c:559 msgid "show object size" msgstr "Objektgröße anzeigen" -#: builtin/cat-file.c:555 +#: builtin/cat-file.c:561 msgid "exit with zero when there's no error" msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:556 +#: builtin/cat-file.c:562 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:564 msgid "for blob objects, run textconv on object's content" msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:566 msgid "for blob objects, run filters on object's content" msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen" -#: builtin/cat-file.c:561 git-submodule.sh:943 +#: builtin/cat-file.c:567 git-submodule.sh:944 msgid "blob" msgstr "Blob" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:568 msgid "use a specific path for --textconv/--filters" msgstr "einen bestimmten Pfad für --textconv/--filters verwenden" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:570 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s und -t mit beschädigten Objekten erlauben" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:571 msgid "buffer --batch output" msgstr "Ausgabe von --batch puffern" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:573 msgid "show info and content of objects fed from the standard input" msgstr "" "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-" "Eingabe" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:576 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:579 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit " "--batch oder --batch-check)" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:581 msgid "show all objects with --batch or --batch-check" msgstr "alle Objekte mit --batch oder --batch-check anzeigen" -#: builtin/check-attr.c:11 +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..." -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <Attribut>...]" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "alle Attribute einer Datei ausgeben" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "nur .gitattributes vom Index verwenden" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 msgid "read file names from stdin" msgstr "Dateinamen von der Standard-Eingabe lesen" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 +#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "Eingabe-Pfade ohne Ãœbereinstimmungen anzeigen" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "Index bei der Prüfung ignorieren" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:158 msgid "cannot specify pathnames with --stdin" msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:161 msgid "-z only makes sense with --stdin" msgstr "Die Option -z kann nur mit --stdin verwendet werden." -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:163 msgid "no path specified" msgstr "kein Pfad angegeben" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:167 msgid "--quiet is only valid with a single pathname" msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig." -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:169 msgid "cannot have both --quiet and --verbose" msgstr "" "Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden." -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:172 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching ist nur mit --verbose zulässig" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<Optionen>] <Kontakt>..." -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "ebenfalls Kontakte von der Standard-Eingabe lesen" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "Konnte Kontakt '%s' nicht parsen." -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "keine Kontakte angegeben" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:145 msgid "stage should be between 1 and 3 or all" msgstr "--stage sollte zwischen 1 und 3 oder 'all' sein" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:161 msgid "check out all files in the index" msgstr "alle Dateien im Index auschecken" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:162 msgid "force overwrite of existing files" msgstr "das Ãœberschreiben bereits existierender Dateien erzwingen" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:164 msgid "no warning for existing files and files not in index" msgstr "" "keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index " "befinden" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:166 msgid "don't checkout new files" msgstr "keine neuen Dateien auschecken" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:168 msgid "update stat information in the index file" msgstr "Dateiinformationen in der Index-Datei aktualisieren" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:172 msgid "read list of paths from the standard input" msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:174 msgid "write the content to temporary files" msgstr "den Inhalt in temporäre Dateien schreiben" -#: builtin/checkout-index.c:174 builtin/column.c:30 +#: builtin/checkout-index.c:175 builtin/column.c:31 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:477 +#: builtin/worktree.c:478 msgid "string" msgstr "Zeichenkette" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:176 msgid "when creating files, prepend <string>" msgstr "" "wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:178 msgid "copy out the files from named stage" msgstr "Dateien von dem benannten Stand kopieren" -#: builtin/checkout.c:27 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<Optionen>] <Branch>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..." -#: builtin/checkout.c:153 builtin/checkout.c:186 +#: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:155 builtin/checkout.c:188 +#: builtin/checkout.c:137 builtin/checkout.c:170 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:171 +#: builtin/checkout.c:153 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:215 +#: builtin/checkout.c:197 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:232 +#: builtin/checkout.c:214 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenführen" -#: builtin/checkout.c:249 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen." -#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 -#: builtin/checkout.c:278 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:281 builtin/checkout.c:284 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:287 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln" -#: builtin/checkout.c:358 builtin/checkout.c:365 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:513 +#: builtin/checkout.c:497 msgid "you need to resolve your current index first" msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." -#: builtin/checkout.c:644 +#: builtin/checkout.c:628 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:669 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:689 builtin/clone.c:678 +#: builtin/checkout.c:673 builtin/clone.c:682 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:693 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:700 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:702 builtin/checkout.c:1090 +#: builtin/checkout.c:686 builtin/checkout.c:1075 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:704 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:755 +#: builtin/checkout.c:739 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:745 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6189,7 +6280,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:780 +#: builtin/checkout.c:764 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6205,178 +6296,173 @@ msgid_plural "" "\n" msgstr[0] "" "Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n" -"ein guter Zeitpunkt sein dies zu tun mit:\n" +"ein guter Zeitpunkt sein, dies zu tun mit:\n" "\n" " git branch <neuer-Branchname> %s\n" "\n" msgstr[1] "" "Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n" -"ein guter Zeitpunkt sein dies zu tun mit:\n" +"ein guter Zeitpunkt sein, dies zu tun mit:\n" "\n" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:816 +#: builtin/checkout.c:800 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:820 +#: builtin/checkout.c:804 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:847 builtin/checkout.c:1085 +#: builtin/checkout.c:832 builtin/checkout.c:1070 msgid "You are on a branch yet to be born" -msgstr "Sie sind auf einem Branch, der noch geboren wird" +msgstr "Sie sind auf einem Branch, der noch nicht geboren ist" -#: builtin/checkout.c:991 +#: builtin/checkout.c:976 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:1031 builtin/worktree.c:214 +#: builtin/checkout.c:1016 builtin/worktree.c:215 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1045 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1084 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1102 builtin/checkout.c:1106 +#: builtin/checkout.c:1087 builtin/checkout.c:1091 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 +#: builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1126 +#: builtin/checkout.c:1111 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 -#: builtin/worktree.c:331 +#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 +#: builtin/worktree.c:330 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1145 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1147 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1148 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1164 builtin/worktree.c:333 +#: builtin/checkout.c:1149 builtin/worktree.c:332 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1150 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1153 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1155 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1172 +#: builtin/checkout.c:1157 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1173 +#: builtin/checkout.c:1158 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1174 builtin/merge.c:234 +#: builtin/checkout.c:1159 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 +#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1161 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1179 +#: builtin/checkout.c:1164 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1166 msgid "second guess 'git checkout <no-such-branch>'" msgstr "second guess 'git checkout <no-such-branch>'" -#: builtin/checkout.c:1183 +#: builtin/checkout.c:1168 msgid "do not check if another worktree is holding the given ref" msgstr "" "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis " "ausgecheckt wurde, deaktivieren" -#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 -#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:172 +#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 +#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1203 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1220 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1225 msgid "Missing branch name; try -b" msgstr "Vermisse Branchnamen; versuchen Sie -b" -#: builtin/checkout.c:1282 +#: builtin/checkout.c:1261 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1268 #, c-format -msgid "" -"Cannot update paths and switch to branch '%s' at the same time.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" -msgstr "" -"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln.\n" -"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst " -"werden kann?" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden." -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1272 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1276 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6384,38 +6470,38 @@ msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "Sie aus dem Index auschecken." -#: builtin/clean.c:25 +#: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..." -#: builtin/clean.c:29 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "Lösche %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "Würde %s löschen\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "Ãœberspringe Repository %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "Würde Repository %s überspringen\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "Fehler beim Löschen von %s" -#: builtin/clean.c:297 git-add--interactive.perl:614 +#: builtin/clean.c:298 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6428,7 +6514,7 @@ msgstr "" "foo - Element anhand eines eindeutigen Präfix auswählen\n" " - (leer) nichts auswählen\n" -#: builtin/clean.c:301 git-add--interactive.perl:623 +#: builtin/clean.c:302 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6449,38 +6535,38 @@ msgstr "" "* - alle Elemente auswählen\n" " - (leer) Auswahl beenden\n" -#: builtin/clean.c:517 git-add--interactive.perl:589 -#: git-add--interactive.perl:594 +#: builtin/clean.c:518 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Wie bitte (%s)?\n" -#: builtin/clean.c:659 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "Ignorier-Muster eingeben>> " -#: builtin/clean.c:696 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "Wählen Sie Einträge zum Löschen" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:759 #, c-format msgid "Remove %s [y/N]? " msgstr "'%s' löschen [y/N]? " -#: builtin/clean.c:783 git-add--interactive.perl:1660 +#: builtin/clean.c:784 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Tschüss.\n" -#: builtin/clean.c:791 +#: builtin/clean.c:792 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6498,15 +6584,15 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: builtin/clean.c:818 git-add--interactive.perl:1736 +#: builtin/clean.c:819 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Befehle ***" -#: builtin/clean.c:819 git-add--interactive.perl:1733 +#: builtin/clean.c:820 git-add--interactive.perl:1689 msgid "What now" msgstr "Was nun" -#: builtin/clean.c:827 +#: builtin/clean.c:828 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Würde das folgende Element entfernen:" @@ -6516,45 +6602,45 @@ msgstr[1] "Würde die folgenden Elemente entfernen:" msgid "No more files to clean, exiting." msgstr "Keine Dateien mehr zum Löschen, beende." -#: builtin/clean.c:875 +#: builtin/clean.c:906 msgid "do not print names of files removed" msgstr "keine Namen von gelöschten Dateien ausgeben" -#: builtin/clean.c:877 +#: builtin/clean.c:908 msgid "force" msgstr "Aktion erzwingen" -#: builtin/clean.c:878 +#: builtin/clean.c:909 msgid "interactive cleaning" msgstr "interaktives Clean" -#: builtin/clean.c:880 +#: builtin/clean.c:911 msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" -#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 -#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 -#: builtin/name-rev.c:350 builtin/show-ref.c:176 +#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 +#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:882 +#: builtin/clean.c:913 msgid "add <pattern> to ignore rules" msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen" -#: builtin/clean.c:883 +#: builtin/clean.c:914 msgid "remove ignored files, too" msgstr "auch ignorierte Dateien löschen" -#: builtin/clean.c:885 +#: builtin/clean.c:916 msgid "remove only ignored files" msgstr "nur ignorierte Dateien löschen" -#: builtin/clean.c:903 +#: builtin/clean.c:934 msgid "-x and -X cannot be used together" msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:907 +#: builtin/clean.c:938 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6562,7 +6648,7 @@ msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " "\"clean\" verweigert" -#: builtin/clean.c:910 +#: builtin/clean.c:941 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6570,144 +6656,148 @@ msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -" "f gegeben; \"clean\" verweigert" -#: builtin/clone.c:37 +#: builtin/clone.c:38 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:80 +#: builtin/clone.c:82 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 +#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:85 +#: builtin/clone.c:87 msgid "create a mirror repository (implies bare)" msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:87 +#: builtin/clone.c:89 msgid "to clone from a local repository" msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:89 +#: builtin/clone.c:91 msgid "don't use local hardlinks, always copy" msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:91 +#: builtin/clone.c:93 msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "pathspec" msgstr "Pfadspezifikation" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:100 +#: builtin/clone.c:102 msgid "number of submodules cloned in parallel" msgstr "Anzahl der parallel zu klonenden Submodule" -#: builtin/clone.c:101 builtin/init-db.c:475 +#: builtin/clone.c:103 builtin/init-db.c:476 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:102 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 #: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:108 +#: builtin/clone.c:110 msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" -#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 +#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "Name" -#: builtin/clone.c:110 +#: builtin/clone.c:112 msgid "use <name> instead of 'origin' to track upstream" msgstr "<Name> statt 'origin' für Upstream-Repository verwenden" -#: builtin/clone.c:112 +#: builtin/clone.c:114 msgid "checkout <branch> instead of the remote's HEAD" msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:114 +#: builtin/clone.c:116 msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 -#: builtin/pull.c:202 +#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/pull.c:205 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:116 +#: builtin/clone.c:118 msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 +#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 #: parse-options.h:142 msgid "time" msgstr "Zeit" -#: builtin/clone.c:118 +#: builtin/clone.c:120 msgid "create a shallow clone since a specific time" msgstr "" "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten " "Zeit\n" "erstellen" -#: builtin/clone.c:119 builtin/fetch.c:124 +#: builtin/clone.c:121 builtin/fetch.c:119 msgid "revision" msgstr "Commit" -#: builtin/clone.c:120 builtin/fetch.c:125 +#: builtin/clone.c:122 builtin/fetch.c:120 msgid "deepen history of shallow clone, excluding rev" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n" "Ausschluss eines Commits vertiefen" -#: builtin/clone.c:122 +#: builtin/clone.c:124 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:124 +#: builtin/clone.c:126 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten" + +#: builtin/clone.c:128 msgid "any cloned submodules will be shallow" msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)" -#: builtin/clone.c:125 builtin/init-db.c:484 +#: builtin/clone.c:129 builtin/init-db.c:485 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:126 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "key=value" msgstr "Schlüssel=Wert" -#: builtin/clone.c:128 +#: builtin/clone.c:132 msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" -#: builtin/clone.c:268 +#: builtin/clone.c:272 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6715,42 +6805,42 @@ msgstr "" "Konnte keinen Verzeichnisnamen erraten.\n" "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an." -#: builtin/clone.c:321 +#: builtin/clone.c:325 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n" -#: builtin/clone.c:393 +#: builtin/clone.c:397 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: builtin/clone.c:401 +#: builtin/clone.c:405 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:415 +#: builtin/clone.c:419 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:437 +#: builtin/clone.c:441 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:441 +#: builtin/clone.c:445 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:466 +#: builtin/clone.c:470 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:478 +#: builtin/clone.c:482 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6760,101 +6850,101 @@ msgstr "" "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n" -#: builtin/clone.c:555 +#: builtin/clone.c:559 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:650 +#: builtin/clone.c:654 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: builtin/clone.c:666 +#: builtin/clone.c:670 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:715 +#: builtin/clone.c:719 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " "nicht ausgecheckt werden.\n" -#: builtin/clone.c:746 +#: builtin/clone.c:750 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:786 +#: builtin/clone.c:792 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:849 +#: builtin/clone.c:855 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" -#: builtin/clone.c:851 +#: builtin/clone.c:857 msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:884 builtin/receive-pack.c:1900 +#: builtin/clone.c:890 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:888 +#: builtin/clone.c:894 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:901 +#: builtin/clone.c:907 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:904 +#: builtin/clone.c:910 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:917 +#: builtin/clone.c:923 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:923 builtin/fetch.c:1337 +#: builtin/clone.c:929 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:933 +#: builtin/clone.c:939 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:943 +#: builtin/clone.c:949 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 -#: builtin/worktree.c:221 builtin/worktree.c:251 +#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 +#: builtin/worktree.c:222 builtin/worktree.c:252 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:961 +#: builtin/clone.c:967 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:973 +#: builtin/clone.c:979 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:975 +#: builtin/clone.c:981 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:999 +#: builtin/clone.c:1005 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6862,89 +6952,89 @@ msgstr "" "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-" "able" -#: builtin/clone.c:1055 +#: builtin/clone.c:1067 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " "stattdessen file://" -#: builtin/clone.c:1057 +#: builtin/clone.c:1069 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1059 +#: builtin/clone.c:1071 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1062 +#: builtin/clone.c:1074 msgid "source repository is shallow, ignoring --local" msgstr "" -"Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --" -"local" +"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n" +"ignoriere --local" -#: builtin/clone.c:1067 +#: builtin/clone.c:1079 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:1071 +#: builtin/clone.c:1083 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:1126 builtin/clone.c:1134 +#: builtin/clone.c:1138 builtin/clone.c:1146 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1137 +#: builtin/clone.c:1149 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<Optionen>]" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "Konfigurationsvariablen nachschlagen" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "zu verwendende Anordnung" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "maximale Breite" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "Abstand zum linken Rand" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "Abstand zur rechten Rand" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "Abstand zwischen Spalten" -#: builtin/column.c:51 +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "Die Option --command muss an erster Stelle stehen." -#: builtin/commit.c:38 +#: builtin/commit.c:39 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..." -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..." -#: builtin/commit.c:48 +#: builtin/commit.c:49 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6972,7 +7062,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6998,7 +7088,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:73 +#: builtin/commit.c:74 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" @@ -7008,7 +7098,7 @@ msgstr "" "machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n" "Commit mit \"git reset HEAD^\" vollständig entfernen.\n" -#: builtin/commit.c:78 +#: builtin/commit.c:79 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7023,11 +7113,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:85 +#: builtin/commit.c:86 msgid "Otherwise, please use 'git reset'\n" msgstr "Andernfalls benutzen Sie bitte 'git reset'\n" -#: builtin/commit.c:88 +#: builtin/commit.c:89 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7043,62 +7133,62 @@ msgstr "" "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n" "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n" -#: builtin/commit.c:318 +#: builtin/commit.c:319 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." -#: builtin/commit.c:359 +#: builtin/commit.c:360 msgid "unable to create temporary index" msgstr "Konnte temporären Index nicht erstellen." -#: builtin/commit.c:365 +#: builtin/commit.c:366 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:378 +#: builtin/commit.c:379 msgid "unable to update temporary index" msgstr "Konnte temporären Index nicht aktualisieren." -#: builtin/commit.c:380 +#: builtin/commit.c:381 msgid "Failed to update main cache tree" msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" -#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 +#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:458 +#: builtin/commit.c:459 msgid "cannot do a partial commit during a merge." msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist." -#: builtin/commit.c:460 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist." -#: builtin/commit.c:469 +#: builtin/commit.c:470 msgid "cannot read the index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:488 +#: builtin/commit.c:489 msgid "unable to write temporary index file" msgstr "Konnte temporäre Index-Datei nicht schreiben." -#: builtin/commit.c:582 +#: builtin/commit.c:583 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:584 +#: builtin/commit.c:585 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:603 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:655 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7106,38 +7196,38 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:704 builtin/shortlog.c:294 +#: builtin/commit.c:705 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:706 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:710 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:742 +#: builtin/commit.c:743 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:796 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:814 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -7152,7 +7242,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:819 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -7167,7 +7257,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7177,7 +7267,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7190,157 +7280,157 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:859 +#: builtin/commit.c:857 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:865 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:874 +#: builtin/commit.c:872 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:889 msgid "Cannot read index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:954 +#: builtin/commit.c:951 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:968 builtin/tag.c:273 +#: builtin/commit.c:965 builtin/tag.c:274 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1071 +#: builtin/commit.c:1068 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem " "vorhandenen Autor überein" -#: builtin/commit.c:1086 builtin/commit.c:1325 +#: builtin/commit.c:1083 builtin/commit.c:1328 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unversionierte Dateien" -#: builtin/commit.c:1124 +#: builtin/commit.c:1121 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1154 +#: builtin/commit.c:1151 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Die Optionen --reset-author und --author können nicht gemeinsam verwendet " "werden." -#: builtin/commit.c:1163 +#: builtin/commit.c:1160 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1166 +#: builtin/commit.c:1163 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1168 +#: builtin/commit.c:1165 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1171 +#: builtin/commit.c:1168 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1181 +#: builtin/commit.c:1178 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1183 +#: builtin/commit.c:1180 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden." -#: builtin/commit.c:1191 +#: builtin/commit.c:1188 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1208 +#: builtin/commit.c:1205 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Es kann nur eine Option von --include/--only/--all/--interactive/--patch " "verwendet werden." -#: builtin/commit.c:1210 +#: builtin/commit.c:1207 msgid "No paths with --include/--only does not make sense." msgstr "" "Die Optionen --include und --only können nur mit der Angabe von Pfaden " "verwendet werden." -#: builtin/commit.c:1212 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an" - -#: builtin/commit.c:1224 builtin/tag.c:551 +#: builtin/commit.c:1219 builtin/tag.c:552 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1229 +#: builtin/commit.c:1224 msgid "Paths with -a does not make sense." msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden." -#: builtin/commit.c:1339 builtin/commit.c:1612 +#: builtin/commit.c:1342 builtin/commit.c:1617 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1341 builtin/commit.c:1614 +#: builtin/commit.c:1344 builtin/commit.c:1619 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1343 +#: builtin/commit.c:1346 +msgid "show stash information" +msgstr "Stashinformationen anzeigen" + +#: builtin/commit.c:1348 msgid "version" msgstr "Version" -#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:448 +#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 +#: builtin/worktree.c:449 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1346 builtin/commit.c:1618 +#: builtin/commit.c:1351 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1349 builtin/commit.c:1621 +#: builtin/commit.c:1354 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:411 +#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 +#: builtin/fast-export.c:986 builtin/tag.c:412 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1352 builtin/commit.c:1624 +#: builtin/commit.c:1357 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: " "all)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1360 msgid "show ignored files" msgstr "ignorierte Dateien anzeigen" -#: builtin/commit.c:1356 parse-options.h:155 +#: builtin/commit.c:1361 parse-options.h:155 msgid "when" msgstr "wann" -#: builtin/commit.c:1357 +#: builtin/commit.c:1362 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7348,203 +7438,203 @@ msgstr "" "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1359 +#: builtin/commit.c:1364 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1435 +#: builtin/commit.c:1440 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: builtin/commit.c:1437 +#: builtin/commit.c:1442 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellten Commit nicht analysieren." -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: builtin/commit.c:1582 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1583 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1585 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1586 builtin/tag.c:409 +#: builtin/commit.c:1591 builtin/tag.c:410 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "author" msgstr "Autor" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1588 builtin/gc.c:357 +#: builtin/commit.c:1593 builtin/gc.c:358 msgid "date" msgstr "Datum" -#: builtin/commit.c:1588 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:407 +#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 +#: builtin/notes.c:564 builtin/tag.c:408 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1589 +#: builtin/commit.c:1594 msgid "commit message" msgstr "Commit-Beschreibung" -#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "Commit" -#: builtin/commit.c:1590 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1592 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1593 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1594 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 +#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" -#: builtin/commit.c:1596 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1597 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "default" msgstr "Standard" -#: builtin/commit.c:1598 builtin/tag.c:412 +#: builtin/commit.c:1603 builtin/tag.c:413 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: builtin/commit.c:1599 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 -#: builtin/revert.c:112 +#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" -#: builtin/commit.c:1604 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1605 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1606 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1607 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1608 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1609 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1610 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "Hooks pre-commit und commit-msg umgehen" -#: builtin/commit.c:1611 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1622 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1623 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1628 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1630 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1659 +#: builtin/commit.c:1665 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: builtin/commit.c:1707 +#: builtin/commit.c:1710 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1714 +#: builtin/commit.c:1717 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1733 +#: builtin/commit.c:1736 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1744 +#: builtin/commit.c:1747 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1749 +#: builtin/commit.c:1752 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1797 +#: builtin/commit.c:1800 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7555,145 +7645,145 @@ msgstr "" "voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n" "anschließend \"git reset HEAD\" zu Wiederherstellung aus." -#: builtin/config.c:9 +#: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<Optionen>]" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "Config file location" msgstr "Ort der Konfigurationsdatei" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use global config file" msgstr "globale Konfigurationsdatei verwenden" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use system config file" msgstr "systemweite Konfigurationsdatei verwenden" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use repository config file" msgstr "Konfigurationsdatei des Repositories verwenden" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use given config file" msgstr "die angegebene Konfigurationsdatei verwenden" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "blob-id" msgstr "Blob-Id" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "read config from given blob object" msgstr "Konfiguration von angegebenem Blob-Objekt lesen" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "Action" msgstr "Aktion" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get value: name [value-regex]" msgstr "Wert zurückgeben: Name [Wert-regex]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get all values: key [value-regex]" msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get values for regexp: name-regex [value-regex]" msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get value specific for the URL: section[.var] URL" msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "replace all matching variables: name value [value_regex]" msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] " -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "add a new variable: name value" msgstr "neue Variable hinzufügen: Name Wert" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove a variable: name [value-regex]" msgstr "eine Variable entfernen: Name [Wert-regex]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove all matches: name [value-regex]" msgstr "alle Ãœbereinstimmungen entfernen: Name [Wert-regex]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "rename section: old-name new-name" msgstr "eine Sektion umbenennen: alter-Name neuer-Name" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "remove a section: name" msgstr "eine Sektion entfernen: Name" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "list all" msgstr "alles auflisten" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "open an editor" msgstr "einen Editor öffnen" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color configured: slot [default]" msgstr "die konfigurierte Farbe finden: Slot [Standard]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color setting: slot [stdout-is-tty]" msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "Type" msgstr "Typ" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is \"true\" or \"false\"" msgstr "Wert ist \"true\" oder \"false\"" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is decimal number" msgstr "Wert ist eine Dezimalzahl" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is --bool or --int" msgstr "Wert ist --bool oder --int" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is a path (file or directory name)" msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "Other" msgstr "Sonstiges" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "terminate values with NUL byte" msgstr "schließt Werte mit NUL-Byte ab" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "show variable names only" msgstr "nur Variablennamen anzeigen" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "respect include directives on lookup" msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" -#: builtin/config.c:86 +#: builtin/config.c:87 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, " "Befehlszeile)" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "konnte Standard-Farbwert nicht parsen" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7702,18 +7792,22 @@ msgid "" "#\tname = %s\n" "#\temail = %s\n" msgstr "" -"# Das ist Git's benutzerspezifische Konfiguraionsdatei.\n" +"# Das ist Git's benutzerspezifische Konfigurationsdatei.\n" "[user]\n" "# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:\n" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:615 +#: builtin/config.c:499 +msgid "--local can only be used inside a git repository" +msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden." + +#: builtin/config.c:621 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." -#: builtin/config.c:627 +#: builtin/config.c:633 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7723,75 +7817,75 @@ msgstr "" " Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n" " zu ändern." -#: builtin/count-objects.c:86 +#: builtin/count-objects.c:87 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:96 +#: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<Optionen>] [<Commit-Angabe>...]" -#: builtin/describe.c:19 +#: builtin/describe.c:20 msgid "git describe [<options>] --dirty" msgstr "git describe [<Optionen>] --dirty" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "head" msgstr "Branch" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "lightweight" msgstr "nicht-annotiert" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "annotated" msgstr "annotiert" -#: builtin/describe.c:250 +#: builtin/describe.c:253 #, c-format msgid "annotated tag %s not available" msgstr "annotiertes Tag %s ist nicht verfügbar" -#: builtin/describe.c:254 +#: builtin/describe.c:257 #, c-format msgid "annotated tag %s has no embedded name" msgstr "annotiertes Tag %s hat keinen eingebetteten Namen" -#: builtin/describe.c:256 +#: builtin/describe.c:259 #, c-format msgid "tag '%s' is really '%s' here" msgstr "Tag '%s' ist eigentlich '%s' hier" -#: builtin/describe.c:283 builtin/log.c:487 +#: builtin/describe.c:286 builtin/log.c:489 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gültiger Objekt-Name" -#: builtin/describe.c:286 +#: builtin/describe.c:289 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ist kein gültiges '%s' Objekt" -#: builtin/describe.c:303 +#: builtin/describe.c:306 #, c-format msgid "no tag exactly matches '%s'" msgstr "kein Tag entspricht exakt '%s'" -#: builtin/describe.c:305 +#: builtin/describe.c:308 #, c-format msgid "searching to describe %s\n" msgstr "suche zur Beschreibung von %s\n" -#: builtin/describe.c:352 +#: builtin/describe.c:355 #, c-format msgid "finished search at %s\n" msgstr "beendete Suche bei %s\n" -#: builtin/describe.c:379 +#: builtin/describe.c:382 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7800,7 +7894,7 @@ msgstr "" "Keine annotierten Tags können '%s' beschreiben.\n" "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags." -#: builtin/describe.c:383 +#: builtin/describe.c:386 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7809,12 +7903,12 @@ msgstr "" "Keine Tags können '%s' beschreiben.\n" "Versuchen Sie --always oder erstellen Sie einige Tags." -#: builtin/describe.c:413 +#: builtin/describe.c:416 #, c-format msgid "traversed %lu commits\n" msgstr "%lu Commits durchlaufen\n" -#: builtin/describe.c:416 +#: builtin/describe.c:419 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7823,79 +7917,79 @@ msgstr "" "mehr als %i Tags gefunden; führe die ersten %i auf\n" "Suche bei %s aufgegeben\n" -#: builtin/describe.c:438 +#: builtin/describe.c:441 msgid "find the tag that comes after the commit" msgstr "das Tag finden, das nach dem Commit kommt" -#: builtin/describe.c:439 +#: builtin/describe.c:442 msgid "debug search strategy on stderr" msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren" -#: builtin/describe.c:440 +#: builtin/describe.c:443 msgid "use any ref" msgstr "alle Referenzen verwenden" -#: builtin/describe.c:441 +#: builtin/describe.c:444 msgid "use any tag, even unannotated" msgstr "jedes Tag verwenden, auch nicht-annotierte" -#: builtin/describe.c:442 +#: builtin/describe.c:445 msgid "always use long format" msgstr "immer langes Format verwenden" -#: builtin/describe.c:443 +#: builtin/describe.c:446 msgid "only follow first parent" msgstr "nur erstem Elternteil folgen" -#: builtin/describe.c:446 +#: builtin/describe.c:449 msgid "only output exact matches" msgstr "nur exakte Ãœbereinstimmungen ausgeben" -#: builtin/describe.c:448 +#: builtin/describe.c:451 msgid "consider <n> most recent tags (default: 10)" msgstr "die jüngsten <n> Tags betrachten (Standard: 10)" -#: builtin/describe.c:450 +#: builtin/describe.c:453 msgid "only consider tags matching <pattern>" msgstr "nur Tags, die <Muster> entsprechen, betrachten" -#: builtin/describe.c:452 +#: builtin/describe.c:455 msgid "do not consider tags matching <pattern>" msgstr "keine Tags betrachten, die <Muster> entsprechen" -#: builtin/describe.c:454 builtin/name-rev.c:357 +#: builtin/describe.c:457 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" -#: builtin/describe.c:455 builtin/describe.c:458 +#: builtin/describe.c:458 builtin/describe.c:461 msgid "mark" msgstr "Kennzeichen" -#: builtin/describe.c:456 +#: builtin/describe.c:459 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" "<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty" "\")" -#: builtin/describe.c:459 +#: builtin/describe.c:462 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken" "\")" -#: builtin/describe.c:477 +#: builtin/describe.c:480 msgid "--long is incompatible with --abbrev=0" msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." -#: builtin/describe.c:506 +#: builtin/describe.c:509 msgid "No names found, cannot describe anything." msgstr "Keine Namen gefunden, kann nichts beschreiben." -#: builtin/describe.c:549 +#: builtin/describe.c:552 msgid "--dirty is incompatible with commit-ishes" msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." -#: builtin/describe.c:551 +#: builtin/describe.c:554 msgid "--broken is incompatible with commit-ishes" msgstr "Die Option --broken kann nicht mit Commits verwendet werden." @@ -7904,55 +7998,55 @@ msgstr "Die Option --broken kann nicht mit Commits verwendet werden." msgid "'%s': not a regular file or symlink" msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:359 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:401 +#: builtin/diff.c:402 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:410 +#: builtin/diff.c:411 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" -#: builtin/difftool.c:28 +#: builtin/difftool.c:29 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]" -#: builtin/difftool.c:241 +#: builtin/difftool.c:249 #, c-format msgid "failed: %d" msgstr "fehlgeschlagen: %d" -#: builtin/difftool.c:283 +#: builtin/difftool.c:291 #, c-format msgid "could not read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/difftool.c:285 +#: builtin/difftool.c:293 #, c-format msgid "could not read symlink file %s" msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen." -#: builtin/difftool.c:293 +#: builtin/difftool.c:301 #, c-format msgid "could not read object %s for symlink %s" msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen." -#: builtin/difftool.c:395 +#: builtin/difftool.c:403 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7960,54 +8054,54 @@ msgstr "" "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n" "Diff-Modus('-d' und '--dir-diff') nicht unterstützt." -#: builtin/difftool.c:609 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "beide Dateien geändert: '%s' und '%s'." -#: builtin/difftool.c:611 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "Datei im Arbeitsverzeichnis belassen." -#: builtin/difftool.c:622 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "Es existieren temporäre Dateien in '%s'." -#: builtin/difftool.c:623 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "Sie könnten diese aufräumen oder wiederherstellen." -#: builtin/difftool.c:669 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "`diff.guitool` anstatt `diff.tool` benutzen" -#: builtin/difftool.c:671 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "Diff über ganzes Verzeichnis ausführen" -#: builtin/difftool.c:673 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools" -#: builtin/difftool.c:679 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden" -#: builtin/difftool.c:680 +#: builtin/difftool.c:700 msgid "<tool>" msgstr "<Tool>" -#: builtin/difftool.c:681 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "das angegebene Diff-Tool benutzen" -#: builtin/difftool.c:683 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können" -#: builtin/difftool.c:686 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -8016,245 +8110,249 @@ msgstr "" "Rückkehrwert\n" "verschieden 0 ausgeführt wurde" -#: builtin/difftool.c:688 +#: builtin/difftool.c:708 msgid "<command>" msgstr "<Programm>" -#: builtin/difftool.c:689 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben" -#: builtin/difftool.c:713 +#: builtin/difftool.c:733 msgid "no <tool> given for --tool=<tool>" msgstr "kein <Tool> für --tool=<Tool> angegeben" -#: builtin/difftool.c:720 +#: builtin/difftool.c:740 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "kein <Programm> für --extcmd=<Programm> angegeben" -#: builtin/fast-export.c:25 +#: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:982 msgid "show progress after <n> objects" msgstr "Fortschritt nach <n> Objekten anzeigen" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:984 msgid "select handling of signed tags" msgstr "Behandlung von signierten Tags wählen" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:987 msgid "select handling of tags that tag filtered objects" msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:990 msgid "Dump marks to this file" msgstr "Kennzeichen in diese Datei schreiben" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:992 msgid "Import marks from this file" msgstr "Kennzeichen von dieser Datei importieren" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:994 msgid "Fake a tagger when tags lack one" msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:996 msgid "Output full tree for each commit" msgstr "für jeden Commit das gesamte Verzeichnis ausgeben" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:998 msgid "Use the done feature to terminate the stream" msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:999 msgid "Skip output of blob data" msgstr "Ausgabe von Blob-Daten überspringen" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "refspec" msgstr "Refspec" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1001 msgid "Apply refspec to exported refs" msgstr "Refspec auf exportierte Referenzen anwenden" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "anonymize output" msgstr "Ausgabe anonymisieren" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] <group>" msgstr "git fetch [<Optionen>] <Gruppe>" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:95 builtin/pull.c:175 +#: builtin/fetch.c:90 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:97 builtin/pull.c:178 +#: builtin/fetch.c:92 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" -#: builtin/fetch.c:99 builtin/pull.c:181 +#: builtin/fetch.c:94 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:100 builtin/pull.c:183 +#: builtin/fetch.c:95 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "das Ãœberschreiben von lokalen Branches erzwingen" -#: builtin/fetch.c:102 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:104 builtin/pull.c:185 +#: builtin/fetch.c:99 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" -#: builtin/fetch.c:106 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "nicht alle Tags anfordern (--no-tags)" -#: builtin/fetch.c:108 +#: builtin/fetch.c:103 msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:110 builtin/pull.c:188 +#: builtin/fetch.c:105 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:111 builtin/pull.c:191 +#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:112 builtin/pull.c:192 +#: builtin/fetch.c:107 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:116 builtin/pull.c:200 +#: builtin/fetch.c:111 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" -#: builtin/fetch.c:118 +#: builtin/fetch.c:113 msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 +#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" -#: builtin/fetch.c:123 +#: builtin/fetch.c:118 msgid "deepen history of shallow repository based on time" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) auf " "Zeitbasis\n" "vertiefen" -#: builtin/fetch.c:129 builtin/pull.c:206 +#: builtin/fetch.c:124 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:131 builtin/log.c:1440 +#: builtin/fetch.c:126 builtin/log.c:1450 msgid "dir" msgstr "Verzeichnis" -#: builtin/fetch.c:132 +#: builtin/fetch.c:127 msgid "prepend this to submodule path output" msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" -#: builtin/fetch.c:135 -msgid "default mode for recursion" -msgstr "Standard-Modus für Rekursion" +#: builtin/fetch.c:130 +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)" -#: builtin/fetch.c:137 builtin/pull.c:209 +#: builtin/fetch.c:134 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:138 builtin/pull.c:211 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:139 builtin/pull.c:212 +#: builtin/fetch.c:136 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:395 +#: builtin/fetch.c:394 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:513 +#: builtin/fetch.c:512 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "Konfiguration fetch.output enthält ungültigen Wert %s" -#: builtin/fetch.c:606 +#: builtin/fetch.c:605 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:610 +#: builtin/fetch.c:609 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:623 builtin/fetch.c:703 +#: builtin/fetch.c:622 builtin/fetch.c:702 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:624 +#: builtin/fetch.c:623 msgid "can't fetch in current branch" msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen" -#: builtin/fetch.c:633 +#: builtin/fetch.c:632 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 -#: builtin/fetch.c:698 +#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 +#: builtin/fetch.c:697 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:653 +#: builtin/fetch.c:652 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:656 +#: builtin/fetch.c:655 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:659 +#: builtin/fetch.c:658 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:698 +#: builtin/fetch.c:697 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:703 +#: builtin/fetch.c:702 msgid "non-fast-forward" msgstr "kein Vorspulen" -#: builtin/fetch.c:748 +#: builtin/fetch.c:747 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:768 +#: builtin/fetch.c:767 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" @@ -8289,7 +8387,7 @@ msgstr " (%s wurde unreferenziert)" msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:955 builtin/remote.c:1022 +#: builtin/fetch.c:955 builtin/remote.c:1023 msgid "(none)" msgstr "(nichts)" @@ -8297,7 +8395,7 @@ msgstr "(nichts)" #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -"Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository " +"Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository " "wurde verweigert." #: builtin/fetch.c:997 @@ -8320,7 +8418,7 @@ msgstr "Weiß nicht wie von %s angefordert wird." msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" @@ -8357,105 +8455,105 @@ msgstr "" "Die Option --unshallow kann nicht in einem Repository mit unvollständiger " "Historie verwendet werden." -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1349 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1354 +#: builtin/fetch.c:1351 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1365 +#: builtin/fetch.c:1362 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1373 +#: builtin/fetch.c:1370 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n" "von Refspecs verwendet werden." -#: builtin/fmt-merge-msg.c:14 +#: builtin/fmt-merge-msg.c:15 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file " "<Datei>]" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "Alias für --log (veraltet)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "Text" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "<Text> als Beschreibungsanfang verwenden" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "Datei zum Einlesen" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<Optionen>] [<Muster>]" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <Objekt>]" -#: builtin/for-each-ref.c:11 +#: builtin/for-each-ref.c:12 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" msgstr "git for-each-ref [(--merged | --no-merged) [<Commit>]]" -#: builtin/for-each-ref.c:12 +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<Objekt>]] [--no-contains [<Commit>]]" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "Platzhalter als Shell-String formatieren" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "Platzhalter als Perl-String formatieren" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "Platzhalter als Python-String formatieren" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "Platzhalter als Tcl-String formatieren" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "nur zusammengeführte Referenzen ausgeben" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "nur nicht zusammengeführte Referenzen ausgeben" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit enthalten" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" @@ -8519,21 +8617,21 @@ msgstr "ausführliche Namen für erreichbare Objekte anzeigen" msgid "Checking objects" msgstr "Prüfe Objekte" -#: builtin/gc.c:25 +#: builtin/gc.c:26 msgid "git gc [<options>]" msgstr "git gc [<Optionen>]" -#: builtin/gc.c:78 +#: builtin/gc.c:79 #, c-format msgid "Failed to fstat %s: %s" msgstr "Konnte '%s' nicht lesen: %s" -#: builtin/gc.c:310 +#: builtin/gc.c:311 #, c-format msgid "Can't stat %s" msgstr "Kann '%s' nicht lesen." -#: builtin/gc.c:319 +#: builtin/gc.c:320 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8549,49 +8647,49 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:358 +#: builtin/gc.c:359 msgid "prune unreferenced objects" msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:360 +#: builtin/gc.c:361 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "enable auto-gc mode" msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "force running gc even if there may be another gc running" msgstr "" "Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n" "\"git gc\" bereits ausgeführt wird" -#: builtin/gc.c:379 +#: builtin/gc.c:380 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry" -#: builtin/gc.c:407 +#: builtin/gc.c:408 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Die Datenbank des Repositories wird für eine optimale Performance im\n" "Hintergrund komprimiert.\n" -#: builtin/gc.c:409 +#: builtin/gc.c:410 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "Die Datenbank des Projektarchivs wird für eine optimale Performance " "komprimiert.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n" -#: builtin/gc.c:431 +#: builtin/gc.c:436 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8599,275 +8697,288 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:475 +#: builtin/gc.c:480 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um " "diese zu löschen." -#: builtin/grep.c:25 +#: builtin/grep.c:27 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" -#: builtin/grep.c:232 +#: builtin/grep.c:235 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: Fehler beim Erzeugen eines Thread: %s" -#: builtin/grep.c:290 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" -#: builtin/grep.c:769 builtin/grep.c:810 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" + +#: builtin/grep.c:788 builtin/grep.c:829 #, c-format msgid "unable to read tree (%s)" msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" -#: builtin/grep.c:829 +#: builtin/grep.c:848 #, c-format msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" -#: builtin/grep.c:893 +#: builtin/grep.c:912 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:980 +#: builtin/grep.c:999 msgid "search in index instead of in the work tree" msgstr "im Index anstatt im Arbeitsverzeichnis suchen" -#: builtin/grep.c:982 +#: builtin/grep.c:1001 msgid "find in contents not managed by git" msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" -#: builtin/grep.c:984 +#: builtin/grep.c:1003 msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" -#: builtin/grep.c:986 +#: builtin/grep.c:1005 msgid "ignore files specified via '.gitignore'" msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren" -#: builtin/grep.c:988 +#: builtin/grep.c:1007 msgid "recursively search in each submodule" msgstr "rekursive Suche in jedem Submodul" -#: builtin/grep.c:990 +#: builtin/grep.c:1009 msgid "basename" msgstr "Basisname" -#: builtin/grep.c:991 +#: builtin/grep.c:1010 msgid "prepend parent project's basename to output" msgstr "Basisname des Elternprojektes an Ausgaben voranstellen" -#: builtin/grep.c:994 +#: builtin/grep.c:1013 msgid "show non-matching lines" msgstr "Zeilen ohne Ãœbereinstimmungen anzeigen" -#: builtin/grep.c:996 +#: builtin/grep.c:1015 msgid "case insensitive matching" msgstr "Ãœbereinstimmungen unabhängig von Groß- und Kleinschreibung finden" -#: builtin/grep.c:998 +#: builtin/grep.c:1017 msgid "match patterns only at word boundaries" msgstr "nur ganze Wörter suchen" -#: builtin/grep.c:1000 +#: builtin/grep.c:1019 msgid "process binary files as text" msgstr "binäre Dateien als Text verarbeiten" -#: builtin/grep.c:1002 +#: builtin/grep.c:1021 msgid "don't match patterns in binary files" msgstr "keine Muster in Binärdateien finden" -#: builtin/grep.c:1005 +#: builtin/grep.c:1024 msgid "process binary files with textconv filters" msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten" -#: builtin/grep.c:1007 +#: builtin/grep.c:1026 msgid "descend at most <depth> levels" msgstr "höchstens <Tiefe> Ebenen durchlaufen" -#: builtin/grep.c:1011 +#: builtin/grep.c:1030 msgid "use extended POSIX regular expressions" msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden" -#: builtin/grep.c:1014 +#: builtin/grep.c:1033 msgid "use basic POSIX regular expressions (default)" msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)" -#: builtin/grep.c:1017 +#: builtin/grep.c:1036 msgid "interpret patterns as fixed strings" msgstr "Muster als feste Zeichenketten interpretieren" -#: builtin/grep.c:1020 +#: builtin/grep.c:1039 msgid "use Perl-compatible regular expressions" msgstr "Perl-kompatible reguläre Ausdrücke verwenden" -#: builtin/grep.c:1023 +#: builtin/grep.c:1042 msgid "show line numbers" msgstr "Zeilennummern anzeigen" -#: builtin/grep.c:1024 +#: builtin/grep.c:1043 msgid "don't show filenames" msgstr "keine Dateinamen anzeigen" -#: builtin/grep.c:1025 +#: builtin/grep.c:1044 msgid "show filenames" msgstr "Dateinamen anzeigen" -#: builtin/grep.c:1027 +#: builtin/grep.c:1046 msgid "show filenames relative to top directory" msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" -#: builtin/grep.c:1029 +#: builtin/grep.c:1048 msgid "show only filenames instead of matching lines" msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen" -#: builtin/grep.c:1031 +#: builtin/grep.c:1050 msgid "synonym for --files-with-matches" msgstr "Synonym für --files-with-matches" -#: builtin/grep.c:1034 +#: builtin/grep.c:1053 msgid "show only the names of files without match" msgstr "nur die Dateinamen ohne Ãœbereinstimmungen anzeigen" -#: builtin/grep.c:1036 +#: builtin/grep.c:1055 msgid "print NUL after filenames" msgstr "NUL-Zeichen nach Dateinamen ausgeben" -#: builtin/grep.c:1038 +#: builtin/grep.c:1057 msgid "show the number of matches instead of matching lines" msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen" -#: builtin/grep.c:1039 +#: builtin/grep.c:1058 msgid "highlight matches" msgstr "Ãœbereinstimmungen hervorheben" -#: builtin/grep.c:1041 +#: builtin/grep.c:1060 msgid "print empty line between matches from different files" msgstr "" "eine Leerzeile zwischen Ãœbereinstimmungen in verschiedenen Dateien ausgeben" -#: builtin/grep.c:1043 +#: builtin/grep.c:1062 msgid "show filename only once above matches from same file" msgstr "" "den Dateinamen nur einmal oberhalb der Ãœbereinstimmungen aus dieser Datei " "anzeigen" -#: builtin/grep.c:1046 +#: builtin/grep.c:1065 msgid "show <n> context lines before and after matches" msgstr "<n> Zeilen vor und nach den Ãœbereinstimmungen anzeigen" -#: builtin/grep.c:1049 +#: builtin/grep.c:1068 msgid "show <n> context lines before matches" msgstr "<n> Zeilen vor den Ãœbereinstimmungen anzeigen" -#: builtin/grep.c:1051 +#: builtin/grep.c:1070 msgid "show <n> context lines after matches" msgstr "<n> Zeilen nach den Ãœbereinstimmungen anzeigen" -#: builtin/grep.c:1053 +#: builtin/grep.c:1072 msgid "use <n> worker threads" msgstr "<n> Threads benutzen" -#: builtin/grep.c:1054 +#: builtin/grep.c:1073 msgid "shortcut for -C NUM" msgstr "Kurzform für -C NUM" -#: builtin/grep.c:1057 +#: builtin/grep.c:1076 msgid "show a line with the function name before matches" msgstr "eine Zeile mit dem Funktionsnamen vor Ãœbereinstimmungen anzeigen" -#: builtin/grep.c:1059 +#: builtin/grep.c:1078 msgid "show the surrounding function" msgstr "die umgebende Funktion anzeigen" -#: builtin/grep.c:1062 +#: builtin/grep.c:1081 msgid "read patterns from file" msgstr "Muster von einer Datei lesen" -#: builtin/grep.c:1064 +#: builtin/grep.c:1083 msgid "match <pattern>" msgstr "<Muster> finden" -#: builtin/grep.c:1066 +#: builtin/grep.c:1085 msgid "combine patterns specified with -e" msgstr "Muster kombinieren, die mit -e angegeben wurden" -#: builtin/grep.c:1078 +#: builtin/grep.c:1097 msgid "indicate hit with exit status without output" msgstr "Ãœbereinstimmungen nur durch Beendigungsstatus anzeigen" -#: builtin/grep.c:1080 +#: builtin/grep.c:1099 msgid "show only matches from files that match all patterns" msgstr "" "nur Ãœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" -#: builtin/grep.c:1082 +#: builtin/grep.c:1101 msgid "show parse tree for grep expression" msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "pager" msgstr "Anzeigeprogramm" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "show matching files in the pager" msgstr "Dateien mit Ãœbereinstimmungen im Anzeigeprogramm anzeigen" -#: builtin/grep.c:1089 +#: builtin/grep.c:1108 msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:1153 +#: builtin/grep.c:1172 msgid "no pattern given." msgstr "keine Muster angegeben" -#: builtin/grep.c:1189 +#: builtin/grep.c:1204 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden" -#: builtin/grep.c:1195 +#: builtin/grep.c:1211 #, c-format msgid "unable to resolve revision: %s" msgstr "Konnte Commit nicht auflösen: %s" -#: builtin/grep.c:1228 builtin/index-pack.c:1485 +#: builtin/grep.c:1245 builtin/index-pack.c:1490 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/grep.c:1251 +#: builtin/grep.c:1250 +msgid "no threads support, ignoring --threads" +msgstr "keine Unterstützung von Threads, --threads wird ignoriert" + +#: builtin/grep.c:1281 msgid "--open-files-in-pager only works on the worktree" msgstr "" "Die Option --open-files-in-pager kann nur innerhalb des " "Arbeitsverzeichnisses verwendet werden." -#: builtin/grep.c:1274 +#: builtin/grep.c:1304 msgid "option not supported with --recurse-submodules." msgstr "Option wird mit --recurse-submodules nicht unterstützt." -#: builtin/grep.c:1280 +#: builtin/grep.c:1310 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "Die Optionen --cached und --untracked können nicht mit --no-index verwendet " "werden." -#: builtin/grep.c:1286 +#: builtin/grep.c:1316 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten " "verwendet werden." -#: builtin/grep.c:1294 +#: builtin/grep.c:1324 msgid "both --cached and trees are given." msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -8875,93 +8986,93 @@ msgstr "" "git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] " "[--] <Datei>..." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "type" msgstr "Art" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "object type" msgstr "Art des Objektes" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "write the object into the object database" msgstr "das Objekt in die Objektdatenbank schreiben" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "read the object from stdin" msgstr "das Objekt von der Standard-Eingabe lesen" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "store file as is without filters" msgstr "Datei wie sie ist speichern, ohne Filter" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n" "Fehlersuche in Git, erzeugen" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "process file as it were from this path" msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre" -#: builtin/help.c:42 +#: builtin/help.c:43 msgid "print all available commands" msgstr "alle vorhandenen Befehle anzeigen" -#: builtin/help.c:43 +#: builtin/help.c:44 msgid "exclude guides" msgstr "Anleitungen ausschließen" -#: builtin/help.c:44 +#: builtin/help.c:45 msgid "print list of useful guides" msgstr "Liste von allgemein verwendeten Anleitungen anzeigen" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "show man page" msgstr "Handbuch anzeigen" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "show manual in web browser" msgstr "Handbuch in einem Webbrowser anzeigen" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "show info page" msgstr "Info-Seite anzeigen" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]" -#: builtin/help.c:66 +#: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "nicht erkanntes Hilfeformat: %s" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "Konnte emacsclient nicht starten." -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "Konnte Version des emacsclient nicht parsen." -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Version des emacsclient '%d' ist zu alt (< 22)." -#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 +#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 #, c-format msgid "failed to exec '%s'" msgstr "Fehler beim Ausführen von '%s'" -#: builtin/help.c:207 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8970,7 +9081,7 @@ msgstr "" "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen." -#: builtin/help.c:219 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8979,132 +9090,132 @@ msgstr "" "'%s': Programm für unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen." -#: builtin/help.c:336 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': unbekannter Handbuch-Betrachter." -#: builtin/help.c:353 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:361 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:403 +#: builtin/help.c:404 msgid "Defining attributes per path" msgstr "Definition von Attributen pro Pfad" -#: builtin/help.c:404 +#: builtin/help.c:405 msgid "Everyday Git With 20 Commands Or So" msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen" -#: builtin/help.c:405 +#: builtin/help.c:406 msgid "A Git glossary" msgstr "Ein Git-Glossar" -#: builtin/help.c:406 +#: builtin/help.c:407 msgid "Specifies intentionally untracked files to ignore" msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien" -#: builtin/help.c:407 +#: builtin/help.c:408 msgid "Defining submodule properties" msgstr "Definition von Submodul-Eigenschaften" -#: builtin/help.c:408 +#: builtin/help.c:409 msgid "Specifying revisions and ranges for Git" msgstr "Spezifikation von Commits und Bereichen für Git" -#: builtin/help.c:409 +#: builtin/help.c:410 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)" -#: builtin/help.c:410 +#: builtin/help.c:411 msgid "An overview of recommended workflows with Git" msgstr "Eine Ãœbersicht über empfohlene Arbeitsabläufe mit Git" -#: builtin/help.c:422 +#: builtin/help.c:423 msgid "The common Git guides are:\n" msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n" -#: builtin/help.c:440 +#: builtin/help.c:441 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "für `git %s' wurde der Alias `%s' angelegt" -#: builtin/help.c:462 builtin/help.c:479 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "Verwendung: %s%s" -#: builtin/index-pack.c:154 +#: builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "kann %s nicht öffnen" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "object type mismatch at %s" msgstr "Objekt-Typen passen bei %s nicht zusammen" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, c-format msgid "did not receive expected object %s" msgstr "konnte erwartetes Objekt %s nicht empfangen" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "object %s: expected type %s, found %s" msgstr "Objekt %s: erwarteter Typ %s, %s gefunden" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:270 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kann %d Byte nicht lesen" msgstr[1] "kann %d Bytes nicht lesen" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "early EOF" msgstr "zu frühes Dateiende" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "read error on input" msgstr "Fehler beim Lesen der Eingabe" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:293 msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfügbar waren" -#: builtin/index-pack.c:299 +#: builtin/index-pack.c:300 msgid "pack too large for current definition of off_t" msgstr "Paket ist zu groß für die aktuelle Definition von off_t" -#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "Paket überschreitet die maximal erlaubte Größe" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "unable to create '%s'" msgstr "konnte '%s' nicht erstellen" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:324 #, c-format msgid "cannot open packfile '%s'" msgstr "Kann Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:338 msgid "pack signature mismatch" msgstr "Paketsignatur stimmt nicht überein" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:340 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "Paketversion %<PRIu32> nicht unterstützt" -#: builtin/index-pack.c:357 +#: builtin/index-pack.c:358 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s" @@ -9143,14 +9254,14 @@ msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes" msgid "serious inflate inconsistency" msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 #: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:257 +#: builtin/index-pack.c:751 builtin/pack-objects.c:167 +#: builtin/pack-objects.c:261 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" @@ -9170,250 +9281,245 @@ msgstr "Kann existierendes Objekt %s nicht lesen." msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:851 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:854 msgid "Error in object" msgstr "Fehler in Objekt" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c:856 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:927 builtin/index-pack.c:958 +#: builtin/index-pack.c:928 builtin/index-pack.c:959 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1164 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1169 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1168 +#: builtin/index-pack.c:1172 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1179 +#: builtin/index-pack.c:1184 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1202 +#: builtin/index-pack.c:1207 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1213 +#: builtin/index-pack.c:1218 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1260 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "abgeschlossen mit %d lokalem Objekt" msgstr[1] "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1278 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1277 +#: builtin/index-pack.c:1282 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelöste Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1306 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1377 +#: builtin/index-pack.c:1382 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1403 +#: builtin/index-pack.c:1408 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1420 #, c-format msgid "cannot write keep file '%s'" msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" -#: builtin/index-pack.c:1423 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot close written keep file '%s'" msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" -#: builtin/index-pack.c:1433 +#: builtin/index-pack.c:1438 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1446 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1479 +#: builtin/index-pack.c:1484 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" - -#: builtin/index-pack.c:1547 +#: builtin/index-pack.c:1552 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1549 +#: builtin/index-pack.c:1554 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1602 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "kein Unterschied: %d Objekt" msgstr[1] "kein Unterschied: %d Objekte" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1609 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" -#: builtin/index-pack.c:1616 +#: builtin/index-pack.c:1622 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 -#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 +#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 +#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1737 +#: builtin/index-pack.c:1743 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1745 msgid "--stdin requires a git repository" msgstr "--stdin erfordert ein Git-Repository" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1753 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." -#: builtin/init-db.c:54 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "Kann '%s' nicht lesen" -#: builtin/init-db.c:60 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "kann Vorlage '%s' nicht lesen" -#: builtin/init-db.c:65 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "kann Verzeichnis '%s' nicht öffnen" -#: builtin/init-db.c:76 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "kann Verweis '%s' nicht lesen" -#: builtin/init-db.c:78 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen" -#: builtin/init-db.c:84 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kann '%s' nicht nach '%s' kopieren" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "ignoriere Vorlage %s" -#: builtin/init-db.c:119 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "keine Vorlagen in '%s' gefunden" -#: builtin/init-db.c:134 +#: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopiere keine Vorlagen von '%s': %s" -#: builtin/init-db.c:327 +#: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" -#: builtin/init-db.c:330 +#: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "Konnte %s nicht nach %s verschieben" -#: builtin/init-db.c:347 builtin/init-db.c:350 +#: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Leeres Git-Repository in %s%s initialisiert\n" -#: builtin/init-db.c:457 +#: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -9421,25 +9527,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" "shared[=<Berechtigungen>]] [<Verzeichnis>]" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 msgid "permissions" msgstr "Berechtigungen" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird" -#: builtin/init-db.c:515 builtin/init-db.c:520 +#: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:524 +#: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:545 +#: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -9448,7 +9554,7 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:573 +#: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." @@ -9481,112 +9587,112 @@ msgstr "Anhang/Anhänge hinzufügen" msgid "no input file given for in-place editing" msgstr "keine Datei zur direkten Bearbeitung angegeben" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git show [<options>] <object>..." msgstr "git show [<Optionen>] <Objekt>..." -#: builtin/log.c:89 +#: builtin/log.c:90 #, c-format msgid "invalid --decorate option: %s" msgstr "Ungültige Option für --decorate: %s" -#: builtin/log.c:144 +#: builtin/log.c:147 msgid "suppress diff output" msgstr "Ausgabe der Unterschiede unterdrücken" -#: builtin/log.c:145 +#: builtin/log.c:148 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:146 +#: builtin/log.c:149 msgid "Use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:147 +#: builtin/log.c:150 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Process line range n,m in file, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1" -#: builtin/log.c:246 +#: builtin/log.c:249 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:493 +#: builtin/log.c:497 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungültige Datei" -#: builtin/log.c:507 builtin/log.c:601 +#: builtin/log.c:512 builtin/log.c:606 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:625 +#: builtin/log.c:630 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:746 +#: builtin/log.c:751 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:846 +#: builtin/log.c:852 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:861 +#: builtin/log.c:868 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:875 +#: builtin/log.c:885 msgid "Need exactly one range." msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:885 +#: builtin/log.c:895 msgid "Not a range." msgstr "Kein Commit-Bereich." -#: builtin/log.c:991 +#: builtin/log.c:1001 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:1071 +#: builtin/log.c:1081 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:1098 +#: builtin/log.c:1108 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1148 +#: builtin/log.c:1158 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 +#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 #, c-format msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 +#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/log.c:1270 +#: builtin/log.c:1280 msgid "Could not find exact merge base." msgstr "Konnte keine exakte Merge-Basis finden." -#: builtin/log.c:1274 +#: builtin/log.c:1284 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" @@ -9597,216 +9703,221 @@ msgstr "" "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n" "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an." -#: builtin/log.c:1294 +#: builtin/log.c:1304 msgid "Failed to find exact merge base" msgstr "Fehler beim Finden einer exakten Merge-Basis." -#: builtin/log.c:1305 +#: builtin/log.c:1315 msgid "base commit should be the ancestor of revision list" msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein." -#: builtin/log.c:1309 +#: builtin/log.c:1319 msgid "base commit shouldn't be in revision list" msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." -#: builtin/log.c:1358 +#: builtin/log.c:1368 msgid "cannot get patch id" msgstr "kann Patch-Id nicht lesen" -#: builtin/log.c:1415 +#: builtin/log.c:1425 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1418 +#: builtin/log.c:1428 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1422 +#: builtin/log.c:1432 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1424 +#: builtin/log.c:1434 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1426 +#: builtin/log.c:1436 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1427 +#: builtin/log.c:1437 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1428 +#: builtin/log.c:1438 msgid "use <sfx> instead of '.patch'" msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1430 +#: builtin/log.c:1440 msgid "start numbering patches at <n> instead of 1" msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1432 +#: builtin/log.c:1442 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1434 +#: builtin/log.c:1444 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "[RFC PATCH] anstatt [PATCH] verwenden" -#: builtin/log.c:1437 +#: builtin/log.c:1447 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[<Präfix>] anstatt [PATCH] verwenden" -#: builtin/log.c:1440 +#: builtin/log.c:1450 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1443 +#: builtin/log.c:1453 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufügen" -#: builtin/log.c:1446 +#: builtin/log.c:1456 msgid "don't output binary diffs" msgstr "keine binären Unterschiede ausgeben" -#: builtin/log.c:1448 +#: builtin/log.c:1458 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1450 +#: builtin/log.c:1460 msgid "don't include a patch matching a commit upstream" msgstr "" "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen" -#: builtin/log.c:1452 +#: builtin/log.c:1462 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1454 +#: builtin/log.c:1464 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1455 +#: builtin/log.c:1465 msgid "header" msgstr "Header" -#: builtin/log.c:1456 +#: builtin/log.c:1466 msgid "add email header" msgstr "E-Mail-Header hinzufügen" -#: builtin/log.c:1457 builtin/log.c:1459 +#: builtin/log.c:1467 builtin/log.c:1469 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1457 +#: builtin/log.c:1467 msgid "add To: header" msgstr "\"To:\"-Header hinzufügen" -#: builtin/log.c:1459 +#: builtin/log.c:1469 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufügen" -#: builtin/log.c:1461 +#: builtin/log.c:1471 msgid "ident" msgstr "Ident" -#: builtin/log.c:1462 +#: builtin/log.c:1472 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn " "fehlend)" -#: builtin/log.c:1464 +#: builtin/log.c:1474 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1465 +#: builtin/log.c:1475 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1466 builtin/log.c:1469 +#: builtin/log.c:1476 builtin/log.c:1479 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1467 +#: builtin/log.c:1477 msgid "attach the patch" msgstr "den Patch anhängen" -#: builtin/log.c:1470 +#: builtin/log.c:1480 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfügen" -#: builtin/log.c:1474 +#: builtin/log.c:1484 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1476 +#: builtin/log.c:1486 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1477 +#: builtin/log.c:1487 msgid "add a signature" msgstr "eine Signatur hinzufügen" -#: builtin/log.c:1478 +#: builtin/log.c:1488 msgid "base-commit" msgstr "Basis-Commit" -#: builtin/log.c:1479 +#: builtin/log.c:1489 msgid "add prerequisite tree info to the patch series" msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen" -#: builtin/log.c:1481 +#: builtin/log.c:1491 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufügen" -#: builtin/log.c:1482 +#: builtin/log.c:1492 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1572 +#: builtin/log.c:1567 +#, c-format +msgid "invalid ident line: %s" +msgstr "Ungültige Identifikationszeile: %s" + +#: builtin/log.c:1582 msgid "-n and -k are mutually exclusive." msgstr "Die Optionen -n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1574 +#: builtin/log.c:1584 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus." -#: builtin/log.c:1582 +#: builtin/log.c:1592 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1584 +#: builtin/log.c:1594 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1586 +#: builtin/log.c:1596 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1616 +#: builtin/log.c:1626 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1618 +#: builtin/log.c:1628 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1712 +#: builtin/log.c:1722 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:1784 +#: builtin/log.c:1794 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1833 +#: builtin/log.c:1843 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:1887 +#: builtin/log.c:1897 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9965,221 +10076,226 @@ msgstr "" #: builtin/ls-remote.c:66 msgid "show underlying ref in addition to the object pointed by it" -msgstr "zusätzlich die auf durch dieses Objekt verwiesene Referenzen anzeigen" +msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "nur Verzeichnisse anzeigen" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "Rekursion in Unterverzeichnissen durchführen" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "Verzeichnisse bei Rekursion anzeigen" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "Einträge mit NUL-Byte abschließen" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "Objektgröße einschließen" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "nur Dateinamen auflisten" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "vollständige Pfadnamen verwenden" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis " "(impliziert --full-name)" -#: builtin/merge.c:46 +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "Leere mbox: '%s'" + +#: builtin/merge.c:47 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:103 +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:140 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:196 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:199 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:200 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:202 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits " "hinzufügen" -#: builtin/merge.c:205 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:207 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:209 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:152 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:210 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:212 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:216 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen" -#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 -#: builtin/revert.c:108 +#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/revert.c:109 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:218 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:166 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:169 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:220 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:222 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:226 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:228 +#: builtin/merge.c:229 msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -#: builtin/merge.c:230 builtin/pull.c:170 +#: builtin/merge.c:231 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" -#: builtin/merge.c:258 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:263 +#: builtin/merge.c:264 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:268 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:287 builtin/merge.c:304 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:334 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:345 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:395 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:446 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:536 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:656 +#: builtin/merge.c:657 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:670 +#: builtin/merge.c:671 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:685 +#: builtin/merge.c:686 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:737 +#: builtin/merge.c:738 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:746 +#: builtin/merge.c:747 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge " "abzuschließen.\n" -#: builtin/merge.c:752 +#: builtin/merge.c:753 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10195,76 +10311,71 @@ msgstr "" "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/merge.c:776 +#: builtin/merge.c:777 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:796 +#: builtin/merge.c:797 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:851 +#: builtin/merge.c:850 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:889 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:892 +#: builtin/merge.c:891 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:894 +#: builtin/merge.c:893 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert." -#: builtin/merge.c:899 +#: builtin/merge.c:898 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:946 +#: builtin/merge.c:945 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1020 -#, c-format -msgid "could not close '%s'" -msgstr "Konnte '%s' nicht schließen" - -#: builtin/merge.c:1047 +#: builtin/merge.c:1046 #, c-format msgid "not something we can merge in %s: %s" msgstr "nichts was wir in %s zusammenführen können: %s" -#: builtin/merge.c:1081 +#: builtin/merge.c:1080 msgid "not something we can merge" msgstr "nichts was wir zusammenführen können" -#: builtin/merge.c:1146 +#: builtin/merge.c:1145 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1150 +#: builtin/merge.c:1149 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)" +msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1162 +#: builtin/merge.c:1161 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1166 +#: builtin/merge.c:1165 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist keine Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1182 +#: builtin/merge.c:1181 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10272,7 +10383,7 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1189 +#: builtin/merge.c:1188 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10280,163 +10391,163 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1192 +#: builtin/merge.c:1191 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1201 +#: builtin/merge.c:1200 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1209 +#: builtin/merge.c:1208 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1226 +#: builtin/merge.c:1225 msgid "Squash commit into empty head not supported yet" msgstr "" "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen." -#: builtin/merge.c:1228 +#: builtin/merge.c:1227 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1233 +#: builtin/merge.c:1232 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1235 +#: builtin/merge.c:1234 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen." -#: builtin/merge.c:1269 +#: builtin/merge.c:1268 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1272 +#: builtin/merge.c:1271 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1275 +#: builtin/merge.c:1274 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1278 +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n" -#: builtin/merge.c:1340 +#: builtin/merge.c:1339 msgid "refusing to merge unrelated histories" msgstr "Verweigere den Merge von nicht zusammenhängenden Historien." -#: builtin/merge.c:1349 +#: builtin/merge.c:1348 msgid "Already up-to-date." msgstr "Bereits aktuell." -#: builtin/merge.c:1359 +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1400 +#: builtin/merge.c:1399 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1407 +#: builtin/merge.c:1406 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1432 +#: builtin/merge.c:1431 msgid "Already up-to-date. Yeeah!" msgstr "Bereits aktuell." -#: builtin/merge.c:1438 +#: builtin/merge.c:1437 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1461 builtin/merge.c:1540 +#: builtin/merge.c:1460 builtin/merge.c:1539 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1465 +#: builtin/merge.c:1464 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1530 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1533 +#: builtin/merge.c:1532 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1541 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1554 +#: builtin/merge.c:1553 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <Commit> <Commit>..." -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <Commit>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <Commit>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <Commit> <Commit>" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <Referenz> [<Commit>]" -#: builtin/merge-base.c:217 +#: builtin/merge-base.c:218 msgid "output all common ancestors" msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits" -#: builtin/merge-base.c:219 +#: builtin/merge-base.c:220 msgid "find ancestors for a single n-way merge" msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden" -#: builtin/merge-base.c:221 +#: builtin/merge-base.c:222 msgid "list revs not reachable from others" msgstr "Commits auflisten, die nicht durch Andere erreichbar sind" -#: builtin/merge-base.c:223 +#: builtin/merge-base.c:224 msgid "is the first one ancestor of the other?" -msgstr "ist der Erste ein Vorgänger-Commit von dem Anderen?" +msgstr "ist der Erste ein Vorgänger-Commit des Anderen?" -#: builtin/merge-base.c:225 +#: builtin/merge-base.c:226 msgid "find where <commit> forked from reflog of <ref>" msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde" -#: builtin/merge-file.c:8 +#: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" @@ -10444,35 +10555,35 @@ msgstr "" "git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> " "<orig-Datei> <Datei2>" -#: builtin/merge-file.c:32 +#: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "Ergebnisse zur Standard-Ausgabe senden" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "einen diff3 basierten Merge verwenden" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "bei Konflikten unsere Variante verwenden" -#: builtin/merge-file.c:36 +#: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "bei Konflikten ihre Variante verwenden" -#: builtin/merge-file.c:38 +#: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "bei Konflikten eine gemeinsame Variante verwenden" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "bei Konflikten diese Kennzeichnungslänge verwenden" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "keine Warnung bei Konflikten" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:45 msgid "set labels for file1/orig-file/file2" msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen" @@ -10511,162 +10622,162 @@ msgstr "Führe %s mit %s zusammen\n" msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:152 +#: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen" -#: builtin/mktree.c:153 builtin/write-tree.c:24 +#: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "fehlende Objekte erlauben" -#: builtin/mktree.c:154 +#: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" -#: builtin/mv.c:16 +#: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<Optionen>] <Quelle>... <Ziel>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?" -#: builtin/mv.c:84 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder " "benutzen\n" "Sie \"stash\", um fortzufahren." -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s ist zum Commit vorgemerkt" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert" -#: builtin/mv.c:125 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "Fehler beim Verschieben oder Umbenennen überspringen" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "Ziel '%s' ist kein Verzeichnis" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Prüfe Umbenennung von '%s' nach '%s'\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "ungültige Quelle" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "kann Verzeichnis nicht in sich selbst verschieben" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "kann Verzeichnis nicht über Datei verschieben" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "Quellverzeichnis ist leer" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "nicht unter Versionskontrolle" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "Ziel existiert bereits" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "überschreibe '%s'" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "Kann nicht überschreiben" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "mehrere Quellen für das selbe Ziel" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "Zielverzeichnis existiert nicht" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, Quelle=%s, Ziel=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 +#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/name-rev.c:289 +#: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<Optionen>] <Commit>..." -#: builtin/name-rev.c:290 +#: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<Optionen>] --all" -#: builtin/name-rev.c:291 +#: builtin/name-rev.c:340 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<Optionen>] --stdin" -#: builtin/name-rev.c:346 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "nur Namen anzeigen (keine SHA-1)" -#: builtin/name-rev.c:347 +#: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "nur Tags verwenden, um die Commits zu benennen" -#: builtin/name-rev.c:349 +#: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" msgstr "nur Referenzen verwenden die <Muster> entsprechen" -#: builtin/name-rev.c:351 +#: builtin/name-rev.c:400 msgid "ignore refs matching <pattern>" msgstr "ignoriere Referenzen die <Muster> entsprechen" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:403 msgid "read from stdin" msgstr "von der Standard-Eingabe lesen" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" -#: builtin/name-rev.c:361 +#: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -10674,12 +10785,12 @@ msgstr "" "git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [-m " "<Beschreibung> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -10687,207 +10798,208 @@ msgstr "" "git notes [--ref <Notiz-Referenz>] append [--allow-empty] [-m <Beschreibung> " "| -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <Notiz-Referenz>] edit [--allow-empty] [<Objekt>]" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <Notiz-Referenz>] show [<Objekt>]" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie>] <Notiz-" "Referenz>" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <Notiz-Referenz>] prune [-n | -v]" -#: builtin/notes.c:36 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <Notiz-Referenz>] get-ref" -#: builtin/notes.c:41 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" msgstr "git notes [list [<Objekt>]]" -#: builtin/notes.c:46 +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<Optionen>] [<Objekt>]" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<Optionen>] <von-Objekt> <nach-Objekt>" -#: builtin/notes.c:52 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<von-Objekt> <nach-Objekt>]..." -#: builtin/notes.c:57 +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<Optionen>] [<Objekt>]" -#: builtin/notes.c:62 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" msgstr "git notes edit [<Objekt>]" -#: builtin/notes.c:67 +#: builtin/notes.c:68 msgid "git notes show [<object>]" msgstr "git notes show [<Objekt>]" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<Optionen>] <Notiz-Referenz>" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<Optionen>]" -#: builtin/notes.c:74 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<Optionen>]" -#: builtin/notes.c:79 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" msgstr "git notes remove [<Objekt>]" -#: builtin/notes.c:84 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" msgstr "git notes prune [<Optionen>]" -#: builtin/notes.c:89 +#: builtin/notes.c:90 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:94 +#: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "Schreiben/Bearbeiten der Notizen für das folgende Objekt:" -#: builtin/notes.c:147 +#: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht starten" -#: builtin/notes.c:151 +#: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "Konnte Ausgabe von 'show' nicht lesen." -#: builtin/notes.c:159 +#: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht abschließen" -#: builtin/notes.c:194 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "" "Bitte liefern Sie die Notiz-Inhalte unter Verwendung der Option -m oder -F." -#: builtin/notes.c:203 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "Konnte Notiz-Objekt nicht schreiben" -#: builtin/notes.c:205 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen." -#: builtin/notes.c:233 builtin/tag.c:516 +#: builtin/notes.c:234 builtin/tag.c:517 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:235 builtin/tag.c:519 +#: builtin/notes.c:236 builtin/tag.c:520 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" -#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 -#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 +#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/notes.c:257 +#: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "Fehler beim Lesen des Objektes '%s'." -#: builtin/notes.c:261 +#: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen." -#: builtin/notes.c:301 +#: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/notes.c:316 +#: builtin/notes.c:317 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#. TRANSLATORS: the first %s will be replaced by a -#. git notes command: 'add', 'merge', 'remove', etc. -#: builtin/notes.c:345 +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. +#: builtin/notes.c:348 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" "Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) " "zurückgewiesen" -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 -#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 +#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 +#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 +#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 msgid "too many parameters" msgstr "zu viele Parameter" -#: builtin/notes.c:378 builtin/notes.c:664 +#: builtin/notes.c:381 builtin/notes.c:667 #, c-format msgid "no note found for object %s." msgstr "Keine Notiz für Objekt %s gefunden." -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents as a string" msgstr "Notizinhalte als Zeichenkette" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents in a file" msgstr "Notizinhalte in einer Datei" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse and edit specified note object" msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse specified note object" msgstr "Wiederverwendung des angegebenen Notiz-Objektes" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "allow storing empty note" msgstr "Speichern leerer Notiz erlauben" -#: builtin/notes.c:412 builtin/notes.c:483 +#: builtin/notes.c:415 builtin/notes.c:486 msgid "replace existing notes" msgstr "existierende Notizen ersetzen" -#: builtin/notes.c:437 +#: builtin/notes.c:440 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10896,31 +11008,31 @@ msgstr "" "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s " "gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:452 builtin/notes.c:531 +#: builtin/notes.c:455 builtin/notes.c:534 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Ãœberschreibe existierende Notizen für Objekt %s\n" -#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 +#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz für Objekt %s\n" -#: builtin/notes.c:484 +#: builtin/notes.c:487 msgid "read objects from stdin" msgstr "Objekte von der Standard-Eingabe lesen" -#: builtin/notes.c:486 +#: builtin/notes.c:489 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --" "stdin)" -#: builtin/notes.c:504 +#: builtin/notes.c:507 msgid "too few parameters" msgstr "zu wenig Parameter" -#: builtin/notes.c:525 +#: builtin/notes.c:528 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10929,12 +11041,12 @@ msgstr "" "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. " "Verwenden Sie '-f', um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:537 +#: builtin/notes.c:540 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich." -#: builtin/notes.c:589 +#: builtin/notes.c:592 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10943,52 +11055,52 @@ msgstr "" "Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n" "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n" -#: builtin/notes.c:684 +#: builtin/notes.c:687 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL" -#: builtin/notes.c:686 +#: builtin/notes.c:689 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF" -#: builtin/notes.c:688 +#: builtin/notes.c:691 msgid "failed to remove 'git notes merge' worktree" msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'." -#: builtin/notes.c:708 +#: builtin/notes.c:711 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL" -#: builtin/notes.c:710 +#: builtin/notes.c:713 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden." -#: builtin/notes.c:712 +#: builtin/notes.c:715 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen." -#: builtin/notes.c:725 +#: builtin/notes.c:728 msgid "failed to resolve NOTES_MERGE_REF" msgstr "Fehler beim Auflösen von NOTES_MERGE_REF" -#: builtin/notes.c:728 +#: builtin/notes.c:731 msgid "failed to finalize notes merge" msgstr "Fehler beim Abschließen der Zusammenführung der Notizen." -#: builtin/notes.c:754 +#: builtin/notes.c:757 #, c-format msgid "unknown notes merge strategy %s" msgstr "unbekannte Merge-Strategie '%s' für Notizen" -#: builtin/notes.c:770 +#: builtin/notes.c:773 msgid "General options" msgstr "Allgemeine Optionen" -#: builtin/notes.c:772 +#: builtin/notes.c:775 msgid "Merge options" msgstr "Merge-Optionen" -#: builtin/notes.c:774 +#: builtin/notes.c:777 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10996,49 +11108,49 @@ msgstr "" "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:776 +#: builtin/notes.c:779 msgid "Committing unmerged notes" msgstr "nicht zusammengeführte Notizen eintragen" -#: builtin/notes.c:778 +#: builtin/notes.c:781 msgid "finalize notes merge by committing unmerged notes" msgstr "" "Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen " "committet werden" -#: builtin/notes.c:780 +#: builtin/notes.c:783 msgid "Aborting notes merge resolution" msgstr "Konfliktauflösung beim Merge von Notizen abbrechen" -#: builtin/notes.c:782 +#: builtin/notes.c:785 msgid "abort notes merge" msgstr "Merge von Notizen abbrechen" -#: builtin/notes.c:793 +#: builtin/notes.c:796 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren." -#: builtin/notes.c:798 +#: builtin/notes.c:801 msgid "must specify a notes ref to merge" msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben." -#: builtin/notes.c:822 +#: builtin/notes.c:825 #, c-format msgid "unknown -s/--strategy: %s" msgstr "Unbekannter Wert für -s/--strategy: %s" -#: builtin/notes.c:859 +#: builtin/notes.c:862 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s" -#: builtin/notes.c:862 +#: builtin/notes.c:865 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" "Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)" -#: builtin/notes.c:864 +#: builtin/notes.c:867 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11050,236 +11162,235 @@ msgstr "" "commit',\n" "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n" -#: builtin/notes.c:886 +#: builtin/notes.c:889 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:898 +#: builtin/notes.c:901 msgid "attempt to remove non-existent note is not an error" msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" -#: builtin/notes.c:901 +#: builtin/notes.c:904 msgid "read object names from the standard input" msgstr "Objektnamen von der Standard-Eingabe lesen" -#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" -#: builtin/notes.c:940 +#: builtin/notes.c:943 msgid "report pruned notes" msgstr "gelöschte Notizen melden" -#: builtin/notes.c:982 +#: builtin/notes.c:985 msgid "notes-ref" msgstr "Notiz-Referenz" -#: builtin/notes.c:983 +#: builtin/notes.c:986 msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1018 +#: builtin/notes.c:1021 #, c-format msgid "unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 #, c-format msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:770 +#: builtin/pack-objects.c:776 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n" "aufgetrennt." -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:789 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1063 +#: builtin/pack-objects.c:1069 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-" "Datei\n" "geschrieben wurden." -#: builtin/pack-objects.c:2426 +#: builtin/pack-objects.c:2434 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2843 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2847 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Index-Version '%s'" -#: builtin/pack-objects.c:2863 +#: builtin/pack-objects.c:2877 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2865 +#: builtin/pack-objects.c:2879 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2867 +#: builtin/pack-objects.c:2881 msgid "show progress meter during object writing phase" -msgstr "" -"Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen" +msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" -#: builtin/pack-objects.c:2870 +#: builtin/pack-objects.c:2884 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2871 +#: builtin/pack-objects.c:2885 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2872 +#: builtin/pack-objects.c:2886 msgid "write the pack index file in the specified idx format version" msgstr "" "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:2875 +#: builtin/pack-objects.c:2889 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2891 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2893 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2895 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2897 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2899 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2901 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2903 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2905 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2907 msgid "use threads when searching for best delta matches" msgstr "" "Threads bei der Suche nach den besten Ãœbereinstimmungen bei Unterschieden " "verwenden" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2909 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2911 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2913 msgid "limit the objects to those that are not yet packed" msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:2916 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2919 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:2908 +#: builtin/pack-objects.c:2922 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2925 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2927 msgid "include tag objects that refer to objects to be packed" msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2929 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2931 msgid "pack loose unreachable objects" msgstr "nicht erreichbare lose Objekte packen" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2933 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2936 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:2924 +#: builtin/pack-objects.c:2938 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:2926 +#: builtin/pack-objects.c:2940 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2942 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:2930 +#: builtin/pack-objects.c:2944 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2946 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:2934 +#: builtin/pack-objects.c:2948 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:3061 +#: builtin/pack-objects.c:3075 msgid "Counting objects" msgstr "Zähle Objekte" @@ -11319,45 +11430,49 @@ msgstr "Objekte älter als <Zeit> verfallen lassen" msgid "cannot prune in a precious-objects repo" msgstr "kann \"prune\" in precious-objects Repository nicht ausführen" -#: builtin/pull.c:51 builtin/pull.c:53 +#: builtin/pull.c:54 builtin/pull.c:56 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: builtin/pull.c:73 +#: builtin/pull.c:76 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/pull.c:121 +#: builtin/pull.c:124 +msgid "control for recursive fetching of submodules" +msgstr "rekursive Anforderungen von Submodulen kontrollieren" + +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "Optionen bezogen auf Merge" -#: builtin/pull.c:124 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Änderungen durch Rebase statt Merge" -#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 +#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 msgid "allow fast-forward" msgstr "Vorspulen erlauben" -#: builtin/pull.c:157 +#: builtin/pull.c:164 msgid "automatically stash/stash pop before and after rebase" msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase" -#: builtin/pull.c:173 +#: builtin/pull.c:180 msgid "Options related to fetching" msgstr "Optionen bezogen auf Fetch" -#: builtin/pull.c:195 +#: builtin/pull.c:198 msgid "number of submodules pulled in parallel" msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" -#: builtin/pull.c:284 +#: builtin/pull.c:287 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Ungültiger Wert für pull.ff: %s" -#: builtin/pull.c:397 +#: builtin/pull.c:399 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11365,14 +11480,14 @@ msgstr "" "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:399 +#: builtin/pull.c:401 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:400 +#: builtin/pull.c:402 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11380,7 +11495,7 @@ msgstr "" "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n" "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt." -#: builtin/pull.c:403 +#: builtin/pull.c:405 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11392,39 +11507,39 @@ msgstr "" "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n" "der Befehlszeile angeben." -#: builtin/pull.c:408 git-parse-remote.sh:73 +#: builtin/pull.c:410 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Im Moment auf keinem Branch." -#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen " "möchten." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 +#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten." -#: builtin/pull.c:413 builtin/pull.c:428 +#: builtin/pull.c:415 builtin/pull.c:430 msgid "See git-pull(1) for details." msgstr "Siehe git-pull(1) für weitere Details." -#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 +#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<Remote-Repository>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 +#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<Branch>" -#: builtin/pull.c:423 git-parse-remote.sh:75 +#: builtin/pull.c:425 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch." -#: builtin/pull.c:432 git-parse-remote.sh:95 +#: builtin/pull.c:434 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -11432,7 +11547,7 @@ msgstr "" "Sie\n" "dies tun mit:" -#: builtin/pull.c:437 +#: builtin/pull.c:439 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11442,29 +11557,29 @@ msgstr "" "des Remote-Repositories durchzuführen, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:754 +#: builtin/pull.c:792 msgid "ignoring --verify-signatures for rebase" msgstr "Ignoriere --verify-signatures für Rebase" -#: builtin/pull.c:801 +#: builtin/pull.c:840 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash ist nur mit --rebase zulässig." -#: builtin/pull.c:809 +#: builtin/pull.c:848 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit " "vorgemerkt sind." -#: builtin/pull.c:812 +#: builtin/pull.c:851 msgid "pull with rebase" msgstr "Pull mit Rebase" -#: builtin/pull.c:813 +#: builtin/pull.c:852 msgid "please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/pull.c:838 +#: builtin/pull.c:877 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11474,7 +11589,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:843 +#: builtin/pull.c:882 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11491,27 +11606,31 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:858 +#: builtin/pull.c:897 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen." -#: builtin/pull.c:862 +#: builtin/pull.c:901 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausführen." -#: builtin/push.c:16 +#: builtin/pull.c:908 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen ausführen." + +#: builtin/push.c:17 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/push.c:89 +#: builtin/push.c:90 msgid "tag shorthand without <tag>" msgstr "Kurzschrift für Tag ohne <Tag>" -#: builtin/push.c:99 +#: builtin/push.c:100 msgid "--delete only accepts plain target ref names" msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel." -#: builtin/push.c:143 +#: builtin/push.c:144 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11520,7 +11639,7 @@ msgstr "" "Um eine Variante permanent zu verwenden, siehe push.default in 'git help " "config'." -#: builtin/push.c:146 +#: builtin/push.c:147 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11546,7 +11665,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:161 +#: builtin/push.c:162 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11561,7 +11680,7 @@ msgstr "" "\n" " git push %s HEAD:<Name-des-Remote-Branches>\n" -#: builtin/push.c:175 +#: builtin/push.c:176 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11575,13 +11694,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:183 +#: builtin/push.c:184 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert." -#: builtin/push.c:186 +#: builtin/push.c:187 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11592,14 +11711,14 @@ msgstr "" "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n" "Remote-Branch zu aktualisieren." -#: builtin/push.c:245 +#: builtin/push.c:246 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Sie haben keine Refspec für \"push\" angegeben, und push.default ist " "\"nothing\"." -#: builtin/push.c:252 +#: builtin/push.c:253 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11613,7 +11732,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:258 +#: builtin/push.c:259 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" @@ -11627,7 +11746,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:264 +#: builtin/push.c:265 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" @@ -11646,13 +11765,13 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:271 +#: builtin/push.c:272 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n" "im Remote-Repository existiert." -#: builtin/push.c:274 +#: builtin/push.c:275 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" @@ -11662,22 +11781,22 @@ msgstr "" "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n" "die Option '--force' zu verwenden.\n" -#: builtin/push.c:334 +#: builtin/push.c:335 #, c-format msgid "Pushing to %s\n" msgstr "Versende nach %s\n" -#: builtin/push.c:338 +#: builtin/push.c:339 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:369 +#: builtin/push.c:370 #, c-format msgid "bad repository '%s'" msgstr "ungültiges Repository '%s'" -#: builtin/push.c:370 +#: builtin/push.c:371 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11699,112 +11818,112 @@ msgstr "" "\n" " git push <Name>\n" -#: builtin/push.c:388 +#: builtin/push.c:389 msgid "--all and --tags are incompatible" msgstr "Die Optionen --all und --tags sind inkompatibel." -#: builtin/push.c:389 +#: builtin/push.c:390 msgid "--all can't be combined with refspecs" msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden." -#: builtin/push.c:394 +#: builtin/push.c:395 msgid "--mirror and --tags are incompatible" msgstr "Die Optionen --mirror und --tags sind inkompatibel." -#: builtin/push.c:395 +#: builtin/push.c:396 msgid "--mirror can't be combined with refspecs" msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." -#: builtin/push.c:400 +#: builtin/push.c:401 msgid "--all and --mirror are incompatible" msgstr "Die Optionen --all und --mirror sind inkompatibel." -#: builtin/push.c:518 +#: builtin/push.c:523 msgid "repository" msgstr "Repository" -#: builtin/push.c:519 builtin/send-pack.c:162 +#: builtin/push.c:524 builtin/send-pack.c:163 msgid "push all refs" msgstr "alle Referenzen versenden" -#: builtin/push.c:520 builtin/send-pack.c:164 +#: builtin/push.c:525 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "alle Referenzen spiegeln" -#: builtin/push.c:522 +#: builtin/push.c:527 msgid "delete refs" msgstr "Referenzen löschen" -#: builtin/push.c:523 +#: builtin/push.c:528 msgid "push tags (can't be used with --all or --mirror)" msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:526 builtin/send-pack.c:165 +#: builtin/push.c:531 builtin/send-pack.c:166 msgid "force updates" msgstr "Aktualisierung erzwingen" -#: builtin/push.c:528 builtin/send-pack.c:179 +#: builtin/push.c:533 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "Referenzname>:<Erwartungswert" -#: builtin/push.c:529 builtin/send-pack.c:180 +#: builtin/push.c:534 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" -#: builtin/push.c:532 +#: builtin/push.c:537 msgid "control recursive pushing of submodules" msgstr "rekursiven \"push\" von Submodulen steuern" -#: builtin/push.c:534 builtin/send-pack.c:173 +#: builtin/push.c:539 builtin/send-pack.c:174 msgid "use thin pack" msgstr "kleinere Pakete verwenden" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 -#: builtin/send-pack.c:160 +#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:537 +#: builtin/push.c:542 msgid "set upstream for git pull/status" msgstr "Upstream für \"git pull/status\" setzen" -#: builtin/push.c:540 +#: builtin/push.c:545 msgid "prune locally removed refs" msgstr "lokal gelöschte Referenzen entfernen" -#: builtin/push.c:542 +#: builtin/push.c:547 msgid "bypass pre-push hook" msgstr "\"pre-push hook\" umgehen" -#: builtin/push.c:543 +#: builtin/push.c:548 msgid "push missing but relevant tags" msgstr "fehlende, aber relevante Tags versenden" -#: builtin/push.c:546 builtin/send-pack.c:167 +#: builtin/push.c:551 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "signiert \"push\" mit GPG" -#: builtin/push.c:548 builtin/send-pack.c:174 +#: builtin/push.c:553 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "Referenzen atomar versenden" -#: builtin/push.c:549 builtin/send-pack.c:170 +#: builtin/push.c:554 builtin/send-pack.c:171 msgid "server-specific" msgstr "serverspezifisch" -#: builtin/push.c:549 builtin/send-pack.c:171 +#: builtin/push.c:554 builtin/send-pack.c:172 msgid "option to transmit" msgstr "Option übertragen" -#: builtin/push.c:563 +#: builtin/push.c:568 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:565 +#: builtin/push.c:570 msgid "--delete doesn't make sense without any refs" msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." -#: builtin/push.c:584 +#: builtin/push.c:589 msgid "push options must not have new line characters" msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben" @@ -11819,87 +11938,87 @@ msgstr "" "index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> " "[<Commit-Referenz3>]])" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:121 msgid "write resulting index to <file>" msgstr "resultierenden Index nach <Datei> schreiben" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:124 msgid "only empty the index" msgstr "nur den Index leeren" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:126 msgid "Merging" msgstr "Merge" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:128 msgid "perform a merge in addition to a read" msgstr "einen Merge, zusätzlich zum Lesen, ausführen" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:130 msgid "3-way merge if no file level merging required" msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:132 msgid "3-way merge in presence of adds and removes" msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c:134 msgid "same as -m, but discard unmerged entries" msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:135 msgid "<subdirectory>/" msgstr "<Unterverzeichnis>/" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:136 msgid "read the tree into the index under <subdirectory>/" msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:139 msgid "update working tree with merge result" msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:141 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:151 +#: builtin/read-tree.c:142 msgid "allow explicitly ignored files to be overwritten" msgstr "explizit ignorierte Dateien zu überschreiben erlauben" -#: builtin/read-tree.c:154 +#: builtin/read-tree.c:145 msgid "don't check the working tree after merging" msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen" -#: builtin/read-tree.c:155 +#: builtin/read-tree.c:146 msgid "don't update the index or the work tree" msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren" -#: builtin/read-tree.c:157 +#: builtin/read-tree.c:148 msgid "skip applying sparse checkout filter" msgstr "Anwendung des Filters für partielles Auschecken überspringen" -#: builtin/read-tree.c:159 +#: builtin/read-tree.c:150 msgid "debug unpack-trees" msgstr "unpack-trees protokollieren" -#: builtin/rebase--helper.c:7 +#: builtin/rebase--helper.c:8 msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<Optionen>]" -#: builtin/rebase--helper.c:19 +#: builtin/rebase--helper.c:20 msgid "continue rebase" msgstr "Rebase fortsetzen" -#: builtin/rebase--helper.c:21 +#: builtin/rebase--helper.c:22 msgid "abort rebase" msgstr "Rebase abbrechen" -#: builtin/receive-pack.c:27 +#: builtin/receive-pack.c:28 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <Git-Verzeichnis>" -#: builtin/receive-pack.c:795 +#: builtin/receive-pack.c:838 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" @@ -11916,7 +12035,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" "Standardmäßig wird die Aktualisierung des aktuellen Branches in einem\n" -"nicht-Bare-Repository zurückgewiesen, da dies den Index und das Arbeits-\n" +"Nicht-Bare-Repository zurückgewiesen, da dies den Index und das Arbeits-\n" "verzeichnis inkonsistent zu dem machen würde, was Sie gepushed haben, und\n" "'git reset --hard' erforderlich wäre, damit das Arbeitsverzeichnis HEAD\n" "entspricht.\n" @@ -11931,7 +12050,7 @@ msgstr "" "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n" "'refuse'." -#: builtin/receive-pack.c:815 +#: builtin/receive-pack.c:858 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" @@ -11952,29 +12071,29 @@ msgstr "" "\n" "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'." -#: builtin/receive-pack.c:1888 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "weniger Ausgaben" -#: builtin/receive-pack.c:1902 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Sie müssen ein Repository angeben." -#: builtin/reflog.c:423 +#: builtin/reflog.c:424 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel für '%s'" -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:541 builtin/reflog.c:546 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11982,82 +12101,82 @@ msgstr "" "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <Name> <URL>" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:15 builtin/remote.c:35 msgid "git remote rename <old> <new>" msgstr "git remote rename <alt> <neu>" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:16 builtin/remote.c:40 msgid "git remote remove <name>" msgstr "git remote remove <Name>" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:17 builtin/remote.c:45 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <Name>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <Name>" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <Name> <Branch>..." -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:22 builtin/remote.c:71 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <Name>" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <Name> <neueURL>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <Name> <URL>" -#: builtin/remote.c:29 +#: builtin/remote.c:30 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<Optionen>] <Name> <URL>" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <Name> <Branch>..." -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <Name> <Branch>..." -#: builtin/remote.c:55 +#: builtin/remote.c:56 msgid "git remote show [<options>] <name>" msgstr "git remote show [<Optionen>] <Name>" -#: builtin/remote.c:60 +#: builtin/remote.c:61 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<Optionen>] <Name>" -#: builtin/remote.c:65 +#: builtin/remote.c:66 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..." -#: builtin/remote.c:94 +#: builtin/remote.c:95 #, c-format msgid "Updating %s" msgstr "Aktualisiere %s" -#: builtin/remote.c:126 +#: builtin/remote.c:127 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -12065,92 +12184,92 @@ msgstr "" "--mirror ist gefährlich und veraltet; bitte\n" "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push" -#: builtin/remote.c:143 +#: builtin/remote.c:144 #, c-format msgid "unknown mirror argument: %s" msgstr "unbekanntes Argument für Option --mirror: %s" -#: builtin/remote.c:159 +#: builtin/remote.c:160 msgid "fetch the remote branches" msgstr "die Remote-Branches anfordern" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "import all tags and associated objects when fetching" msgstr "alle Tags und verbundene Objekte beim Anfordern importieren" -#: builtin/remote.c:164 +#: builtin/remote.c:165 msgid "or do not fetch any tag at all (--no-tags)" msgstr "oder fordere gar keine Zweige an (--no-tags)" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "branch(es) to track" msgstr "Branch(es) zur Ãœbernahme" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "master branch" msgstr "Hauptbranch" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und " "\"fetch\"" -#: builtin/remote.c:181 +#: builtin/remote.c:182 msgid "specifying a master branch makes no sense with --mirror" msgstr "" "Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet " "werden." -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " "Spiegelarchiven verwendet werden." -#: builtin/remote.c:190 builtin/remote.c:629 +#: builtin/remote.c:191 builtin/remote.c:630 #, c-format msgid "remote %s already exists." msgstr "externes Repository %s existiert bereits" -#: builtin/remote.c:194 builtin/remote.c:633 +#: builtin/remote.c:195 builtin/remote.c:634 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" -#: builtin/remote.c:234 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten" -#: builtin/remote.c:336 +#: builtin/remote.c:337 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:438 builtin/remote.c:446 msgid "(matching)" msgstr "(übereinstimmend)" -#: builtin/remote.c:449 +#: builtin/remote.c:450 msgid "(delete)" msgstr "(lösche)" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 +#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 #, c-format msgid "No such remote: %s" msgstr "Kein solches Remote-Repository: %s" -#: builtin/remote.c:639 +#: builtin/remote.c:640 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12161,17 +12280,17 @@ msgstr "" "\t%s\n" "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." -#: builtin/remote.c:695 +#: builtin/remote.c:696 #, c-format msgid "deleting '%s' failed" msgstr "Konnte '%s' nicht löschen" -#: builtin/remote.c:729 +#: builtin/remote.c:730 #, c-format msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:794 +#: builtin/remote.c:795 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12187,137 +12306,139 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:808 +#: builtin/remote.c:809 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:909 +#: builtin/remote.c:910 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)" -#: builtin/remote.c:912 +#: builtin/remote.c:913 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:914 +#: builtin/remote.c:915 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" -#: builtin/remote.c:916 +#: builtin/remote.c:917 msgid " ???" msgstr " ???" -#: builtin/remote.c:957 +#: builtin/remote.c:958 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen" -#: builtin/remote.c:965 +#: builtin/remote.c:966 #, c-format msgid "rebases interactively onto remote %s" msgstr "interaktiver Rebase auf Remote-Branch %s" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:969 +#: builtin/remote.c:970 #, c-format msgid " merges with remote %s" msgstr " führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:972 +#: builtin/remote.c:973 #, c-format msgid "merges with remote %s" msgstr "führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:975 +#: builtin/remote.c:976 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s und mit Remote-Branch %s\n" -#: builtin/remote.c:1018 +#: builtin/remote.c:1019 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1021 +#: builtin/remote.c:1022 msgid "delete" msgstr "gelöscht" -#: builtin/remote.c:1025 +#: builtin/remote.c:1026 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1028 +#: builtin/remote.c:1029 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1031 +#: builtin/remote.c:1032 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1038 +#: builtin/remote.c:1039 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1041 +#: builtin/remote.c:1042 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1045 +#: builtin/remote.c:1046 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1048 +#: builtin/remote.c:1049 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1116 +#: builtin/remote.c:1117 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1143 +#: builtin/remote.c:1144 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 +#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 msgid "(no URL)" msgstr "(keine URL)" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1156 builtin/remote.c:1158 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 +#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1160 +#: builtin/remote.c:1164 msgid "(not queried)" msgstr "(nicht abgefragt)" -#: builtin/remote.c:1162 +#: builtin/remote.c:1166 msgid "(unknown)" msgstr "(unbekannt)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1170 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -12325,172 +12446,172 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1178 +#: builtin/remote.c:1182 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1181 builtin/remote.c:1207 +#: builtin/remote.c:1185 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1190 +#: builtin/remote.c:1194 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokaler Branch konfiguriert für 'git pull':" msgstr[1] " Lokale Branches konfiguriert für 'git pull':" -#: builtin/remote.c:1198 +#: builtin/remote.c:1202 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1204 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1227 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1242 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1244 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen " "aus mit:" -#: builtin/remote.c:1254 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1262 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1282 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1283 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1293 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1294 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1313 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1437 +#: builtin/remote.c:1441 msgid "add branch" msgstr "Branch hinzufügen" -#: builtin/remote.c:1444 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1461 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "nur URLs für Push ausgeben" -#: builtin/remote.c:1463 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "alle URLs ausgeben" -#: builtin/remote.c:1491 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Keine URLs für Remote-Repository '%s' konfiguriert." -#: builtin/remote.c:1517 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "URLs für \"push\" manipulieren" -#: builtin/remote.c:1519 +#: builtin/remote.c:1523 msgid "add URL" msgstr "URL hinzufügen" -#: builtin/remote.c:1521 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "URLs löschen" -#: builtin/remote.c:1528 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1569 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/remote.c:1593 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" -#: builtin/remote.c:1624 +#: builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" -#: builtin/repack.c:17 +#: builtin/repack.c:18 msgid "git repack [<options>]" msgstr "git repack [<Optionen>]" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -12499,126 +12620,130 @@ msgstr "" "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n" "Konfiguration." -#: builtin/repack.c:166 +#: builtin/repack.c:168 msgid "pack everything in a single pack" msgstr "alles in eine einzige Pack-Datei packen" -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "same as -a, and turn unreachable objects loose" msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht" -#: builtin/repack.c:171 +#: builtin/repack.c:173 msgid "remove redundant packs, and run git-prune-packed" msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "--no-reuse-delta an git-pack-objects übergeben" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-object to git-pack-objects" msgstr "--no-reuse-object an git-pack-objects übergeben" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "do not run git-update-server-info" msgstr "git-update-server-info nicht ausführen" -#: builtin/repack.c:180 +#: builtin/repack.c:182 msgid "pass --local to git-pack-objects" msgstr "--local an git-pack-objects übergeben" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "write bitmap index" msgstr "Bitmap-Index schreiben" -#: builtin/repack.c:183 +#: builtin/repack.c:185 msgid "approxidate" msgstr "Datumsangabe" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "with -A, do not loosen objects older than this" msgstr "mit -A, keine Objekte älter als dieses Datum löschen" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -a, repack unreachable objects" msgstr "mit -a, nicht erreichbare Objekte neu packen" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "size of the window used for delta compression" msgstr "Größe des Fensters für die Delta-Kompression" -#: builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:191 builtin/repack.c:197 msgid "bytes" msgstr "Bytes" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "gleiches wie oben, aber die Speichergröße anstatt der\n" "Anzahl der Einträge limitieren" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "limits the maximum delta depth" msgstr "die maximale Delta-Tiefe limitieren" -#: builtin/repack.c:194 +#: builtin/repack.c:196 +msgid "limits the maximum number of threads" +msgstr "maximale Anzahl von Threads limitieren" + +#: builtin/repack.c:198 msgid "maximum size of each packfile" msgstr "maximale Größe für jede Paketdatei" -#: builtin/repack.c:196 +#: builtin/repack.c:200 msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:206 +#: builtin/repack.c:210 msgid "cannot delete packs in a precious-objects repo" msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen" -#: builtin/repack.c:210 +#: builtin/repack.c:214 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable und -A sind inkompatibel" -#: builtin/repack.c:400 builtin/worktree.c:115 +#: builtin/repack.c:406 builtin/worktree.c:116 #, c-format msgid "failed to remove '%s'" msgstr "Fehler beim Löschen von '%s'" -#: builtin/replace.c:19 +#: builtin/replace.c:20 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <Objekt> <Ersetzung>" -#: builtin/replace.c:20 +#: builtin/replace.c:21 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <Objekt>" -#: builtin/replace.c:21 +#: builtin/replace.c:22 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <Commit> [<Eltern-Commit>...]" -#: builtin/replace.c:22 +#: builtin/replace.c:23 msgid "git replace -d <object>..." msgstr "git replace -d <Objekt>..." -#: builtin/replace.c:23 +#: builtin/replace.c:24 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<Format>] [-l [<Muster>]]" -#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 +#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 #, c-format msgid "Not a valid object name: '%s'" msgstr "Ungültiger Objekt-Name: '%s'" -#: builtin/replace.c:360 +#: builtin/replace.c:361 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ungültiger Merge-Tag in Commit '%s'" -#: builtin/replace.c:362 +#: builtin/replace.c:363 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "fehlerhafter Merge-Tag in Commit '%s'" -#: builtin/replace.c:373 +#: builtin/replace.c:374 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12627,206 +12752,206 @@ msgstr "" "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n" "wird; benutzen Sie --edit anstatt --graft" -#: builtin/replace.c:406 +#: builtin/replace.c:407 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "Der ursprüngliche Commit '%s' hat eine GPG-Signatur." -#: builtin/replace.c:407 +#: builtin/replace.c:408 msgid "the signature will be removed in the replacement commit!" msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!" -#: builtin/replace.c:413 +#: builtin/replace.c:414 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben" -#: builtin/replace.c:437 +#: builtin/replace.c:438 msgid "list replace refs" msgstr "ersetzende Referenzen auflisten" -#: builtin/replace.c:438 +#: builtin/replace.c:439 msgid "delete replace refs" msgstr "ersetzende Referenzen löschen" -#: builtin/replace.c:439 +#: builtin/replace.c:440 msgid "edit existing object" msgstr "existierendes Objekt bearbeiten" -#: builtin/replace.c:440 +#: builtin/replace.c:441 msgid "change a commit's parents" msgstr "Eltern-Commits eines Commits ändern" -#: builtin/replace.c:441 +#: builtin/replace.c:442 msgid "replace the ref if it exists" msgstr "die Referenz ersetzen, wenn sie existiert" -#: builtin/replace.c:442 +#: builtin/replace.c:443 msgid "do not pretty-print contents for --edit" msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit" -#: builtin/replace.c:443 +#: builtin/replace.c:444 msgid "use this format" msgstr "das angegebene Format benutzen" -#: builtin/rerere.c:12 +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "saubere Auflösungen im Index registrieren" -#: builtin/reset.c:26 +#: builtin/reset.c:29 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]" -#: builtin/reset.c:27 +#: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfade>..." -#: builtin/reset.c:28 +#: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "soft" msgstr "soft" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "hard" msgstr "hard" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "merge" msgstr "zusammenführen" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "keep" msgstr "keep" -#: builtin/reset.c:74 +#: builtin/reset.c:77 msgid "You do not have a valid HEAD." msgstr "Sie haben keinen gültigen HEAD." -#: builtin/reset.c:76 +#: builtin/reset.c:79 msgid "Failed to find tree of HEAD." msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD." -#: builtin/reset.c:82 +#: builtin/reset.c:85 #, c-format msgid "Failed to find tree of %s." msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." -#: builtin/reset.c:100 +#: builtin/reset.c:103 #, c-format msgid "HEAD is now at %s" msgstr "HEAD ist jetzt bei %s" -#: builtin/reset.c:183 +#: builtin/reset.c:186 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist." -#: builtin/reset.c:276 +#: builtin/reset.c:286 msgid "be quiet, only report errors" msgstr "weniger Ausgaben, meldet nur Fehler" -#: builtin/reset.c:278 +#: builtin/reset.c:288 msgid "reset HEAD and index" msgstr "HEAD und Index umsetzen" -#: builtin/reset.c:279 +#: builtin/reset.c:289 msgid "reset only HEAD" msgstr "nur HEAD umsetzen" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:291 builtin/reset.c:293 msgid "reset HEAD, index and working tree" msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen" -#: builtin/reset.c:285 +#: builtin/reset.c:295 msgid "reset HEAD but keep local changes" msgstr "HEAD umsetzen, aber lokale Änderungen behalten" -#: builtin/reset.c:288 +#: builtin/reset.c:301 msgid "record only the fact that removed paths will be added later" msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen" -#: builtin/reset.c:305 +#: builtin/reset.c:320 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Konnte '%s' nicht als gültigen Commit auflösen." -#: builtin/reset.c:313 +#: builtin/reset.c:328 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen." -#: builtin/reset.c:322 +#: builtin/reset.c:337 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: builtin/reset.c:331 +#: builtin/reset.c:346 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- " "<Pfade>'." -#: builtin/reset.c:333 +#: builtin/reset.c:348 #, c-format msgid "Cannot do %s reset with paths." msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich." -#: builtin/reset.c:343 +#: builtin/reset.c:358 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt" -#: builtin/reset.c:347 +#: builtin/reset.c:362 msgid "-N can only be used with --mixed" msgstr "-N kann nur mit -mixed benutzt werden" -#: builtin/reset.c:364 +#: builtin/reset.c:379 msgid "Unstaged changes after reset:" msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:" -#: builtin/reset.c:370 +#: builtin/reset.c:385 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen." -#: builtin/reset.c:374 +#: builtin/reset.c:389 msgid "Could not write new index file." msgstr "Konnte neue Index-Datei nicht schreiben." -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:358 msgid "rev-list does not support display of notes" msgstr "rev-list unterstützt keine Anzeige von Notizen" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:394 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:399 msgid "keep the `--` passed as an arg" msgstr "`--` als Argument lassen" -#: builtin/rev-parse.c:400 +#: builtin/rev-parse.c:401 msgid "stop parsing after the first non-option argument" msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen" -#: builtin/rev-parse.c:403 +#: builtin/rev-parse.c:404 msgid "output in stuck long form" msgstr "" "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')" -#: builtin/rev-parse.c:534 +#: builtin/rev-parse.c:535 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12841,96 +12966,96 @@ msgstr "" "Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei " "erster Verwendung aus." -#: builtin/revert.c:22 +#: builtin/revert.c:23 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<Optionen>] <Commit-Angabe>..." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert <subcommand>" msgstr "git revert <Unterbefehl>" -#: builtin/revert.c:28 +#: builtin/revert.c:29 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..." -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <Unterbefehl>" -#: builtin/revert.c:89 +#: builtin/revert.c:90 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kann nicht mit %s verwendet werden" -#: builtin/revert.c:98 +#: builtin/revert.c:99 msgid "end revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "resume revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "cancel revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "don't automatically commit" msgstr "nicht automatisch committen" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "edit the commit message" msgstr "Commit-Beschreibung bearbeiten" -#: builtin/revert.c:105 +#: builtin/revert.c:106 msgid "parent-number" msgstr "Nummer des Elternteils" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "select mainline parent" msgstr "Elternteil der Hauptlinie auswählen" -#: builtin/revert.c:108 +#: builtin/revert.c:109 msgid "merge strategy" msgstr "Merge-Strategie" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "option" msgstr "Option" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option for merge strategy" msgstr "Option für Merge-Strategie" -#: builtin/revert.c:119 +#: builtin/revert.c:120 msgid "append commit name" msgstr "Commit-Namen anhängen" -#: builtin/revert.c:121 +#: builtin/revert.c:122 msgid "preserve initially empty commits" msgstr "ursprüngliche, leere Commits erhalten" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "allow commits with empty messages" msgstr "Commits mit leerer Beschreibung erlauben" -#: builtin/revert.c:123 +#: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "redundante, leere Commits behalten" -#: builtin/revert.c:211 +#: builtin/revert.c:212 msgid "revert failed" msgstr "\"revert\" fehlgeschlagen" -#: builtin/revert.c:224 +#: builtin/revert.c:225 msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" -#: builtin/rm.c:17 +#: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<Optionen>] [--] <Datei>..." -#: builtin/rm.c:205 +#: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -12945,7 +13070,7 @@ msgstr[1] "" "unterschiedlich\n" "zu der Datei und HEAD:" -#: builtin/rm.c:210 +#: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" @@ -12953,44 +13078,44 @@ msgstr "" "\n" "(benutzen Sie -f, um die Löschung zu erzwingen)" -#: builtin/rm.c:214 +#: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "die folgende Datei hat zum Commit vorgemerkte Änderungen:" msgstr[1] "die folgenden Dateien haben zum Commit vorgemerkte Änderungen:" -#: builtin/rm.c:218 builtin/rm.c:227 +#: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" "\n" -"(benutzen Sie --cached, um die Datei zu behalten, oder -f, um die Entfernung " +"(benutzen Sie --cached, um die Datei zu behalten, oder -f, um das Entfernen " "zu erzwingen)" -#: builtin/rm.c:224 +#: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "die folgende Datei hat lokale Änderungen:" msgstr[1] "die folgenden Dateien haben lokale Änderungen:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "keine gelöschten Dateien auflisten" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "nur aus dem Index entfernen" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "die \"up-to-date\" Prüfung überschreiben" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" -msgstr "rekursive Entfernung erlauben" +msgstr "rekursives Entfernen erlauben" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "mit Rückgabewert 0 beenden, wenn keine Ãœbereinstimmung gefunden wurde" @@ -13009,7 +13134,7 @@ msgstr "git rm: konnte %s nicht löschen" msgid "could not remove '%s'" msgstr "Konnte '%s' nicht löschen" -#: builtin/send-pack.c:18 +#: builtin/send-pack.c:19 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -13022,51 +13147,51 @@ msgstr "" " --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig " "aus." -#: builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "remote name" msgstr "Name des Remote-Repositories" -#: builtin/send-pack.c:175 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "zustandsloses RPC-Protokoll verwenden" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "Referenzen von der Standard-Eingabe lesen" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "Status des Remote-Helpers ausgeben" -#: builtin/shortlog.c:13 +#: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] [<Pfad>...]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:249 msgid "Group by committer rather than author" msgstr "über Commit-Ersteller anstatt Autor gruppieren" -#: builtin/shortlog.c:250 +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren" -#: builtin/shortlog.c:252 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern" -#: builtin/shortlog.c:254 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "die E-Mail-Adresse von jedem Autor anzeigen" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "Ausgabe mit Zeilenumbrüchen" -#: builtin/show-branch.c:10 +#: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -13078,127 +13203,127 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" -#: builtin/show-branch.c:374 +#: builtin/show-branch.c:376 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignoriere %s; kann nicht mehr als %d Referenz behandeln" msgstr[1] "ignoriere %s; kann nicht mehr als %d Referenzen behandeln" -#: builtin/show-branch.c:536 +#: builtin/show-branch.c:530 #, c-format msgid "no matching refs with %s" msgstr "keine übereinstimmenden Referenzen mit %s" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:626 msgid "show remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches anzeigen" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:628 msgid "show remote-tracking branches" msgstr "Remote-Tracking-Branches anzeigen" -#: builtin/show-branch.c:636 +#: builtin/show-branch.c:630 msgid "color '*!+-' corresponding to the branch" msgstr "'*!+-' entsprechend des Branches einfärben" -#: builtin/show-branch.c:638 +#: builtin/show-branch.c:632 msgid "show <n> more commits after the common ancestor" msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:634 msgid "synonym to more=-1" msgstr "Synonym für more=-1" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:635 msgid "suppress naming strings" msgstr "Namen unterdrücken" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:637 msgid "include the current branch" msgstr "den aktuellen Branch einbeziehen" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:639 msgid "name commits with their object names" msgstr "Commits nach ihren Objektnamen benennen" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:641 msgid "show possible merge bases" msgstr "mögliche Merge-Basen anzeigen" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:643 msgid "show refs unreachable from any other ref" msgstr "" "Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:645 msgid "show commits in topological order" msgstr "Commits in topologischer Ordnung anzeigen" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:648 msgid "show only commits not on the first branch" msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:650 msgid "show merges reachable from only one tip" msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:652 msgid "topologically sort, maintaining date order where possible" msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:655 msgid "<n>[,<base>]" msgstr "<n>[,<Basis>]" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen" -#: builtin/show-branch.c:696 +#: builtin/show-branch.c:690 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-" "base" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" msgstr "keine Branches angegeben, und HEAD ist ungültig" -#: builtin/show-branch.c:723 +#: builtin/show-branch.c:717 msgid "--reflog option needs one branch name" msgstr "Die Option --reflog benötigt einen Branchnamen." -#: builtin/show-branch.c:726 +#: builtin/show-branch.c:720 #, 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] "nur %d Eintrag kann zur selben Zeit angezeigt werden" msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden" -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:724 #, c-format msgid "no such ref %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/show-branch.c:814 +#: builtin/show-branch.c:808 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "Kann nicht mehr als %d Commit behandeln." msgstr[1] "Kann nicht mehr als %d Commits behandeln." -#: builtin/show-branch.c:818 +#: builtin/show-branch.c:812 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' ist keine gültige Referenz." -#: builtin/show-branch.c:821 +#: builtin/show-branch.c:815 #, c-format msgid "cannot find commit %s (%s)" msgstr "kann Commit %s (%s) nicht finden" @@ -13251,35 +13376,35 @@ msgstr "" "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " "Repository befinden" -#: builtin/stripspace.c:17 +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "" "alle Zeilen, die mit dem Kommentarzeichen beginnen, überspringen und " "entfernen" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Vollständiger Referenzname erwartet, %s erhalten" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:72 #, c-format msgid "cannot strip one component off url '%s'" msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" @@ -13489,50 +13614,46 @@ msgstr "Rekursion in Submodule durchführen" msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<Pfad>...]" -#: builtin/submodule--helper.c:1226 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden" - -#: builtin/submodule--helper.c:1233 +#: builtin/submodule--helper.c:1232 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" -#: builtin/submodule--helper.c:1239 +#: builtin/submodule--helper.c:1238 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <Name>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:41 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" "Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:42 msgid "delete symbolic ref" msgstr "symbolische Referenzen löschen" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:43 msgid "shorten ref output" msgstr "verkürzte Ausgabe der Referenzen" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason" msgstr "Grund" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason of the update" msgstr "Grund für die Aktualisierung" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" @@ -13540,11 +13661,11 @@ msgstr "" "git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>] " "<Tagname> [<Commit>]" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "git tag -d <tagname>..." msgstr "git tag -d <Tagname>..." -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -13554,21 +13675,21 @@ msgstr "" "points-at <Objekt>]\n" "\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]" -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<Format>] <Tagname>..." -#: builtin/tag.c:83 +#: builtin/tag.c:84 #, c-format msgid "tag '%s' not found." msgstr "Tag '%s' nicht gefunden." -#: builtin/tag.c:99 +#: builtin/tag.c:100 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' gelöscht (war %s)\n" -#: builtin/tag.c:128 +#: builtin/tag.c:129 #, c-format msgid "" "\n" @@ -13581,7 +13702,7 @@ msgstr "" " %s\n" "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:132 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -13596,348 +13717,348 @@ msgstr "" "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n" "selbst entfernen wenn Sie möchten.\n" -#: builtin/tag.c:210 +#: builtin/tag.c:211 msgid "unable to sign the tag" msgstr "konnte Tag nicht signieren" -#: builtin/tag.c:212 +#: builtin/tag.c:213 msgid "unable to write tag file" msgstr "konnte Tag-Datei nicht schreiben" -#: builtin/tag.c:236 +#: builtin/tag.c:237 msgid "bad object type." msgstr "ungültiger Objekt-Typ" -#: builtin/tag.c:282 +#: builtin/tag.c:283 msgid "no tag message?" msgstr "keine Tag-Beschreibung?" -#: builtin/tag.c:289 +#: builtin/tag.c:290 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Tag-Beschreibung wurde gelassen in %s\n" -#: builtin/tag.c:397 +#: builtin/tag.c:398 msgid "list tag names" msgstr "Tagnamen auflisten" -#: builtin/tag.c:399 +#: builtin/tag.c:400 msgid "print <n> lines of each tag message" msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen" -#: builtin/tag.c:401 +#: builtin/tag.c:402 msgid "delete tags" msgstr "Tags löschen" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "verify tags" msgstr "Tags überprüfen" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "Tag creation options" msgstr "Optionen für Erstellung von Tags" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "annotated tag, needs a message" msgstr "annotiertes Tag, benötigt eine Beschreibung" -#: builtin/tag.c:408 +#: builtin/tag.c:409 msgid "tag message" msgstr "Tag-Beschreibung" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "annotated and GPG-signed tag" msgstr "annotiertes und GPG-signiertes Tag" -#: builtin/tag.c:414 +#: builtin/tag.c:415 msgid "use another key to sign the tag" msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:416 builtin/update-ref.c:368 +#: builtin/tag.c:417 builtin/update-ref.c:369 msgid "create a reflog" msgstr "Reflog erstellen" -#: builtin/tag.c:418 +#: builtin/tag.c:419 msgid "Tag listing options" msgstr "Optionen für Auflistung der Tags" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:421 builtin/tag.c:423 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:422 builtin/tag.c:424 msgid "print only tags that don't contain the commit" msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "print only tags that are merged" msgstr "nur Tags ausgeben, die gemerged wurden" -#: builtin/tag.c:425 +#: builtin/tag.c:426 msgid "print only tags that are not merged" msgstr "nur Tags ausgeben, die nicht gemerged wurden" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags of the object" msgstr "nur Tags von dem Objekt ausgeben" -#: builtin/tag.c:469 +#: builtin/tag.c:470 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:491 +#: builtin/tag.c:492 msgid "-n option is only allowed in list mode" msgstr "Die Option -n ist nur im Listenmodus erlaubt." -#: builtin/tag.c:493 +#: builtin/tag.c:494 msgid "--contains option is only allowed in list mode" msgstr "Die Option --contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:495 +#: builtin/tag.c:496 msgid "--no-contains option is only allowed in list mode" msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:497 +#: builtin/tag.c:498 msgid "--points-at option is only allowed in list mode" msgstr "Die Option --points-at ist nur im Listenmodus erlaubt." -#: builtin/tag.c:499 +#: builtin/tag.c:500 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt." -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:529 +#: builtin/tag.c:530 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:535 +#: builtin/tag.c:536 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:540 +#: builtin/tag.c:541 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:570 +#: builtin/tag.c:571 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" -#: builtin/unpack-objects.c:493 +#: builtin/unpack-objects.c:494 msgid "Unpacking objects" msgstr "Entpacke Objekte" -#: builtin/update-index.c:79 +#: builtin/update-index.c:80 #, c-format msgid "failed to create directory %s" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/update-index.c:85 +#: builtin/update-index.c:86 #, c-format msgid "failed to stat %s" msgstr "Konnte '%s' nicht lesen" -#: builtin/update-index.c:95 +#: builtin/update-index.c:96 #, c-format msgid "failed to create file %s" msgstr "Konnte Datei '%s' nicht erstellen" -#: builtin/update-index.c:103 +#: builtin/update-index.c:104 #, c-format msgid "failed to delete file %s" msgstr "Konnte Datei '%s' nicht löschen" -#: builtin/update-index.c:110 builtin/update-index.c:216 +#: builtin/update-index.c:111 builtin/update-index.c:217 #, c-format msgid "failed to delete directory %s" msgstr "Konnte Verzeichnis '%s' nicht löschen" -#: builtin/update-index.c:135 +#: builtin/update-index.c:136 #, c-format msgid "Testing mtime in '%s' " msgstr "Prüfe mtime in '%s' " -#: builtin/update-index.c:149 +#: builtin/update-index.c:150 msgid "directory stat info does not change after adding a new file" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht " "geändert" -#: builtin/update-index.c:162 +#: builtin/update-index.c:163 msgid "directory stat info does not change after adding a new directory" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen eines neuen " "Verzeichnisses nicht geändert" -#: builtin/update-index.c:175 +#: builtin/update-index.c:176 msgid "directory stat info changes after updating a file" msgstr "" "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert" -#: builtin/update-index.c:186 +#: builtin/update-index.c:187 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein " "Unterverzeichnis geändert" -#: builtin/update-index.c:197 +#: builtin/update-index.c:198 msgid "directory stat info does not change after deleting a file" msgstr "" "Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht " "geändert" -#: builtin/update-index.c:210 +#: builtin/update-index.c:211 msgid "directory stat info does not change after deleting a directory" msgstr "" "Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses " "nicht geändert" -#: builtin/update-index.c:217 +#: builtin/update-index.c:218 msgid " OK" msgstr " OK" -#: builtin/update-index.c:568 +#: builtin/update-index.c:569 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:923 +#: builtin/update-index.c:924 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss" -#: builtin/update-index.c:926 +#: builtin/update-index.c:927 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:929 +#: builtin/update-index.c:930 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:931 +#: builtin/update-index.c:932 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:933 +#: builtin/update-index.c:934 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:935 +#: builtin/update-index.c:936 msgid "refresh even if index contains unmerged entries" msgstr "" "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet" -#: builtin/update-index.c:938 +#: builtin/update-index.c:939 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:942 +#: builtin/update-index.c:943 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:946 +#: builtin/update-index.c:947 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:947 +#: builtin/update-index.c:948 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:956 +#: builtin/update-index.c:957 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:959 +#: builtin/update-index.c:960 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:962 +#: builtin/update-index.c:963 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:965 +#: builtin/update-index.c:966 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:968 +#: builtin/update-index.c:969 msgid "add to index only; do not add content to object database" msgstr "" "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-" "Datenbank hinzugefügt" -#: builtin/update-index.c:970 +#: builtin/update-index.c:971 msgid "remove named paths even if present in worktree" msgstr "" "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden" -#: builtin/update-index.c:972 +#: builtin/update-index.c:973 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "read list of paths to be updated from standard input" msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen" -#: builtin/update-index.c:978 +#: builtin/update-index.c:979 msgid "add entries from standard input to the index" msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:982 +#: builtin/update-index.c:983 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "only update entries that differ from HEAD" msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:993 +#: builtin/update-index.c:994 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1000 msgid "write index in this format" msgstr "Index-Datei in diesem Format schreiben" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1002 msgid "enable or disable split index" msgstr "Splitting des Index aktivieren oder deaktivieren" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1004 msgid "enable/disable untracked cache" msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "test if the filesystem supports untracked cache" msgstr "" "prüfen ob das Dateisystem einen Cache für unversionierte Dateien unterstützt" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1008 msgid "enable untracked cache without testing the filesystem" msgstr "" "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1108 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13945,7 +14066,7 @@ msgstr "" "core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn sie wirklich das Splitting des Index aktivieren möchten." -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1117 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13953,7 +14074,7 @@ msgstr "" "core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn Sie wirklich das Splitting des Index deaktivieren möchten." -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1128 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13961,11 +14082,11 @@ msgstr "" "core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten." -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "Untracked cache disabled" msgstr "Cache für unversionierte Dateien deaktiviert" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1140 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13974,241 +14095,241 @@ msgstr "" "dies,\n" "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten." -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1144 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache für unversionierte Dateien für '%s' aktiviert" -#: builtin/update-ref.c:9 +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<Optionen>] -d <Referenzname> [<alter-Wert>]" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" "git update-ref [<Optionen>] <Referenzname> <neuer-Wert> [<alter-Wert>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<Optionen>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "diese Referenz löschen" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "<Referenzname> aktualisieren, nicht den Verweis" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "Aktualisierungen von der Standard-Eingabe lesen" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "die Informationsdateien von Grund auf aktualisieren" -#: builtin/verify-commit.c:17 +#: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <Commit>..." -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:73 msgid "print commit contents" msgstr "Commit-Inhalte ausgeben" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <Paket>..." -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "erweiterte Ausgaben" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "nur Statistiken anzeigen" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..." -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "Tag-Inhalte ausgeben" -#: builtin/worktree.c:15 +#: builtin/worktree.c:16 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<Optionen>] <Pfad> [<Branch>]" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree list [<options>]" msgstr "git worktree list [<Optionen>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<Optionen>] <Pfad>" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<Optionen>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree unlock <path>" msgstr "git worktree unlock <Pfad>" -#: builtin/worktree.c:43 +#: builtin/worktree.c:44 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis" -#: builtin/worktree.c:49 +#: builtin/worktree.c:50 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht" -#: builtin/worktree.c:54 +#: builtin/worktree.c:55 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" -#: builtin/worktree.c:65 +#: builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Lösche worktrees/%s: ungültige gitdir-Datei" -#: builtin/worktree.c:81 +#: builtin/worktree.c:82 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort" -#: builtin/worktree.c:128 +#: builtin/worktree.c:129 msgid "report pruned working trees" msgstr "entfernte Arbeitsverzeichnisse ausgeben" -#: builtin/worktree.c:130 +#: builtin/worktree.c:131 msgid "expire working trees older than <time>" msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen" -#: builtin/worktree.c:204 +#: builtin/worktree.c:205 #, c-format msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:235 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:274 +#: builtin/worktree.c:275 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Bereite %s vor (Identifikation %s)" -#: builtin/worktree.c:328 +#: builtin/worktree.c:327 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "<Branch> auschecken, auch wenn dieser bereits in einem anderen " "Arbeitsverzeichnis ausgecheckt ist" -#: builtin/worktree.c:330 +#: builtin/worktree.c:329 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:332 +#: builtin/worktree.c:331 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:334 +#: builtin/worktree.c:333 msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" -#: builtin/worktree.c:335 +#: builtin/worktree.c:334 msgid "keep the new working tree locked" msgstr "das neue Arbeitsverzeichnis gesperrt lassen" -#: builtin/worktree.c:343 +#: builtin/worktree.c:342 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schließen sich gegenseitig aus" -#: builtin/worktree.c:478 +#: builtin/worktree.c:479 msgid "reason for locking" msgstr "Sperrgrund" -#: builtin/worktree.c:490 builtin/worktree.c:523 +#: builtin/worktree.c:491 builtin/worktree.c:524 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ist kein Arbeitsverzeichnis" -#: builtin/worktree.c:492 builtin/worktree.c:525 +#: builtin/worktree.c:493 builtin/worktree.c:526 msgid "The main working tree cannot be locked or unlocked" msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden." -#: builtin/worktree.c:497 +#: builtin/worktree.c:498 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ist bereits gesperrt, Grund: %s" -#: builtin/worktree.c:499 +#: builtin/worktree.c:500 #, c-format msgid "'%s' is already locked" msgstr "'%s' ist bereits gesperrt" -#: builtin/worktree.c:527 +#: builtin/worktree.c:528 #, c-format msgid "'%s' is not locked" msgstr "'%s' ist nicht gesperrt" -#: builtin/write-tree.c:13 +#: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "<Präfix>/" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "nur nützlich für Fehlersuche" -#: upload-pack.c:22 +#: upload-pack.c:23 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<Optionen>] <Verzeichnis>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "nach einem einzigen Request/Response-Austausch beenden" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "direkt nach der initialen Angabe der Commits beenden" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis " "ist" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "Ãœbertragung nach <n> Sekunden Inaktivität unterbrechen" -#: credential-cache--daemon.c:223 +#: credential-cache--daemon.c:224 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14224,11 +14345,11 @@ msgstr "" "\n" "auszuführen." -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben" -#: git.c:14 +#: git.c:15 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" @@ -14239,22 +14360,22 @@ msgstr "" "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n" "Konzept zu erfahren." -#: http.c:336 +#: http.c:337 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d" -#: http.c:357 +#: http.c:358 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt" -#: http.c:366 +#: http.c:367 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n" "nicht unterstützt." -#: http.c:1766 +#: http.c:1764 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14265,7 +14386,7 @@ msgstr "" " gefragt nach: %s\n" " umgeleitet: %s" -#: remote-curl.c:323 +#: remote-curl.c:324 #, c-format msgid "redirecting to %s" msgstr "Leite nach %s um" @@ -14673,6 +14794,10 @@ msgstr "" msgid "Could not move back to $head_name" msgstr "Konnte nicht zu $head_name zurückgehen" +#: git-rebase.sh:169 +msgid "Applied autostash." +msgstr "Automatischen Stash angewendet." + #: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" @@ -14794,39 +14919,39 @@ msgstr "" msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name zu $onto_name vorgespult." -#: git-stash.sh:53 +#: git-stash.sh:54 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear mit Parametern ist nicht implementiert" -#: git-stash.sh:94 +#: git-stash.sh:95 msgid "You do not have the initial commit yet" msgstr "Sie haben bisher noch keinen initialen Commit" -#: git-stash.sh:109 +#: git-stash.sh:110 msgid "Cannot save the current index state" msgstr "Kann den aktuellen Zustand des Index nicht speichern" -#: git-stash.sh:124 +#: git-stash.sh:125 msgid "Cannot save the untracked files" msgstr "Kann die unversionierten Dateien nicht speichern" -#: git-stash.sh:144 git-stash.sh:157 +#: git-stash.sh:145 git-stash.sh:158 msgid "Cannot save the current worktree state" msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern" -#: git-stash.sh:161 +#: git-stash.sh:162 msgid "No changes selected" msgstr "Keine Änderungen ausgewählt" -#: git-stash.sh:164 +#: git-stash.sh:165 msgid "Cannot remove temporary index (can't happen)" msgstr "Kann temporären Index nicht löschen (kann nicht passieren)" -#: git-stash.sh:177 +#: git-stash.sh:178 msgid "Cannot record working tree state" msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen" -#: git-stash.sh:209 +#: git-stash.sh:210 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren." @@ -14841,7 +14966,7 @@ msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren." #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:265 +#: git-stash.sh:266 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14851,108 +14976,108 @@ msgstr "" " Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- " "'$option'\"" -#: git-stash.sh:278 +#: git-stash.sh:281 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden" -#: git-stash.sh:286 +#: git-stash.sh:289 msgid "No local changes to save" msgstr "Keine lokalen Änderungen zum Speichern" -#: git-stash.sh:291 +#: git-stash.sh:294 msgid "Cannot initialize stash" msgstr "Kann \"stash\" nicht initialisieren" -#: git-stash.sh:295 +#: git-stash.sh:298 msgid "Cannot save the current status" msgstr "Kann den aktuellen Status nicht speichern" -#: git-stash.sh:296 +#: git-stash.sh:299 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg" -#: git-stash.sh:323 +#: git-stash.sh:326 msgid "Cannot remove worktree changes" msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen" -#: git-stash.sh:471 +#: git-stash.sh:474 #, sh-format msgid "unknown option: $opt" msgstr "unbekannte Option: $opt" -#: git-stash.sh:484 -msgid "No stash found." -msgstr "Kein Stash-Eintrag gefunden." +#: git-stash.sh:487 +msgid "No stash entries found." +msgstr "Keine Stash-Einträge gefunden." -#: git-stash.sh:491 +#: git-stash.sh:494 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Zu viele Commits angegeben: $REV" -#: git-stash.sh:506 +#: git-stash.sh:509 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ist keine gültige Referenz" -#: git-stash.sh:534 +#: git-stash.sh:537 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' ist kein \"stash\"-artiger Commit" -#: git-stash.sh:545 +#: git-stash.sh:548 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' ist keine \"stash\"-Referenz" -#: git-stash.sh:553 +#: git-stash.sh:556 msgid "unable to refresh index" msgstr "Konnte den Index nicht aktualisieren." -#: git-stash.sh:557 +#: git-stash.sh:560 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist" -#: git-stash.sh:565 +#: git-stash.sh:568 msgid "Conflicts in index. Try without --index." msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: git-stash.sh:567 +#: git-stash.sh:570 msgid "Could not save index tree" msgstr "Konnte Index-Verzeichnis nicht speichern" -#: git-stash.sh:576 -msgid "Could not restore untracked files from stash" -msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen" +#: git-stash.sh:579 +msgid "Could not restore untracked files from stash entry" +msgstr "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen." -#: git-stash.sh:601 +#: git-stash.sh:604 msgid "Cannot unstage modified files" msgstr "Kann geänderte Dateien nicht aus dem Index entfernen" -#: git-stash.sh:616 +#: git-stash.sh:619 msgid "Index was not unstashed." msgstr "Index wurde nicht aus dem Stash zurückgeladen." -#: git-stash.sh:630 -msgid "The stash is kept in case you need it again." -msgstr "Der Stash wird behalten, im Falle Sie benötigen diesen nochmal." +#: git-stash.sh:633 +msgid "The stash entry is kept in case you need it again." +msgstr "Der Stash-Eintrag wird behalten, im Falle Sie benötigen diesen nochmal." -#: git-stash.sh:639 +#: git-stash.sh:642 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Gelöscht ${REV} ($s)" -#: git-stash.sh:640 +#: git-stash.sh:643 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" -#: git-stash.sh:648 +#: git-stash.sh:651 msgid "No branch name specified" msgstr "Kein Branchname spezifiziert" -#: git-stash.sh:727 +#: git-stash.sh:730 msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" @@ -14977,7 +15102,7 @@ msgstr "'$sm_path' ist bereits zum Commit vorgemerkt" msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul" -#: git-submodule.sh:218 +#: git-submodule.sh:219 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -14988,24 +15113,24 @@ msgstr "" "$sm_path\n" "Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten." -#: git-submodule.sh:236 +#: git-submodule.sh:237 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu." -#: git-submodule.sh:238 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository" -#: git-submodule.sh:246 +#: git-submodule.sh:247 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-" "Repositories:" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -15023,49 +15148,49 @@ msgstr "" "nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n" "wählen Sie einen anderen Namen mit der Option '--name'." -#: git-submodule.sh:254 +#: git-submodule.sh:255 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'." -#: git-submodule.sh:266 +#: git-submodule.sh:267 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kann Submodul '$sm_path' nicht auschecken" -#: git-submodule.sh:271 +#: git-submodule.sh:272 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen" -#: git-submodule.sh:280 +#: git-submodule.sh:281 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:341 +#: git-submodule.sh:342 #, sh-format msgid "Entering '$displaypath'" msgstr "Betrete '$displaypath'" -#: git-submodule.sh:361 +#: git-submodule.sh:362 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück." -#: git-submodule.sh:432 +#: git-submodule.sh:433 #, sh-format msgid "pathspec and --all are incompatible" msgstr "Pfadspezifikationen und --all sind inkompatibel." -#: git-submodule.sh:437 +#: git-submodule.sh:438 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n" "möchten." -#: git-submodule.sh:457 +#: git-submodule.sh:458 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -15077,7 +15202,7 @@ msgstr "" "löschen\n" "möchten)" -#: git-submodule.sh:465 +#: git-submodule.sh:466 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -15086,41 +15211,41 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; " "verwenden Sie '-f', um diese zu verwerfen" -#: git-submodule.sh:468 +#: git-submodule.sh:469 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Verzeichnis '$displaypath' bereinigt." -#: git-submodule.sh:469 +#: git-submodule.sh:470 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen." -#: git-submodule.sh:472 +#: git-submodule.sh:473 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" "Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen." -#: git-submodule.sh:481 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration " "entfernt." -#: git-submodule.sh:637 +#: git-submodule.sh:638 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:647 +#: git-submodule.sh:648 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen" -#: git-submodule.sh:652 +#: git-submodule.sh:653 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -15129,12 +15254,12 @@ msgstr "" "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n" "'$sm_path' nicht finden." -#: git-submodule.sh:670 +#: git-submodule.sh:671 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen" -#: git-submodule.sh:676 +#: git-submodule.sh:677 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -15143,85 +15268,85 @@ msgstr "" "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n" "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen." -#: git-submodule.sh:683 +#: git-submodule.sh:684 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:684 +#: git-submodule.sh:685 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:688 +#: git-submodule.sh:689 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich" -#: git-submodule.sh:689 +#: git-submodule.sh:690 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:694 +#: git-submodule.sh:695 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:695 +#: git-submodule.sh:696 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:700 +#: git-submodule.sh:701 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' " "fehlgeschlagen" -#: git-submodule.sh:701 +#: git-submodule.sh:702 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:732 +#: git-submodule.sh:733 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:840 +#: git-submodule.sh:841 msgid "The --cached option cannot be used with the --files option" msgstr "" "Die Optionen --cached und --files können nicht gemeinsam verwendet werden." -#: git-submodule.sh:892 +#: git-submodule.sh:893 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:912 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:915 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:918 +#: git-submodule.sh:919 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst" -#: git-submodule.sh:1064 +#: git-submodule.sh:1065 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'" -#: git-submodule.sh:1136 +#: git-submodule.sh:1137 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisiere Submodul-URL für '$displaypath'" @@ -15726,81 +15851,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen." #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:238 +#: git-add--interactive.perl:196 #, perl-format msgid "%12s %12s %s" msgstr "%28s %25s %s" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "staged" msgstr "zur Staging-Area hinzugefügt" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "unstaged" msgstr "aus Staging-Area entfernt" -#: git-add--interactive.perl:288 git-add--interactive.perl:313 +#: git-add--interactive.perl:246 git-add--interactive.perl:271 msgid "binary" msgstr "Binär" -#: git-add--interactive.perl:297 git-add--interactive.perl:351 +#: git-add--interactive.perl:255 git-add--interactive.perl:309 msgid "nothing" msgstr "Nichts" -#: git-add--interactive.perl:333 git-add--interactive.perl:348 +#: git-add--interactive.perl:291 git-add--interactive.perl:306 msgid "unchanged" msgstr "unverändert" -#: git-add--interactive.perl:644 +#: git-add--interactive.perl:602 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d Pfad hinzugefügt\n" msgstr[1] "%d Pfade hinzugefügt\n" -#: git-add--interactive.perl:647 +#: git-add--interactive.perl:605 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d Pfad aktualisiert\n" msgstr[1] "%d Pfade aktualisiert\n" -#: git-add--interactive.perl:650 +#: git-add--interactive.perl:608 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d Pfad wiederhergestellt\n" msgstr[1] "%d Pfade wiederhergestellt\n" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:611 #, 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" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:620 msgid "Update" msgstr "Aktualisieren" -#: git-add--interactive.perl:674 +#: git-add--interactive.perl:632 msgid "Revert" msgstr "Revert" -#: git-add--interactive.perl:697 +#: git-add--interactive.perl:655 #, perl-format msgid "note: %s is untracked now.\n" msgstr "Hinweis: %s ist nun unversioniert.\n" -#: git-add--interactive.perl:708 +#: git-add--interactive.perl:666 msgid "Add untracked" msgstr "unversionierte Dateien hinzufügen" -#: git-add--interactive.perl:714 +#: git-add--interactive.perl:672 msgid "No untracked files.\n" msgstr "Keine unversionierten Dateien.\n" -#: git-add--interactive.perl:1030 +#: git-add--interactive.perl:985 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -15809,7 +15934,7 @@ msgstr "" "Block\n" "direkt als zum Hinzufügen zur Staging-Area markiert." -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:988 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -15818,7 +15943,7 @@ msgstr "" "Block\n" "direkt als zum Hinzufügen zum Stash markiert." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:991 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -15827,7 +15952,7 @@ msgstr "" "Block\n" "direkt als zum Entfernen aus der Staging-Area markiert." -#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 +#: git-add--interactive.perl:994 git-add--interactive.perl:1003 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -15836,7 +15961,7 @@ msgstr "" "Block\n" "direkt als zum Anwenden markiert." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 +#: git-add--interactive.perl:997 git-add--interactive.perl:1000 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -15845,19 +15970,19 @@ msgstr "" "Block\n" "direkt als zum Verwerfen markiert." -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1013 #, 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" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1014 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n" "Kurzanleitung.\n" -#: git-add--interactive.perl:1065 +#: git-add--interactive.perl:1020 #, perl-format msgid "" "---\n" @@ -15871,7 +15996,7 @@ msgstr "" "Zeilen, die mit %s beginnen, werden entfernt.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1073 +#: git-add--interactive.perl:1028 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" @@ -15882,7 +16007,7 @@ msgstr "" "werden,\n" "wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n" -#: git-add--interactive.perl:1087 +#: git-add--interactive.perl:1042 #, 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" @@ -15893,14 +16018,14 @@ msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" #. 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:1178 +#: git-add--interactive.perl:1134 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n" "Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?" -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1143 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15916,7 +16041,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit " "vormerken" -#: git-add--interactive.perl:1193 +#: git-add--interactive.perl:1149 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15930,7 +16055,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen" -#: git-add--interactive.perl:1199 +#: git-add--interactive.perl:1155 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15944,7 +16069,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen" -#: git-add--interactive.perl:1205 +#: git-add--interactive.perl:1161 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15961,7 +16086,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index " "anwenden" -#: git-add--interactive.perl:1211 +#: git-add--interactive.perl:1167 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15978,7 +16103,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " "Arbeitsverzeichnis verwerfen" -#: git-add--interactive.perl:1217 +#: git-add--interactive.perl:1173 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15993,7 +16118,7 @@ msgstr "" "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" -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -16007,7 +16132,7 @@ msgstr "" "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" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1188 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -16031,203 +16156,203 @@ msgstr "" "e - aktuellen Patch-Block manuell editieren\n" "? - Hilfe anzeigen\n" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1219 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" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? " -#: git-add--interactive.perl:1267 +#: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" msgstr "Nichts angewendet.\n" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1234 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignoriere nicht zusammengeführte Datei: %s\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1243 msgid "Only binary files changed.\n" msgstr "Nur Binärdateien geändert.\n" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl:1245 msgid "No changes.\n" msgstr "Keine Änderungen.\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1253 msgid "Patch update" msgstr "Patch Aktualisierung" -#: git-add--interactive.perl:1349 +#: git-add--interactive.perl:1305 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1350 +#: git-add--interactive.perl:1306 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1351 +#: git-add--interactive.perl:1307 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1354 +#: git-add--interactive.perl:1310 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung stashen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1311 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "Löschung stashen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1356 +#: git-add--interactive.perl:1312 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "Diesen Patch-Block stashen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1315 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1316 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1361 +#: git-add--interactive.perl:1317 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1320 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung auf Index anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1321 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "Löschung auf Index anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1366 +#: git-add--interactive.perl:1322 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1325 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1326 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1371 +#: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1330 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1331 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1376 +#: git-add--interactive.perl:1332 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/" "%s,?]? " -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1335 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1336 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1381 +#: git-add--interactive.perl:1337 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/" "%s,?]? " -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? " -#: git-add--interactive.perl:1486 +#: git-add--interactive.perl:1442 msgid "go to which hunk? " msgstr "zu welchem Patch-Block springen? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1451 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ungültige Nummer: '%s'\n" -#: git-add--interactive.perl:1500 +#: git-add--interactive.perl:1456 #, 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" -#: git-add--interactive.perl:1526 +#: git-add--interactive.perl:1482 msgid "search for regex? " msgstr "Suche nach regulärem Ausdruck? " -#: git-add--interactive.perl:1539 +#: git-add--interactive.perl:1495 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n" -#: git-add--interactive.perl:1549 +#: git-add--interactive.perl:1505 msgid "No hunk matches the given pattern\n" msgstr "Kein Patch-Block entspricht dem angegebenen Pattern\n" -#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 +#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 msgid "No previous hunk\n" msgstr "Kein vorheriger Patch-Block\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 +#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 msgid "No next hunk\n" msgstr "Kein folgender Patch-Block\n" -#: git-add--interactive.perl:1597 +#: git-add--interactive.perl:1553 #, 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" -#: git-add--interactive.perl:1649 +#: git-add--interactive.perl:1605 msgid "Review diff" msgstr "Diff überprüfen" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1668 +#: git-add--interactive.perl:1624 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -16246,88 +16371,88 @@ msgstr "" "diff - Unterschiede zwischen HEAD und Index anzeigen\n" "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n" -#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 -#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 -#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 +#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 +#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 +#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 msgid "missing --" msgstr "-- fehlt" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1662 #, perl-format msgid "unknown --patch mode: %s" msgstr "Unbekannter --patch Modus: %s" -#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 #, perl-format msgid "invalid argument %s, expecting --" msgstr "ungültiges Argument %s, erwarte --" -#: git-send-email.perl:121 +#: git-send-email.perl:126 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" -"lokale Zeitzone unterscheidet sich von GMT nicht um einen Minutenintervall\n" +"lokale Zeitzone unterscheidet sich von GMT nicht um ein Minutenintervall\n" -#: git-send-email.perl:128 git-send-email.perl:134 +#: git-send-email.perl:133 git-send-email.perl:139 msgid "local time offset greater than or equal to 24 hours\n" msgstr "lokaler Zeit-Offset größer oder gleich 24 Stunden\n" -#: git-send-email.perl:202 git-send-email.perl:208 +#: git-send-email.perl:208 git-send-email.perl:214 msgid "the editor exited uncleanly, aborting everything" msgstr "Der Editor wurde unsauber beendet, breche alles ab." -#: git-send-email.perl:282 +#: git-send-email.perl:291 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n" -#: git-send-email.perl:287 +#: git-send-email.perl:296 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' enthält die verfasste E-Mail.\n" -#: git-send-email.perl:305 +#: git-send-email.perl:314 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n" -#: git-send-email.perl:368 git-send-email.perl:623 +#: git-send-email.perl:379 git-send-email.perl:634 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" "Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n" -#: git-send-email.perl:437 +#: git-send-email.perl:448 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Unbekanntes --suppress-cc Feld: '%s'\n" -#: git-send-email.perl:466 +#: git-send-email.perl:477 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Unbekannte --confirm Einstellung: '%s'\n" -#: git-send-email.perl:498 +#: git-send-email.perl:509 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "Warnung: sendemail Alias mit Anführungsstrichen wird nicht unterstützt: %s\n" -#: git-send-email.perl:500 +#: git-send-email.perl:511 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n" -#: git-send-email.perl:502 +#: git-send-email.perl:513 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstützt: %s\n" -#: git-send-email.perl:507 +#: git-send-email.perl:518 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n" -#: git-send-email.perl:589 +#: git-send-email.perl:600 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -16344,12 +16469,12 @@ msgstr "" " * die Option --format-patch angeben, wenn Sie einen Commit-Bereich " "meinen\n" -#: git-send-email.perl:610 +#: git-send-email.perl:621 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Fehler beim Öffnen von %s: %s" -#: git-send-email.perl:634 +#: git-send-email.perl:645 #, perl-format msgid "" "fatal: %s: %s\n" @@ -16358,7 +16483,7 @@ msgstr "" "fatal: %s: %s\n" "Warnung: Es wurden keine Patches versendet.\n" -#: git-send-email.perl:645 +#: git-send-email.perl:656 msgid "" "\n" "No patch files specified!\n" @@ -16368,17 +16493,17 @@ msgstr "" "keine Patch-Dateien angegeben!\n" "\n" -#: git-send-email.perl:658 +#: git-send-email.perl:669 #, perl-format msgid "No subject line in %s?" msgstr "Keine Betreffzeile in %s?" -#: git-send-email.perl:668 +#: git-send-email.perl:679 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s" -#: git-send-email.perl:678 +#: git-send-email.perl:689 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -16393,32 +16518,32 @@ msgstr "" "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden " "möchten.\n" -#: git-send-email.perl:701 +#: git-send-email.perl:712 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Fehler beim Öffnen von %s.final: %s" -#: git-send-email.perl:704 +#: git-send-email.perl:715 #, perl-format msgid "Failed to open %s: %s" msgstr "Fehler beim Öffnen von %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:750 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "" "To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n" -#: git-send-email.perl:748 +#: git-send-email.perl:759 msgid "Summary email is empty, skipping it\n" msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:780 +#: git-send-email.perl:791 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? " -#: git-send-email.perl:809 +#: git-send-email.perl:820 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -16426,11 +16551,11 @@ msgstr "" "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n" "Content-Transfer-Encoding.\n" -#: git-send-email.perl:814 +#: git-send-email.perl:825 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? " -#: git-send-email.perl:822 +#: git-send-email.perl:833 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16444,22 +16569,22 @@ msgstr "" "an,\n" "wenn Sie den Patch wirklich versenden wollen.\n" -#: git-send-email.perl:841 +#: git-send-email.perl:852 msgid "To whom should the emails be sent (if anyone)?" msgstr "An wen sollen die E-Mails versendet werden (wenn überhaupt jemand)?" -#: git-send-email.perl:859 +#: git-send-email.perl:870 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n" -#: git-send-email.perl:871 +#: git-send-email.perl:882 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine " "existiert)? " -#: git-send-email.perl:921 git-send-email.perl:929 +#: git-send-email.perl:932 git-send-email.perl:940 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n" @@ -16467,18 +16592,18 @@ msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:933 +#: git-send-email.perl:944 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten " "[e]): " -#: git-send-email.perl:1234 +#: git-send-email.perl:1245 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA Pfad \"%s\" existiert nicht" -#: git-send-email.perl:1309 +#: git-send-email.perl:1320 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16507,130 +16632,174 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1324 +#: git-send-email.perl:1335 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Diese E-Mail versenden? (Ja [y]|Nein [n]|Beenden [q]|Alle [a]): " -#: git-send-email.perl:1327 +#: git-send-email.perl:1338 msgid "Send this email reply required" msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich." -#: git-send-email.perl:1353 +#: git-send-email.perl:1364 msgid "The required SMTP server is not properly defined." msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert." -#: git-send-email.perl:1397 +#: git-send-email.perl:1411 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Server unterstützt kein STARTTLS! %s" -#: git-send-email.perl:1403 +#: git-send-email.perl:1416 git-send-email.perl:1420 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "STARTTLS fehlgeschlagen! %s" + +#: git-send-email.perl:1430 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre " "Konfiguration\n" "und benutzen Sie --smtp-debug." -#: git-send-email.perl:1421 +#: git-send-email.perl:1448 #, perl-format msgid "Failed to send %s\n" msgstr "Fehler beim Senden %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Dry-Sent %s\n" msgstr "Probeversand %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Sent %s\n" msgstr "%s gesendet\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "Dry-OK. Log says:\n" msgstr "Probeversand OK. Log enthält:\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "OK. Log says:\n" msgstr "OK. Log enthält:\n" -#: git-send-email.perl:1438 +#: git-send-email.perl:1465 msgid "Result: " msgstr "Ergebnis: " -#: git-send-email.perl:1441 +#: git-send-email.perl:1468 msgid "Result: OK\n" msgstr "Ergebnis: OK\n" -#: git-send-email.perl:1454 +#: git-send-email.perl:1481 #, perl-format msgid "can't open file %s" msgstr "Kann Datei %s nicht öffnen" -#: git-send-email.perl:1501 git-send-email.perl:1521 +#: git-send-email.perl:1528 git-send-email.perl:1548 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1507 +#: git-send-email.perl:1534 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1555 +#: git-send-email.perl:1582 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1578 +#: git-send-email.perl:1605 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1676 +#: git-send-email.perl:1711 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Konnte '%s' nicht ausführen" -#: git-send-email.perl:1683 +#: git-send-email.perl:1718 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Füge %s: %s hinzu von: '%s'\n" -#: git-send-email.perl:1687 +#: git-send-email.perl:1722 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'" -#: git-send-email.perl:1714 +#: git-send-email.perl:1749 msgid "cannot send message as 7bit" msgstr "Kann Nachricht nicht als 7bit versenden." -#: git-send-email.perl:1722 +#: git-send-email.perl:1757 msgid "invalid transfer encoding" msgstr "Ungültiges Transfer-Encoding" -#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 #, perl-format msgid "unable to open %s: %s\n" msgstr "konnte %s nicht öffnen: %s\n" -#: git-send-email.perl:1744 +#: git-send-email.perl:1798 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist" -#: git-send-email.perl:1760 +#: git-send-email.perl:1814 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1764 +#: git-send-email.perl:1818 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " +#~ msgid "Could not open file '%s'" +#~ msgstr "Konnte Datei '%s' nicht öffnen" + +#~ msgid "in %0.1f seconds automatically..." +#~ msgstr "Automatische Ausführung in %0.1f Sekunden ..." + +#~ msgid "dup2(%d,%d) failed" +#~ msgstr "dup2(%d,%d) fehlgeschlagen" + +#~ msgid "Initial commit on " +#~ msgstr "Initialer Commit auf " + +#~ msgid "Patch is empty. Was it split wrong?" +#~ msgstr "Patch ist leer. War dessen Aufteilung falsch?" + +#~ msgid "" +#~ "You still have unmerged paths in your index.\n" +#~ "Did you forget to use 'git add'?" +#~ msgstr "" +#~ "Sie haben immer noch nicht zusammengeführte Pfade im Index.\n" +#~ "Haben Sie vergessen 'git add' zu benutzen?" + +#~ msgid "" +#~ "Cannot update paths and switch to branch '%s' at the same time.\n" +#~ "Did you intend to checkout '%s' which can not be resolved as commit?" +#~ msgstr "" +#~ "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln.\n" +#~ "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit " +#~ "aufgelöst werden kann?" + +#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..." +#~ msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an" + +#~ msgid "default mode for recursion" +#~ msgstr "Standard-Modus für Rekursion" + +#~ msgid "submodule--helper subcommand must be called with a subcommand" +#~ msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden" + #~ msgid "tag: tagging " #~ msgstr "tag: tagge " @@ -28,7 +28,7 @@ # to debug | déboguer # debugging | débogage # to deflate | compresser -# email | e-mail +# email | courriel # entry | élément # fast-forward | avance rapide # fast-forwarded | mis à jour en avance rapide @@ -73,8 +73,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-05-05 09:35+0800\n" -"PO-Revision-Date: 2017-05-05 12:02+0200\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" +"PO-Revision-Date: 2017-07-23 04:35+0200\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -83,37 +83,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -#: advice.c:55 +#: advice.c:58 #, c-format msgid "hint: %.*s\n" msgstr "astuce: %.*s\n" -#: advice.c:83 +#: advice.c:86 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Impossible de picorer car vous avez des fichiers non fusionnés." -#: advice.c:85 +#: advice.c:88 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:87 +#: advice.c:90 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:89 +#: advice.c:92 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:91 +#: advice.c:94 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:93 +#: advice.c:96 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:101 +#: advice.c:104 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." @@ -121,23 +121,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:109 +#: advice.c:112 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:114 builtin/merge.c:1185 +#: advice.c:117 builtin/merge.c:1184 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:116 +#: advice.c:119 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:117 +#: advice.c:120 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:123 +#: advice.c:126 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -169,89 +169,99 @@ msgstr "" " git checkout -b <nom-de-la-nouvelle-branche>\n" "\n" -#: apply.c:57 +#: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: apply.c:73 +#: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: apply.c:125 +#: apply.c:126 msgid "--reject and --3way cannot be used together." msgstr "--reject et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:127 +#: apply.c:128 msgid "--cached and --3way cannot be used together." msgstr "--cached et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:130 +#: apply.c:131 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: apply.c:141 +#: apply.c:142 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: apply.c:144 +#: apply.c:145 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: apply.c:845 +#: apply.c:836 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: apply.c:854 +#: apply.c:845 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: apply.c:938 +#: apply.c:929 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: apply.c:977 +#: apply.c:967 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: apply.c:983 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: apply.c:984 +#: apply.c:974 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: apply.c:990 +#: apply.c:979 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: apply.c:1488 +#: apply.c:1008 +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "mode invalide dans la ligne %d : %s" + +#: apply.c:1326 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "lignes d'entête inconsistantes %d et %d" + +#: apply.c:1498 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: apply.c:1557 +#: apply.c:1567 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: apply.c:1577 +#: apply.c:1587 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -266,83 +276,83 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: apply.c:1589 +#: apply.c:1600 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" -#: apply.c:1759 +#: apply.c:1770 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1761 +#: apply.c:1772 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1795 +#: apply.c:1806 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1832 +#: apply.c:1843 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1834 +#: apply.c:1845 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1837 +#: apply.c:1848 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: apply.c:1984 +#: apply.c:1995 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2021 +#: apply.c:2032 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2182 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2265 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2269 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2922 +#: apply.c:2933 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3041 +#: apply.c:3052 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: apply.c:3053 +#: apply.c:3064 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: apply.c:3059 +#: apply.c:3070 #, c-format msgid "" "while searching for:\n" @@ -351,580 +361,580 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3081 +#: apply.c:3092 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3089 +#: apply.c:3100 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section " "inverse" -#: apply.c:3135 +#: apply.c:3146 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index" -#: apply.c:3145 +#: apply.c:3156 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel." -#: apply.c:3153 +#: apply.c:3164 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide" -#: apply.c:3171 +#: apply.c:3182 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue" -#: apply.c:3184 +#: apply.c:3195 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3190 +#: apply.c:3201 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: apply.c:3211 +#: apply.c:3222 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3333 +#: apply.c:3344 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 +#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3389 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3418 apply.c:3658 +#: apply.c:3429 apply.c:3669 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3501 apply.c:3672 +#: apply.c:3512 apply.c:3683 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3510 apply.c:3680 +#: apply.c:3521 apply.c:3691 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3545 +#: apply.c:3556 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: apply.c:3548 +#: apply.c:3559 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3564 apply.c:3568 +#: apply.c:3575 apply.c:3579 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3580 +#: apply.c:3591 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Echec du retour à une fusion à 3 points…\n" -#: apply.c:3594 +#: apply.c:3605 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3599 +#: apply.c:3610 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3625 +#: apply.c:3636 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3697 +#: apply.c:3708 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3699 +#: apply.c:3710 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3850 apply.c:3852 +#: apply.c:3860 apply.c:3862 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3908 +#: apply.c:3918 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3911 +#: apply.c:3921 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3931 +#: apply.c:3941 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: apply.c:3936 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: apply.c:3956 +#: apply.c:3966 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: apply.c:3960 +#: apply.c:3970 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:3975 +#: apply.c:3985 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4066 +#: apply.c:4076 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "l'information sha1 est manquante ou inutilisable pour le sous-module %s" -#: apply.c:4073 +#: apply.c:4083 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle" -#: apply.c:4076 +#: apply.c:4086 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 +#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: apply.c:4085 +#: apply.c:4095 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4095 +#: apply.c:4105 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4233 +#: apply.c:4243 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4268 +#: apply.c:4278 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4274 +#: apply.c:4284 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: apply.c:4288 apply.c:4432 +#: apply.c:4298 apply.c:4442 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4329 +#: apply.c:4339 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4333 +#: apply.c:4343 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4403 +#: apply.c:4413 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4501 +#: apply.c:4511 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4509 +#: apply.c:4519 msgid "internal error" msgstr "erreur interne" -#: apply.c:4512 +#: apply.c:4522 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: apply.c:4523 +#: apply.c:4533 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 +#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4545 +#: apply.c:4555 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4549 +#: apply.c:4559 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4659 +#: apply.c:4669 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4667 +#: apply.c:4677 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4686 +#: apply.c:4696 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4823 +#: apply.c:4833 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4850 +#: apply.c:4860 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: apply.c:4856 apply.c:4871 +#: apply.c:4866 apply.c:4881 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne a ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." -#: apply.c:4864 +#: apply.c:4874 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "path" msgstr "chemin" -#: apply.c:4912 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4915 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4917 builtin/am.c:2285 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4918 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4921 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4923 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: apply.c:4927 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: apply.c:4929 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" -msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" +msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée" -#: apply.c:4931 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: apply.c:4933 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: apply.c:4935 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4937 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4939 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: apply.c:4941 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: apply.c:4943 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 +#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:4948 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:4949 builtin/am.c:2264 +#: apply.c:4959 builtin/am.c:2245 msgid "action" msgstr "action" -#: apply.c:4950 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: apply.c:4953 apply.c:4956 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:4959 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:4961 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:4963 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:4965 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 +#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 +#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 +#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:4968 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: apply.c:4971 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: apply.c:4973 builtin/am.c:2273 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "racine" -#: apply.c:4974 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: archive.c:12 +#: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:14 +#: archive.c:15 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou " "apparenté> [<chemin>...]" -#: archive.c:15 +#: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" -#: archive.c:417 +#: archive.c:418 msgid "fmt" msgstr "fmt" -#: archive.c:417 +#: archive.c:418 msgid "archive format" msgstr "format d'archive" -#: archive.c:418 builtin/log.c:1436 +#: archive.c:419 builtin/log.c:1446 msgid "prefix" msgstr "préfixe" -#: archive.c:419 +#: archive.c:420 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 +#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 +#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "fichier" -#: archive.c:421 builtin/archive.c:89 +#: archive.c:422 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:423 +#: archive.c:424 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:424 +#: archive.c:425 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:425 +#: archive.c:426 msgid "store only" msgstr "stockage seulement" -#: archive.c:426 +#: archive.c:427 msgid "compress faster" msgstr "compression rapide" -#: archive.c:434 +#: archive.c:435 msgid "compress better" msgstr "compression efficace" -#: archive.c:437 +#: archive.c:438 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "dépôt" -#: archive.c:440 builtin/archive.c:91 +#: archive.c:441 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 msgid "command" msgstr "commande" -#: archive.c:442 builtin/archive.c:93 +#: archive.c:443 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: archive.c:449 +#: archive.c:450 msgid "Unexpected option --remote" msgstr "Option --remote inattendue" -#: archive.c:451 +#: archive.c:452 msgid "Option --exec can only be used together with --remote" msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote" -#: archive.c:453 +#: archive.c:454 msgid "Unexpected option --output" msgstr "Option --output inattendue" -#: archive.c:475 +#: archive.c:476 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" -#: archive.c:482 +#: archive.c:483 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supporté pour le format '%s' : -%d" -#: attr.c:212 +#: attr.c:214 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -932,27 +942,22 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." -#: bisect.c:444 -#, c-format -msgid "Could not open file '%s'" -msgstr "impossible d'ouvrir le fichier '%s'" - -#: bisect.c:449 +#: bisect.c:447 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" -#: bisect.c:657 +#: bisect.c:655 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" -#: bisect.c:710 +#: bisect.c:708 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:734 +#: bisect.c:732 #, c-format msgid "" "The merge base %s is bad.\n" @@ -961,7 +966,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" -#: bisect.c:739 +#: bisect.c:737 #, c-format msgid "" "The merge base %s is new.\n" @@ -970,7 +975,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" -#: bisect.c:744 +#: bisect.c:742 #, c-format msgid "" "The merge base %s is %s.\n" @@ -979,7 +984,7 @@ msgstr "" "La base de fusion %s est %s.\n" "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n" -#: bisect.c:752 +#: bisect.c:750 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -990,7 +995,7 @@ msgstr "" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" -#: bisect.c:765 +#: bisect.c:763 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1002,36 +1007,36 @@ msgstr "" "et %s.\n" "On continue tout de même." -#: bisect.c:800 +#: bisect.c:798 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" -#: bisect.c:851 +#: bisect.c:849 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:919 +#: bisect.c:917 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:949 +#: bisect.c:947 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" -#: bisect.c:969 +#: bisect.c:967 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" -#: bisect.c:977 +#: bisect.c:975 #, c-format msgid "" "No testable commit found.\n" @@ -1040,15 +1045,16 @@ msgstr "" "Aucun commit testable n'a été trouvé\n" "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n" -#: bisect.c:996 +#: bisect.c:994 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "(à peu près %d étape)" msgstr[1] "(à peu près %d étapes)" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. #: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" @@ -1056,6 +1062,44 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bissection : %d révision à tester après cette %s\n" msgstr[1] "Bissection : %d révisions à tester après cette %s\n" +#: blame.c:1757 +msgid "--contents and --reverse do not blend well." +msgstr "--contents et --reverse ne font pas bon ménage." + +#: blame.c:1768 +msgid "cannot use --contents with final commit object name" +msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" + +#: blame.c:1788 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse et --first-parent ensemble nécessitent la spécification d'un " +"dernier commit" + +#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 +#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 +#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 +#: builtin/shortlog.c:177 +msgid "revision walk setup failed" +msgstr "échec de la préparation du parcours des révisions" + +#: blame.c:1815 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " +"premier parent" + +#: blame.c:1826 +#, c-format +msgid "no such path %s in %s" +msgstr "pas de chemin %s dans %s" + +#: blame.c:1837 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "impossible de lire le blob %s pour le chemin %s" + #: branch.c:53 #, c-format msgid "" @@ -1196,7 +1240,7 @@ msgstr "Point d'embranchement invalide : '%s'." msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" -#: branch.c:364 +#: branch.c:366 #, 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" @@ -1206,92 +1250,85 @@ msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ne semble pas être un fichier bundle v2" -#: bundle.c:61 +#: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 +#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" -#: bundle.c:139 +#: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 -#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 -#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 -#: builtin/merge.c:359 builtin/shortlog.c:176 -msgid "revision walk setup failed" -msgstr "échec de la préparation du parcours des révisions" - -#: bundle.c:185 +#: bundle.c:186 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:194 +#: bundle.c:195 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:253 +#: bundle.c:254 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:264 +#: bundle.c:265 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:304 +#: bundle.c:307 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:353 +#: bundle.c:356 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 +#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:451 +#: bundle.c:454 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:463 +#: bundle.c:466 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:491 +#: bundle.c:494 msgid "index-pack died" msgstr "l'index de groupe a disparu" -#: color.c:300 +#: color.c:301 #, c-format msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 -#: builtin/am.c:1489 builtin/am.c:2126 +#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 +#: builtin/am.c:1469 builtin/am.c:2107 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" -#: commit.c:42 +#: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" @@ -1312,180 +1349,180 @@ msgstr "" msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:191 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" "les conditions d'inclusion de configuration relative doivent venir de " "fichiers" -#: config.c:711 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:715 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:719 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrée standard" -#: config.c:723 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:727 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:731 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:859 +#: config.c:868 msgid "out of range" msgstr "hors plage" -#: config.c:859 +#: config.c:868 msgid "invalid unit" msgstr "unité invalide" -#: config.c:865 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:870 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " "%s : %s" -#: config.c:873 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " "%s : %s" -#: config.c:876 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " "standard : %s" -#: config.c:879 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %s : %s" -#: config.c:882 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %s : %s" -#: config.c:885 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:980 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:1075 config.c:1086 +#: config.c:1084 config.c:1095 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:1203 +#: config.c:1212 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1359 +#: config.c:1368 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1557 +#: config.c:1564 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1611 +#: config.c:1894 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:1970 +#: config.c:2064 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:1991 +#: config.c:2085 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par " "défaut" -#: config.c:2017 +#: config.c:2111 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " "100" -#: config.c:2028 +#: config.c:2122 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2030 +#: config.c:2124 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2089 +#: config.c:2183 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2423 config.c:2648 +#: config.c:2517 config.c:2745 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2541 +#: config.c:2635 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2543 builtin/remote.c:774 +#: config.c:2637 builtin/remote.c:775 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: connect.c:49 +#: connect.c:50 msgid "The remote end hung up upon initial contact" msgstr "L'hôte distant a fermé la connexion lors du contact initial" -#: connect.c:51 +#: connect.c:52 msgid "" "Could not read from remote repository.\n" "\n" @@ -1497,7 +1534,7 @@ msgstr "" "Veuillez vérifier que vous avez les droits d'accès\n" "et que le dépôt existe." -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -1513,7 +1550,7 @@ msgstr "impossible d'écrire dans la rev-list" msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" -#: convert.c:201 +#: convert.c:205 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -1523,12 +1560,12 @@ msgstr "" "Le fichier conservera ses fins de ligne d'origine dans votre copie de " "travail." -#: convert.c:205 +#: convert.c:209 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "Les CRLF seraient remplacés par des LF dans %s." -#: convert.c:211 +#: convert.c:215 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -1538,78 +1575,78 @@ msgstr "" "Le fichier conservera ses fins de ligne d'origine dans votre copie de " "travail." -#: convert.c:215 +#: convert.c:219 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "Les LF seraient remplacés par des CRLF dans %s" -#: date.c:97 +#: date.c:116 msgid "in the future" msgstr "dans le futur" -#: date.c:103 +#: date.c:122 #, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" -msgstr[0] "il y a %lu seconde" -msgstr[1] "il y a %lu secondes" +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "il y a %<PRIuMAX> seconde" +msgstr[1] "il y a %<PRIuMAX> secondes" -#: date.c:110 +#: date.c:129 #, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" -msgstr[0] "il y a %lu minute" -msgstr[1] "il y a %lu minutes" +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "il y a %<PRIuMAX> minute" +msgstr[1] "il y a %<PRIuMAX> minutes" -#: date.c:117 +#: date.c:136 #, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" -msgstr[0] "il y a %lu heure" -msgstr[1] "il y a %lu heures" +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "il y a %<PRIuMAX> heure" +msgstr[1] "il y a %<PRIuMAX> heures" -#: date.c:124 +#: date.c:143 #, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" -msgstr[0] "il y a %lu jour" -msgstr[1] "il y a %lu jours" +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "il y a %<PRIuMAX> jour" +msgstr[1] "il y a %<PRIuMAX> jours" -#: date.c:130 +#: date.c:149 #, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" -msgstr[0] "il y a %lu semaine" -msgstr[1] "il y a %lu semaines" +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "il y a %<PRIuMAX> semaine" +msgstr[1] "il y a %<PRIuMAX> semaines" -#: date.c:137 +#: date.c:156 #, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" -msgstr[0] "il y a %lu mois" -msgstr[1] "il y a %lu mois" +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "il y a %<PRIuMAX> mois" +msgstr[1] "il y a %<PRIuMAX> mois" -#: date.c:148 +#: date.c:167 #, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "%lu an" -msgstr[1] "%lu ans" +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> an" +msgstr[1] "%<PRIuMAX> ans" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:151 +#: date.c:170 #, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "il y a %s et %lu mois" -msgstr[1] "il y a %s et %lu mois" +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "il y a %s et %<PRIuMAX> mois" +msgstr[1] "il y a %s et %<PRIuMAX> mois" -#: date.c:156 date.c:161 +#: date.c:175 date.c:180 #, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "il y a %lu an" -msgstr[1] "il y a %lu ans" +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "il y a %<PRIuMAX> an" +msgstr[1] "il y a %<PRIuMAX> ans" #: diffcore-order.c:24 #, c-format @@ -1620,29 +1657,29 @@ msgstr "impossible de lire le fichier de commande '%s'" msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" -#: diff.c:62 +#: diff.c:63 #, c-format msgid "option '%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" -#: diff.c:124 +#: diff.c:125 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:129 +#: diff.c:130 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:281 +#: diff.c:282 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:344 +#: diff.c:342 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1651,20 +1688,20 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:3102 +#: diff.c:3101 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3428 +#: diff.c:3427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:3518 +#: diff.c:3517 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3681 +#: diff.c:3680 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1673,24 +1710,24 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3695 +#: diff.c:3694 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: diff.c:4719 +#: diff.c:4716 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:4722 +#: diff.c:4719 msgid "only found copies from modified paths due to too many files." msgstr "" "recherche uniquement des copies par modification de chemin à cause d'un trop " "grand nombre de fichiers." -#: diff.c:4725 +#: diff.c:4722 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1698,258 +1735,258 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." -#: dir.c:1899 +#: dir.c:1948 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2018 +#: dir.c:2067 msgid "Untracked cache is disabled on this system or location." msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit." -#: dir.c:2776 dir.c:2781 +#: dir.c:2846 dir.c:2851 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:2806 +#: dir.c:2876 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" -#: entry.c:280 +#: entry.c:281 #, c-format msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" -#: fetch-pack.c:249 +#: fetch-pack.c:251 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : list courte attendue" -#: fetch-pack.c:261 +#: fetch-pack.c:263 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu" -#: fetch-pack.c:280 builtin/archive.c:63 +#: fetch-pack.c:282 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "erreur distante : %s" -#: fetch-pack.c:281 +#: fetch-pack.c:283 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:333 +#: fetch-pack.c:335 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:419 +#: fetch-pack.c:421 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:425 +#: fetch-pack.c:427 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:427 +#: fetch-pack.c:429 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:430 +#: fetch-pack.c:432 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:435 +#: fetch-pack.c:437 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:474 +#: fetch-pack.c:476 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:488 +#: fetch-pack.c:490 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:521 +#: fetch-pack.c:523 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:531 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "fait" -#: fetch-pack.c:543 +#: fetch-pack.c:545 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:589 +#: fetch-pack.c:591 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:737 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:775 +#: fetch-pack.c:813 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:783 +#: fetch-pack.c:821 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:839 +#: fetch-pack.c:877 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:855 +#: fetch-pack.c:893 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:857 +#: fetch-pack.c:895 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:884 +#: fetch-pack.c:922 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:888 +#: fetch-pack.c:926 msgid "Server supports multi_ack_detailed" msgstr "Le serveur supporte multi_ack_detailed" -#: fetch-pack.c:891 +#: fetch-pack.c:929 msgid "Server supports no-done" msgstr "Le serveur support no-done" -#: fetch-pack.c:897 +#: fetch-pack.c:935 msgid "Server supports multi_ack" msgstr "Le serveur supporte multi_ack" -#: fetch-pack.c:901 +#: fetch-pack.c:939 msgid "Server supports side-band-64k" msgstr "Le serveur supporte side-band-64k" -#: fetch-pack.c:905 +#: fetch-pack.c:943 msgid "Server supports side-band" msgstr "Le serveru supporte side-band" -#: fetch-pack.c:909 +#: fetch-pack.c:947 msgid "Server supports allow-tip-sha1-in-want" msgstr "Le serveur supporte allow-tip-sha1-in-want" -#: fetch-pack.c:913 +#: fetch-pack.c:951 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Le serveur supporte allow-reachable-sha1-in-want" -#: fetch-pack.c:923 +#: fetch-pack.c:961 msgid "Server supports ofs-delta" msgstr "Le serveur support ofs-delta" -#: fetch-pack.c:930 +#: fetch-pack.c:968 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:936 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:940 +#: fetch-pack.c:978 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:942 +#: fetch-pack.c:980 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:953 +#: fetch-pack.c:991 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:965 +#: fetch-pack.c:1003 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1127 +#: fetch-pack.c:1165 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1149 +#: fetch-pack.c:1187 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1152 +#: fetch-pack.c:1190 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" -#: gpg-interface.c:185 +#: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:215 +#: gpg-interface.c:211 msgid "could not create temporary file" msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:217 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" -#: graph.c:96 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:1796 +#: grep.c:1981 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:1824 +#: grep.c:2009 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" -#: help.c:218 +#: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" -#: help.c:225 +#: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" -#: help.c:256 +#: help.c:217 msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:321 +#: help.c:281 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1958,50 +1995,70 @@ msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" -#: help.c:376 +#: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:398 +#: help.c:358 #, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" +msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe " -"pas.\n" -"Continuons en supposant que vous avez voulu dire '%s'" +"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas." -#: help.c:403 +#: help.c:363 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "dans %0.1f secondes automatiquement..." +msgid "Continuing under the assumption that you meant '%s'." +msgstr "Continuons en supposant que vous avez voulu dire '%s'<" -#: help.c:410 +#: help.c:368 +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "" +"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'<" + +#: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." -#: help.c:414 help.c:480 +#: help.c:380 msgid "" "\n" -"Did you mean this?" +"The most similar command is" msgid_plural "" "\n" -"Did you mean one of these?" +"The most similar commands are" msgstr[0] "" "\n" -"Vouliez-vous dire cela ?" +"La commande la plus ressemblante est" msgstr[1] "" "\n" -"Vouliez-vous dire un de ceux-là ?" +"Les commandes les plus ressemblantes sont" -#: help.c:476 +#: help.c:395 +msgid "git version [<options>]" +msgstr "git version [<options>]" + +#: help.c:456 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: ident.c:343 +#: help.c:460 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"Vouliez-vous dire cela ?" +msgstr[1] "" +"\n" +"Vouliez-vous dire un de ceux-là ?" + +#: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2027,35 +2084,35 @@ msgstr "" "Éliminez --global pour ne faire les réglages que dans ce dépôt.\n" "\n" -#: ident.c:367 +#: ident.c:366 msgid "no email was given and auto-detection is disabled" msgstr "aucun courriel fourni et l'auto-détection est désactivée" -#: ident.c:372 +#: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)" -#: ident.c:382 +#: ident.c:381 msgid "no name was given and auto-detection is disabled" msgstr "aucun nom fourni et l'auto-détection est désactivée" -#: ident.c:388 +#: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)" -#: ident.c:396 +#: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "nom d'identifiant vide (pour <%s>) non permis" -#: ident.c:402 +#: ident.c:401 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "le nom n'est constitué que de caractères interdits : %s" -#: ident.c:417 builtin/commit.c:611 +#: ident.c:416 builtin/commit.c:612 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" @@ -2088,78 +2145,78 @@ msgstr "Impossible de créer '%s.lock' : %s" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 -#: builtin/checkout.c:607 builtin/clone.c:749 +#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 +#: builtin/checkout.c:591 builtin/clone.c:753 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: merge-recursive.c:209 +#: merge-recursive.c:210 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:231 merge-recursive.c:239 +#: merge-recursive.c:232 merge-recursive.c:240 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "échec de addinfo_cache pour le chemin '%s'" -#: merge-recursive.c:303 +#: merge-recursive.c:304 msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:727 +#: merge-recursive.c:728 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:738 +#: merge-recursive.c:739 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:752 merge-recursive.c:771 +#: merge-recursive.c:753 merge-recursive.c:772 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:761 +#: merge-recursive.c:762 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:803 builtin/cat-file.c:34 +#: merge-recursive.c:804 builtin/cat-file.c:36 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:805 +#: merge-recursive.c:806 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:829 +#: merge-recursive.c:830 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:840 +#: merge-recursive.c:841 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:845 +#: merge-recursive.c:846 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:985 +#: merge-recursive.c:986 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:989 +#: merge-recursive.c:990 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:1092 +#: merge-recursive.c:1093 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2168,7 +2225,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1097 +#: merge-recursive.c:1098 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2177,7 +2234,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre." -#: merge-recursive.c:1104 +#: merge-recursive.c:1105 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2186,7 +2243,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1109 +#: merge-recursive.c:1110 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2195,20 +2252,20 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1200 +#: merge-recursive.c:1201 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1225 +#: merge-recursive.c:1226 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2217,137 +2274,137 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1231 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1293 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" ">'%s' dans %s" -#: merge-recursive.c:1325 +#: merge-recursive.c:1326 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renommage de %s en %s et de %s en %s à la place" -#: merge-recursive.c:1528 +#: merge-recursive.c:1529 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1543 +#: merge-recursive.c:1544 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:1550 merge-recursive.c:1780 +#: merge-recursive.c:1551 merge-recursive.c:1781 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:1607 +#: merge-recursive.c:1608 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:1610 +#: merge-recursive.c:1611 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modify" msgstr "modification" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modified" msgstr "modifié" -#: merge-recursive.c:1689 +#: merge-recursive.c:1690 msgid "content" msgstr "contenu" -#: merge-recursive.c:1696 +#: merge-recursive.c:1697 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:1732 +#: merge-recursive.c:1733 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:1746 +#: merge-recursive.c:1747 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1750 git-submodule.sh:944 +#: merge-recursive.c:1751 git-submodule.sh:945 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:1751 +#: merge-recursive.c:1752 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:1871 +#: merge-recursive.c:1872 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:1877 +#: merge-recursive.c:1878 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1883 +#: merge-recursive.c:1884 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:1892 +#: merge-recursive.c:1893 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1929 +#: merge-recursive.c:1930 msgid "Already up-to-date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1938 +#: merge-recursive.c:1939 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:2021 +#: merge-recursive.c:2022 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:2034 +#: merge-recursive.c:2035 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2136 +#: merge-recursive.c:2137 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -2367,23 +2424,25 @@ msgstr "" msgid "You have not concluded your notes merge (%s exists)." msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)." -#: notes-utils.c:41 +#: notes-utils.c:42 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Impossible de valider un arbre de notes non initialisé/référencé" -#: notes-utils.c:100 +#: notes-utils.c:101 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Mauvaise valeur de notes.rewriteMode : '%s'" -#: notes-utils.c:110 +#: notes-utils.c:111 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c:141 #, c-format msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" @@ -2393,28 +2452,29 @@ msgstr "Mauvaise valeur de %s : '%s'" msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: parse-options.c:572 +#: parse-options.c:573 msgid "..." msgstr "..." -#: parse-options.c:590 +#: parse-options.c:591 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#. +#: parse-options.c:597 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:597 +#: parse-options.c:600 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:631 +#: parse-options.c:634 msgid "-NUM" msgstr "-NUM" @@ -2423,37 +2483,37 @@ msgstr "-NUM" msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: path.c:810 +#: path.c:890 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" -#: pathspec.c:125 +#: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une " "valeur d'attribut" -#: pathspec.c:143 +#: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." msgstr "Une seule spécification 'attr:' est autorisée." -#: pathspec.c:146 +#: pathspec.c:150 msgid "attr spec must not be empty" msgstr "un spécificateur d'attribut ne peut pas être vide" -#: pathspec.c:189 +#: pathspec.c:193 #, c-format msgid "invalid attribute name %s" msgstr "nom d'attribut invalide %s" -#: pathspec.c:254 +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont " "incompatibles" -#: pathspec.c:261 +#: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2461,53 +2521,48 @@ msgstr "" "le réglage global de spécificateur de chemin 'literal' est incompatible avec " "tous les autres réglages globaux de spécificateur de chemin" -#: pathspec.c:301 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'" -#: pathspec.c:322 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'" -#: pathspec.c:327 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'" -#: pathspec.c:365 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Spécificateur magique '%c' non implémenté dans '%s'" -#: pathspec.c:421 pathspec.c:443 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Le chemin '%s' est dans le sous-module '%.*s'" - -#: pathspec.c:483 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s : 'literal' et 'glob' sont incompatibles" -#: pathspec.c:496 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s : '%s' est hors du dépôt" -#: pathspec.c:584 +#: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnémonique : '%c')" -#: pathspec.c:594 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s : le spécificateur magique de chemin n'est pas supporté par cette " "commande : %s" -#: pathspec.c:644 +#: pathspec.c:575 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2516,16 +2571,16 @@ msgstr "" "invalides dans les prochaines versions. Veuillez utiliser . à la place pour " "correspondre à tous le chemins" -#: pathspec.c:668 +#: pathspec.c:599 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" -#: pretty.c:982 +#: pretty.c:963 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: read-cache.c:1442 +#: read-cache.c:1443 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2534,7 +2589,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1452 +#: read-cache.c:1453 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2543,47 +2598,52 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#: read-cache.c:2308 builtin/merge.c:1019 +#, c-format +msgid "could not close '%s'" +msgstr "impossible de fermer '%s'" + +#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:2388 +#: read-cache.c:2396 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:2400 +#: read-cache.c:2408 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: refs.c:620 builtin/merge.c:844 +#: refs.c:622 #, c-format msgid "Could not open '%s' for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: refs.c:1667 +#: refs.c:1769 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs/files-backend.c:1631 +#: refs/files-backend.c:1664 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:1634 +#: refs/files-backend.c:1667 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" -#: refs/files-backend.c:1643 +#: refs/files-backend.c:1676 #, c-format msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" # à priori on parle d'une branche ici -#: ref-filter.c:35 wt-status.c:1780 +#: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "disparue" @@ -2602,304 +2662,306 @@ msgstr "en retard de %d" msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:104 +#: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:106 +#: ref-filter.c:107 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:120 +#: ref-filter.c:121 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:124 +#: ref-filter.c:125 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:126 +#: ref-filter.c:127 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" -#: ref-filter.c:166 +#: ref-filter.c:167 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:173 +#: ref-filter.c:174 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:180 +#: ref-filter.c:181 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) n'accepte pas d'argument" -#: ref-filter.c:199 +#: ref-filter.c:200 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:201 +#: ref-filter.c:202 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:214 +#: ref-filter.c:215 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valeur positive attendue objectname:short=%s" -#: ref-filter.c:218 +#: ref-filter.c:219 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:245 +#: ref-filter.c:246 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:257 +#: ref-filter.c:258 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:261 +#: ref-filter.c:262 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:267 +#: ref-filter.c:268 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:271 +#: ref-filter.c:272 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:286 +#: ref-filter.c:287 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnu : %s" -#: ref-filter.c:371 +#: ref-filter.c:378 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:397 +#: ref-filter.c:404 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:501 +#: ref-filter.c:508 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format : atome %%(if) utilisé sans un atome %%(then)" -#: ref-filter.c:561 +#: ref-filter.c:568 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format : atome %%(then) utilisé sans un atome %%(if)" -#: ref-filter.c:563 +#: ref-filter.c:570 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format : atome %%(then) utilisé plus d'une fois" -#: ref-filter.c:565 +#: ref-filter.c:572 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:591 +#: ref-filter.c:598 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(if)" -#: ref-filter.c:593 +#: ref-filter.c:600 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(then)" -#: ref-filter.c:595 +#: ref-filter.c:602 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format : atome %%(else) utilisé plus d'une fois" -#: ref-filter.c:608 +#: ref-filter.c:615 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:663 +#: ref-filter.c:670 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1247 +#: ref-filter.c:1254 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: ref-filter.c:1250 +#: ref-filter.c:1257 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: ref-filter.c:1256 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1265 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD détachée sur %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: ref-filter.c:1261 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1272 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD détachée depuis %s)" -#: ref-filter.c:1265 +#: ref-filter.c:1276 msgid "(no branch)" msgstr "(aucune branche)" -#: ref-filter.c:1420 ref-filter.c:1451 +#: ref-filter.c:1426 ref-filter.c:1457 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1423 ref-filter.c:1454 +#: ref-filter.c:1429 ref-filter.c:1460 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "echec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1692 +#: ref-filter.c:1760 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:1759 +#: ref-filter.c:1827 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:1764 +#: ref-filter.c:1832 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:2028 +#: ref-filter.c:2095 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2109 +#: ref-filter.c:2176 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: remote.c:754 +#: remote.c:747 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de récupérer à la fois %s et %s pour %s" -#: remote.c:758 +#: remote.c:751 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:762 +#: remote.c:755 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:770 +#: remote.c:763 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1685 remote.c:1787 +#: remote.c:1680 remote.c:1782 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1694 +#: remote.c:1689 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1697 +#: remote.c:1692 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1703 +#: remote.c:1698 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi" -#: remote.c:1718 +#: remote.c:1713 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de " "branche locale de suivi" -#: remote.c:1730 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1741 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les références de spec pour '%s' n'incluent pas '%s'" -#: remote.c:1754 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1776 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:2081 +#: remote.c:2076 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" -#: remote.c:2085 +#: remote.c:2080 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2088 +#: remote.c:2083 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2092 +#: remote.c:2087 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:2098 +#: remote.c:2093 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2101 +#: remote.c:2096 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2911,11 +2973,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2109 +#: remote.c:2104 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2112 +#: remote.c:2107 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2930,52 +2992,47 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2122 +#: remote.c:2117 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: revision.c:2158 +#: revision.c:2187 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2161 +#: revision.c:2190 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2355 +#: revision.c:2384 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: run-command.c:125 +#: run-command.c:644 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:127 -#, c-format -msgid "dup2(%d,%d) failed" -msgstr "échec de dup2(%d,%d)" - -#: send-pack.c:150 +#: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" -msgstr "impossible d'analyser le status de dépaquetage remote : %s" +msgstr "impossible d'analyser l'état de dépaquetage distant : %s" -#: send-pack.c:152 +#: send-pack.c:153 #, c-format msgid "remote unpack failed: %s" msgstr "le dépaquetage a échoué : %s" -#: send-pack.c:315 +#: send-pack.c:316 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:428 +#: send-pack.c:429 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:430 +#: send-pack.c:431 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -2983,32 +3040,32 @@ msgstr "" "pas d'envoi de certificat de poussée car le receveur ne gère pas les " "poussées avec --signed" -#: send-pack.c:442 +#: send-pack.c:443 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: send-pack.c:447 +#: send-pack.c:448 msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" -#: sequencer.c:215 +#: sequencer.c:216 msgid "revert" msgstr "revert" -#: sequencer.c:217 +#: sequencer.c:218 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:219 +#: sequencer.c:220 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:221 +#: sequencer.c:222 #, c-format msgid "Unknown action: %d" msgstr "Action inconnue : %d" -#: sequencer.c:278 +#: sequencer.c:279 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3016,7 +3073,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:281 +#: sequencer.c:282 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3026,63 +3083,63 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:294 sequencer.c:1682 +#: sequencer.c:295 sequencer.c:1685 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" -#: sequencer.c:301 +#: sequencer.c:302 #, c-format msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 #, c-format msgid "failed to finalize '%s'." msgstr "échec lors de la finalisation de '%s'." -#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 -#: builtin/commit.c:749 builtin/merge.c:1018 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 +#: builtin/commit.c:750 builtin/merge.c:1017 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: sequencer.c:355 +#: sequencer.c:356 #, c-format msgid "your local changes would be overwritten by %s." msgstr "vos modifications locales seraient écrasées par %s." -#: sequencer.c:359 +#: sequencer.c:360 msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:388 +#: sequencer.c:389 #, c-format msgid "%s: fast-forward" msgstr "%s : avance rapide" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". +#. "rebase -i". #. -#: sequencer.c:470 +#: sequencer.c:472 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:489 +#: sequencer.c:491 msgid "could not resolve HEAD commit\n" msgstr "impossible de résoudre le commit HEAD\n" -#: sequencer.c:509 +#: sequencer.c:511 msgid "unable to update cache tree\n" msgstr "impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:592 +#: sequencer.c:595 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3111,17 +3168,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:694 +#: sequencer.c:697 #, c-format msgid "could not parse commit %s\n" msgstr "impossible d'analyser le commit %s\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse parent commit %s\n" msgstr "impossible d'analyser le commit parent %s\n" -#: sequencer.c:821 +#: sequencer.c:824 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3132,7 +3189,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:827 +#: sequencer.c:830 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3143,232 +3200,232 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:833 sequencer.c:858 +#: sequencer.c:836 sequencer.c:861 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:842 +#: sequencer.c:845 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:844 +#: sequencer.c:847 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:846 +#: sequencer.c:849 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:852 +#: sequencer.c:855 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:861 git-rebase--interactive.sh:445 +#: sequencer.c:864 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:869 +#: sequencer.c:872 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:876 +#: sequencer.c:879 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:881 +#: sequencer.c:884 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:886 +#: sequencer.c:889 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:952 +#: sequencer.c:955 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:970 +#: sequencer.c:973 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:978 +#: sequencer.c:981 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:982 +#: sequencer.c:985 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" "une branche principale a été spécifiée mais le commit %s n'est pas une " "fusion." -#: sequencer.c:988 +#: sequencer.c:991 #, c-format msgid "cannot get commit message for %s" msgstr "impossible d'obtenir un message de validation pour %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1009 +#: sequencer.c:1012 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1071 sequencer.c:1827 +#: sequencer.c:1075 sequencer.c:1830 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1122 +#: sequencer.c:1126 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1123 +#: sequencer.c:1127 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:1165 +#: sequencer.c:1169 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:1175 +#: sequencer.c:1179 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:1182 +#: sequencer.c:1186 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:1303 +#: sequencer.c:1306 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:1311 +#: sequencer.c:1314 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:1344 +#: sequencer.c:1347 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:1356 +#: sequencer.c:1359 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:1358 +#: sequencer.c:1361 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:1363 +#: sequencer.c:1366 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:1374 +#: sequencer.c:1377 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:1376 +#: sequencer.c:1379 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:1439 +#: sequencer.c:1442 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" -#: sequencer.c:1442 +#: sequencer.c:1445 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:1499 +#: sequencer.c:1502 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:1537 +#: sequencer.c:1540 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:1538 +#: sequencer.c:1541 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:1541 +#: sequencer.c:1544 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:1555 +#: sequencer.c:1558 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:1611 sequencer.c:2181 +#: sequencer.c:1614 sequencer.c:2188 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:1613 +#: sequencer.c:1616 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:1615 sequencer.c:1649 +#: sequencer.c:1618 sequencer.c:1652 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:1635 builtin/grep.c:910 +#: sequencer.c:1638 builtin/grep.c:929 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:1637 +#: sequencer.c:1640 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:1638 +#: sequencer.c:1641 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:1644 +#: sequencer.c:1647 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:1655 +#: sequencer.c:1658 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" -#: sequencer.c:1792 sequencer.c:2080 +#: sequencer.c:1795 sequencer.c:2086 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1832 builtin/difftool.c:616 +#: sequencer.c:1835 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:1848 +#: sequencer.c:1851 msgid "could not read index" msgstr "impossible de lire l'index" -#: sequencer.c:1853 +#: sequencer.c:1856 #, c-format msgid "" "execution failed: %s\n" @@ -3383,11 +3440,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:1859 +#: sequencer.c:1862 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" -#: sequencer.c:1865 +#: sequencer.c:1868 #, c-format msgid "" "execution succeeded: %s\n" @@ -3404,17 +3461,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1920 git-rebase.sh:169 +#: sequencer.c:1925 #, c-format -msgid "Applied autostash." -msgstr "Autoremisage appliqué." +msgid "Applied autostash.\n" +msgstr "Autoremisage appliqué.\n" -#: sequencer.c:1932 +#: sequencer.c:1937 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:1934 git-rebase.sh:173 +#: sequencer.c:1940 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3425,57 +3482,57 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:2016 +#: sequencer.c:2022 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:2058 +#: sequencer.c:2064 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:2088 +#: sequencer.c:2094 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:2092 +#: sequencer.c:2099 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:2099 +#: sequencer.c:2106 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:2106 +#: sequencer.c:2113 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:2190 +#: sequencer.c:2197 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:2195 +#: sequencer.c:2202 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:2204 +#: sequencer.c:2211 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:2206 +#: sequencer.c:2213 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:2208 +#: sequencer.c:2215 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:2211 +#: sequencer.c:2218 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3485,25 +3542,25 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:2221 +#: sequencer.c:2228 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:2301 +#: sequencer.c:2308 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:2305 +#: sequencer.c:2312 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:2338 +#: sequencer.c:2345 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: setup.c:165 +#: setup.c:171 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3513,7 +3570,7 @@ msgstr "" "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " "n'existent pas localement." -#: setup.c:178 +#: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3524,7 +3581,7 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:228 +#: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3535,34 +3592,34 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:475 +#: setup.c:504 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:483 +#: setup.c:512 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:776 +#: setup.c:810 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s" -#: setup.c:778 builtin/index-pack.c:1646 +#: setup.c:812 builtin/index-pack.c:1652 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: setup.c:1010 +#: setup.c:1050 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1022 setup.c:1028 +#: setup.c:1062 setup.c:1068 #, c-format msgid "Cannot change to '%s'" msgstr "Impossible de modifié en '%s'" -#: setup.c:1041 +#: setup.c:1081 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3573,7 +3630,7 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas activé)." -#: setup.c:1106 +#: setup.c:1173 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3583,29 +3640,29 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: sha1_file.c:559 +#: sha1_file.c:560 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1_file.c:585 +#: sha1_file.c:586 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "extraire le dépôt de référence '%s' comme une extraction liée n'est pas " "encore supporté." -#: sha1_file.c:591 +#: sha1_file.c:592 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: sha1_file.c:597 +#: sha1_file.c:598 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1_file.c:605 +#: sha1_file.c:606 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" @@ -3614,27 +3671,27 @@ msgstr "le dépôt de référence '%s' est greffé" msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: sha1_file.c:2721 +#: sha1_file.c:2729 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)" -#: sha1_file.c:2725 +#: sha1_file.c:2733 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" -#: sha1_name.c:409 +#: sha1_name.c:419 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "le SHA1 court %s est ambigu" -#: sha1_name.c:420 +#: sha1_name.c:430 msgid "The candidates are:" msgstr "Les candidats sont :" -#: sha1_name.c:580 +#: sha1_name.c:589 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" @@ -3646,7 +3703,7 @@ msgid "" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" -"Git ne créé normalement jamais de référence qui se termine par 40 caractères " +"Git ne crée normalement jamais de référence qui se termine par 40 caractères " "hexa\n" "car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n" "peuvent être créées par erreur. Par exemple,\n" @@ -3659,57 +3716,67 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: submodule.c:67 submodule.c:101 +#: submodule.c:70 submodule.c:104 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Modification impossible de .gitmodules non fusionné, résolvez les conflits " "d'abord" -#: submodule.c:71 submodule.c:105 +#: submodule.c:74 submodule.c:108 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Impossible de trouver une section où path=%s dans .gitmodules" -#: submodule.c:79 +#: submodule.c:82 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" # ici %s est un chemin -#: submodule.c:112 +#: submodule.c:115 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" -#: submodule.c:123 +#: submodule.c:126 msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:161 +#: submodule.c:165 msgid "negative values not allowed for submodule.fetchJobs" msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" -#: submodule.c:1194 +#: submodule.c:376 +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "dans le sous-module '%s' non populé" + +#: submodule.c:407 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Le chemin '%s' est dans le sous-module '%.*s'" + +#: submodule.c:1337 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' n'est pas reconnu comme dépôt git" -#: submodule.c:1332 +#: submodule.c:1475 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossible de démarrer 'git status' dans le sous-module '%s'" -#: submodule.c:1345 +#: submodule.c:1488 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossible de lancer 'git status' dans le sous-module '%s'" -#: submodule.c:1421 +#: submodule.c:1581 #, c-format msgid "submodule '%s' has dirty index" msgstr "le sous-module '%s' a un index sale" -#: submodule.c:1678 +#: submodule.c:1845 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3717,18 +3784,18 @@ msgstr "" "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " "n'est pas supporté" -#: submodule.c:1690 submodule.c:1746 +#: submodule.c:1857 submodule.c:1913 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:1694 builtin/submodule--helper.c:678 +#: submodule.c:1861 builtin/submodule--helper.c:678 #: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" -#: submodule.c:1697 +#: submodule.c:1864 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3739,94 +3806,94 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:1781 +#: submodule.c:1948 #, c-format msgid "could not recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: submodule.c:1825 +#: submodule.c:1992 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:1845 +#: submodule.c:2012 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?" -#: submodule.c:1864 +#: submodule.c:2031 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" -#: submodule-config.c:380 +#: submodule-config.c:420 #, c-format msgid "invalid value for %s" msgstr "Valeur invalide pour %s" -#: trailer.c:240 +#: trailer.c:241 #, c-format msgid "running trailer command '%s' failed" msgstr "échec de la commande trailer '%s'" -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 -#: trailer.c:543 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 +#: trailer.c:544 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:525 trailer.c:530 builtin/remote.c:289 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: trailer.c:702 +#: trailer.c:703 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "symbole vide dans la ligne de fin '%.*s'" -#: trailer.c:722 +#: trailer.c:723 #, c-format msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:725 +#: trailer.c:726 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: trailer.c:949 builtin/am.c:44 +#: trailer.c:950 builtin/am.c:45 #, c-format msgid "could not stat %s" msgstr "stat impossible de %s" -#: trailer.c:951 +#: trailer.c:952 #, c-format msgid "file %s is not a regular file" msgstr "%s n'est pas un fichier régulier" -#: trailer.c:953 +#: trailer.c:954 #, c-format msgid "file %s is not writable by user" msgstr "le fichier %s n'est pas inscriptible par l'utilisateur" -#: trailer.c:965 +#: trailer.c:966 msgid "could not open temporary file" msgstr "impossible de créer un fichier temporaire" -#: trailer.c:1001 +#: trailer.c:1002 #, c-format msgid "could not rename temporary file to %s" msgstr "impossible de renommer un fichier temporaire en %s" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:889 +#: transport.c:890 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3835,7 +3902,7 @@ msgstr "" "Les chemins suivant de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:893 +#: transport.c:894 #, c-format msgid "" "\n" @@ -3862,11 +3929,11 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:901 +#: transport.c:902 msgid "Aborting." msgstr "Abandon." -#: transport-helper.c:1080 +#: transport-helper.c:1071 #, c-format msgid "Could not read ref %s" msgstr "impossible de lire la réf %s" @@ -3887,7 +3954,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre" msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:104 +#: unpack-trees.c:105 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3898,7 +3965,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3908,7 +3975,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3918,7 +3985,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3928,7 +3995,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:114 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3937,7 +4004,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3946,7 +4013,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:122 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3956,7 +4023,7 @@ msgstr "" "contenus :\n" "%s" -#: unpack-trees.c:125 +#: unpack-trees.c:126 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3966,7 +4033,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3975,7 +4042,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3985,7 +4052,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3994,7 +4061,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:135 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4004,7 +4071,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4013,7 +4080,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4024,7 +4091,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4034,7 +4101,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4044,7 +4111,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4053,7 +4120,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4063,7 +4130,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4072,12 +4139,12 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:164 +#: unpack-trees.c:165 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -4087,7 +4154,7 @@ msgstr "" "pas à jour :\n" "%s" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4098,7 +4165,7 @@ msgstr "" "jour par l'extraction creuse :\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4109,7 +4176,7 @@ msgstr "" "à jour par extraction creuse :\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "Cannot update submodule:\n" @@ -4118,19 +4185,19 @@ msgstr "" "Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:247 +#: unpack-trees.c:248 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:272 +#: unpack-trees.c:277 #, c-format msgid "submodule update strategy not supported for submodule '%s'" msgstr "" "stratégie de mise à jour de sous-module non supportée pour le sous-module " "'%s'" -#: unpack-trees.c:340 +#: unpack-trees.c:346 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -4163,192 +4230,198 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: worktree.c:285 +#: worktree.c:245 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#: wrapper.c:222 wrapper.c:392 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 -#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 -#: builtin/pull.c:341 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 +#: builtin/am.c:849 builtin/merge.c:1014 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: wrapper.c:581 wrapper.c:602 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:610 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" -#: wrapper.c:634 +#: wrapper.c:656 #, c-format msgid "could not write to %s" msgstr "Impossible d'écrire dans %s" -#: wrapper.c:636 +#: wrapper.c:658 #, c-format msgid "could not close %s" msgstr "impossible de fermer %s" -#: wt-status.c:151 +#: wt-status.c:152 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:181 wt-status.c:208 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)" -#: wt-status.c:184 +#: wt-status.c:185 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:187 wt-status.c:191 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " "résolu)" -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:199 wt-status.c:958 +#: wt-status.c:200 wt-status.c:981 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:217 wt-status.c:967 +#: wt-status.c:218 wt-status.c:990 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" -#: wt-status.c:223 +#: wt-status.c:224 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " "validé)" -#: wt-status.c:224 +#: wt-status.c:225 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " "dans la copie de travail)" -#: wt-status.c:226 +#: wt-status.c:227 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" -#: wt-status.c:238 +#: wt-status.c:239 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" -#: wt-status.c:253 +#: wt-status.c:254 msgid "both deleted:" msgstr "supprimé des deux côtés :" -#: wt-status.c:255 +#: wt-status.c:256 msgid "added by us:" msgstr "ajouté par nous :" -#: wt-status.c:257 +#: wt-status.c:258 msgid "deleted by them:" msgstr "supprimé par eux :" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by them:" msgstr "ajouté par eux :" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by us:" msgstr "supprimé par nous :" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both added:" msgstr "ajouté de deux côtés :" -#: wt-status.c:265 +#: wt-status.c:266 msgid "both modified:" msgstr "modifié des deux côtés :" -#: wt-status.c:275 +#: wt-status.c:276 msgid "new file:" msgstr "nouveau fichier :" -#: wt-status.c:277 +#: wt-status.c:278 msgid "copied:" msgstr "copié :" -#: wt-status.c:279 +#: wt-status.c:280 msgid "deleted:" msgstr "supprimé :" -#: wt-status.c:281 +#: wt-status.c:282 msgid "modified:" msgstr "modifié :" -#: wt-status.c:283 +#: wt-status.c:284 msgid "renamed:" msgstr "renommé :" -#: wt-status.c:285 +#: wt-status.c:286 msgid "typechange:" msgstr "modif. type :" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unknown:" msgstr "inconnu :" -#: wt-status.c:289 +#: wt-status.c:290 msgid "unmerged:" msgstr "non fusionné :" -#: wt-status.c:371 +#: wt-status.c:372 msgid "new commits, " msgstr "nouveaux commits, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "modified content, " msgstr "contenu modifié, " -#: wt-status.c:375 +#: wt-status.c:376 msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:831 +#: wt-status.c:821 +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "Votre remisage contient actuellement %d entrée" +msgstr[1] "Votre remisage contient actuellement %d entrées" + +#: wt-status.c:853 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:833 +#: wt-status.c:855 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:914 +#: wt-status.c:937 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -4356,107 +4429,107 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:1026 +#: wt-status.c:1049 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:1029 +#: wt-status.c:1052 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1031 +#: wt-status.c:1054 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1036 +#: wt-status.c:1059 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:1039 +#: wt-status.c:1062 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1049 +#: wt-status.c:1072 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:1052 +#: wt-status.c:1075 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1056 +#: wt-status.c:1079 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1058 +#: wt-status.c:1081 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1060 +#: wt-status.c:1083 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1189 +#: wt-status.c:1214 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1191 +#: wt-status.c:1216 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1194 +#: wt-status.c:1219 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1205 +#: wt-status.c:1230 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1210 +#: wt-status.c:1235 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1213 +#: wt-status.c:1238 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1221 +#: wt-status.c:1246 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1234 +#: wt-status.c:1259 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1239 +#: wt-status.c:1264 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1253 +#: wt-status.c:1278 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1255 +#: wt-status.c:1280 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1257 +#: wt-status.c:1282 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1263 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1267 +#: wt-status.c:1292 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4464,124 +4537,128 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1272 +#: wt-status.c:1297 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1275 +#: wt-status.c:1300 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1279 +#: wt-status.c:1304 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1284 +#: wt-status.c:1309 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1287 +#: wt-status.c:1312 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1289 +#: wt-status.c:1314 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1299 +#: wt-status.c:1324 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1304 +#: wt-status.c:1329 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1307 +#: wt-status.c:1332 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1309 +#: wt-status.c:1334 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1318 +#: wt-status.c:1343 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1323 +#: wt-status.c:1348 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1326 +#: wt-status.c:1351 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1328 +#: wt-status.c:1353 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1339 +#: wt-status.c:1364 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1343 +#: wt-status.c:1368 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1346 +#: wt-status.c:1371 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1543 +#: wt-status.c:1568 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1549 +#: wt-status.c:1574 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1551 +#: wt-status.c:1576 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1556 +#: wt-status.c:1581 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1558 +#: wt-status.c:1583 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1561 +#: wt-status.c:1586 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1579 +#: wt-status.c:1606 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1593 +#: wt-status.c:1607 +msgid "No commits yet" +msgstr "Aucun commit" + +#: wt-status.c:1621 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1595 +#: wt-status.c:1623 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1599 +#: wt-status.c:1627 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4593,32 +4670,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1605 +#: wt-status.c:1633 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1607 +#: wt-status.c:1635 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1613 +#: wt-status.c:1641 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1618 +#: wt-status.c:1646 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1621 +#: wt-status.c:1649 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1624 +#: wt-status.c:1652 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4627,231 +4704,271 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1627 +#: wt-status.c:1655 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1630 +#: wt-status.c:1658 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1633 wt-status.c:1638 +#: wt-status.c:1661 wt-status.c:1666 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1636 +#: wt-status.c:1664 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1640 +#: wt-status.c:1668 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1749 -msgid "Initial commit on " -msgstr "Validation initiale sur " +#: wt-status.c:1780 +msgid "No commits yet on " +msgstr "Encore aucun commit sur " -#: wt-status.c:1753 +#: wt-status.c:1784 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1782 wt-status.c:1790 +#: wt-status.c:1813 wt-status.c:1821 msgid "behind " msgstr "derrière " -#: wt-status.c:1785 wt-status.c:1788 +#: wt-status.c:1816 wt-status.c:1819 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2280 +#: wt-status.c:2311 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2286 +#: wt-status.c:2317 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2288 +#: wt-status.c:2319 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." -#: compat/precompose_utf8.c:57 builtin/clone.c:432 +#: compat/precompose_utf8.c:58 builtin/clone.c:436 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" -#: builtin/add.c:22 +#: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." -#: builtin/add.c:80 +#: builtin/add.c:82 #, c-format msgid "unexpected diff status %c" -msgstr "status de diff inattendu %c" +msgstr "état de diff inattendu %c" -#: builtin/add.c:85 builtin/commit.c:291 +#: builtin/add.c:87 builtin/commit.c:292 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" -#: builtin/add.c:95 +#: builtin/add.c:97 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:149 +#: builtin/add.c:151 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:209 builtin/rev-parse.c:872 +#: builtin/add.c:211 builtin/rev-parse.c:873 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:220 +#: builtin/add.c:222 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." -#: builtin/add.c:224 +#: builtin/add.c:226 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:227 +#: builtin/add.c:229 msgid "editing patch failed" msgstr "échec de l'édition du patch" -#: builtin/add.c:230 +#: builtin/add.c:232 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:232 +#: builtin/add.c:234 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:237 +#: builtin/add.c:239 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:247 +#: builtin/add.c:249 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 +#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:269 +#: builtin/add.c:272 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 +#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:271 +#: builtin/add.c:274 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:272 +#: builtin/add.c:275 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:273 +#: builtin/add.c:276 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:274 +#: builtin/add.c:277 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" -#: builtin/add.c:275 +#: builtin/add.c:278 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:278 +#: builtin/add.c:281 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:280 +#: builtin/add.c:283 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:281 +#: builtin/add.c:284 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" -#: builtin/add.c:282 +#: builtin/add.c:285 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" -#: builtin/add.c:283 builtin/update-index.c:951 +#: builtin/add.c:286 builtin/update-index.c:952 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:952 +#: builtin/add.c:286 builtin/update-index.c:953 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/add.c:305 +#: builtin/add.c:288 +msgid "warn when adding an embedded repository" +msgstr "avertir lors de l'ajout d'un dépôt embarqué" + +#: builtin/add.c:303 +#, 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 "" +"Vous avez ajouté un autre dépôt git dans votre dépôt actuel.\n" +"Les clones du dépôt conteneur ne contiendrons pas le contenu\n" +"du dépôt embarqué et ne sauront pas comment l'obtenir.\n" +"Si vous vouliez ajouter un sous-module, utilisez :\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"Si vous avez ajouté ce chemin par erreur, vous pouvez le\n" +"supprimer de l'index avec :\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"Référez-vous à \"git help submodule\" pour plus d'information." + +#: builtin/add.c:331 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "dépôt git embarqué ajouté : %s" + +#: builtin/add.c:349 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" -#: builtin/add.c:312 +#: builtin/add.c:357 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:348 +#: builtin/add.c:394 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:355 +#: builtin/add.c:401 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" -#: builtin/add.c:359 +#: builtin/add.c:405 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" -#: builtin/add.c:374 +#: builtin/add.c:420 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:375 +#: builtin/add.c:421 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 -#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 +#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 +#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/am.c:412 +#: builtin/am.c:413 msgid "could not parse author script" msgstr "impossible d'analyser le script author" @@ -4899,7 +5016,7 @@ msgstr "décalage horaire invalide" msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:991 builtin/clone.c:397 +#: builtin/am.c:991 builtin/clone.c:401 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" @@ -4908,53 +5025,53 @@ msgstr "échec de la création du répertoire '%s'" msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1127 builtin/commit.c:376 +#: builtin/am.c:1120 builtin/commit.c:377 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1178 +#: builtin/am.c:1171 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." -#: builtin/am.c:1179 +#: builtin/am.c:1172 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." -#: builtin/am.c:1180 +#: builtin/am.c:1173 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" "abort\"." -#: builtin/am.c:1315 -msgid "Patch is empty. Was it split wrong?" -msgstr "Le patch est vide. Le découpage était-il bon ?" +#: builtin/am.c:1304 +msgid "Patch is empty." +msgstr "Le patch actuel est vide." -#: builtin/am.c:1386 builtin/log.c:1557 +#: builtin/am.c:1370 #, c-format -msgid "invalid ident line: %s" -msgstr "ligne d'identification invalide : %s" +msgid "invalid ident line: %.*s" +msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1413 +#: builtin/am.c:1392 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: builtin/am.c:1606 +#: builtin/am.c:1586 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: builtin/am.c:1608 +#: builtin/am.c:1588 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1627 +#: builtin/am.c:1607 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4962,38 +5079,38 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1633 +#: builtin/am.c:1613 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1658 +#: builtin/am.c:1638 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1682 builtin/merge.c:631 +#: builtin/am.c:1662 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: builtin/am.c:1689 +#: builtin/am.c:1669 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 -#: builtin/merge.c:827 +#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 +#: builtin/merge.c:828 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: builtin/am.c:1735 builtin/am.c:1739 +#: builtin/am.c:1715 builtin/am.c:1719 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1755 +#: builtin/am.c:1735 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "impossible d'être interactif sans entrée standard connectée à un terminal." -#: builtin/am.c:1760 +#: builtin/am.c:1740 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -5001,35 +5118,35 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1770 +#: builtin/am.c:1750 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " -#: builtin/am.c:1820 +#: builtin/am.c:1800 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1860 builtin/am.c:1932 +#: builtin/am.c:1840 builtin/am.c:1912 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1876 +#: builtin/am.c:1856 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1884 +#: builtin/am.c:1864 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1890 +#: builtin/am.c:1870 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La copie du patch qui a échoué se trouve dans : %s" -#: builtin/am.c:1935 +#: builtin/am.c:1915 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5040,25 +5157,30 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1942 +#: builtin/am.c:1922 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +"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 "" -"Vous avez toujours des chemins non fusionnés dans votre index\n" -"Auriez-vous oublié de faire 'git add' ?" +"Vous avez encore des chemin non-fusionnés dans votre index.\n" +"Vous devriez lancer 'git add' sur chaque conflit résolu pour les marquer " +"comme tel.\n" +"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " +"accepter son état." -#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 -#: builtin/reset.c:316 +#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 +#: builtin/reset.c:331 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:2102 +#: builtin/am.c:2083 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2136 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5066,135 +5188,136 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2199 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2232 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2233 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --quit | --abort)" -#: builtin/am.c:2239 +#: builtin/am.c:2220 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2241 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2243 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:178 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:180 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2246 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2249 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2251 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2253 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2255 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2257 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -#: builtin/am.c:2260 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2263 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 -#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 -#: builtin/am.c:2292 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 +#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 +#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 +#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 +#: parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 -#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2289 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2295 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" -#: builtin/am.c:2297 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2300 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2303 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2306 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2310 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2312 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 -#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 +#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2315 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2318 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2333 +#: builtin/am.c:2317 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." @@ -5202,17 +5325,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2340 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2355 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." -#: builtin/am.c:2379 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -5221,7 +5344,7 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2385 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de résolution de l'opération en cours, nous ne sommes pas dans une " @@ -5273,204 +5396,175 @@ msgstr "effectuer 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" -#: builtin/blame.c:33 +#: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>" -#: builtin/blame.c:38 +#: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" -#: builtin/blame.c:1777 -msgid "Blaming lines" -msgstr "Assignation de blâme au lignes" - -#: builtin/blame.c:2573 +#: builtin/blame.c:668 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:2574 +#: builtin/blame.c:669 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:2575 +#: builtin/blame.c:670 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:2576 +#: builtin/blame.c:671 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2577 +#: builtin/blame.c:672 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:2578 +#: builtin/blame.c:673 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2579 +#: builtin/blame.c:674 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2580 +#: builtin/blame.c:675 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2581 +#: builtin/blame.c:676 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2582 +#: builtin/blame.c:677 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2583 +#: builtin/blame.c:678 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:2584 +#: builtin/blame.c:679 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2585 +#: builtin/blame.c:680 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2586 +#: builtin/blame.c:681 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:2587 +#: builtin/blame.c:682 msgid "Show author email instead of name (Default: off)" -msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)" +msgstr "Afficher l'courriel de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:2588 +#: builtin/blame.c:683 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2595 +#: builtin/blame.c:690 msgid "Use an experimental heuristic to improve diffs" msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs" -#: builtin/blame.c:2597 +#: builtin/blame.c:692 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2598 +#: builtin/blame.c:693 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:2599 +#: builtin/blame.c:694 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2600 builtin/blame.c:2601 +#: builtin/blame.c:695 builtin/blame.c:696 msgid "score" msgstr "score" -#: builtin/blame.c:2600 +#: builtin/blame.c:695 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2601 +#: builtin/blame.c:696 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" -#: builtin/blame.c:2649 +#: builtin/blame.c:744 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas être utilisé avec --incremental ou les formats " "porcelaine" -#. TRANSLATORS: This string is used to tell us the maximum -#. display width for a relative timestamp in "git blame" -#. output. For C locale, "4 years, 11 months ago", which -#. takes 22 places, is the longest among various forms of -#. relative timestamps, but your language may need more or -#. fewer display columns. -#: builtin/blame.c:2697 +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c:795 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:2777 -msgid "--contents and --reverse do not blend well." -msgstr "--contents et --reverse ne font pas bon ménage." - -#: builtin/blame.c:2797 -msgid "cannot use --contents with final commit object name" -msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" - -#: builtin/blame.c:2802 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "" -"--reverse et --first-parent ensemble nécessitent la spécification d'un " -"dernier commit" - -#: builtin/blame.c:2829 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "" -"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " -"premier parent" - -#: builtin/blame.c:2840 -#, c-format -msgid "no such path %s in %s" -msgstr "pas de chemin %s dans %s" - -#: builtin/blame.c:2851 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "impossible de lire le blob %s pour le chemin %s" - -#: builtin/blame.c:2870 +#: builtin/blame.c:882 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "le fichier %s n'a qu'%lu ligne" msgstr[1] "le fichier %s n'a que %lu lignes" -#: builtin/branch.c:26 +#: builtin/blame.c:928 +msgid "Blaming lines" +msgstr "Assignation de blâme au lignes" + +#: builtin/branch.c:27 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..." -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<options>] [-r | -a] [--points-at]" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<options>] [-r | -a] [--format]" -#: builtin/branch.c:144 +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5479,7 +5573,7 @@ msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5488,12 +5582,12 @@ msgstr "" "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n" " '%s', même si elle est fusionnée dans HEAD." -#: builtin/branch.c:162 +#: builtin/branch.c:163 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:166 +#: builtin/branch.c:167 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5502,93 +5596,93 @@ msgstr "" "La branche '%s' n'est pas totalement fusionnée.\n" "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'." -#: builtin/branch.c:179 +#: builtin/branch.c:180 msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" -#: builtin/branch.c:210 +#: builtin/branch.c:211 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:216 +#: builtin/branch.c:217 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:230 +#: builtin/branch.c:231 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" -#: builtin/branch.c:245 +#: builtin/branch.c:246 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvée." -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:261 +#: builtin/branch.c:262 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Erreur lors de la suppression de la branche de suivi '%s'" -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:270 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche de suivi %s supprimée (précédemment %s).\n" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -#: builtin/branch.c:441 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being rebased at %s" msgstr "La branche %s est en cours de rebasage sur %s" -#: builtin/branch.c:445 +#: builtin/branch.c:449 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:460 +#: builtin/branch.c:464 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:470 +#: builtin/branch.c:474 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:487 +#: builtin/branch.c:491 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:490 +#: builtin/branch.c:494 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:502 +#: builtin/branch.c:506 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:518 +#: builtin/branch.c:522 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5599,176 +5693,176 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:551 +#: builtin/branch.c:555 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:553 +#: builtin/branch.c:557 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:554 +#: builtin/branch.c:558 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:555 +#: builtin/branch.c:559 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:557 +#: builtin/branch.c:561 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "upstream" msgstr "amont" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:560 +#: builtin/branch.c:564 msgid "Unset the upstream info" msgstr "Désactiver l'information amont" -#: builtin/branch.c:561 +#: builtin/branch.c:565 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:562 +#: builtin/branch.c:566 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:564 builtin/branch.c:566 +#: builtin/branch.c:568 builtin/branch.c:570 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:565 builtin/branch.c:567 +#: builtin/branch.c:569 builtin/branch.c:571 msgid "print only branches that don't contain the commit" msgstr "afficher seulement les branches qui ne contiennent pas le commit" -#: builtin/branch.c:570 +#: builtin/branch.c:574 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:571 +#: builtin/branch.c:575 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:573 +#: builtin/branch.c:577 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:574 +#: builtin/branch.c:578 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:575 +#: builtin/branch.c:579 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:576 +#: builtin/branch.c:580 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:577 +#: builtin/branch.c:581 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:578 +#: builtin/branch.c:582 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:581 +#: builtin/branch.c:585 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:583 +#: builtin/branch.c:587 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:584 +#: builtin/branch.c:588 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 +#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "key" msgstr "clé" -#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 -#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:429 +#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 +#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 +#: builtin/tag.c:430 msgid "object" msgstr "objet" -#: builtin/branch.c:589 +#: builtin/branch.c:593 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 +#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 -#: builtin/verify-tag.c:38 +#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:611 +#: builtin/branch.c:615 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:615 builtin/clone.c:724 +#: builtin/branch.c:619 builtin/clone.c:728 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:638 +#: builtin/branch.c:642 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:649 builtin/branch.c:701 +#: builtin/branch.c:653 builtin/branch.c:705 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:677 +#: builtin/branch.c:681 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:682 +#: builtin/branch.c:686 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:689 +#: builtin/branch.c:693 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:692 +#: builtin/branch.c:696 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:707 +#: builtin/branch.c:711 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:712 +#: builtin/branch.c:716 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:716 +#: builtin/branch.c:720 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5776,41 +5870,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 +#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:723 +#: builtin/branch.c:727 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:735 +#: builtin/branch.c:739 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:739 +#: builtin/branch.c:743 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:745 +#: builtin/branch.c:749 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:759 +#: builtin/branch.c:763 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:765 +#: builtin/branch.c:769 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:768 +#: builtin/branch.c:772 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5819,7 +5913,7 @@ msgstr "" "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --" "track ou --set-upstream-to\n" -#: builtin/branch.c:785 +#: builtin/branch.c:789 #, c-format msgid "" "\n" @@ -5843,7 +5937,7 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:513 +#: builtin/cat-file.c:519 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5851,7 +5945,7 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:514 +#: builtin/cat-file.c:520 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5859,309 +5953,309 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:551 +#: builtin/cat-file.c:557 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:552 +#: builtin/cat-file.c:558 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:553 +#: builtin/cat-file.c:559 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:555 +#: builtin/cat-file.c:561 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:556 +#: builtin/cat-file.c:562 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:564 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:566 msgid "for blob objects, run filters on object's content" msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" -#: builtin/cat-file.c:561 git-submodule.sh:943 +#: builtin/cat-file.c:567 git-submodule.sh:944 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:568 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spécifique pour --textconv/--filters" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:570 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:571 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:573 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:576 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:579 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "suivre les liens symbolique internes à la copie de travail (utilisé avec --" "batch ou --batch-check)" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:581 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/check-attr.c:11 +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..." -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "afficher tous les attributs associés au fichier" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "utiliser .gitattributes seulement depuis l'index" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 msgid "read file names from stdin" msgstr "lire les noms de fichier depuis l'entrée standard" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 +#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "afficher les chemins en entrée qui ne correspondent pas" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "ignorer l'index pendant la vérification" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:158 msgid "cannot specify pathnames with --stdin" msgstr "impossible de spécifier les chemins avec --stdin" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:161 msgid "-z only makes sense with --stdin" msgstr "-z n'a de sens qu'avec l'option --stdin" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:163 msgid "no path specified" msgstr "aucun chemin spécifié" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:167 msgid "--quiet is only valid with a single pathname" msgstr "--quiet n'est valide qu'avec un seul chemin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:169 msgid "cannot have both --quiet and --verbose" msgstr "impossible d'avoir --quiet et --verbose" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:172 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<options>] <contact>..." -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "lire aussi les contacts depuis l'entrée standard" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "impossible d'analyser le contact : %s" -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "aucun contact spécifié" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<options>] [--] [<fichier>...]" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:145 msgid "stage should be between 1 and 3 or all" msgstr "stage doit valoir entre 1 et 3, ou all" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:161 msgid "check out all files in the index" msgstr "extraire tous les fichiers présents dans l'index" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:162 msgid "force overwrite of existing files" msgstr "forcer l'écrasement des fichiers existants" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:164 msgid "no warning for existing files and files not in index" msgstr "" "pas d'avertissement pour les fichiers existants et les fichiers absents de " "l'index" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:166 msgid "don't checkout new files" msgstr "ne pas extraire les nouveaux fichiers" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:168 msgid "update stat information in the index file" msgstr "mettre à jour l'information de stat dans le fichier d'index" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:172 msgid "read list of paths from the standard input" msgstr "lire la liste des chemins depuis l'entrée standard" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:174 msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" -#: builtin/checkout-index.c:174 builtin/column.c:30 +#: builtin/checkout-index.c:175 builtin/column.c:31 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:477 +#: builtin/worktree.c:478 msgid "string" msgstr "chaîne" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:176 msgid "when creating files, prepend <string>" msgstr "lors de la création de fichiers, préfixer par <chaîne>" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:178 msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" -#: builtin/checkout.c:27 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<options>] <branche>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<options>] [<branche>] -- <fichier>..." -#: builtin/checkout.c:153 builtin/checkout.c:186 +#: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:155 builtin/checkout.c:188 +#: builtin/checkout.c:137 builtin/checkout.c:170 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:171 +#: builtin/checkout.c:153 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" -#: builtin/checkout.c:215 +#: builtin/checkout.c:197 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:232 +#: builtin/checkout.c:214 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:249 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 -#: builtin/checkout.c:278 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:281 builtin/checkout.c:284 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:287 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:358 builtin/checkout.c:365 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:513 +#: builtin/checkout.c:497 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:644 +#: builtin/checkout.c:628 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:669 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:689 builtin/clone.c:678 +#: builtin/checkout.c:673 builtin/clone.c:682 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:693 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:700 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:702 builtin/checkout.c:1090 +#: builtin/checkout.c:686 builtin/checkout.c:1075 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:704 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:755 +#: builtin/checkout.c:739 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:745 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6184,7 +6278,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:780 +#: builtin/checkout.c:764 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6213,166 +6307,162 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:816 +#: builtin/checkout.c:800 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:820 +#: builtin/checkout.c:804 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:847 builtin/checkout.c:1085 +#: builtin/checkout.c:832 builtin/checkout.c:1070 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:991 +#: builtin/checkout.c:976 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1031 builtin/worktree.c:214 +#: builtin/checkout.c:1016 builtin/worktree.c:215 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1045 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1084 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1102 builtin/checkout.c:1106 +#: builtin/checkout.c:1087 builtin/checkout.c:1091 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" -#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 +#: builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1126 +#: builtin/checkout.c:1111 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 -#: builtin/worktree.c:331 +#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 +#: builtin/worktree.c:330 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1145 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1147 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1148 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1164 builtin/worktree.c:333 +#: builtin/checkout.c:1149 builtin/worktree.c:332 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1150 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1153 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1155 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1172 +#: builtin/checkout.c:1157 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1173 +#: builtin/checkout.c:1158 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1174 builtin/merge.c:234 +#: builtin/checkout.c:1159 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 +#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 msgid "style" msgstr "style" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1161 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1179 +#: builtin/checkout.c:1164 msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1166 msgid "second guess 'git checkout <no-such-branch>'" msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1183 +#: builtin/checkout.c:1168 msgid "do not check if another worktree is holding the given ref" msgstr "" "ne pas vérifier si une autre copie de travail contient le référence fournie" -#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 -#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:172 +#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 +#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1203 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1220 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1225 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1282 +#: builtin/checkout.c:1261 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1268 #, c-format -msgid "" -"Cannot update paths and switch to branch '%s' at the same time.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -"Impossible de mettre à jour les chemins et de basculer sur la branche '%s' " -"en même temps.\n" -"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" +"'%s' n'est pas un commit et une branche '%s' ne peut pas être créée depuis." -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1272 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1276 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6380,38 +6470,38 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/clean.c:25 +#: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." -#: builtin/clean.c:29 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "Ignore le dépôt %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dépôt %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:297 git-add--interactive.perl:614 +#: builtin/clean.c:298 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6424,7 +6514,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:301 git-add--interactive.perl:623 +#: builtin/clean.c:302 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6445,38 +6535,38 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:517 git-add--interactive.perl:589 -#: git-add--interactive.perl:594 +#: builtin/clean.c:518 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:659 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:696 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:717 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:759 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:783 git-add--interactive.perl:1660 +#: builtin/clean.c:784 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: builtin/clean.c:791 +#: builtin/clean.c:792 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6494,15 +6584,15 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:818 git-add--interactive.perl:1736 +#: builtin/clean.c:819 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:819 git-add--interactive.perl:1733 +#: builtin/clean.c:820 git-add--interactive.perl:1689 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:827 +#: builtin/clean.c:828 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" @@ -6512,45 +6602,45 @@ msgstr[1] "Supprimerait les éléments suivants :" msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:875 +#: builtin/clean.c:906 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:877 +#: builtin/clean.c:908 msgid "force" msgstr "forcer" -#: builtin/clean.c:878 +#: builtin/clean.c:909 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:880 +#: builtin/clean.c:911 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 -#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 -#: builtin/name-rev.c:350 builtin/show-ref.c:176 +#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 +#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "motif" -#: builtin/clean.c:882 +#: builtin/clean.c:913 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:883 +#: builtin/clean.c:914 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:885 +#: builtin/clean.c:916 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:903 +#: builtin/clean.c:934 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:907 +#: builtin/clean.c:938 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6558,7 +6648,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:910 +#: builtin/clean.c:941 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6566,139 +6656,145 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:37 +#: builtin/clone.c:38 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:80 +#: builtin/clone.c:82 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 +#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:85 +#: builtin/clone.c:87 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:87 +#: builtin/clone.c:89 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:89 +#: builtin/clone.c:91 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:91 +#: builtin/clone.c:93 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "pathspec" msgstr "spécificateur de chemin" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:100 +#: builtin/clone.c:102 msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:101 builtin/init-db.c:475 +#: builtin/clone.c:103 builtin/init-db.c:476 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:102 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 #: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:108 +#: builtin/clone.c:110 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 +#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:110 +#: builtin/clone.c:112 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:112 +#: builtin/clone.c:114 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:114 +#: builtin/clone.c:116 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 -#: builtin/pull.c:202 +#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/pull.c:205 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:116 +#: builtin/clone.c:118 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 +#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 #: parse-options.h:142 msgid "time" msgstr "heure" -#: builtin/clone.c:118 +#: builtin/clone.c:120 msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:119 builtin/fetch.c:124 +#: builtin/clone.c:121 builtin/fetch.c:119 msgid "revision" msgstr "révision" -#: builtin/clone.c:120 builtin/fetch.c:125 +#: builtin/clone.c:122 builtin/fetch.c:120 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:122 +#: builtin/clone.c:124 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:124 +#: builtin/clone.c:126 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "" +"ne pas cloner les tags et indiquer au récupérations futures de ne pas le " +"faire" + +#: builtin/clone.c:128 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:125 builtin/init-db.c:484 +#: builtin/clone.c:129 builtin/init-db.c:485 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:126 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:128 +#: builtin/clone.c:132 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:268 +#: builtin/clone.c:272 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6706,42 +6802,42 @@ msgstr "" "Aucun nom de répertoire n'a pu être deviné\n" "Veuillez spécifier un répertoire dans la ligne de commande" -#: builtin/clone.c:321 +#: builtin/clone.c:325 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" -#: builtin/clone.c:393 +#: builtin/clone.c:397 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: builtin/clone.c:401 +#: builtin/clone.c:405 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:415 +#: builtin/clone.c:419 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:437 +#: builtin/clone.c:441 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:441 +#: builtin/clone.c:445 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:470 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:478 +#: builtin/clone.c:482 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6751,102 +6847,102 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer l'extraction avec 'git checkout -f HEAD'\n" -#: builtin/clone.c:555 +#: builtin/clone.c:559 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:650 +#: builtin/clone.c:654 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:666 +#: builtin/clone.c:670 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:715 +#: builtin/clone.c:719 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:746 +#: builtin/clone.c:750 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:786 +#: builtin/clone.c:792 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:849 +#: builtin/clone.c:855 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:851 +#: builtin/clone.c:857 msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:884 builtin/receive-pack.c:1900 +#: builtin/clone.c:890 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:888 +#: builtin/clone.c:894 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:901 +#: builtin/clone.c:907 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:904 +#: builtin/clone.c:910 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:917 +#: builtin/clone.c:923 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:923 builtin/fetch.c:1337 +#: builtin/clone.c:929 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:933 +#: builtin/clone.c:939 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:943 +#: builtin/clone.c:949 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà ." -#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 -#: builtin/worktree.c:221 builtin/worktree.c:251 +#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 +#: builtin/worktree.c:222 builtin/worktree.c:252 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:961 +#: builtin/clone.c:967 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:973 +#: builtin/clone.c:979 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:975 +#: builtin/clone.c:981 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:999 +#: builtin/clone.c:1005 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6854,86 +6950,86 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1055 +#: builtin/clone.c:1067 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:1057 +#: builtin/clone.c:1069 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://" "\"." -#: builtin/clone.c:1059 +#: builtin/clone.c:1071 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt " "\"file://\"." -#: builtin/clone.c:1062 +#: builtin/clone.c:1074 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1067 +#: builtin/clone.c:1079 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1071 +#: builtin/clone.c:1083 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:1126 builtin/clone.c:1134 +#: builtin/clone.c:1138 builtin/clone.c:1146 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:1137 +#: builtin/clone.c:1149 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<options>]" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "rechercher les variables de configuration" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "mise en page à utiliser" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "Largeur maximale" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "Remplissage d'espace sur la bordure gauche" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "Remplissage d'espace sur le côté droit" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "Remplissage d'espace entre les colonnes" -#: builtin/column.c:51 +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "--command doit être le premier argument" -#: builtin/commit.c:38 +#: builtin/commit.c:39 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<options>] [--] <spécification-de-chemin>..." -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<options>] [--] <spécification-de-chemin>..." -#: builtin/commit.c:48 +#: builtin/commit.c:49 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6947,7 +7043,8 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Votre nom et votre adresse e-mail ont été configurés automatiquement en se\n" +"Votre nom et votre adresse courriel ont été configurés automatiquement en " +"se\n" "fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n" "vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n" "paramétrant explicitement. Lancez les commandes suivantes et suivez les\n" @@ -6960,7 +7057,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6973,7 +7070,7 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Votre nom et votre adresse e-mail ont été configurés automatiquement en se " +"Votre nom et votre adresse courriel ont été configurés automatiquement en se " "fondant\n" "sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier " "qu'ils sont corrects.\n" @@ -6986,7 +7083,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:73 +#: builtin/commit.c:74 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" @@ -6997,7 +7094,7 @@ msgstr "" "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n" "supprimer complètement le commit avec \"git reset HEAD^\".\n" -#: builtin/commit.c:78 +#: builtin/commit.c:79 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7012,11 +7109,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:85 +#: builtin/commit.c:86 msgid "Otherwise, please use 'git reset'\n" msgstr "Sinon, veuillez utiliser 'git reset'\n" -#: builtin/commit.c:88 +#: builtin/commit.c:89 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7032,61 +7129,61 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:318 +#: builtin/commit.c:319 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:359 +#: builtin/commit.c:360 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:365 +#: builtin/commit.c:366 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:378 +#: builtin/commit.c:379 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:380 +#: builtin/commit.c:381 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 +#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:458 +#: builtin/commit.c:459 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:460 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:469 +#: builtin/commit.c:470 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:488 +#: builtin/commit.c:489 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:582 +#: builtin/commit.c:583 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:584 +#: builtin/commit.c:585 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:603 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:655 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7094,38 +7191,38 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:704 builtin/shortlog.c:294 +#: builtin/commit.c:705 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:706 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:710 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:743 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:814 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -7140,7 +7237,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:819 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -7155,7 +7252,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7165,7 +7262,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7176,150 +7273,150 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:859 +#: builtin/commit.c:857 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:865 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:874 +#: builtin/commit.c:872 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:889 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:954 +#: builtin/commit.c:951 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:968 builtin/tag.c:273 +#: builtin/commit.c:965 builtin/tag.c:274 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1071 +#: builtin/commit.c:1068 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1086 builtin/commit.c:1325 +#: builtin/commit.c:1083 builtin/commit.c:1328 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1124 +#: builtin/commit.c:1121 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1154 +#: builtin/commit.c:1151 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1163 +#: builtin/commit.c:1160 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1166 +#: builtin/commit.c:1163 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1168 +#: builtin/commit.c:1165 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1171 +#: builtin/commit.c:1168 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1181 +#: builtin/commit.c:1178 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1183 +#: builtin/commit.c:1180 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." -#: builtin/commit.c:1191 +#: builtin/commit.c:1188 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1208 +#: builtin/commit.c:1205 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1210 +#: builtin/commit.c:1207 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1212 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." - -#: builtin/commit.c:1224 builtin/tag.c:551 +#: builtin/commit.c:1219 builtin/tag.c:552 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1229 +#: builtin/commit.c:1224 msgid "Paths with -a does not make sense." msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1339 builtin/commit.c:1612 +#: builtin/commit.c:1342 builtin/commit.c:1617 msgid "show status concisely" -msgstr "afficher le statut avec concision" +msgstr "afficher l'état avec concision" -#: builtin/commit.c:1341 builtin/commit.c:1614 +#: builtin/commit.c:1344 builtin/commit.c:1619 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1343 +#: builtin/commit.c:1346 +msgid "show stash information" +msgstr "afficher l'information de remisage" + +#: builtin/commit.c:1348 msgid "version" msgstr "version" -#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:448 +#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 +#: builtin/worktree.c:449 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1346 builtin/commit.c:1618 +#: builtin/commit.c:1351 builtin/commit.c:1623 msgid "show status in long format (default)" -msgstr "afficher le statut en format long (par défaut)" +msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1349 builtin/commit.c:1621 +#: builtin/commit.c:1354 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:411 +#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 +#: builtin/fast-export.c:986 builtin/tag.c:412 msgid "mode" msgstr "mode" -#: builtin/commit.c:1352 builtin/commit.c:1624 +#: builtin/commit.c:1357 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1360 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1356 parse-options.h:155 +#: builtin/commit.c:1361 parse-options.h:155 msgid "when" msgstr "quand" -#: builtin/commit.c:1357 +#: builtin/commit.c:1362 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7327,201 +7424,201 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1359 +#: builtin/commit.c:1364 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1435 +#: builtin/commit.c:1440 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1437 +#: builtin/commit.c:1442 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1582 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1583 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1585 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1586 builtin/tag.c:409 +#: builtin/commit.c:1591 builtin/tag.c:410 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "author" msgstr "auteur" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1588 builtin/gc.c:357 +#: builtin/commit.c:1593 builtin/gc.c:358 msgid "date" msgstr "date" -#: builtin/commit.c:1588 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:407 +#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 +#: builtin/notes.c:564 builtin/tag.c:408 msgid "message" msgstr "message" -#: builtin/commit.c:1589 +#: builtin/commit.c:1594 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "commit" -#: builtin/commit.c:1590 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1592 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1593 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1594 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 +#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1596 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1597 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "default" msgstr "défaut" -#: builtin/commit.c:1598 builtin/tag.c:412 +#: builtin/commit.c:1603 builtin/tag.c:413 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1599 +#: builtin/commit.c:1604 msgid "include status in commit message template" -msgstr "inclure le statut dans le modèle de message de validation" +msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 -#: builtin/revert.c:112 +#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1604 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1605 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1606 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1607 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1608 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1609 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1610 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1611 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1622 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1623 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1628 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1630 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1659 +#: builtin/commit.c:1665 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1707 +#: builtin/commit.c:1710 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1714 +#: builtin/commit.c:1717 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1733 +#: builtin/commit.c:1736 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1744 +#: builtin/commit.c:1747 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1749 +#: builtin/commit.c:1752 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1797 +#: builtin/commit.c:1800 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7531,146 +7628,146 @@ msgstr "" "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n" "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer." -#: builtin/config.c:9 +#: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "Action" msgstr "Action" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get all values: key [value-regex]" msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get value specific for the URL: section[.var] URL" msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "Type" msgstr "Type" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is a path (file or directory name)" msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "Other" msgstr "Autre" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "show variable names only" msgstr "n'afficher que les noms de variable" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:86 +#: builtin/config.c:87 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " "ligne de commande)" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7685,12 +7782,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:615 +#: builtin/config.c:499 +msgid "--local can only be used inside a git repository" +msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git" + +#: builtin/config.c:621 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" -#: builtin/config.c:627 +#: builtin/config.c:633 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7699,75 +7800,75 @@ msgstr "" "impossible de surcharger des valeurs multiples avec une seule valeur\n" " Utilisez une regexp, --add ou --replace-all pour modifier %s." -#: builtin/count-objects.c:86 +#: builtin/count-objects.c:87 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:96 +#: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<options>] <commit ou apparenté>*" -#: builtin/describe.c:19 +#: builtin/describe.c:20 msgid "git describe [<options>] --dirty" msgstr "git describe [<options>] --dirty" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "head" msgstr "tête" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "lightweight" msgstr "léger" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "annotated" msgstr "annoté" -#: builtin/describe.c:250 +#: builtin/describe.c:253 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:254 +#: builtin/describe.c:257 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'étiquette annotée %s n'a pas de nom embarqué" -#: builtin/describe.c:256 +#: builtin/describe.c:259 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:283 builtin/log.c:487 +#: builtin/describe.c:286 builtin/log.c:489 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" -#: builtin/describe.c:286 +#: builtin/describe.c:289 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: builtin/describe.c:303 +#: builtin/describe.c:306 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:305 +#: builtin/describe.c:308 #, c-format msgid "searching to describe %s\n" msgstr "recherche de la description de %s\n" -#: builtin/describe.c:352 +#: builtin/describe.c:355 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" -#: builtin/describe.c:379 +#: builtin/describe.c:382 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7776,7 +7877,7 @@ msgstr "" "Aucune étiquette annotée ne peut décrire '%s'.\n" "Cependant, il existe des étiquettes non-annotées : essayez avec --tags." -#: builtin/describe.c:383 +#: builtin/describe.c:386 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7785,12 +7886,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:413 +#: builtin/describe.c:416 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:416 +#: builtin/describe.c:419 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7800,77 +7901,77 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" -#: builtin/describe.c:438 +#: builtin/describe.c:441 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:439 +#: builtin/describe.c:442 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:440 +#: builtin/describe.c:443 msgid "use any ref" msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:441 +#: builtin/describe.c:444 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:442 +#: builtin/describe.c:445 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:443 +#: builtin/describe.c:446 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:446 +#: builtin/describe.c:449 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:448 +#: builtin/describe.c:451 msgid "consider <n> most recent tags (default: 10)" msgstr "" "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" -#: builtin/describe.c:450 +#: builtin/describe.c:453 msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:452 +#: builtin/describe.c:455 msgid "do not consider tags matching <pattern>" msgstr "ne pas considérer les étiquettes correspondant à <motif>" -#: builtin/describe.c:454 builtin/name-rev.c:357 +#: builtin/describe.c:457 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:455 builtin/describe.c:458 +#: builtin/describe.c:458 builtin/describe.c:461 msgid "mark" msgstr "marque" -#: builtin/describe.c:456 +#: builtin/describe.c:459 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" -#: builtin/describe.c:459 +#: builtin/describe.c:462 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" -#: builtin/describe.c:477 +#: builtin/describe.c:480 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:506 +#: builtin/describe.c:509 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:549 +#: builtin/describe.c:552 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/describe.c:551 +#: builtin/describe.c:554 msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilés" @@ -7879,55 +7980,55 @@ msgstr "--broken est incompatible avec les commits ou assimilés" msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:358 +#: builtin/diff.c:359 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:401 +#: builtin/diff.c:402 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:410 +#: builtin/diff.c:411 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." -#: builtin/difftool.c:28 +#: builtin/difftool.c:29 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" -#: builtin/difftool.c:241 +#: builtin/difftool.c:249 #, c-format msgid "failed: %d" msgstr "échec : %d" -#: builtin/difftool.c:283 +#: builtin/difftool.c:291 #, c-format msgid "could not read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/difftool.c:285 +#: builtin/difftool.c:293 #, c-format msgid "could not read symlink file %s" msgstr "impossible de lire le fichier symlink %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:301 #, c-format msgid "could not read object %s for symlink %s" msgstr "Impossible de lire l'objet %s pour le symlink %s" -#: builtin/difftool.c:395 +#: builtin/difftool.c:403 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7935,53 +8036,53 @@ msgstr "" "les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n" "dans le mode de diff de répertoire ('-d' et '--dir-diff')." -#: builtin/difftool.c:609 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiés : '%s' et '%s'." -#: builtin/difftool.c:611 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a été laissé." -#: builtin/difftool.c:622 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." -#: builtin/difftool.c:623 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." -#: builtin/difftool.c:669 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:671 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" -#: builtin/difftool.c:673 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:679 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" -#: builtin/difftool.c:680 +#: builtin/difftool.c:700 msgid "<tool>" msgstr "<outil>" -#: builtin/difftool.c:681 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" -#: builtin/difftool.c:683 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "afficher une liste des outils de diff utilisables avec `--tool`" -#: builtin/difftool.c:686 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -7989,243 +8090,247 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " "non-nul" -#: builtin/difftool.c:688 +#: builtin/difftool.c:708 msgid "<command>" msgstr "<commande>" -#: builtin/difftool.c:689 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" -#: builtin/difftool.c:713 +#: builtin/difftool.c:733 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spécifié pour --tool=<outil>" -#: builtin/difftool.c:720 +#: builtin/difftool.c:740 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" -#: builtin/fast-export.c:25 +#: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:982 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:984 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:987 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:990 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:992 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:994 msgid "Fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:996 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:998 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:999 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1001 msgid "Apply refspec to exported refs" msgstr "Appliquer le spécificateur de référence aux références exportées" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:95 builtin/pull.c:175 +#: builtin/fetch.c:90 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:97 builtin/pull.c:178 +#: builtin/fetch.c:92 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:99 builtin/pull.c:181 +#: builtin/fetch.c:94 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:100 builtin/pull.c:183 +#: builtin/fetch.c:95 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:102 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:104 builtin/pull.c:185 +#: builtin/fetch.c:99 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:106 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:108 +#: builtin/fetch.c:103 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:110 builtin/pull.c:188 +#: builtin/fetch.c:105 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:111 builtin/pull.c:191 +#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:112 builtin/pull.c:192 +#: builtin/fetch.c:107 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:116 builtin/pull.c:200 +#: builtin/fetch.c:111 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:118 +#: builtin/fetch.c:113 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 +#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:123 +#: builtin/fetch.c:118 msgid "deepen history of shallow repository based on time" msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" -#: builtin/fetch.c:129 builtin/pull.c:206 +#: builtin/fetch.c:124 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:131 builtin/log.c:1440 +#: builtin/fetch.c:126 builtin/log.c:1450 msgid "dir" msgstr "répertoire" -#: builtin/fetch.c:132 +#: builtin/fetch.c:127 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:135 -msgid "default mode for recursion" -msgstr "mode par défaut pour la récursion" +#: builtin/fetch.c:130 +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)" -#: builtin/fetch.c:137 builtin/pull.c:209 +#: builtin/fetch.c:134 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:138 builtin/pull.c:211 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:139 builtin/pull.c:212 +#: builtin/fetch.c:136 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:395 +#: builtin/fetch.c:394 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:513 +#: builtin/fetch.c:512 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" "le paramètre de configuration fetch.output contient une valeur invalide %s" -#: builtin/fetch.c:606 +#: builtin/fetch.c:605 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:610 +#: builtin/fetch.c:609 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:623 builtin/fetch.c:703 +#: builtin/fetch.c:622 builtin/fetch.c:702 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:624 +#: builtin/fetch.c:623 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:633 +#: builtin/fetch.c:632 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 -#: builtin/fetch.c:698 +#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 +#: builtin/fetch.c:697 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:653 +#: builtin/fetch.c:652 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:656 +#: builtin/fetch.c:655 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:659 +#: builtin/fetch.c:658 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:698 +#: builtin/fetch.c:697 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:703 +#: builtin/fetch.c:702 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:748 +#: builtin/fetch.c:747 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:768 +#: builtin/fetch.c:767 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" @@ -8259,7 +8364,7 @@ msgstr " (%s est devenu en suspens)" msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:955 builtin/remote.c:1022 +#: builtin/fetch.c:955 builtin/remote.c:1023 msgid "(none)" msgstr "(aucun(e))" @@ -8288,7 +8393,7 @@ msgstr "Je ne sais pas récupérer depuis %s" msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" @@ -8321,104 +8426,104 @@ msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1349 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1354 +#: builtin/fetch.c:1351 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1365 +#: builtin/fetch.c:1362 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1373 +#: builtin/fetch.c:1370 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" -#: builtin/fmt-merge-msg.c:14 +#: builtin/fmt-merge-msg.c:15 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "utiliser <texte> comme début de message" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<options>] [<motif>]" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--point-at <objet>]" -#: builtin/for-each-ref.c:11 +#: builtin/for-each-ref.c:12 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" -#: builtin/for-each-ref.c:12 +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "afficher seulement les références pointant sur l'objet" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "afficher seulement les références qui sont fusionnées" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "afficher seulement les références qui ne sont pas fusionnées" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "afficher seulement les références qui contiennent le commit" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "afficher seulement les références qui ne contiennent pas le commit" @@ -8483,21 +8588,21 @@ msgstr "afficher les noms étendus pour les objets inaccessibles" msgid "Checking objects" msgstr "Vérification des objets" -#: builtin/gc.c:25 +#: builtin/gc.c:26 msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c:78 +#: builtin/gc.c:79 #, c-format msgid "Failed to fstat %s: %s" msgstr "Échec du stat de %s : %s" -#: builtin/gc.c:310 +#: builtin/gc.c:311 #, c-format msgid "Can't stat %s" msgstr "impossible de faire un stat de %s" -#: builtin/gc.c:319 +#: builtin/gc.c:320 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8506,54 +8611,54 @@ msgid "" "\n" "%s" msgstr "" -"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n" +"Le dernier lancement de gc a rapporté l'erreur suivante. Veuillez corriger\n" "la cause et supprimer %s.\n" "Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit " "supprimé.\n" "\n" "%s" -#: builtin/gc.c:358 +#: builtin/gc.c:359 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:360 +#: builtin/gc.c:361 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " "tourne déjà " -#: builtin/gc.c:379 +#: builtin/gc.c:380 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "impossible de lire la valeur de gc.logexpiry %s" -#: builtin/gc.c:407 +#: builtin/gc.c:408 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Compression automatique du dépôt en tâche de fond pour optimiser les " "performances.\n" -#: builtin/gc.c:409 +#: builtin/gc.c:410 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Compression du dépôt pour optimiser les performances.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" -#: builtin/gc.c:431 +#: builtin/gc.c:436 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8561,274 +8666,287 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " "(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:475 +#: builtin/gc.c:480 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " "supprimer." -#: builtin/grep.c:25 +#: builtin/grep.c:27 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" -#: builtin/grep.c:232 +#: builtin/grep.c:235 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep : échec de création du fil: %s" -#: builtin/grep.c:290 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "nombre de fils spécifié invalide (%d) pour %s" -#: builtin/grep.c:769 builtin/grep.c:810 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "pas de support des fils, ignore %s" + +#: builtin/grep.c:788 builtin/grep.c:829 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:829 +#: builtin/grep.c:848 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:893 +#: builtin/grep.c:912 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend un valeur numérique" -#: builtin/grep.c:980 +#: builtin/grep.c:999 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:982 +#: builtin/grep.c:1001 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:984 +#: builtin/grep.c:1003 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:986 +#: builtin/grep.c:1005 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:988 +#: builtin/grep.c:1007 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:990 +#: builtin/grep.c:1009 msgid "basename" msgstr "nom de base" -#: builtin/grep.c:991 +#: builtin/grep.c:1010 msgid "prepend parent project's basename to output" msgstr "préfixer le nom de base du projet parent à la sortie" -#: builtin/grep.c:994 +#: builtin/grep.c:1013 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:996 +#: builtin/grep.c:1015 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:998 +#: builtin/grep.c:1017 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:1000 +#: builtin/grep.c:1019 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:1002 +#: builtin/grep.c:1021 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:1005 +#: builtin/grep.c:1024 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:1007 +#: builtin/grep.c:1026 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:1011 +#: builtin/grep.c:1030 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:1014 +#: builtin/grep.c:1033 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:1017 +#: builtin/grep.c:1036 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:1020 +#: builtin/grep.c:1039 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:1023 +#: builtin/grep.c:1042 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:1024 +#: builtin/grep.c:1043 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:1025 +#: builtin/grep.c:1044 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:1027 +#: builtin/grep.c:1046 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:1029 +#: builtin/grep.c:1048 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:1031 +#: builtin/grep.c:1050 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:1034 +#: builtin/grep.c:1053 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:1036 +#: builtin/grep.c:1055 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:1038 +#: builtin/grep.c:1057 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:1039 +#: builtin/grep.c:1058 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:1041 +#: builtin/grep.c:1060 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:1043 +#: builtin/grep.c:1062 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:1046 +#: builtin/grep.c:1065 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:1049 +#: builtin/grep.c:1068 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:1051 +#: builtin/grep.c:1070 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:1053 +#: builtin/grep.c:1072 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:1054 +#: builtin/grep.c:1073 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:1057 +#: builtin/grep.c:1076 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:1059 +#: builtin/grep.c:1078 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:1062 +#: builtin/grep.c:1081 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:1064 +#: builtin/grep.c:1083 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:1066 +#: builtin/grep.c:1085 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:1078 +#: builtin/grep.c:1097 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:1080 +#: builtin/grep.c:1099 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:1082 +#: builtin/grep.c:1101 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:1089 +#: builtin/grep.c:1108 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:1153 +#: builtin/grep.c:1172 msgid "no pattern given." msgstr "aucun motif fourni." -#: builtin/grep.c:1189 +#: builtin/grep.c:1204 msgid "--no-index or --untracked cannot be used with revs" msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" -#: builtin/grep.c:1195 +#: builtin/grep.c:1211 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1228 builtin/index-pack.c:1485 +#: builtin/grep.c:1245 builtin/index-pack.c:1490 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1251 +#: builtin/grep.c:1250 +msgid "no threads support, ignoring --threads" +msgstr "pas de support des fils, ignore --threads" + +#: builtin/grep.c:1281 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:1274 +#: builtin/grep.c:1304 msgid "option not supported with --recurse-submodules." msgstr "option non supportée avec --recurse-submodules." -#: builtin/grep.c:1280 +#: builtin/grep.c:1310 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index." -#: builtin/grep.c:1286 +#: builtin/grep.c:1316 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi." -#: builtin/grep.c:1294 +#: builtin/grep.c:1324 msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en même temps." -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -8836,93 +8954,93 @@ msgstr "" "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] " "[--] <fichier>..." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "type" msgstr "type" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "object type" msgstr "type d'objet" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "write the object into the object database" msgstr "écrire l'objet dans la base de donnée d'objets" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "read the object from stdin" msgstr "lire l'objet depuis l'entrée standard" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "store file as is without filters" msgstr "stocker le fichier tel quel sans filtrage" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "juste hasher n'importe quel contenu pour créer des objets corrompus pour " "debugger Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "process file as it were from this path" msgstr "traiter le fichier comme s'il venait de ce chemin" -#: builtin/help.c:42 +#: builtin/help.c:43 msgid "print all available commands" msgstr "afficher toutes les commandes disponibles" -#: builtin/help.c:43 +#: builtin/help.c:44 msgid "exclude guides" msgstr "exclure les guides" -#: builtin/help.c:44 +#: builtin/help.c:45 msgid "print list of useful guides" msgstr "afficher une liste de guides utiles" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "show man page" msgstr "afficher la page de manuel" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "show manual in web browser" msgstr "afficher le manuel dans un navigateur web" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "show info page" msgstr "afficher la page info" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]" -#: builtin/help.c:66 +#: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'aide non reconnu '%s'" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "échec de démarrage d'emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "échec d'analyse de la version d'emacsclient." -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." -#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 +#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 #, c-format msgid "failed to exec '%s'" msgstr "échec de l'exécution de '%s'" -#: builtin/help.c:207 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8931,7 +9049,7 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:219 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8940,133 +9058,133 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:336 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:353 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:361 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:403 +#: builtin/help.c:404 msgid "Defining attributes per path" msgstr "Définition des attributs par chemin" -#: builtin/help.c:404 +#: builtin/help.c:405 msgid "Everyday Git With 20 Commands Or So" msgstr "Git de tous les jours avec à peu près 20 commandes" -#: builtin/help.c:405 +#: builtin/help.c:406 msgid "A Git glossary" msgstr "Un glossaire Git" -#: builtin/help.c:406 +#: builtin/help.c:407 msgid "Specifies intentionally untracked files to ignore" msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" -#: builtin/help.c:407 +#: builtin/help.c:408 msgid "Defining submodule properties" msgstr "Définition des propriétés de sous-module" -#: builtin/help.c:408 +#: builtin/help.c:409 msgid "Specifying revisions and ranges for Git" msgstr "Spécification des révisions et portées pour Git" -#: builtin/help.c:409 +#: builtin/help.c:410 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" "Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)" -#: builtin/help.c:410 +#: builtin/help.c:411 msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" -#: builtin/help.c:422 +#: builtin/help.c:423 msgid "The common Git guides are:\n" msgstr "Les guides Git populaires sont : \n" -#: builtin/help.c:440 +#: builtin/help.c:441 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s\" est un alias de `%s'" -#: builtin/help.c:462 builtin/help.c:479 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/index-pack.c:154 +#: builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reçu %s" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reçu %s" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:270 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "impossible de remplir %d octet" msgstr[1] "impossible de remplir %d octets" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "early EOF" msgstr "fin de fichier prématurée" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "read error on input" msgstr "erreur de lecture sur l'entrée" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:293 msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:299 +#: builtin/index-pack.c:300 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" -#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "le paquet dépasse la taille maximale permise" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:324 #, c-format msgid "cannot open packfile '%s'" msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:338 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:340 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:357 +#: builtin/index-pack.c:358 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s" @@ -9104,14 +9222,14 @@ msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus" msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 #: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:257 +#: builtin/index-pack.c:751 builtin/pack-objects.c:167 +#: builtin/pack-objects.c:261 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" @@ -9131,251 +9249,246 @@ msgstr "impossible de lire l'objet existant %s" msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:851 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:854 msgid "Error in object" msgstr "Erreur dans l'objet" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c:856 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:927 builtin/index-pack.c:958 +#: builtin/index-pack.c:928 builtin/index-pack.c:959 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1164 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1169 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1168 +#: builtin/index-pack.c:1172 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1179 +#: builtin/index-pack.c:1184 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1202 +#: builtin/index-pack.c:1207 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1213 +#: builtin/index-pack.c:1218 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1260 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "complété avec %d objet local" msgstr[1] "complété avec %d objets locaux" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1278 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1277 +#: builtin/index-pack.c:1282 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1306 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1377 +#: builtin/index-pack.c:1382 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1403 +#: builtin/index-pack.c:1408 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1420 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1423 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1433 +#: builtin/index-pack.c:1438 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1446 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1479 +#: builtin/index-pack.c:1484 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "pas de support des fils, ignore %s" - -#: builtin/index-pack.c:1547 +#: builtin/index-pack.c:1552 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1549 +#: builtin/index-pack.c:1554 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1602 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1609 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1616 +#: builtin/index-pack.c:1622 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 -#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 +#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 +#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1737 +#: builtin/index-pack.c:1743 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1745 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1753 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" -#: builtin/init-db.c:54 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/init-db.c:60 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "impossible de faire un stat du modèle '%s'" -#: builtin/init-db.c:65 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "impossible d'ouvrir (opendir) '%s'" -#: builtin/init-db.c:76 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "impossible de readlink '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "impossible de créer un lien symbolique de '%s' '%s'" -#: builtin/init-db.c:84 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "modèle %s ignoré" -#: builtin/init-db.c:119 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "modèles non trouvés %s" -#: builtin/init-db.c:134 +#: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "pas de copie des modèles depuis '%s' : %s" -#: builtin/init-db.c:327 +#: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:330 +#: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" -#: builtin/init-db.c:347 builtin/init-db.c:350 +#: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "%s existe déjà " -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Dépôt Git existant réinitialisé dans %s%s\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Dépôt Git vide partagé initialisé dans %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Dépôt Git vide initialisé dans %s%s\n" -#: builtin/init-db.c:457 +#: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -9383,25 +9496,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:515 builtin/init-db.c:520 +#: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:524 +#: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:545 +#: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -9410,7 +9523,7 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:573 +#: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" @@ -9443,114 +9556,114 @@ msgstr "ligne(s) de fin à ajouter" msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:89 +#: builtin/log.c:90 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:144 +#: builtin/log.c:147 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: builtin/log.c:145 +#: builtin/log.c:148 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:146 +#: builtin/log.c:149 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:147 +#: builtin/log.c:150 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " "compte à 1" -#: builtin/log.c:246 +#: builtin/log.c:249 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:493 +#: builtin/log.c:497 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:507 builtin/log.c:601 +#: builtin/log.c:512 builtin/log.c:606 #, c-format msgid "Could not read object %s" msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:625 +#: builtin/log.c:630 #, c-format msgid "Unknown type: %d" msgstr "Type inconnu : %d" -#: builtin/log.c:746 +#: builtin/log.c:751 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:846 +#: builtin/log.c:852 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:861 +#: builtin/log.c:868 #, c-format msgid "Cannot open patch file %s" msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:875 +#: builtin/log.c:885 msgid "Need exactly one range." msgstr "Exactement une plage nécessaire." -#: builtin/log.c:885 +#: builtin/log.c:895 msgid "Not a range." msgstr "Ceci n'est pas une plage." -#: builtin/log.c:991 +#: builtin/log.c:1001 msgid "Cover letter needs email format" -msgstr "La lettre de motivation doit être au format e-mail" +msgstr "La lettre de motivation doit être au format courriel" -#: builtin/log.c:1071 +#: builtin/log.c:1081 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1098 +#: builtin/log.c:1108 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1148 +#: builtin/log.c:1158 msgid "Two output directories?" msgstr "Deux répertoires de sortie ?" -#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 +#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 #, c-format msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 +#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." -#: builtin/log.c:1270 +#: builtin/log.c:1280 msgid "Could not find exact merge base." msgstr "Impossible de trouver la base de fusion exacte." -#: builtin/log.c:1274 +#: builtin/log.c:1284 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" @@ -9563,216 +9676,221 @@ msgstr "" "ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement." -#: builtin/log.c:1294 +#: builtin/log.c:1304 msgid "Failed to find exact merge base" msgstr "Impossible de trouver la base de fusion exacte" -#: builtin/log.c:1305 +#: builtin/log.c:1315 msgid "base commit should be the ancestor of revision list" msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" -#: builtin/log.c:1309 +#: builtin/log.c:1319 msgid "base commit shouldn't be in revision list" msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" -#: builtin/log.c:1358 +#: builtin/log.c:1368 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1415 +#: builtin/log.c:1425 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1418 +#: builtin/log.c:1428 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1422 +#: builtin/log.c:1432 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1424 +#: builtin/log.c:1434 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1426 +#: builtin/log.c:1436 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1427 +#: builtin/log.c:1437 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1428 +#: builtin/log.c:1438 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1430 +#: builtin/log.c:1440 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1432 +#: builtin/log.c:1442 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1434 +#: builtin/log.c:1444 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1437 +#: builtin/log.c:1447 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1440 +#: builtin/log.c:1450 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1443 +#: builtin/log.c:1453 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1446 +#: builtin/log.c:1456 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1448 +#: builtin/log.c:1458 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1450 +#: builtin/log.c:1460 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1452 +#: builtin/log.c:1462 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1454 +#: builtin/log.c:1464 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1455 +#: builtin/log.c:1465 msgid "header" msgstr "en-tête" -#: builtin/log.c:1456 +#: builtin/log.c:1466 msgid "add email header" -msgstr "ajouter l'en-tête d'e-mail" +msgstr "ajouter l'en-tête d'courriel" -#: builtin/log.c:1457 builtin/log.c:1459 +#: builtin/log.c:1467 builtin/log.c:1469 msgid "email" -msgstr "e-mail" +msgstr "courriel" -#: builtin/log.c:1457 +#: builtin/log.c:1467 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1459 +#: builtin/log.c:1469 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1461 +#: builtin/log.c:1471 msgid "ident" msgstr "ident" -#: builtin/log.c:1462 +#: builtin/log.c:1472 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1464 +#: builtin/log.c:1474 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1465 +#: builtin/log.c:1475 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1466 builtin/log.c:1469 +#: builtin/log.c:1476 builtin/log.c:1479 msgid "boundary" msgstr "limite" -#: builtin/log.c:1467 +#: builtin/log.c:1477 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1470 +#: builtin/log.c:1480 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1474 +#: builtin/log.c:1484 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1476 +#: builtin/log.c:1486 msgid "signature" msgstr "signature" -#: builtin/log.c:1477 +#: builtin/log.c:1487 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1478 +#: builtin/log.c:1488 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1479 +#: builtin/log.c:1489 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1481 +#: builtin/log.c:1491 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1482 +#: builtin/log.c:1492 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1572 +#: builtin/log.c:1567 +#, c-format +msgid "invalid ident line: %s" +msgstr "ligne d'identification invalide : %s" + +#: builtin/log.c:1582 msgid "-n and -k are mutually exclusive." msgstr "-n et -k sont mutuellement exclusifs." -#: builtin/log.c:1574 +#: builtin/log.c:1584 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs." -#: builtin/log.c:1582 +#: builtin/log.c:1592 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1584 +#: builtin/log.c:1594 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1586 +#: builtin/log.c:1596 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1616 +#: builtin/log.c:1626 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1618 +#: builtin/log.c:1628 #, c-format msgid "Could not create directory '%s'" msgstr "Impossible de créer le répertoire '%s'" -#: builtin/log.c:1712 +#: builtin/log.c:1722 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1784 +#: builtin/log.c:1794 msgid "Failed to create output files" msgstr "Échec de création des fichiers en sortie" -#: builtin/log.c:1833 +#: builtin/log.c:1843 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1887 +#: builtin/log.c:1897 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9786,7 +9904,7 @@ msgstr "git ls-files [<options>] [<fichier>...]" #: builtin/ls-files.c:517 msgid "identify the file status with tags" -msgstr "identifier le statut de fichier avec les étiquettes" +msgstr "identifier l'état de fichier avec les étiquettes" #: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" @@ -9931,219 +10049,224 @@ msgstr "" msgid "show underlying ref in addition to the object pointed by it" msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "afficher seulement les arbres" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "parcourir les sous-arbres" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "afficher les arbres en les parcourant" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "terminer les éléments avec un octet NUL" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "inclure la taille d'objet" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "afficher seulement les noms de fichiers" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "utiliser les noms de chemins complets" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "afficher l'arbre entier ; pas seulement le répertoire courant (implique --" "full-name)" -#: builtin/merge.c:46 +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "mbox vide : '%s'" + +#: builtin/merge.c:47 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:103 +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:140 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:196 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:199 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:200 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:202 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:205 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:207 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:209 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:152 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:210 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:212 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:216 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 -#: builtin/revert.c:108 +#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/revert.c:109 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:218 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:166 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:169 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:220 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:222 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:226 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:228 +#: builtin/merge.c:229 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:230 builtin/pull.c:170 +#: builtin/merge.c:231 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:258 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:263 +#: builtin/merge.c:264 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:268 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:287 builtin/merge.c:304 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:334 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:345 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:395 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:446 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:536 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:656 +#: builtin/merge.c:657 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:670 +#: builtin/merge.c:671 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:685 +#: builtin/merge.c:686 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:737 +#: builtin/merge.c:738 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:746 +#: builtin/merge.c:747 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:752 +#: builtin/merge.c:753 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10160,75 +10283,70 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:776 +#: builtin/merge.c:777 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:796 +#: builtin/merge.c:797 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:851 +#: builtin/merge.c:850 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:889 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:892 +#: builtin/merge.c:891 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:894 +#: builtin/merge.c:893 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:899 +#: builtin/merge.c:898 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:946 +#: builtin/merge.c:945 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1020 -#, c-format -msgid "could not close '%s'" -msgstr "impossible de fermer '%s'" - -#: builtin/merge.c:1047 +#: builtin/merge.c:1046 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1081 +#: builtin/merge.c:1080 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1146 +#: builtin/merge.c:1145 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1150 +#: builtin/merge.c:1149 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1162 +#: builtin/merge.c:1161 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1166 +#: builtin/merge.c:1165 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." -#: builtin/merge.c:1182 +#: builtin/merge.c:1181 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10236,7 +10354,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1189 +#: builtin/merge.c:1188 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10244,160 +10362,160 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1192 +#: builtin/merge.c:1191 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1201 +#: builtin/merge.c:1200 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1209 +#: builtin/merge.c:1208 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1226 +#: builtin/merge.c:1225 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1228 +#: builtin/merge.c:1227 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1233 +#: builtin/merge.c:1232 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1235 +#: builtin/merge.c:1234 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1269 +#: builtin/merge.c:1268 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: builtin/merge.c:1272 +#: builtin/merge.c:1271 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#: builtin/merge.c:1275 +#: builtin/merge.c:1274 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1278 +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: builtin/merge.c:1340 +#: builtin/merge.c:1339 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1349 +#: builtin/merge.c:1348 msgid "Already up-to-date." msgstr "Déjà à jour." -#: builtin/merge.c:1359 +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1400 +#: builtin/merge.c:1399 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1407 +#: builtin/merge.c:1406 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1432 +#: builtin/merge.c:1431 msgid "Already up-to-date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1438 +#: builtin/merge.c:1437 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1461 builtin/merge.c:1540 +#: builtin/merge.c:1460 builtin/merge.c:1539 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1465 +#: builtin/merge.c:1464 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1530 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1533 +#: builtin/merge.c:1532 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1541 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1554 +#: builtin/merge.c:1553 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <commit> <commit>..." -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <commit>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <validation>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <validation> <validation>" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <référence> [<validation>]" -#: builtin/merge-base.c:217 +#: builtin/merge-base.c:218 msgid "output all common ancestors" msgstr "afficher tous les ancêtres communs" -#: builtin/merge-base.c:219 +#: builtin/merge-base.c:220 msgid "find ancestors for a single n-way merge" msgstr "trouver les ancêtres pour une fusion simple à n points" -#: builtin/merge-base.c:221 +#: builtin/merge-base.c:222 msgid "list revs not reachable from others" msgstr "afficher les révisions inaccessibles depuis les autres" -#: builtin/merge-base.c:223 +#: builtin/merge-base.c:224 msgid "is the first one ancestor of the other?" msgstr "est le premier ancêtre de l'autre ?" -#: builtin/merge-base.c:225 +#: builtin/merge-base.c:226 msgid "find where <commit> forked from reflog of <ref>" msgstr "trouver où <validation> a divergé du reflog de <référence>" -#: builtin/merge-file.c:8 +#: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" @@ -10405,35 +10523,35 @@ msgstr "" "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> " "<fichier-orig> <fichier2>" -#: builtin/merge-file.c:32 +#: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "envoyer les résultats sur la sortie standard" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "utiliser une fusion basée sur diff3" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "pour les conflits, utiliser notre version (our)" -#: builtin/merge-file.c:36 +#: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "pour les conflits, utiliser leur version (their)" -#: builtin/merge-file.c:38 +#: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "pour les conflits, utiliser l'ensemble des versions" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "pour les conflits, utiliser cette taille de marqueur" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "ne pas avertir à propos des conflits" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:45 msgid "set labels for file1/orig-file/file2" msgstr "définir les labels pour fichier1/fichier-orig/fichier2" @@ -10472,162 +10590,162 @@ msgstr "Fusion de %s avec %s\n" msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:152 +#: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "l'entrée se termine par NUL" -#: builtin/mktree.c:153 builtin/write-tree.c:24 +#: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "autoriser les objets manquants" -#: builtin/mktree.c:154 +#: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" -#: builtin/mv.c:16 +#: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<options>] <source>... <destination>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?" -#: builtin/mv.c:84 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Veuillez indexer vos modifications de .gitmodules ou les remiser pour " "continuer" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s est dans l'index" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:125 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "la destination '%s' n'est pas un répertoire" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vérification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "mauvaise source" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "impossible de déplacer un répertoire sur un fichier" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "le répertoire source est vide" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "pas sous le contrôle de version" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "la destination existe" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "Impossible d'écraser" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "multiples sources pour la même destination" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "le répertoire de destination n'existe pas" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 +#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:289 +#: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:290 +#: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:291 +#: builtin/name-rev.c:340 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:346 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:347 +#: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:349 +#: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:351 +#: builtin/name-rev.c:400 msgid "ignore refs matching <pattern>" msgstr "ignorer les références correspondant à <motif>" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:403 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:361 +#: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <références-notes>] [list [<object>]]" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -10635,12 +10753,12 @@ msgstr "" "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> " "| -F <fichier> | (-c | -C) <objet>] [<objet>]" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -10648,204 +10766,205 @@ msgstr "" "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -" "F <fichier> | (-c | -C) <objet>] [<objet>]" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <références-notes>] show [<objet>]" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] " "<références-notes>" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <références-notes>] remove [<objet>...]" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <références-notes>] prune [-n | -v]" -#: builtin/notes.c:36 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <références-notes>] get-ref" -#: builtin/notes.c:41 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" msgstr "git notes [list [<objet>]]" -#: builtin/notes.c:46 +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<options>] [<objet>]" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<options>] <depuis-objet> <vers-objet>" -#: builtin/notes.c:52 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<depuis-objet> <vers-objet>]..." -#: builtin/notes.c:57 +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<options>] [<objet>]" -#: builtin/notes.c:62 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" msgstr "git notes edit [<objet>]" -#: builtin/notes.c:67 +#: builtin/notes.c:68 msgid "git notes show [<object>]" msgstr "git notes show [<objet>]" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<options>] <références-notes>" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<options>]" -#: builtin/notes.c:74 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<options>]" -#: builtin/notes.c:79 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" msgstr "git notes remove [<objet>]" -#: builtin/notes.c:84 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" msgstr "git notes prune [<options>]" -#: builtin/notes.c:89 +#: builtin/notes.c:90 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:94 +#: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "Écrire/éditer les notes pour l'objet suivant :" -#: builtin/notes.c:147 +#: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "impossible de démarrer 'show' pour l'objet '%s'" -#: builtin/notes.c:151 +#: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "impossible de lire la sortie de 'show'" -#: builtin/notes.c:159 +#: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "impossible de finir 'show' pour l'objet '%s'" -#: builtin/notes.c:194 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F" -#: builtin/notes.c:203 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "impossible d'écrire l'objet note" -#: builtin/notes.c:205 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "le contenu de la note a été laissé dans %s" -#: builtin/notes.c:233 builtin/tag.c:516 +#: builtin/notes.c:234 builtin/tag.c:517 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:235 builtin/tag.c:519 +#: builtin/notes.c:236 builtin/tag.c:520 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" -#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 -#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 +#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "impossible de résoudre '%s' comme une référence valide." -#: builtin/notes.c:257 +#: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "impossible de lire l'objet '%s'." -#: builtin/notes.c:261 +#: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "impossible de lire les informations de note d'un objet non-blob '%s'." -#: builtin/notes.c:301 +#: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "ligne en entrée malformée : '%s'." -#: builtin/notes.c:316 +#: builtin/notes.c:317 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "impossible de copier les notes de '%s' vers '%s'" -#. TRANSLATORS: the first %s will be replaced by a -#. git notes command: 'add', 'merge', 'remove', etc. -#: builtin/notes.c:345 +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. +#: builtin/notes.c:348 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)" -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 -#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 +#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 +#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 +#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 msgid "too many parameters" msgstr "trop de paramètres" -#: builtin/notes.c:378 builtin/notes.c:664 +#: builtin/notes.c:381 builtin/notes.c:667 #, c-format msgid "no note found for object %s." msgstr "pas de note trouvée pour l'objet %s." -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents as a string" msgstr "contenu de la note sous forme de chaîne" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents in a file" msgstr "contenu de la note dans un fichier" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse and edit specified note object" msgstr "réutiliser et éditer l'objet de note spécifié" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse specified note object" msgstr "réutiliser l'objet de note spécifié" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "allow storing empty note" msgstr "permettre de stocker une note vide" -#: builtin/notes.c:412 builtin/notes.c:483 +#: builtin/notes.c:415 builtin/notes.c:486 msgid "replace existing notes" msgstr "remplacer les notes existantes" -#: builtin/notes.c:437 +#: builtin/notes.c:440 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10854,30 +10973,30 @@ msgstr "" "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:452 builtin/notes.c:531 +#: builtin/notes.c:455 builtin/notes.c:534 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Écrasement des notes existantes pour l'objet %s\n" -#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 +#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 #, c-format msgid "Removing note for object %s\n" msgstr "Suppression de la note pour l'objet %s\n" -#: builtin/notes.c:484 +#: builtin/notes.c:487 msgid "read objects from stdin" msgstr "lire les objets depuis l'entrée standard" -#: builtin/notes.c:486 +#: builtin/notes.c:489 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "charger la configuration de réécriture pour <commande> (implique --stdin)" -#: builtin/notes.c:504 +#: builtin/notes.c:507 msgid "too few parameters" msgstr "pas assez de paramètres" -#: builtin/notes.c:525 +#: builtin/notes.c:528 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -10886,12 +11005,12 @@ msgstr "" "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:537 +#: builtin/notes.c:540 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "notes manquantes sur l'objet source %s. Impossible de copier." -#: builtin/notes.c:589 +#: builtin/notes.c:592 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10900,52 +11019,52 @@ msgstr "" "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n" "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n" -#: builtin/notes.c:684 +#: builtin/notes.c:687 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL" -#: builtin/notes.c:686 +#: builtin/notes.c:689 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "échec de la suppression de la référence NOTES_MERGE_REF" -#: builtin/notes.c:688 +#: builtin/notes.c:691 msgid "failed to remove 'git notes merge' worktree" msgstr "échec de la suppression de la copie de travail 'git notes merge'" -#: builtin/notes.c:708 +#: builtin/notes.c:711 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL" -#: builtin/notes.c:710 +#: builtin/notes.c:713 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:712 +#: builtin/notes.c:715 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:725 +#: builtin/notes.c:728 msgid "failed to resolve NOTES_MERGE_REF" msgstr "échec de la résolution de NOTES_MERGE_REF" -#: builtin/notes.c:728 +#: builtin/notes.c:731 msgid "failed to finalize notes merge" msgstr "impossible de finaliser la fusion de notes" -#: builtin/notes.c:754 +#: builtin/notes.c:757 #, c-format msgid "unknown notes merge strategy %s" msgstr "stratégie de fusion de notes inconnue %s" -#: builtin/notes.c:770 +#: builtin/notes.c:773 msgid "General options" msgstr "Options générales" -#: builtin/notes.c:772 +#: builtin/notes.c:775 msgid "Merge options" msgstr "Options de fusion" -#: builtin/notes.c:774 +#: builtin/notes.c:777 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10953,47 +11072,47 @@ msgstr "" "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:776 +#: builtin/notes.c:779 msgid "Committing unmerged notes" msgstr "Validation des notes non fusionnées" -#: builtin/notes.c:778 +#: builtin/notes.c:781 msgid "finalize notes merge by committing unmerged notes" msgstr "finaliser la fusion de notes en validant les notes non fusionnées" -#: builtin/notes.c:780 +#: builtin/notes.c:783 msgid "Aborting notes merge resolution" msgstr "Abandon de la résolution de fusion des notes" -#: builtin/notes.c:782 +#: builtin/notes.c:785 msgid "abort notes merge" msgstr "abandonner la fusion de notes" -#: builtin/notes.c:793 +#: builtin/notes.c:796 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles" -#: builtin/notes.c:798 +#: builtin/notes.c:801 msgid "must specify a notes ref to merge" msgstr "vous devez spécifier une référence de notes à fusionner" -#: builtin/notes.c:822 +#: builtin/notes.c:825 #, c-format msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy inconnu : %s" -#: builtin/notes.c:859 +#: builtin/notes.c:862 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "une fusion de notes dans %s est déjà en cours avec %s" -#: builtin/notes.c:862 +#: builtin/notes.c:865 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" "impossible de stocker le lien vers la référence actuelle aux notes (%s)" -#: builtin/notes.c:864 +#: builtin/notes.c:867 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11004,235 +11123,235 @@ msgstr "" "valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion " "avec 'git notes merge --abort'.\n" -#: builtin/notes.c:886 +#: builtin/notes.c:889 #, c-format msgid "Object %s has no note\n" msgstr "L'objet %s n'a pas de note\n" -#: builtin/notes.c:898 +#: builtin/notes.c:901 msgid "attempt to remove non-existent note is not an error" msgstr "" "la tentative de suppression d'une note non existante n'est pas une erreur" -#: builtin/notes.c:901 +#: builtin/notes.c:904 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" -#: builtin/notes.c:940 +#: builtin/notes.c:943 msgid "report pruned notes" msgstr "afficher les notes éliminées" -#: builtin/notes.c:982 +#: builtin/notes.c:985 msgid "notes-ref" msgstr "références-notes" -#: builtin/notes.c:983 +#: builtin/notes.c:986 msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1018 +#: builtin/notes.c:1021 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [options...] [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:770 +#: builtin/pack-objects.c:776 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " "cause de pack.packSizeLimit" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:789 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1063 +#: builtin/pack-objects.c:1069 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:2426 +#: builtin/pack-objects.c:2434 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2843 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2847 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2863 +#: builtin/pack-objects.c:2877 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2865 +#: builtin/pack-objects.c:2879 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2867 +#: builtin/pack-objects.c:2881 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:2870 +#: builtin/pack-objects.c:2884 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:2871 +#: builtin/pack-objects.c:2885 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2872 +#: builtin/pack-objects.c:2886 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:2875 +#: builtin/pack-objects.c:2889 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2891 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2893 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2895 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2897 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2899 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2901 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2903 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2905 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2907 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleurs correspondance des " "deltas" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2909 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2911 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2913 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:2916 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2919 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:2908 +#: builtin/pack-objects.c:2922 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2925 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2927 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2929 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2931 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2933 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2936 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2924 +#: builtin/pack-objects.c:2938 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2926 +#: builtin/pack-objects.c:2940 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2942 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2930 +#: builtin/pack-objects.c:2944 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2946 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:2934 +#: builtin/pack-objects.c:2948 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:3061 +#: builtin/pack-objects.c:3075 msgid "Counting objects" msgstr "Décompte des objets" @@ -11272,45 +11391,49 @@ msgstr "faire expirer les objets plus vieux que <heure>" msgid "cannot prune in a precious-objects repo" msgstr "impossible de nettoyer dans un dépôt d'objets précieux" -#: builtin/pull.c:51 builtin/pull.c:53 +#: builtin/pull.c:54 builtin/pull.c:56 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: builtin/pull.c:73 +#: builtin/pull.c:76 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:121 +#: builtin/pull.c:124 +msgid "control for recursive fetching of submodules" +msgstr "contrôler la récupération récursive dans les sous-modules" + +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:124 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 +#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:157 +#: builtin/pull.c:164 msgid "automatically stash/stash pop before and after rebase" msgstr "remiser avant et réappliquer après le rebasage automatiquement" -#: builtin/pull.c:173 +#: builtin/pull.c:180 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:195 +#: builtin/pull.c:198 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:284 +#: builtin/pull.c:287 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:397 +#: builtin/pull.c:399 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11318,14 +11441,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " "venez de récupérer." -#: builtin/pull.c:399 +#: builtin/pull.c:401 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les références que " "vous venez de récupérer." -#: builtin/pull.c:400 +#: builtin/pull.c:402 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11333,7 +11456,7 @@ msgstr "" "Généralement, cela signifie que vous avez indiqué un spécificateur\n" "de référence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:403 +#: builtin/pull.c:405 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11345,44 +11468,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:408 git-parse-remote.sh:73 +#: builtin/pull.c:410 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 +#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:413 builtin/pull.c:428 +#: builtin/pull.c:415 builtin/pull.c:430 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 +#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 +#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:423 git-parse-remote.sh:75 +#: builtin/pull.c:425 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:432 git-parse-remote.sh:95 +#: builtin/pull.c:434 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :" -#: builtin/pull.c:437 +#: builtin/pull.c:439 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11392,29 +11515,29 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:754 +#: builtin/pull.c:792 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:801 +#: builtin/pull.c:840 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." -#: builtin/pull.c:809 +#: builtin/pull.c:848 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " "l'index." -#: builtin/pull.c:812 +#: builtin/pull.c:851 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:813 +#: builtin/pull.c:852 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:838 +#: builtin/pull.c:877 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11425,7 +11548,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:843 +#: builtin/pull.c:882 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11442,27 +11565,33 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:858 +#: builtin/pull.c:897 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:862 +#: builtin/pull.c:901 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/push.c:16 +#: builtin/pull.c:908 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "" +"impossible de rebaser avec des modifications de sous-modules enregistrées " +"localement" + +#: builtin/push.c:17 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:89 +#: builtin/push.c:90 msgid "tag shorthand without <tag>" msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:99 +#: builtin/push.c:100 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:143 +#: builtin/push.c:144 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11471,7 +11600,7 @@ msgstr "" "Pour choisir l'option de manière permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:146 +#: builtin/push.c:147 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11496,7 +11625,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:161 +#: builtin/push.c:162 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11511,7 +11640,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:175 +#: builtin/push.c:176 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11525,13 +11654,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:183 +#: builtin/push.c:184 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branche courante %s a de multiples branches amont, impossible de pousser." -#: builtin/push.c:186 +#: builtin/push.c:187 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11542,14 +11671,14 @@ msgstr "" "pas une branche amont de votre branche courante '%s', sans me dire\n" "quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:245 +#: builtin/push.c:246 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Vous n'avez pas spécifié de spécifications de référence à pousser, et push." "default est \"nothing\"." -#: builtin/push.c:252 +#: builtin/push.c:253 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11564,7 +11693,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:258 +#: builtin/push.c:259 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" @@ -11579,7 +11708,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:264 +#: builtin/push.c:265 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" @@ -11597,13 +11726,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:271 +#: builtin/push.c:272 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " "branche distante." -#: builtin/push.c:274 +#: builtin/push.c:275 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" @@ -11615,22 +11744,22 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:334 +#: builtin/push.c:335 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:338 +#: builtin/push.c:339 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:369 +#: builtin/push.c:370 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:370 +#: builtin/push.c:371 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11652,113 +11781,113 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:388 +#: builtin/push.c:389 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:389 +#: builtin/push.c:390 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:394 +#: builtin/push.c:395 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:395 +#: builtin/push.c:396 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:400 +#: builtin/push.c:401 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:518 +#: builtin/push.c:523 msgid "repository" msgstr "dépôt" -#: builtin/push.c:519 builtin/send-pack.c:162 +#: builtin/push.c:524 builtin/send-pack.c:163 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:520 builtin/send-pack.c:164 +#: builtin/push.c:525 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:522 +#: builtin/push.c:527 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:523 +#: builtin/push.c:528 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:526 builtin/send-pack.c:165 +#: builtin/push.c:531 builtin/send-pack.c:166 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:528 builtin/send-pack.c:179 +#: builtin/push.c:533 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:529 builtin/send-pack.c:180 +#: builtin/push.c:534 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:532 +#: builtin/push.c:537 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:534 builtin/send-pack.c:173 +#: builtin/push.c:539 builtin/send-pack.c:174 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 -#: builtin/send-pack.c:160 +#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:537 +#: builtin/push.c:542 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:540 +#: builtin/push.c:545 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:542 +#: builtin/push.c:547 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:543 +#: builtin/push.c:548 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:546 builtin/send-pack.c:167 +#: builtin/push.c:551 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:548 builtin/send-pack.c:174 +#: builtin/push.c:553 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:549 builtin/send-pack.c:170 +#: builtin/push.c:554 builtin/send-pack.c:171 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/push.c:549 builtin/send-pack.c:171 +#: builtin/push.c:554 builtin/send-pack.c:172 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/push.c:563 +#: builtin/push.c:568 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:565 +#: builtin/push.c:570 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:584 +#: builtin/push.c:589 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -11775,87 +11904,87 @@ msgstr "" "sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté " "1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:121 msgid "write resulting index to <file>" msgstr "écrire l'index résultant dans <fichier>" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:124 msgid "only empty the index" msgstr "juste vider l'index" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:126 msgid "Merging" msgstr "Fusion" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:128 msgid "perform a merge in addition to a read" msgstr "effectuer une fusion en plus d'une lecture" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:130 msgid "3-way merge if no file level merging required" msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:132 msgid "3-way merge in presence of adds and removes" msgstr "fusion à 3 points en présence d'ajouts et suppressions" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c:134 msgid "same as -m, but discard unmerged entries" msgstr "comme -m, mais annule les éléments non fusionnés" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:135 msgid "<subdirectory>/" msgstr "<sous-répertoire>/" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:136 msgid "read the tree into the index under <subdirectory>/" msgstr "lire l'arbre dans l'index dans <sous-répertoire>/" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:139 msgid "update working tree with merge result" msgstr "mettre à jour la copie de travail avec le résultat de la fusion" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:141 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:151 +#: builtin/read-tree.c:142 msgid "allow explicitly ignored files to be overwritten" msgstr "autoriser explicitement les fichiers ignorés à être écrasés" -#: builtin/read-tree.c:154 +#: builtin/read-tree.c:145 msgid "don't check the working tree after merging" msgstr "ne pas vérifier la copie de travail après la fusion" -#: builtin/read-tree.c:155 +#: builtin/read-tree.c:146 msgid "don't update the index or the work tree" msgstr "ne pas mettre à jour l'index ou la copie de travail" -#: builtin/read-tree.c:157 +#: builtin/read-tree.c:148 msgid "skip applying sparse checkout filter" msgstr "sauter l'application du filtre d'extraction creuse" -#: builtin/read-tree.c:159 +#: builtin/read-tree.c:150 msgid "debug unpack-trees" msgstr "déboguer unpack-trees" -#: builtin/rebase--helper.c:7 +#: builtin/rebase--helper.c:8 msgid "git rebase--helper [<options>]" msgstr "git rebase-helper [<options>]" -#: builtin/rebase--helper.c:19 +#: builtin/rebase--helper.c:20 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase--helper.c:21 +#: builtin/rebase--helper.c:22 msgid "abort rebase" msgstr "abandonner le rebasage" -#: builtin/receive-pack.c:27 +#: builtin/receive-pack.c:28 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:795 +#: builtin/receive-pack.c:838 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" @@ -11885,7 +12014,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:815 +#: builtin/receive-pack.c:858 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" @@ -11905,29 +12034,29 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1888 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1902 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." -#: builtin/reflog.c:423 +#: builtin/reflog.c:424 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' pour '%s' n'est pas un horodatage valide" -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:541 builtin/reflog.c:546 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11935,83 +12064,83 @@ msgstr "" "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:15 builtin/remote.c:35 msgid "git remote rename <old> <new>" msgstr "git remote rename <ancienne> <nouvelle>" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:16 builtin/remote.c:40 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:17 builtin/remote.c:45 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | " "<distante>)...]" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branche>..." -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:22 builtin/remote.c:71 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <nouvelle-URL>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <URL>" -#: builtin/remote.c:29 +#: builtin/remote.c:30 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branche>..." -#: builtin/remote.c:55 +#: builtin/remote.c:56 msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <nom>" -#: builtin/remote.c:60 +#: builtin/remote.c:61 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <nom>" -#: builtin/remote.c:65 +#: builtin/remote.c:66 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<groupe> | <distante>]..." -#: builtin/remote.c:94 +#: builtin/remote.c:95 #, c-format msgid "Updating %s" msgstr "Mise à jour de %s" -#: builtin/remote.c:126 +#: builtin/remote.c:127 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -12019,92 +12148,92 @@ msgstr "" "--mirror est dangereux et obsolète ; merci\n" "\t d'utiliser --mirror=fetch ou --mirror=push à la place" -#: builtin/remote.c:143 +#: builtin/remote.c:144 #, c-format msgid "unknown mirror argument: %s" msgstr "argument miroir inconnu : %s" -#: builtin/remote.c:159 +#: builtin/remote.c:160 msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "import all tags and associated objects when fetching" msgstr "" "importer toutes les étiquettes et les objets associés lors du rapatriement" -#: builtin/remote.c:164 +#: builtin/remote.c:165 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou ne rapatrier aucune étiquette (--no-tags)" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "branch(es) to track" msgstr "branche(s) à suivre" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "master branch" msgstr "branche maîtresse" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" -#: builtin/remote.c:181 +#: builtin/remote.c:182 msgid "specifying a master branch makes no sense with --mirror" msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror" -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "spécifier les branches à suivre n'a de sens qu'avec des miroirs de " "rapatriement" -#: builtin/remote.c:190 builtin/remote.c:629 +#: builtin/remote.c:191 builtin/remote.c:630 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà ." -#: builtin/remote.c:194 builtin/remote.c:633 +#: builtin/remote.c:195 builtin/remote.c:634 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" -#: builtin/remote.c:234 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:336 +#: builtin/remote.c:337 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Impossible d'obtenir une correspondance distante pour la spécification de " "référence %s" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:438 builtin/remote.c:446 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:449 +#: builtin/remote.c:450 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 +#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 #, c-format msgid "No such remote: %s" msgstr "Distante inconnue : %s" -#: builtin/remote.c:639 +#: builtin/remote.c:640 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Impossible de renommer la section de configuration '%s' en '%s'" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12115,17 +12244,17 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:695 +#: builtin/remote.c:696 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:729 +#: builtin/remote.c:730 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:794 +#: builtin/remote.c:795 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12140,137 +12269,139 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:808 +#: builtin/remote.c:809 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:909 +#: builtin/remote.c:910 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:912 +#: builtin/remote.c:913 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:914 +#: builtin/remote.c:915 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:916 +#: builtin/remote.c:917 msgid " ???" msgstr " ???" -#: builtin/remote.c:957 +#: builtin/remote.c:958 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche" -#: builtin/remote.c:965 +#: builtin/remote.c:966 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase de manière interactive sur la distante %s" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:969 +#: builtin/remote.c:970 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:972 +#: builtin/remote.c:973 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:975 +#: builtin/remote.c:976 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s et avec la distante %s\n" -#: builtin/remote.c:1018 +#: builtin/remote.c:1019 msgid "create" msgstr "créer" -#: builtin/remote.c:1021 +#: builtin/remote.c:1022 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1025 +#: builtin/remote.c:1026 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1028 +#: builtin/remote.c:1029 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1031 +#: builtin/remote.c:1032 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1038 +#: builtin/remote.c:1039 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1041 +#: builtin/remote.c:1042 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1045 +#: builtin/remote.c:1046 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1048 +#: builtin/remote.c:1049 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1116 +#: builtin/remote.c:1117 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1143 +#: builtin/remote.c:1144 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 +#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 msgid "(no URL)" msgstr "(pas d'URL)" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1156 builtin/remote.c:1158 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 +#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1160 +#: builtin/remote.c:1164 msgid "(not queried)" msgstr "(non demandé)" -#: builtin/remote.c:1162 +#: builtin/remote.c:1166 msgid "(unknown)" msgstr "(inconnu)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1170 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -12278,171 +12409,171 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1178 +#: builtin/remote.c:1182 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1181 builtin/remote.c:1207 +#: builtin/remote.c:1185 builtin/remote.c:1211 msgid " (status not queried)" -msgstr " (statut non demandé)" +msgstr " (état non demandé)" -#: builtin/remote.c:1190 +#: builtin/remote.c:1194 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branche locale configurée pour 'git pull' :" msgstr[1] " Branches locales configurées pour 'git pull' :" -#: builtin/remote.c:1198 +#: builtin/remote.c:1202 msgid " Local refs will be mirrored by 'git push'" msgstr " Les références locales seront reflétées par 'git push'" -#: builtin/remote.c:1204 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Référence locale configurée pour 'git push'%s :" msgstr[1] " Références locales configurées pour 'git push'%s :" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1227 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1242 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1244 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Il y a de multiples branches HEAD distantes. Veuillez en choisir une " "explicitement avec :" -#: builtin/remote.c:1254 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1283 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1293 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1294 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1313 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1437 +#: builtin/remote.c:1441 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1444 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1461 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "interroger les URLs de poussée plutôt que les URLs de récupération" -#: builtin/remote.c:1463 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "retourner toutes les URLs" -#: builtin/remote.c:1491 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "aucune URL configurée pour le dépôt distant '%s'" -#: builtin/remote.c:1517 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1519 +#: builtin/remote.c:1523 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1528 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1569 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1593 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" -#: builtin/remote.c:1624 +#: builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" -#: builtin/repack.c:17 +#: builtin/repack.c:18 msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -12451,124 +12582,128 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." -#: builtin/repack.c:166 +#: builtin/repack.c:168 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:171 +#: builtin/repack.c:173 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:180 +#: builtin/repack.c:182 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:183 +#: builtin/repack.c:185 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "with -A, do not loosen objects older than this" msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" -#: builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:191 builtin/repack.c:197 msgid "bytes" msgstr "octets" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:194 +#: builtin/repack.c:196 +msgid "limits the maximum number of threads" +msgstr "limite le nombre maximal de fils" + +#: builtin/repack.c:198 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:196 +#: builtin/repack.c:200 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:206 +#: builtin/repack.c:210 msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" -#: builtin/repack.c:210 +#: builtin/repack.c:214 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:400 builtin/worktree.c:115 +#: builtin/repack.c:406 builtin/worktree.c:116 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/replace.c:19 +#: builtin/replace.c:20 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objet> <remplacement>" -#: builtin/replace.c:20 +#: builtin/replace.c:21 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <objet>" -#: builtin/replace.c:21 +#: builtin/replace.c:22 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <commit> [<parent>...]" -#: builtin/replace.c:22 +#: builtin/replace.c:23 msgid "git replace -d <object>..." msgstr "git replace -d <objet>..." -#: builtin/replace.c:23 +#: builtin/replace.c:24 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<motif>]]" -#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 +#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 #, c-format msgid "Not a valid object name: '%s'" msgstr "Nom d'objet invalide : '%s'" -#: builtin/replace.c:360 +#: builtin/replace.c:361 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:362 +#: builtin/replace.c:363 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:373 +#: builtin/replace.c:374 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12577,208 +12712,208 @@ msgstr "" "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:406 +#: builtin/replace.c:407 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "le commit original '%s' contient une signature GPG." -#: builtin/replace.c:407 +#: builtin/replace.c:408 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:413 +#: builtin/replace.c:414 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:437 +#: builtin/replace.c:438 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:438 +#: builtin/replace.c:439 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:439 +#: builtin/replace.c:440 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:440 +#: builtin/replace.c:441 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:441 +#: builtin/replace.c:442 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:442 +#: builtin/replace.c:443 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:443 +#: builtin/replace.c:444 msgid "use this format" msgstr "utiliser ce format" -#: builtin/rerere.c:12 +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "enregistrer des résolutions propres dans l'index" -#: builtin/reset.c:26 +#: builtin/reset.c:29 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -#: builtin/reset.c:27 +#: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..." -#: builtin/reset.c:28 +#: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "soft" msgstr "soft" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "hard" msgstr "hard" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "merge" msgstr "merge" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "keep" msgstr "keep" -#: builtin/reset.c:74 +#: builtin/reset.c:77 msgid "You do not have a valid HEAD." msgstr "Vous n'avez pas une HEAD valide." -#: builtin/reset.c:76 +#: builtin/reset.c:79 msgid "Failed to find tree of HEAD." msgstr "Impossible de trouver l'arbre pour HEAD." -#: builtin/reset.c:82 +#: builtin/reset.c:85 #, c-format msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." -#: builtin/reset.c:100 +#: builtin/reset.c:103 #, c-format msgid "HEAD is now at %s" msgstr "HEAD est maintenant à %s" -#: builtin/reset.c:183 +#: builtin/reset.c:186 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:276 +#: builtin/reset.c:286 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" -#: builtin/reset.c:278 +#: builtin/reset.c:288 msgid "reset HEAD and index" msgstr "réinitialiser HEAD et l'index" -#: builtin/reset.c:279 +#: builtin/reset.c:289 msgid "reset only HEAD" msgstr "réinitialiser seulement HEAD" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:291 builtin/reset.c:293 msgid "reset HEAD, index and working tree" msgstr "réinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:285 +#: builtin/reset.c:295 msgid "reset HEAD but keep local changes" msgstr "réinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:288 +#: builtin/reset.c:301 msgid "record only the fact that removed paths will be added later" msgstr "" "enregistrer seulement le fait que les chemins effacés seront ajoutés plus " "tard" -#: builtin/reset.c:305 +#: builtin/reset.c:320 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Échec de résolution de '%s' comme une révision valide." -#: builtin/reset.c:313 +#: builtin/reset.c:328 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Échec de résolution de '%s' comme un arbre valide." -#: builtin/reset.c:322 +#: builtin/reset.c:337 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch est incompatible avec --{hard,mixed,soft}" -#: builtin/reset.c:331 +#: builtin/reset.c:346 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " "place." -#: builtin/reset.c:333 +#: builtin/reset.c:348 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:343 +#: builtin/reset.c:358 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu" -#: builtin/reset.c:347 +#: builtin/reset.c:362 msgid "-N can only be used with --mixed" msgstr "-N ne peut être utilisé qu'avec --mixed" -#: builtin/reset.c:364 +#: builtin/reset.c:379 msgid "Unstaged changes after reset:" msgstr "Modifications non indexées après reset :" -#: builtin/reset.c:370 +#: builtin/reset.c:385 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." -#: builtin/reset.c:374 +#: builtin/reset.c:389 msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:358 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:394 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:399 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passé en argument" -#: builtin/rev-parse.c:400 +#: builtin/rev-parse.c:401 msgid "stop parsing after the first non-option argument" msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:403 +#: builtin/rev-parse.c:404 msgid "output in stuck long form" msgstr "sortie en forme longue fixée" -#: builtin/rev-parse.c:534 +#: builtin/rev-parse.c:535 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12793,96 +12928,96 @@ msgstr "" "Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur " "l'utilisation principale." -#: builtin/revert.c:22 +#: builtin/revert.c:23 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<options>] <commit ou apparenté>..." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert <subcommand>" msgstr "git revert <sous-commande>" -#: builtin/revert.c:28 +#: builtin/revert.c:29 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<options>] <commit ou apparenté>..." -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <sous-commande>" -#: builtin/revert.c:89 +#: builtin/revert.c:90 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s : %s ne peut pas être utilisé avec %s" -#: builtin/revert.c:98 +#: builtin/revert.c:99 msgid "end revert or cherry-pick sequence" msgstr "mettre fin au retour ou picorage" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "resume revert or cherry-pick sequence" msgstr "reprendre le retour ou picorage" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "cancel revert or cherry-pick sequence" msgstr "annuler le retour ou picorage" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "don't automatically commit" msgstr "ne pas valider automatiquement" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "edit the commit message" msgstr "éditer le message de validation" -#: builtin/revert.c:105 +#: builtin/revert.c:106 msgid "parent-number" msgstr "numéro-de-parent" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "select mainline parent" msgstr "sélectionner le parent principal" -#: builtin/revert.c:108 +#: builtin/revert.c:109 msgid "merge strategy" msgstr "stratégie de fusion" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "option" msgstr "option" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option for merge strategy" msgstr "option pour la stratégie de fusion" -#: builtin/revert.c:119 +#: builtin/revert.c:120 msgid "append commit name" msgstr "ajouter le nom de validation" -#: builtin/revert.c:121 +#: builtin/revert.c:122 msgid "preserve initially empty commits" msgstr "préserver les validations vides initialement" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/revert.c:123 +#: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "garder les validations redondantes, vides" -#: builtin/revert.c:211 +#: builtin/revert.c:212 msgid "revert failed" msgstr "revert a échoué" -#: builtin/revert.c:224 +#: builtin/revert.c:225 msgid "cherry-pick failed" msgstr "le picorage a échoué" -#: builtin/rm.c:17 +#: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<options>] [--] <fichier>..." -#: builtin/rm.c:205 +#: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -12896,7 +13031,7 @@ msgstr[1] "" "les fichiers suivants ont du contenu indexé différent\n" "du fichier et de HEAD :" -#: builtin/rm.c:210 +#: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" @@ -12904,13 +13039,13 @@ msgstr "" "\n" "(utilisez -f pour forcer la suppression)" -#: builtin/rm.c:214 +#: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "le fichier suivant a des changements indexés :" msgstr[1] "les fichiers suivants ont des changements indexés :" -#: builtin/rm.c:218 builtin/rm.c:227 +#: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -12918,31 +13053,31 @@ msgstr "" "\n" "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)" -#: builtin/rm.c:224 +#: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "le fichier suivant a des modifications locales :" msgstr[1] "les fichiers suivants ont des modifications locales :" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimés" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "outrepasser la vérification des fichiers à jour" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "autoriser la suppression récursive" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" -msgstr "sortir avec un statut zéro même si rien ne correspondait" +msgstr "sortir avec un état zéro même si rien ne correspondait" #: builtin/rm.c:308 #, c-format @@ -12959,7 +13094,7 @@ msgstr "git rm : impossible de supprimer %s" msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" -#: builtin/send-pack.c:18 +#: builtin/send-pack.c:19 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -12972,53 +13107,53 @@ msgstr "" " --all et la spécification explicite de <référence> sont mutuellement " "exclusifs." -#: builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "remote name" msgstr "nom distant" -#: builtin/send-pack.c:175 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "utiliser un protocole RPC sans état" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "lire les références depuis l'entrée standard" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "afficher les messages du greffon de protocole distant" -#: builtin/shortlog.c:13 +#: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:249 msgid "Group by committer rather than author" msgstr "Grouper par validateur plutôt que par auteur" -#: builtin/shortlog.c:250 +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "trier la sortie sur le nombre de validations par auteur" -#: builtin/shortlog.c:252 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Supprimer les descriptions de validation, fournit seulement le nombre de " "validations" -#: builtin/shortlog.c:254 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" -msgstr "Afficher l'adresse e-mail de chaque auteur" +msgstr "Afficher l'adresse courriel de chaque auteur" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "Couper les lignes" -#: builtin/show-branch.c:10 +#: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -13030,128 +13165,128 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]" -#: builtin/show-branch.c:374 +#: builtin/show-branch.c:376 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "%s ignoré; impossible de gérer plus de %d référence" msgstr[1] "%s ignoré; impossible de gérer plus de %d références" -#: builtin/show-branch.c:536 +#: builtin/show-branch.c:530 #, c-format msgid "no matching refs with %s" msgstr "aucune référence correspond à %s" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:626 msgid "show remote-tracking and local branches" msgstr "afficher les branches de suivi distantes et les branches locales" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:628 msgid "show remote-tracking branches" msgstr "afficher les branches de suivi distantes" -#: builtin/show-branch.c:636 +#: builtin/show-branch.c:630 msgid "color '*!+-' corresponding to the branch" msgstr "couleur '*!+-' correspondant à la branche" -#: builtin/show-branch.c:638 +#: builtin/show-branch.c:632 msgid "show <n> more commits after the common ancestor" msgstr "afficher <n> validations de plus après l'ancêtre commun" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:634 msgid "synonym to more=-1" msgstr "synonyme de more=-1" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:635 msgid "suppress naming strings" msgstr "supprimer les chaînes de nommage" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:637 msgid "include the current branch" msgstr "inclure la branche courante" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:639 msgid "name commits with their object names" msgstr "nommer les validations avec leurs noms d'objet" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:641 msgid "show possible merge bases" msgstr "afficher les bases possibles de fusion" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:643 msgid "show refs unreachable from any other ref" msgstr "afficher les références inaccessibles depuis toute autre référence" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:645 msgid "show commits in topological order" msgstr "afficher les validations dans l'ordre topologique" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:648 msgid "show only commits not on the first branch" msgstr "" "afficher seulement les validations qui ne sont pas sur la première branche" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:650 msgid "show merges reachable from only one tip" msgstr "afficher les fusions accessibles depuis une seule pointe" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:652 msgid "topologically sort, maintaining date order where possible" msgstr "tri topologique, maintenant l'ordre par date si possible" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:655 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" msgstr "" "afficher les <n> plus récents éléments de ref-log en commençant à la base" -#: builtin/show-branch.c:696 +#: builtin/show-branch.c:690 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog est incompatible avec --all, --remotes, --independant et --merge-" "base" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" msgstr "aucune branche spécifiée, et HEAD est invalide" -#: builtin/show-branch.c:723 +#: builtin/show-branch.c:717 msgid "--reflog option needs one branch name" msgstr "--reflog requiert un nom de branche" -#: builtin/show-branch.c:726 +#: builtin/show-branch.c:720 #, 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] "%d entrée seulement ne peut être montrée en même temps." msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps." -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:724 #, c-format msgid "no such ref %s" msgstr "référence inexistante %s" -#: builtin/show-branch.c:814 +#: builtin/show-branch.c:808 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "impossible de gérer plus de %d révision." msgstr[1] "impossible de gérer plus de %d révisions." -#: builtin/show-branch.c:818 +#: builtin/show-branch.c:812 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' n'est pas une référence valide." -#: builtin/show-branch.c:821 +#: builtin/show-branch.c:815 #, c-format msgid "cannot find commit %s (%s)" msgstr "impossible de trouver le commit %s (%s)" @@ -13205,35 +13340,35 @@ msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " "local" -#: builtin/stripspace.c:17 +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "" "sauter et supprimer toutes les lignes commençant par le caractère de " "commentaire" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:72 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" @@ -13440,51 +13575,46 @@ msgstr "parcourir récursivement les sous-modules" msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<chemin>...]" -#: builtin/submodule--helper.c:1226 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "" -"la sous-commande submodule--helper doit être appelée avec une sous-commande" - -#: builtin/submodule--helper.c:1233 +#: builtin/submodule--helper.c:1232 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" -#: builtin/submodule--helper.c:1239 +#: builtin/submodule--helper.c:1238 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<options>] nom [<référence>]" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <nom>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:41 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" "supprimer le message d'erreur pour une référence non symbolique (détachée)" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:42 msgid "delete symbolic ref" msgstr "supprimer la référence symbolique" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:43 msgid "shorten ref output" msgstr "raccourcir l'affichage de la référence" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason of the update" msgstr "raison de la mise à jour" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" @@ -13492,11 +13622,11 @@ msgstr "" "git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-" "étiquette> [<head>]" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "git tag -d <tagname>..." msgstr "git tag -d <nométiquette>..." -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -13506,21 +13636,21 @@ msgstr "" "points-at <objet>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]" -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <nométiquette>..." -#: builtin/tag.c:83 +#: builtin/tag.c:84 #, c-format msgid "tag '%s' not found." msgstr "étiquette '%s' non trouvée." -#: builtin/tag.c:99 +#: builtin/tag.c:100 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" -#: builtin/tag.c:128 +#: builtin/tag.c:129 #, c-format msgid "" "\n" @@ -13533,7 +13663,7 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:132 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -13548,343 +13678,343 @@ msgstr "" "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" "même si vous le souhaitez.\n" -#: builtin/tag.c:210 +#: builtin/tag.c:211 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:212 +#: builtin/tag.c:213 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" -#: builtin/tag.c:236 +#: builtin/tag.c:237 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:282 +#: builtin/tag.c:283 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:289 +#: builtin/tag.c:290 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" -#: builtin/tag.c:397 +#: builtin/tag.c:398 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:399 +#: builtin/tag.c:400 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:401 +#: builtin/tag.c:402 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:408 +#: builtin/tag.c:409 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:414 +#: builtin/tag.c:415 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:416 builtin/update-ref.c:368 +#: builtin/tag.c:417 builtin/update-ref.c:369 msgid "create a reflog" msgstr "créer un reflog" -#: builtin/tag.c:418 +#: builtin/tag.c:419 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:421 builtin/tag.c:423 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:422 builtin/tag.c:424 msgid "print only tags that don't contain the commit" msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "print only tags that are merged" msgstr "afficher seulement les étiquettes qui sont fusionnées" -#: builtin/tag.c:425 +#: builtin/tag.c:426 msgid "print only tags that are not merged" msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:469 +#: builtin/tag.c:470 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:491 +#: builtin/tag.c:492 msgid "-n option is only allowed in list mode" msgstr "l'option -n est autorisée seulement en mode de liste" -#: builtin/tag.c:493 +#: builtin/tag.c:494 msgid "--contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode de liste" -#: builtin/tag.c:495 +#: builtin/tag.c:496 msgid "--no-contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode liste" -#: builtin/tag.c:497 +#: builtin/tag.c:498 msgid "--points-at option is only allowed in list mode" msgstr "l'option --points-at est autorisée seulement en mode liste" -#: builtin/tag.c:499 +#: builtin/tag.c:500 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "les options --merged et --no-merged ne sont autorisées qu'en mode liste" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:529 +#: builtin/tag.c:530 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:535 +#: builtin/tag.c:536 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:540 +#: builtin/tag.c:541 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà " -#: builtin/tag.c:570 +#: builtin/tag.c:571 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" -#: builtin/unpack-objects.c:493 +#: builtin/unpack-objects.c:494 msgid "Unpacking objects" msgstr "Dépaquetage des objets" -#: builtin/update-index.c:79 +#: builtin/update-index.c:80 #, c-format msgid "failed to create directory %s" msgstr "échec de la création du répertoire %s" -#: builtin/update-index.c:85 +#: builtin/update-index.c:86 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/update-index.c:95 +#: builtin/update-index.c:96 #, c-format msgid "failed to create file %s" msgstr "échec de la création du fichier %s" -#: builtin/update-index.c:103 +#: builtin/update-index.c:104 #, c-format msgid "failed to delete file %s" msgstr "échec de la suppression du fichier %s" -#: builtin/update-index.c:110 builtin/update-index.c:216 +#: builtin/update-index.c:111 builtin/update-index.c:217 #, c-format msgid "failed to delete directory %s" msgstr "échec de la suppression du répertoire %s" -#: builtin/update-index.c:135 +#: builtin/update-index.c:136 #, c-format msgid "Testing mtime in '%s' " msgstr "Test du mtime dans '%s' " -#: builtin/update-index.c:149 +#: builtin/update-index.c:150 msgid "directory stat info does not change after adding a new file" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un fichier" -#: builtin/update-index.c:162 +#: builtin/update-index.c:163 msgid "directory stat info does not change after adding a new directory" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un répertoire" -#: builtin/update-index.c:175 +#: builtin/update-index.c:176 msgid "directory stat info changes after updating a file" msgstr "" "l'information de stat du répertoire change après mise à jour d'un fichier" -#: builtin/update-index.c:186 +#: builtin/update-index.c:187 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "l'information de stat du répertoire change après l'ajout d'un fichier dans " "un sous-répertoire" -#: builtin/update-index.c:197 +#: builtin/update-index.c:198 msgid "directory stat info does not change after deleting a file" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "fichier<" -#: builtin/update-index.c:210 +#: builtin/update-index.c:211 msgid "directory stat info does not change after deleting a directory" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "répertoire" -#: builtin/update-index.c:217 +#: builtin/update-index.c:218 msgid " OK" msgstr " OK" -#: builtin/update-index.c:568 +#: builtin/update-index.c:569 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:923 +#: builtin/update-index.c:924 msgid "continue refresh even when index needs update" msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour" -#: builtin/update-index.c:926 +#: builtin/update-index.c:927 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:929 +#: builtin/update-index.c:930 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:931 +#: builtin/update-index.c:932 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:933 +#: builtin/update-index.c:934 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:935 +#: builtin/update-index.c:936 msgid "refresh even if index contains unmerged entries" msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:938 +#: builtin/update-index.c:939 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:942 +#: builtin/update-index.c:943 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:946 +#: builtin/update-index.c:947 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:947 +#: builtin/update-index.c:948 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:956 +#: builtin/update-index.c:957 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:959 +#: builtin/update-index.c:960 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:962 +#: builtin/update-index.c:963 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:965 +#: builtin/update-index.c:966 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:968 +#: builtin/update-index.c:969 msgid "add to index only; do not add content to object database" msgstr "" "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " "données des objets" -#: builtin/update-index.c:970 +#: builtin/update-index.c:971 msgid "remove named paths even if present in worktree" msgstr "" "supprimer les chemins nommés même s'ils sont présents dans la copie de " "travail" -#: builtin/update-index.c:972 +#: builtin/update-index.c:973 msgid "with --stdin: input lines are terminated by null bytes" msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "read list of paths to be updated from standard input" msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard" -#: builtin/update-index.c:978 +#: builtin/update-index.c:979 msgid "add entries from standard input to the index" msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:982 +#: builtin/update-index.c:983 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:993 +#: builtin/update-index.c:994 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1000 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1002 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1004 msgid "enable/disable untracked cache" msgstr "activer ou désactiver le cache de non-suivis" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "test if the filesystem supports untracked cache" msgstr "tester si le système de fichier supporte le cache de non-suivis" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1008 msgid "enable untracked cache without testing the filesystem" msgstr "activer le cache de non-suivis sans tester le système de fichier" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1108 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -13892,7 +14022,7 @@ msgstr "" "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer l'index coupé" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1117 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -13900,7 +14030,7 @@ msgstr "" "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver l'index coupé" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1128 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13908,11 +14038,11 @@ msgstr "" "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver le cache des fichiers non-suivis" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1140 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13920,246 +14050,246 @@ msgstr "" "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer le cache des fichiers non-suivis" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1144 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activé pour '%s'" -#: builtin/update-ref.c:9 +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" "git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-" "valeur>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<options>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "supprimer la référence" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "mettre à jour <nomréférence> et non la référence pointée par lui" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "l'entrée standard a des arguments qui se terminent par NUL" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "lire les mises à jour depuis l'entrée standard" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "mettre à jour les fichiers d'information à partir de zéro" -#: builtin/verify-commit.c:17 +#: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <commit>..." -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:73 msgid "print commit contents" msgstr "afficher le contenu du commit" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "afficher les messages bruts de gpg" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "verbeux" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "afficher seulement les statistiques" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -#: builtin/worktree.c:15 +#: builtin/worktree.c:16 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<options>] <chemin> [<branche>]" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree list [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<options>] <chemin>" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:43 +#: builtin/worktree.c:44 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:49 +#: builtin/worktree.c:50 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" -#: builtin/worktree.c:54 +#: builtin/worktree.c:55 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:65 +#: builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:81 +#: builtin/worktree.c:82 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Suppression de worktrees/%s : le fichier gitdir point sur un endroit " "inexistant" -#: builtin/worktree.c:128 +#: builtin/worktree.c:129 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:130 +#: builtin/worktree.c:131 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:204 +#: builtin/worktree.c:205 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà " -#: builtin/worktree.c:235 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:274 +#: builtin/worktree.c:275 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Préparation de %s (identifiant %s)" -#: builtin/worktree.c:328 +#: builtin/worktree.c:327 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> même si elle est déjà extraite dans une autre copie de " "travail" -#: builtin/worktree.c:330 +#: builtin/worktree.c:329 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:332 +#: builtin/worktree.c:331 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:334 +#: builtin/worktree.c:333 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:335 +#: builtin/worktree.c:334 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:343 +#: builtin/worktree.c:342 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:478 +#: builtin/worktree.c:479 msgid "reason for locking" -msgstr "raison du vérouillage" +msgstr "raison du verrouillage" -#: builtin/worktree.c:490 builtin/worktree.c:523 +#: builtin/worktree.c:491 builtin/worktree.c:524 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:492 builtin/worktree.c:525 +#: builtin/worktree.c:493 builtin/worktree.c:526 msgid "The main working tree cannot be locked or unlocked" msgstr "" -"La copie de travail principale ne peut pas être vérouillée ou dévérouillée" +"La copie de travail principale ne peut pas être verrouillée ou déverrouillée" -#: builtin/worktree.c:497 +#: builtin/worktree.c:498 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:499 +#: builtin/worktree.c:500 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:527 +#: builtin/worktree.c:528 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/write-tree.c:13 +#: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "<préfixe>/" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: upload-pack.c:22 +#: upload-pack.c:23 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<options>] <répertoire>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "quitter après un unique échange requête/réponse" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "Sortir immédiatement après l'annonce initiale des références" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" "nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire " "Git" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "interrompre le transfer après <n> secondes d'inactivité" +msgstr "interrompre le transfert après <n> secondes d'inactivité" -#: credential-cache--daemon.c:223 +#: credential-cache--daemon.c:224 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14172,11 +14302,11 @@ msgstr "" "\n" " chmod 0700 %s" -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "afficher les messages de debug sur stderr" -#: git.c:14 +#: git.c:15 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" @@ -14186,20 +14316,21 @@ msgstr "" "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n" "pour en lire plus à propos d'une commande spécifique ou d'un concept." -#: http.c:336 +#: http.c:337 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" -msgstr "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" +msgstr "" +"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" -#: http.c:357 +#: http.c:358 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" -#: http.c:366 +#: http.c:367 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0" -#: http.c:1766 +#: http.c:1764 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14210,7 +14341,7 @@ msgstr "" " demandé : %s\n" " redirection : %s" -#: remote-curl.c:323 +#: remote-curl.c:324 #, c-format msgid "redirecting to %s" msgstr "redirection vers %s" @@ -14316,7 +14447,7 @@ msgstr "Afficher différents types d'objets" #: common-cmds.h:36 msgid "Show the working tree status" -msgstr "Afficher le statut de la copie de travail" +msgstr "Afficher l'état de la copie de travail" #: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" @@ -14609,6 +14740,10 @@ msgstr "" msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" +#: git-rebase.sh:169 +msgid "Applied autostash." +msgstr "Autoremisage appliqué." + #: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" @@ -14729,39 +14864,39 @@ msgstr "" msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." -#: git-stash.sh:53 +#: git-stash.sh:54 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear avec des paramètres n'est pas implémenté" -#: git-stash.sh:94 +#: git-stash.sh:95 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: git-stash.sh:109 +#: git-stash.sh:110 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: git-stash.sh:124 +#: git-stash.sh:125 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: git-stash.sh:144 git-stash.sh:157 +#: git-stash.sh:145 git-stash.sh:158 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: git-stash.sh:161 +#: git-stash.sh:162 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: git-stash.sh:164 +#: git-stash.sh:165 msgid "Cannot remove temporary index (can't happen)" msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)" -#: git-stash.sh:177 +#: git-stash.sh:178 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: git-stash.sh:209 +#: git-stash.sh:210 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" @@ -14776,7 +14911,7 @@ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:265 +#: git-stash.sh:266 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14785,108 +14920,110 @@ msgstr "" "erreur: option inconnue pour 'stash save': $option\n" " Pour fournir un message, utilisez git stash save -- '$option'" -#: git-stash.sh:278 +#: git-stash.sh:281 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: git-stash.sh:286 +#: git-stash.sh:289 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: git-stash.sh:291 +#: git-stash.sh:294 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: git-stash.sh:295 +#: git-stash.sh:298 msgid "Cannot save the current status" -msgstr "Impossible de sauver le statut courant" +msgstr "Impossible de sauver l'état courant" -#: git-stash.sh:296 +#: git-stash.sh:299 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg" -#: git-stash.sh:323 +#: git-stash.sh:326 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: git-stash.sh:471 +#: git-stash.sh:474 #, sh-format msgid "unknown option: $opt" msgstr "option inconnue : $opt" -#: git-stash.sh:484 -msgid "No stash found." -msgstr "Pas de remisage trouvé." +#: git-stash.sh:487 +msgid "No stash entries found." +msgstr "Aucune entrée de remisage trouvée." -#: git-stash.sh:491 +#: git-stash.sh:494 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-stash.sh:506 +#: git-stash.sh:509 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference n'est pas une référence valide" -#: git-stash.sh:534 +#: git-stash.sh:537 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' n'est pas une validation de type remisage" -#: git-stash.sh:545 +#: git-stash.sh:548 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' n'est pas une référence de remisage" -#: git-stash.sh:553 +#: git-stash.sh:556 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-stash.sh:557 +#: git-stash.sh:560 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossible d'appliquer un remisage en cours de fusion" -#: git-stash.sh:565 +#: git-stash.sh:568 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-stash.sh:567 +#: git-stash.sh:570 msgid "Could not save index tree" msgstr "Impossible de sauvegarder l'arbre d'index" -#: git-stash.sh:576 -msgid "Could not restore untracked files from stash" -msgstr "Impossible de restaurer les fichiers non-suivis depuis le remisage" +#: git-stash.sh:579 +msgid "Could not restore untracked files from stash entry" +msgstr "" +"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage" -#: git-stash.sh:601 +#: git-stash.sh:604 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-stash.sh:616 +#: git-stash.sh:619 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: git-stash.sh:630 -msgid "The stash is kept in case you need it again." -msgstr "Le remisage est conservé au cas où vous en auriez encore besoin." +#: git-stash.sh:633 +msgid "The stash entry is kept in case you need it again." +msgstr "" +"L'entrée de remisage est conservée au cas où vous en auriez encore besoin." -#: git-stash.sh:639 +#: git-stash.sh:642 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-stash.sh:640 +#: git-stash.sh:643 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:648 +#: git-stash.sh:651 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:727 +#: git-stash.sh:730 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" @@ -14911,7 +15048,7 @@ msgstr "'$sm_path' existe déjà dans l'index" msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module" -#: git-submodule.sh:218 +#: git-submodule.sh:219 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -14922,24 +15059,24 @@ msgstr "" "$sm_path\n" "Utilisez -f si vous voulez vraiment l'ajouter." -#: git-submodule.sh:236 +#: git-submodule.sh:237 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Ajout du dépôt existant à '$sm_path' dans l'index" -#: git-submodule.sh:238 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide" -#: git-submodule.sh:246 +#: git-submodule.sh:247 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) " "distant(s) :" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -14956,48 +15093,48 @@ msgstr "" "correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: git-submodule.sh:254 +#: git-submodule.sh:255 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'." -#: git-submodule.sh:266 +#: git-submodule.sh:267 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:271 +#: git-submodule.sh:272 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:280 +#: git-submodule.sh:281 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:341 +#: git-submodule.sh:342 #, sh-format msgid "Entering '$displaypath'" msgstr "Entrée dans '$displaypath'" -#: git-submodule.sh:361 +#: git-submodule.sh:362 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul." +msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul." -#: git-submodule.sh:432 +#: git-submodule.sh:433 #, sh-format msgid "pathspec and --all are incompatible" msgstr "un spécificateur de chemin et --all sont incompatibles" -#: git-submodule.sh:437 +#: git-submodule.sh:438 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: git-submodule.sh:457 +#: git-submodule.sh:458 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -15008,7 +15145,7 @@ msgstr "" "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: git-submodule.sh:465 +#: git-submodule.sh:466 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -15017,42 +15154,42 @@ msgstr "" "La copie de travail du sous-module '$displaypath' contient des modifications " "locales ; utilisez '-f' pour les annuler" -#: git-submodule.sh:468 +#: git-submodule.sh:469 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Répertoire '$displaypath' nettoyé" -#: git-submodule.sh:469 +#: git-submodule.sh:470 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Impossible de supprimer la copie de travail du sous-module '$displaypath'" -#: git-submodule.sh:472 +#: git-submodule.sh:473 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'" -#: git-submodule.sh:481 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin " "'$displaypath'" -#: git-submodule.sh:637 +#: git-submodule.sh:638 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossible de trouver la révision courante dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:647 +#: git-submodule.sh:648 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:652 +#: git-submodule.sh:653 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -15061,12 +15198,12 @@ msgstr "" "Impossible de trouver la révision courante ${remote_name}/${branch} dans le " "chemin de sous-module '$sm_path'" -#: git-submodule.sh:670 +#: git-submodule.sh:671 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:676 +#: git-submodule.sh:677 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -15075,88 +15212,88 @@ msgstr "" "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas " "$sha1. La récupération directe de ce commit a échoué." -#: git-submodule.sh:683 +#: git-submodule.sh:684 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:684 +#: git-submodule.sh:685 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:688 +#: git-submodule.sh:689 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:689 +#: git-submodule.sh:690 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:694 +#: git-submodule.sh:695 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:695 +#: git-submodule.sh:696 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:700 +#: git-submodule.sh:701 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:701 +#: git-submodule.sh:702 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:732 +#: git-submodule.sh:733 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:840 +#: git-submodule.sh:841 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" -#: git-submodule.sh:892 +#: git-submodule.sh:893 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:912 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:915 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:918 +#: git-submodule.sh:919 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Attention : $display_name ne contient pas les validations $sha1_src et " "$sha1_dst" -#: git-submodule.sh:1064 +#: git-submodule.sh:1065 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" -#: git-submodule.sh:1136 +#: git-submodule.sh:1137 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" @@ -15642,81 +15779,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Impossible de déterminer le chemin absolu du répertoire git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:238 +#: git-add--interactive.perl:196 #, perl-format msgid "%12s %12s %s" msgstr "%12s %s12s %s" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "staged" msgstr "indexé" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "unstaged" msgstr "non-indexé" -#: git-add--interactive.perl:288 git-add--interactive.perl:313 +#: git-add--interactive.perl:246 git-add--interactive.perl:271 msgid "binary" msgstr "binaire" -#: git-add--interactive.perl:297 git-add--interactive.perl:351 +#: git-add--interactive.perl:255 git-add--interactive.perl:309 msgid "nothing" msgstr "rien" -#: git-add--interactive.perl:333 git-add--interactive.perl:348 +#: git-add--interactive.perl:291 git-add--interactive.perl:306 msgid "unchanged" msgstr "inchangé" -#: git-add--interactive.perl:644 +#: git-add--interactive.perl:602 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d chemin ajouté\n" msgstr[1] "%d chemins ajoutés\n" -#: git-add--interactive.perl:647 +#: git-add--interactive.perl:605 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d chemin mis à jour\n" msgstr[1] "%d chemins mis à jour\n" -#: git-add--interactive.perl:650 +#: git-add--interactive.perl:608 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d chemin inversé\n" msgstr[1] "%d chemins inversés\n" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:611 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d chemin touché\n" msgstr[1] "%d chemins touchés\n" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:620 msgid "Update" msgstr "Mise à jour" -#: git-add--interactive.perl:674 +#: git-add--interactive.perl:632 msgid "Revert" msgstr "Inverser" -#: git-add--interactive.perl:697 +#: git-add--interactive.perl:655 #, perl-format msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" -#: git-add--interactive.perl:708 +#: git-add--interactive.perl:666 msgid "Add untracked" msgstr "Ajouter un fichier non-suivi" -#: git-add--interactive.perl:714 +#: git-add--interactive.perl:672 msgid "No untracked files.\n" msgstr "Aucun Fichier non suivi.\n" -#: git-add--interactive.perl:1030 +#: git-add--interactive.perl:985 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -15724,7 +15861,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme indexée." -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:988 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -15732,7 +15869,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme remisée." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:991 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -15740,33 +15877,33 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme desindexée." -#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 +#: git-add--interactive.perl:994 git-add--interactive.perl:1003 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" -"immediatement marquée comme appliquée." +"immédiatement marquée comme appliquée." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 +#: git-add--interactive.perl:997 git-add--interactive.perl:1000 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" -"immediatement marquée comme éliminée." +"immédiatement marquée comme éliminée." -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1013 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1014 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" -#: git-add--interactive.perl:1065 +#: git-add--interactive.perl:1020 #, perl-format msgid "" "---\n" @@ -15780,7 +15917,7 @@ msgstr "" "Les lignes commençant par %s seront éliminées.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1073 +#: git-add--interactive.perl:1028 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" @@ -15790,7 +15927,7 @@ msgstr "" "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" "alors l'édition sera abandonnée et la section conservée.\n" -#: git-add--interactive.perl:1087 +#: git-add--interactive.perl:1042 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" @@ -15801,14 +15938,14 @@ msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" #. 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:1178 +#: git-add--interactive.perl:1134 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " "l'élimine !) [y|n] ? " -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1143 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15822,7 +15959,7 @@ msgstr "" "a - indexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas indexer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1193 +#: git-add--interactive.perl:1149 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15836,7 +15973,7 @@ msgstr "" "a - remiser cette section et toutes les suivantes de ce fichier\n" "d - ne pas remiser cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1199 +#: git-add--interactive.perl:1155 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15850,7 +15987,7 @@ msgstr "" "a - désindexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas désindexer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1205 +#: git-add--interactive.perl:1161 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15864,7 +16001,7 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1211 +#: git-add--interactive.perl:1167 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15878,7 +16015,7 @@ msgstr "" "a - supprimer cette section et toutes les suivantes de ce fichier\n" "d - ne pas supprimer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1217 +#: git-add--interactive.perl:1173 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15892,7 +16029,7 @@ msgstr "" "a - éliminer cette section et toutes les suivantes de ce fichier\n" "d - ne pas éliminer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15906,7 +16043,7 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1188 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15928,203 +16065,203 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1219 msgid "The selected hunks do not apply to the index!\n" msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " -#: git-add--interactive.perl:1267 +#: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1234 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionné ignoré : %s\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1243 msgid "Only binary files changed.\n" msgstr "Seuls des fichiers binaires ont changé.\n" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl:1245 msgid "No changes.\n" msgstr "Aucune modification.\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1253 msgid "Patch update" msgstr "Mise à jour par patch" -#: git-add--interactive.perl:1349 +#: git-add--interactive.perl:1305 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "Indexer le changement de mode [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1350 +#: git-add--interactive.perl:1306 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "Indexer la suppression [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1351 +#: git-add--interactive.perl:1307 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Indexer cette section [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1354 +#: git-add--interactive.perl:1310 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "Remiser le changement de mode [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1311 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "Remiser la suppression [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1356 +#: git-add--interactive.perl:1312 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "Remiser cette section [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1315 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "Désindexer le changement de mode [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1316 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "Désindexer la suppression [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1361 +#: git-add--interactive.perl:1317 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Désindexer cette section [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1320 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1321 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "Appliquer la suppression à l'index [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1366 +#: git-add--interactive.perl:1322 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "Appliquer cette section à l'index [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1325 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1326 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1371 +#: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1330 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1331 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1376 +#: git-add--interactive.perl:1332 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1335 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a," "d,/%s,?] ? " -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1336 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d,/" "%s,?] ? " -#: git-add--interactive.perl:1381 +#: git-add--interactive.perl:1337 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "" "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? " -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " msgstr "aller à quelle section (<ret> pour voir plus) ? " -#: git-add--interactive.perl:1486 +#: git-add--interactive.perl:1442 msgid "go to which hunk? " msgstr "aller à quelle section ? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1451 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nombre invalide : '%s'\n" -#: git-add--interactive.perl:1500 +#: git-add--interactive.perl:1456 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Désolé, %d seule section disponible.\n" msgstr[1] "Désolé, Seulement %d sections disponibles.\n" -#: git-add--interactive.perl:1526 +#: git-add--interactive.perl:1482 msgid "search for regex? " msgstr "rechercher la regex ? " -#: git-add--interactive.perl:1539 +#: git-add--interactive.perl:1495 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regex de recherche malformée %s : %s\n" -#: git-add--interactive.perl:1549 +#: git-add--interactive.perl:1505 msgid "No hunk matches the given pattern\n" msgstr "Aucune section ne correspond au motif donné\n" -#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 +#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 msgid "No previous hunk\n" msgstr "Pas de section précédente\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 +#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 msgid "No next hunk\n" msgstr "Pas de section suivante\n" -#: git-add--interactive.perl:1597 +#: git-add--interactive.perl:1553 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Découpée en %d section.\n" msgstr[1] "Découpée en %d sections.\n" -#: git-add--interactive.perl:1649 +#: git-add--interactive.perl:1605 msgid "Review diff" msgstr "Réviser la différence" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1668 +#: git-add--interactive.perl:1624 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -16142,87 +16279,88 @@ msgstr "" "diff - visualiser les diff entre HEAD et l'index\n" "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n" -#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 -#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 -#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 +#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 +#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 +#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 msgid "missing --" msgstr "-- manquant" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1662 #, perl-format msgid "unknown --patch mode: %s" msgstr "mode de --patch inconnu : %s" -#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" -#: git-send-email.perl:121 +#: git-send-email.perl:126 msgid "local zone differs from GMT by a non-minute interval\n" -msgstr "la zone locale diffère du GMT par un interval supérieur à une minute\n" +msgstr "" +"la zone locale diffère du GMT par un intervalle supérieur à une minute\n" -#: git-send-email.perl:128 git-send-email.perl:134 +#: git-send-email.perl:133 git-send-email.perl:139 msgid "local time offset greater than or equal to 24 hours\n" msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n" -#: git-send-email.perl:202 git-send-email.perl:208 +#: git-send-email.perl:208 git-send-email.perl:214 msgid "the editor exited uncleanly, aborting everything" msgstr "l'éditeur est sorti en erreur, abandon total" -#: git-send-email.perl:282 +#: git-send-email.perl:291 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contient une version intermédiaire du courriel que vous composiez.\n" -#: git-send-email.perl:287 +#: git-send-email.perl:296 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contient le courriel composé.\n" -#: git-send-email.perl:305 +#: git-send-email.perl:314 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases est incompatible avec d'autres options\n" -#: git-send-email.perl:368 git-send-email.perl:623 +#: git-send-email.perl:379 git-send-email.perl:634 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n" -#: git-send-email.perl:437 +#: git-send-email.perl:448 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Champ de --suppress-cc inconnu : '%s'\n" -#: git-send-email.perl:466 +#: git-send-email.perl:477 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Paramètre de --confirm inconnu : '%s'\n" -#: git-send-email.perl:498 +#: git-send-email.perl:509 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n" -#: git-send-email.perl:500 +#: git-send-email.perl:511 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "attention : `:include:` n'est pas supporté : %s\n" -#: git-send-email.perl:502 +#: git-send-email.perl:513 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n" -#: git-send-email.perl:507 +#: git-send-email.perl:518 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "attention : ligne sendmail non reconnue : %s\n" -#: git-send-email.perl:589 +#: git-send-email.perl:600 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -16237,12 +16375,12 @@ msgstr "" " * en indiquant \"./%s\" si vous désignez un fichier, ou\n" " * en fournissant l'option --format-patch pour une plage.\n" -#: git-send-email.perl:610 +#: git-send-email.perl:621 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Échec à l'ouverture du répertoire %s : %s" -#: git-send-email.perl:634 +#: git-send-email.perl:645 #, perl-format msgid "" "fatal: %s: %s\n" @@ -16251,7 +16389,7 @@ msgstr "" "fatal : %s : %s\n" "attention : aucun patch envoyé\n" -#: git-send-email.perl:645 +#: git-send-email.perl:656 msgid "" "\n" "No patch files specified!\n" @@ -16261,17 +16399,17 @@ msgstr "" "Aucun fichier patch spécifié !\n" "\n" -#: git-send-email.perl:658 +#: git-send-email.perl:669 #, perl-format msgid "No subject line in %s?" msgstr "Ligne de sujet non trouvée dans %s ?" -#: git-send-email.perl:668 +#: git-send-email.perl:679 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Impossible d'ouvrir %s en écriture : %s" -#: git-send-email.perl:678 +#: git-send-email.perl:689 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -16285,32 +16423,32 @@ msgstr "" "\n" "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n" -#: git-send-email.perl:701 +#: git-send-email.perl:712 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Échec à l'ouverture de %s.final : %s" -#: git-send-email.perl:704 +#: git-send-email.perl:715 #, perl-format msgid "Failed to open %s: %s" msgstr "Échec à l'ouverture de %s : %s" -#: git-send-email.perl:739 +#: git-send-email.perl:750 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "" "Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n" -#: git-send-email.perl:748 +#: git-send-email.perl:759 msgid "Summary email is empty, skipping it\n" msgstr "Le courriel de résumé etant vide, il a été ignoré\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:780 +#: git-send-email.perl:791 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? " -#: git-send-email.perl:809 +#: git-send-email.perl:820 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -16318,11 +16456,11 @@ msgstr "" "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-" "Transfer-Encoding.\n" -#: git-send-email.perl:814 +#: git-send-email.perl:825 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? " -#: git-send-email.perl:822 +#: git-send-email.perl:833 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -16335,22 +16473,22 @@ msgstr "" "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez " "vraiment envoyer.\n" -#: git-send-email.perl:841 +#: git-send-email.perl:852 msgid "To whom should the emails be sent (if anyone)?" msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?" -#: git-send-email.perl:859 +#: git-send-email.perl:870 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal : l'alias '%s' se développe en lui-même\n" -#: git-send-email.perl:871 +#: git-send-email.perl:882 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -"Message-ID à utiliser comme In-Reply-to pour le premier courriel (s'il y en " +"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en " "a) ? " -#: git-send-email.perl:921 git-send-email.perl:929 +#: git-send-email.perl:932 git-send-email.perl:940 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" @@ -16358,16 +16496,16 @@ msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:933 +#: git-send-email.perl:944 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): " -#: git-send-email.perl:1234 +#: git-send-email.perl:1245 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "le chemin vers la CA \"%s\" n'existe pas" -#: git-send-email.perl:1309 +#: git-send-email.perl:1320 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16394,129 +16532,175 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1324 +#: git-send-email.perl:1335 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : " -#: git-send-email.perl:1327 +#: git-send-email.perl:1338 msgid "Send this email reply required" msgstr "Une réponse est nécessaire" -#: git-send-email.perl:1353 +#: git-send-email.perl:1364 msgid "The required SMTP server is not properly defined." msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." -#: git-send-email.perl:1397 +#: git-send-email.perl:1411 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Le serveur ne supporte pas STARTTLS ! %s" -#: git-send-email.perl:1403 +#: git-send-email.perl:1416 git-send-email.perl:1420 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "echec de STARTTLS ! %s" + +#: git-send-email.perl:1430 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-" "debug." -#: git-send-email.perl:1421 +#: git-send-email.perl:1448 #, perl-format msgid "Failed to send %s\n" msgstr "échec de l'envoi de %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Dry-Sent %s\n" msgstr "Envoi simulé de %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Sent %s\n" msgstr "%s envoyé\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "Dry-OK. Log says:\n" msgstr "Simulation OK. Le journal indique :\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "OK. Log says:\n" msgstr "OK. Le journal indique :\n" -#: git-send-email.perl:1438 +#: git-send-email.perl:1465 msgid "Result: " msgstr "Résultat : " -#: git-send-email.perl:1441 +#: git-send-email.perl:1468 msgid "Result: OK\n" msgstr "Résultat : OK\n" -#: git-send-email.perl:1454 +#: git-send-email.perl:1481 #, perl-format msgid "can't open file %s" msgstr "impossible d'ouvrir le fichier %s" -#: git-send-email.perl:1501 git-send-email.perl:1521 +#: git-send-email.perl:1528 git-send-email.perl:1548 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1507 +#: git-send-email.perl:1534 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1555 +#: git-send-email.perl:1582 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1578 +#: git-send-email.perl:1605 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1676 +#: git-send-email.perl:1711 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exécuter '%s'" -#: git-send-email.perl:1683 +#: git-send-email.perl:1718 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" -#: git-send-email.perl:1687 +#: git-send-email.perl:1722 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) échec de la fermeture du pipe vers '%s'" -#: git-send-email.perl:1714 +#: git-send-email.perl:1749 msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" -#: git-send-email.perl:1722 +#: git-send-email.perl:1757 msgid "invalid transfer encoding" msgstr "codage de transfert invalide" -#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir %s :%s\n" -#: git-send-email.perl:1744 +#: git-send-email.perl:1798 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s : le patch contient une ligne plus longue que 998 caractères" -#: git-send-email.perl:1760 +#: git-send-email.perl:1814 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1764 +#: git-send-email.perl:1818 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#~ msgid "Could not open file '%s'" +#~ msgstr "impossible d'ouvrir le fichier '%s'" + +#~ msgid "in %0.1f seconds automatically..." +#~ msgstr "dans %0.1f secondes automatiquement..." + +#~ msgid "dup2(%d,%d) failed" +#~ msgstr "échec de dup2(%d,%d)" + +#~ msgid "Initial commit on " +#~ msgstr "Validation initiale sur " + +#~ msgid "Patch is empty. Was it split wrong?" +#~ msgstr "Le patch est vide. Le découpage était-il bon ?" + +#~ msgid "" +#~ "You still have unmerged paths in your index.\n" +#~ "Did you forget to use 'git add'?" +#~ msgstr "" +#~ "Vous avez toujours des chemins non fusionnés dans votre index\n" +#~ "Auriez-vous oublié de faire 'git add' ?" + +#~ msgid "" +#~ "Cannot update paths and switch to branch '%s' at the same time.\n" +#~ "Did you intend to checkout '%s' which can not be resolved as commit?" +#~ msgstr "" +#~ "Impossible de mettre à jour les chemins et de basculer sur la branche " +#~ "'%s' en même temps.\n" +#~ "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" + +#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..." +#~ msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." + +#~ msgid "default mode for recursion" +#~ msgstr "mode par défaut pour la récursion" + +#~ msgid "submodule--helper subcommand must be called with a subcommand" +#~ msgstr "" +#~ "la sous-commande submodule--helper doit être appelée avec une sous-" +#~ "commande" + #~ msgid "could not stat '%s" #~ msgstr "stat impossible de '%s'" @@ -17079,8 +17263,8 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " #~ "Pour restaurer la branche d'origine et stopper le patchage, lancez " #~ "\"$cmdline --abort\"." -#~ msgid "Patch does not have a valid e-mail address." -#~ msgstr "Le patch n'a pas d'adresse e-mail valide." +#~ msgid "Patch does not have a valid courriel address." +#~ msgstr "Le patch n'a pas d'adresse courriel valide." #~ msgid "Applying: $FIRSTLINE" #~ msgstr "Application : $FIRSTLINE" @@ -58,8 +58,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-15 11:57+0800\n" -"PO-Revision-Date: 2017-07-19 17:11+0900\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" +"PO-Revision-Date: 2017-08-01 12:26+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-" "ko>\n" @@ -1505,17 +1505,60 @@ msgstr "%sì—ì„œ LF는 CRLFë¡œ ë°”ë€ë‹ˆë‹¤." msgid "in the future" msgstr "미래ì—" -#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167 -#: date.c:175 date.c:180 -msgid "%" -msgid_plural "%" -msgstr[0] "%" +#: date.c:122 +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "%<PRIuMAX>ì´ˆ ì „" + +#: date.c:129 +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "%<PRIuMAX>분 ì „" + +#: date.c:136 +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "%<PRIuMAX>시간 ì „" + +#: date.c:143 +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "%<PRIuMAX>ì¼ ì „" + +#: date.c:149 +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "%<PRIuMAX>주 ì „" + +#: date.c:156 +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "%<PRIuMAX>달 ì „" + +#: date.c:167 +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX>ë…„" #. TRANSLATORS: "%s" is "<n> years" #: date.c:170 -msgid "%s, %" -msgid_plural "%s, %" -msgstr[0] "%s, %" +#, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s, %<PRIuMAX>달 ì „" + +#: date.c:175 date.c:180 +#, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "%<PRIuMAX>ë…„ ì „" #: diffcore-order.c:24 #, c-format @@ -1686,7 +1729,7 @@ msgstr "ìž˜ëª»ëœ ì»¤ë°‹ %s" msgid "giving up" msgstr "í¬ê¸°í•¨" -#: fetch-pack.c:533 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "완료" @@ -8363,7 +8406,7 @@ msgstr "최ì ì„±ëŠ¥ì„ ìœ„í•´ ìžë™ìœ¼ë¡œ ì €ìž¥ì†Œì˜ ë¬¶ìŒì„ 만ë“니다 msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "ìˆ˜ë™ ê´€ë¦¬ ìž‘ì—…ì€ \"git help gc\" ë‚´ìš©ì„ ì°¸ê³ í•˜ì‹ì‹œì˜¤.\n" -#: builtin/gc.c:432 +#: builtin/gc.c:436 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8371,7 +8414,7 @@ msgstr "" "ê°€ë¹„ì§€ì»¬ë ‰í„°ê°€ ì´ë¯¸ '%s' 컴퓨터ì—ì„œ %<PRIuMAX> PIDë¡œ 실행 중입니다 (아니면 --" "force를 사용하ì‹ì‹œì˜¤)" -#: builtin/gc.c:476 +#: builtin/gc.c:480 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-05-05 09:35+0800\n" -"PO-Revision-Date: 2017-06-09 14:19+0000\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" +"PO-Revision-Date: 2017-07-30 09:20+0000\n" "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" "MIME-Version: 1.0\n" @@ -20,59 +20,59 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: advice.c:55 +#: advice.c:58 #, c-format msgid "hint: %.*s\n" msgstr "подÑказка: %.*s\n" -#: advice.c:83 +#: advice.c:86 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Ðевозможно выполнить копирование коммита в текущую ветку, так как у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð½Ðµ Ñлитые файлы." -#: advice.c:85 +#: advice.c:88 msgid "Committing is not possible because you have unmerged files." msgstr "Ðевозможно закоммитить, так как у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð½Ðµ Ñлитые файлы." -#: advice.c:87 +#: advice.c:90 msgid "Merging is not possible because you have unmerged files." msgstr "Ðевозможно выполнить ÑлиÑние, так как у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð½Ðµ Ñлитые файлы." -#: advice.c:89 +#: advice.c:92 msgid "Pulling is not possible because you have unmerged files." msgstr "Ðевозможно выполнить получение, так как у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð½Ðµ Ñлитые файлы." -#: advice.c:91 +#: advice.c:94 msgid "Reverting is not possible because you have unmerged files." msgstr "Ðевозможно обратить изменениÑ, так как у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð½Ðµ Ñлитые файлы." -#: advice.c:93 +#: advice.c:96 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Ðевозможно выполнить %s, так как у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð½Ðµ Ñлитые файлы." -#: advice.c:101 +#: advice.c:104 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чтобы пометить иÑправление и Ñделайте коммит." -#: advice.c:109 +#: advice.c:112 msgid "Exiting because of an unresolved conflict." msgstr "Выход из-за неразрешенного конфликта." -#: advice.c:114 builtin/merge.c:1185 +#: advice.c:117 builtin/merge.c:1184 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Ð’Ñ‹ не завершили ÑлиÑние (приÑутÑтвует файл MERGE_HEAD)." -#: advice.c:116 +#: advice.c:119 msgid "Please, commit your changes before merging." msgstr "Перед ÑлиÑнием, выполните коммит ваших изменений." -#: advice.c:117 +#: advice.c:120 msgid "Exiting because of unfinished merge." msgstr "Выход из-за незавершенного ÑлиÑниÑ." -#: advice.c:123 +#: advice.c:126 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -88,82 +88,92 @@ msgid "" "\n" msgstr "Примечание: переход на «%s».\n\nÐ’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð² ÑоÑтоÑнии «отделённого HEAD». Ð’Ñ‹ можете оÑмотретьÑÑ, Ñделать\nÑкÑпериментальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ закоммитить их, также вы можете отменить\nÐ¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð»ÑŽÐ±Ñ‹Ñ… коммитов в Ñтом ÑоÑтоÑнии не Ð·Ð°Ñ‚Ñ€Ð°Ð³Ð¸Ð²Ð°Ñ Ð»ÑŽÐ±Ñ‹Ðµ ветки и\nне Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ñ Ð½Ð° них.\n\nЕÑли вы хотите Ñоздать новую ветку и Ñохранить Ñвои коммиты, то вы\nможете Ñделать Ñто (ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸Ð»Ð¸ позже) вызвав команду checkout Ñнова,\nно Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -b. Ðапример:\n\n git checkout -b <имÑ-новой-ветки>\n\n" -#: apply.c:57 +#: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð² «%s»" -#: apply.c:73 +#: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð² «%s»" -#: apply.c:125 +#: apply.c:126 msgid "--reject and --3way cannot be used together." msgstr "--reject и --3way Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." -#: apply.c:127 +#: apply.c:128 msgid "--cached and --3way cannot be used together." msgstr "--cached и --3way Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." -#: apply.c:130 +#: apply.c:131 msgid "--3way outside a repository" msgstr "--3way вне репозиториÑ" -#: apply.c:141 +#: apply.c:142 msgid "--index outside a repository" msgstr "--index вне репозиториÑ" -#: apply.c:144 +#: apply.c:145 msgid "--cached outside a repository" msgstr "--cached вне репозиториÑ" -#: apply.c:845 +#: apply.c:836 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Ðе удалоÑÑŒ подготовить регулÑрное выражение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸ времени %s" -#: apply.c:854 +#: apply.c:845 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec возвратил %d Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°: %s" -#: apply.c:938 +#: apply.c:929 #, c-format msgid "unable to find filename in patch at line %d" msgstr "не удалоÑÑŒ найти Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° в Ñтроке патча %d" -#: apply.c:977 +#: apply.c:967 #, 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" -#: apply.c:983 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: плохой git-diff — не ÑоглаÑующееÑÑ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на Ñтроке %d" -#: apply.c:984 +#: apply.c:974 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: плохой git-diff — не ÑоглаÑующееÑÑ Ñтарое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на Ñтроке %d" -#: apply.c:990 +#: apply.c:979 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: плохой git-diff — ожидалоÑÑŒ /dev/null на Ñтроке %d" -#: apply.c:1488 +#: apply.c:1008 +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "недопуÑтимый режим %d: %s" + +#: apply.c:1326 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "противоречивые Ñтроки заголовка %d и %d" + +#: apply.c:1498 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: не Ð¾Ð¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ñтрока: %.*s" -#: apply.c:1557 +#: apply.c:1567 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "фрагмент изменений без заголовка на Ñтроке %d: %.*s" -#: apply.c:1577 +#: apply.c:1587 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname" @@ -176,70 +186,70 @@ msgstr[1] "заголовок git diff не нашел информацию об msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (Ñтрока %d)" msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (Ñтрока %d)" -#: apply.c:1589 +#: apply.c:1600 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "заголовок git diff не Ñодержит информации об имени файла (Ñтрока %d)" -#: apply.c:1759 +#: apply.c:1770 msgid "new file depends on old contents" msgstr "новый файл завиÑит от Ñтарого Ñодержимого" -#: apply.c:1761 +#: apply.c:1772 msgid "deleted file still has contents" msgstr "удаленный файл вÑе еще имеет Ñодержимое" -#: apply.c:1795 +#: apply.c:1806 #, c-format msgid "corrupt patch at line %d" msgstr "патч поврежден на Ñтроке %d" -#: apply.c:1832 +#: apply.c:1843 #, c-format msgid "new file %s depends on old contents" msgstr "новый файл %s завиÑит от Ñтарого Ñодержимого" -#: apply.c:1834 +#: apply.c:1845 #, c-format msgid "deleted file %s still has contents" msgstr "удаленный файл %s вÑе еще имеет Ñодержимое" -#: apply.c:1837 +#: apply.c:1848 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** предупреждение: файл %s ÑтановитÑÑ Ð¿ÑƒÑтым, но не удалÑетÑÑ" -#: apply.c:1984 +#: apply.c:1995 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "поврежденный двоичный патч на Ñтроке %d: %.*s" -#: apply.c:2021 +#: apply.c:2032 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неопознанный двоичный патч на Ñтроке %d" -#: apply.c:2182 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "патч Ñ Ð¼ÑƒÑором на Ñтроке %d" -#: apply.c:2265 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "не удалоÑÑŒ прочитать Ñимвольную ÑÑылку %s" -#: apply.c:2269 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "не удалоÑÑŒ открыть или прочеÑÑ‚ÑŒ %s" -#: apply.c:2922 +#: apply.c:2933 #, c-format msgid "invalid start of line: '%c'" msgstr "неправильное начало Ñтроки: «%c»" -#: apply.c:3041 +#: apply.c:3052 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -248,257 +258,257 @@ msgstr[1] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдв msgstr[2] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтрок)." msgstr[3] "ЧаÑÑ‚ÑŒ #%d уÑпешно применена на %d (Ñо Ñдвигом в %d Ñтрок)." -#: apply.c:3053 +#: apply.c:3064 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "КонтекÑÑ‚ Ñужен до (%ld/%ld), чтобы применить фрагмент на %d Ñтроке" -#: apply.c:3059 +#: apply.c:3070 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "при поиÑке:\n%.*s" -#: apply.c:3081 +#: apply.c:3092 #, c-format msgid "missing binary patch data for '%s'" msgstr "пропущены данные двоичного патча Ð´Ð»Ñ Â«%s»" -#: apply.c:3089 +#: apply.c:3100 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "невозможно выполнить reverse-apply Ð´Ð»Ñ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ патча, без Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ блока «%s»" -#: apply.c:3135 +#: apply.c:3146 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "невозможно применить двоичный патч «%s» без Ñтроки Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ полной верÑией индекÑа" -#: apply.c:3145 +#: apply.c:3156 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "патч применÑÑ‚ÑÑ Ðº файлу «%s» (%s), но его текущее Ñодержимое не ÑоотвеÑтвует ожидаемому." -#: apply.c:3153 +#: apply.c:3164 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "патч применÑетÑÑ Ðº пуÑтому файлу «%s», но файл не пуÑтой" -#: apply.c:3171 +#: apply.c:3182 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "не удалоÑÑŒ прочитать необходимую поÑылку %s Ð´Ð»Ñ Â«%s»" -#: apply.c:3184 +#: apply.c:3195 #, c-format msgid "binary patch does not apply to '%s'" msgstr "не удалоÑÑŒ применить двоичный патч к «%s»" -#: apply.c:3190 +#: apply.c:3201 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "поÑле Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ патча Ð´Ð»Ñ Â«%s» был получен неправильный результат (ожидалоÑÑŒ %s, получено %s)" -#: apply.c:3211 +#: apply.c:3222 #, c-format msgid "patch failed: %s:%ld" msgstr "ошибка Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹: %s:%ld" -#: apply.c:3333 +#: apply.c:3344 #, c-format msgid "cannot checkout %s" msgstr "не удалоÑÑŒ переключить ÑоÑтоÑние на %s" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 +#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 #, c-format msgid "failed to read %s" msgstr "не удалоÑÑŒ прочитать %s" -#: apply.c:3389 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "чтение из «%s» за ÑимволичеÑкой ÑÑылкой" -#: apply.c:3418 apply.c:3658 +#: apply.c:3429 apply.c:3669 #, c-format msgid "path %s has been renamed/deleted" msgstr "путь %s был переименован/удален" -#: apply.c:3501 apply.c:3672 +#: apply.c:3512 apply.c:3683 #, c-format msgid "%s: does not exist in index" msgstr "%s: нет в индекÑе" -#: apply.c:3510 apply.c:3680 +#: apply.c:3521 apply.c:3691 #, c-format msgid "%s: does not match index" msgstr "%s: не Ñовпадает Ñ Ð¸Ð½Ð´ÐµÐºÑом" -#: apply.c:3545 +#: apply.c:3556 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "в репозитории отÑутÑтвует необходимый двоичный объект Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ°Ñ‚Ð° к трёхходовому ÑлиÑнию." -#: apply.c:3548 +#: apply.c:3559 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Откат к трёхходовому ÑлиÑнию…\n" -#: apply.c:3564 apply.c:3568 +#: apply.c:3575 apply.c:3579 #, c-format msgid "cannot read the current contents of '%s'" msgstr "не удалоÑÑŒ прочитать текущее Ñодержимое «%s»" -#: apply.c:3580 +#: apply.c:3591 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Ðе удалоÑÑŒ откатитьÑÑ Ðº трёхходовому ÑлиÑнию…\n" -#: apply.c:3594 +#: apply.c:3605 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Патч применен к «%s» Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð°Ð¼Ð¸.\n" -#: apply.c:3599 +#: apply.c:3610 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Патч применен к «%s» без ошибок.\n" -#: apply.c:3625 +#: apply.c:3636 msgid "removal patch leaves file contents" msgstr "патч ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ удалил Ñодержимое файла" -#: apply.c:3697 +#: apply.c:3708 #, c-format msgid "%s: wrong type" msgstr "%s: неправильный тип" -#: apply.c:3699 +#: apply.c:3710 #, c-format msgid "%s has type %o, expected %o" msgstr "%s имеет тип %o, а ожидалÑÑ %o" -#: apply.c:3850 apply.c:3852 +#: apply.c:3860 apply.c:3862 #, c-format msgid "invalid path '%s'" msgstr "неправильный путь «%s»" -#: apply.c:3908 +#: apply.c:3918 #, c-format msgid "%s: already exists in index" msgstr "%s: уже ÑодержитÑÑ Ð² индекÑе" -#: apply.c:3911 +#: apply.c:3921 #, c-format msgid "%s: already exists in working directory" msgstr "%s: уже ÑодержитÑÑ Ð² рабочем каталоге" -#: apply.c:3931 +#: apply.c:3941 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новый режим доÑтупа (%o) Ð´Ð»Ñ %s не ÑоответÑтвует Ñтарому режиму доÑтупа (%o)" -#: apply.c:3936 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "новый режим доÑтупа (%o) Ð´Ð»Ñ %s не ÑоответÑтвует Ñтарому режиму доÑтупа (%o) Ð´Ð»Ñ %s" -#: apply.c:3956 +#: apply.c:3966 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "затронутый файл «%s» находитÑÑ Ð·Ð° ÑимволичеÑкой ÑÑылкой" -#: apply.c:3960 +#: apply.c:3970 #, c-format msgid "%s: patch does not apply" msgstr "%s: не удалоÑÑŒ применить патч" -#: apply.c:3975 +#: apply.c:3985 #, c-format msgid "Checking patch %s..." msgstr "Проверка патча %s…" -#: apply.c:4066 +#: apply.c:4076 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± sha1 отÑутÑтвует или беÑполезна Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s" -#: apply.c:4073 +#: apply.c:4083 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "изменен режим Ð´Ð»Ñ %s, который не находитÑÑ Ð² текущем HEAD" -#: apply.c:4076 +#: apply.c:4086 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± sha1 отÑутÑтвует или беÑполезна (%s)." -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 +#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "Ñбой make_cache_entry Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»" -#: apply.c:4085 +#: apply.c:4095 #, c-format msgid "could not add %s to temporary index" msgstr "не удалоÑÑŒ добавить %s во временный индекÑ" -#: apply.c:4095 +#: apply.c:4105 #, c-format msgid "could not write temporary index to %s" msgstr "не удалоÑÑŒ запиÑать временный Ð¸Ð½Ð´ÐºÐµÐºÑ Ð² %s" -#: apply.c:4233 +#: apply.c:4243 #, c-format msgid "unable to remove %s from index" msgstr "не удалоÑÑŒ удалить %s из индекÑа" -#: apply.c:4268 +#: apply.c:4278 #, c-format msgid "corrupt patch for submodule %s" msgstr "поврежденный патч Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s" -#: apply.c:4274 +#: apply.c:4284 #, c-format msgid "unable to stat newly created file '%s'" msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Ñозданного файла «%s»" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "не удалоÑÑŒ Ñоздать вÑпомогательный файл Ð´Ð»Ñ Ñозданного файла %s" -#: apply.c:4288 apply.c:4432 +#: apply.c:4298 apply.c:4442 #, c-format msgid "unable to add cache entry for %s" msgstr "не удалоÑÑŒ Ñоздать запиÑÑŒ в кÑше Ð´Ð»Ñ %s" -#: apply.c:4329 +#: apply.c:4339 #, c-format msgid "failed to write to '%s'" msgstr "не удалоÑÑŒ запиÑать в «%s»" -#: apply.c:4333 +#: apply.c:4343 #, c-format msgid "closing file '%s'" msgstr "закрытие файла «%s»" -#: apply.c:4403 +#: apply.c:4413 #, c-format msgid "unable to write file '%s' mode %o" msgstr "не удалоÑÑŒ запиÑать файл «%s» Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð¼ доÑтупа %o" -#: apply.c:4501 +#: apply.c:4511 #, c-format msgid "Applied patch %s cleanly." msgstr "Патч %s применен без ошибок." -#: apply.c:4509 +#: apply.c:4519 msgid "internal error" msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°" -#: apply.c:4512 +#: apply.c:4522 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -507,45 +517,45 @@ msgstr[1] "Применение патча %%s Ñ %d отказами…" msgstr[2] "Применение патча %%s Ñ %d отказами…" msgstr[3] "Применение патча %%s Ñ %d отказами…" -#: apply.c:4523 +#: apply.c:4533 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "уÑечение имени .rej файла до %.*s.rej" -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 +#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "не удалоÑÑŒ открыть %s" -#: apply.c:4545 +#: apply.c:4555 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Блок â„–%d применен без ошибок." -#: apply.c:4549 +#: apply.c:4559 #, c-format msgid "Rejected hunk #%d." msgstr "Блок â„–%d отклонен." -#: apply.c:4659 +#: apply.c:4669 #, c-format msgid "Skipped patch '%s'." msgstr "Патч «%s» пропущен." -#: apply.c:4667 +#: apply.c:4677 msgid "unrecognized input" msgstr "не раÑпознанный ввод" -#: apply.c:4686 +#: apply.c:4696 msgid "unable to read index file" msgstr "не удалоÑÑŒ прочитать файл индекÑа" -#: apply.c:4823 +#: apply.c:4833 #, c-format msgid "can't open patch '%s': %s" msgstr "не удалоÑÑŒ открыть патч «%s»: %s" -#: apply.c:4850 +#: apply.c:4860 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" @@ -554,7 +564,7 @@ msgstr[1] "пропущено %d ошибки в пробельных Ñимво msgstr[2] "пропущено %d ошибок в пробельных Ñимволах" msgstr[3] "пропущено %d ошибок в пробельных Ñимволах" -#: apply.c:4856 apply.c:4871 +#: apply.c:4866 apply.c:4881 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -563,7 +573,7 @@ msgstr[1] "%d Ñтроки добавили ошибки в пробельных msgstr[2] "%d Ñтрок добавили ошибки в пробельных Ñимволах." msgstr[3] "%d Ñтрок добавили ошибки в пробельных Ñимволах." -#: apply.c:4864 +#: apply.c:4874 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -572,304 +582,299 @@ msgstr[1] "%d Ñтроки добавлено поÑле иÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ msgstr[2] "%d Ñтрок добавлено поÑле иÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾ÑˆÐ¸Ð±Ð¾Ðº в пробелах." msgstr[3] "%d Ñтроки добавлено поÑле иÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾ÑˆÐ¸Ð±Ð¾Ðº в пробелах." -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "Ðе удалоÑÑŒ запиÑать новый файл индекÑа" -#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "path" msgstr "путь" -#: apply.c:4912 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "не применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾ указанному пути" -#: apply.c:4915 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾ указанному пути" -#: apply.c:4917 builtin/am.c:2285 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "количеÑтво" -#: apply.c:4918 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "удалить <количеÑтво> ведущих коÑÑ‹Ñ… черт из традиционных путей ÑпиÑка изменений" -#: apply.c:4921 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "игнорировать добавлениÑ, Ñделанные Ñтим патчем" -#: apply.c:4923 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° вывеÑти ÑтатиÑтику добавлений и удалений Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°" -#: apply.c:4927 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "показать количеÑтво добавленных и удаленных Ñтрок в деÑÑтичном предÑтавлении" -#: apply.c:4929 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° вывеÑти ÑтатиÑтику изменений Ð´Ð»Ñ Ð²Ð²Ð¾Ð´Ð°" -#: apply.c:4931 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "вмеÑто Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ‚Ñ‡Ð° проверить подходит ли он" -#: apply.c:4933 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "проверить, что патч применÑетÑÑ Ðº текущему индекÑу" -#: apply.c:4935 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "применить патч, не изменÑÑ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ð¹ каталог" -#: apply.c:4937 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "принÑÑ‚ÑŒ патч, который затрагивает файлы за рабочим каталогом" -#: apply.c:4939 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "а также применить патч (иÑпользуйте Ñ --stat/--summary/--check)" -#: apply.c:4941 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "попытатьÑÑ Ñделать трехходовое ÑлиÑние, еÑли патч не применÑетÑÑ" -#: apply.c:4943 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "поÑтроить временный индекÑ, оÑнованный на вÑтроенной информации об индекÑе" -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 +#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "пути, отделённые ÐУЛЕВЫМ Ñимволом" -#: apply.c:4948 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "удоÑтоверитьÑÑ, что по крайней мере <n> Ñтрок контекÑта Ñовпадают" -#: apply.c:4949 builtin/am.c:2264 +#: apply.c:4959 builtin/am.c:2245 msgid "action" msgstr "дейÑтвие" -#: apply.c:4950 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "определÑÑ‚ÑŒ новые или модифицированные Ñтроки, у которых еÑÑ‚ÑŒ ошибки в пробельных Ñимволах" -#: apply.c:4953 apply.c:4956 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² пробельных Ñимволах при поиÑке контекÑта" -#: apply.c:4959 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "применить патч Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸ÐµÐ¼ изменений" -#: apply.c:4961 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "не ожидать как минимум одной Ñтроки контекÑта" -#: apply.c:4963 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оÑтавить отклоненные блоки изменений в ÑоответÑтвующих *.rej файлах" -#: apply.c:4965 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "разрешить перекрывающиеÑÑ Ð±Ð»Ð¾ÐºÐ¸ изменений" -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 +#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 +#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 +#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "быть многоÑловнее" -#: apply.c:4968 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "разрешить некорректно определенные пропущенные пуÑтые Ñтроки в конце файла" -#: apply.c:4971 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "не доверÑÑ‚ÑŒ количеÑтву Ñтрок из заголовка блока изменений" -#: apply.c:4973 builtin/am.c:2273 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "корень" -#: apply.c:4974 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "добавить <корень> Ñпереди ко вÑем именам файлов" -#: archive.c:12 +#: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:14 +#: archive.c:15 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> " "[<path>...]" msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]" -#: archive.c:15 +#: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Ñпецификатор пути «%s» не ÑоответÑтвует ни одному файлу" -#: archive.c:417 +#: archive.c:418 msgid "fmt" msgstr "формат" -#: archive.c:417 +#: archive.c:418 msgid "archive format" msgstr "формат архива" -#: archive.c:418 builtin/log.c:1436 +#: archive.c:419 builtin/log.c:1446 msgid "prefix" msgstr "префикÑ" -#: archive.c:419 +#: archive.c:420 msgid "prepend prefix to each pathname in the archive" msgstr "добавлÑÑ‚ÑŒ Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ Ð¿ÐµÑ€ÐµÐ´ каждым путем файла в архиве" -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 +#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 +#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "файл" -#: archive.c:421 builtin/archive.c:89 +#: archive.c:422 builtin/archive.c:89 msgid "write the archive to this file" msgstr "запиÑÑŒ архива в Ñтот файл" -#: archive.c:423 +#: archive.c:424 msgid "read .gitattributes in working directory" msgstr "читать .gitattributes в рабочем каталоге" -#: archive.c:424 +#: archive.c:425 msgid "report archived files on stderr" msgstr "отчет об архивированных файлах в stderr" -#: archive.c:425 +#: archive.c:426 msgid "store only" msgstr "только хранение" -#: archive.c:426 +#: archive.c:427 msgid "compress faster" msgstr "Ñжимать быÑтрее" -#: archive.c:434 +#: archive.c:435 msgid "compress better" msgstr "Ñжимать лучше" -#: archive.c:437 +#: archive.c:438 msgid "list supported archive formats" msgstr "перечиÑлить поддерживаемые форматы архивов" -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "репозиторий" -#: archive.c:440 builtin/archive.c:91 +#: archive.c:441 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "получить архив из внешнего <репозиториÑ>" -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 msgid "command" msgstr "команда" -#: archive.c:442 builtin/archive.c:93 +#: archive.c:443 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "путь к команде git-upload-archive на машине Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¼ репозиторием" -#: archive.c:449 +#: archive.c:450 msgid "Unexpected option --remote" msgstr "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ --remote" -#: archive.c:451 +#: archive.c:452 msgid "Option --exec can only be used together with --remote" msgstr "ÐžÐ¿Ñ†Ð¸Ñ --exec может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ вмеÑте Ñ --remote" -#: archive.c:453 +#: archive.c:454 msgid "Unexpected option --output" msgstr "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ --output" -#: archive.c:475 +#: archive.c:476 #, c-format msgid "Unknown archive format '%s'" msgstr "ÐеизвеÑтный формат архива «%s»" -#: archive.c:482 +#: archive.c:483 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Ðргумент не поддерживаетÑÑ Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° «%s»: -%d" -#: attr.c:212 +#: attr.c:214 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым именем атрибута" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "Отрицающие шаблоны в атрибутах git игнорируютÑÑ.\nИÑпользуйте «\\!» Ð´Ð»Ñ Ð±ÑƒÐºÐ²Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñимвола в значении «воÑклицательный знак»." -#: bisect.c:444 -#, c-format -msgid "Could not open file '%s'" -msgstr "Ðе удалоÑÑŒ открыть файл «%s»" - -#: bisect.c:449 +#: bisect.c:447 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Плохое Ñодержимое файла «%s»: %s" -#: bisect.c:657 +#: bisect.c:655 #, c-format msgid "We cannot bisect more!\n" msgstr "Ðевозможно продолжить бинарный поиÑк!\n" -#: bisect.c:710 +#: bisect.c:708 #, c-format msgid "Not a valid commit name %s" msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° %s" -#: bisect.c:734 +#: bisect.c:732 #, 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" -#: bisect.c:739 +#: bisect.c:737 #, 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" -#: bisect.c:744 +#: bisect.c:742 #, 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" -#: bisect.c:752 +#: bisect.c:750 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -877,7 +882,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "ÐеÑколько %s коммитов не ÑвлÑÑŽÑ‚ÑÑ Ð¿Ñ€ÐµÐ´ÐºÐ°Ð¼Ð¸ %s коммита.\nÐ’ Ñтом Ñлучае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s меÑтами?\n" -#: bisect.c:765 +#: bisect.c:763 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -885,43 +890,43 @@ msgid "" "We continue anyway." msgstr "База ÑлиÑÐ½Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ %s и [%s] должно быть пропущена.\nПоÑтому мы не можем быть уверены, что первый %s коммит находитÑÑ Ð¼ÐµÐ¶Ð´Ñƒ %s и %s.\nÐо вÑе же продолжаем поиÑк." -#: bisect.c:800 +#: bisect.c:798 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Бинарный поиÑк: база ÑлиÑÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть проверена\n" -#: bisect.c:851 +#: bisect.c:849 #, c-format msgid "a %s revision is needed" msgstr "нужно указать %s редакцию" -#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 #, c-format msgid "could not create file '%s'" msgstr "не удалоÑÑŒ Ñоздать файл «%s»" -#: bisect.c:919 +#: bisect.c:917 #, c-format msgid "could not read file '%s'" msgstr "не удалоÑÑŒ прочитать файл «%s»" -#: bisect.c:949 +#: bisect.c:947 msgid "reading bisect refs failed" msgstr "Ñбой при чтении ÑÑылок двоичного поиÑка" -#: bisect.c:969 +#: bisect.c:967 #, c-format msgid "%s was both %s and %s\n" msgstr "%s была одновременно и %s и %s\n" -#: bisect.c:977 +#: bisect.c:975 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "ТеÑтируемый коммит не найден.\nВозможно, вы начали поиÑк Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ неправильного параметра пути?\n" -#: bisect.c:996 +#: bisect.c:994 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -930,8 +935,8 @@ msgstr[1] "(примерно %d шага)" msgstr[2] "(примерно %d шагов)" msgstr[3] "(примерно %d шагов)" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. #: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" @@ -941,6 +946,40 @@ msgstr[1] "Бинарный поиÑк: %d редакции оÑталоÑÑŒ Ð¿Ñ msgstr[2] "Бинарный поиÑк: %d редакций оÑталоÑÑŒ проверить поÑле Ñтой %s\n" msgstr[3] "Бинарный поиÑк: %d редакций оÑталоÑÑŒ проверить поÑле Ñтой %s\n" +#: blame.c:1757 +msgid "--contents and --reverse do not blend well." +msgstr "--contents и --reverse не очень ÑочетаютÑÑ." + +#: blame.c:1768 +msgid "cannot use --contents with final commit object name" +msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать --contents Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ финального имени объекта" + +#: blame.c:1788 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "при --reverse и --first-parent вмеÑте нужно указывать конкретный поÑледний коммит" + +#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 +#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 +#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 +#: builtin/merge.c:360 builtin/shortlog.c:177 +msgid "revision walk setup failed" +msgstr "Ñбой инициализации прохода по редакциÑм" + +#: blame.c:1815 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "при указании --reverse и --first-parent вмеÑте, требуетÑÑ Ñ‚Ð°ÐºÐ¶Ðµ указать диапазон по цепочке первого родителÑ" + +#: blame.c:1826 +#, c-format +msgid "no such path %s in %s" +msgstr "нет такого пути %s в %s" + +#: blame.c:1837 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "невозможно прочитать объект %s Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ %s" + #: branch.c:53 #, c-format msgid "" @@ -1061,7 +1100,7 @@ msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° ветки: «%s»." msgid "'%s' is already checked out at '%s'" msgstr "«%s» уже находитÑÑ Ð½Ð° «%s»" -#: branch.c:364 +#: branch.c:366 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD рабочего каталога %s не обновлён" @@ -1071,28 +1110,21 @@ msgstr "HEAD рабочего каталога %s не обновлён" msgid "'%s' does not look like a v2 bundle file" msgstr "«%s» не похож на файл пакета верÑии 2" -#: bundle.c:61 +#: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "неопознанный заголовок: %s%s (%d)" -#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 +#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "не удалоÑÑŒ открыть «%s»" -#: bundle.c:139 +#: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "Ð’ репозитории отÑутÑтвуют необходимые коммиты:" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 -#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 -#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 -#: builtin/merge.c:359 builtin/shortlog.c:176 -msgid "revision walk setup failed" -msgstr "Ñбой инициализации прохода по редакциÑм" - -#: bundle.c:185 +#: bundle.c:186 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" @@ -1101,11 +1133,11 @@ msgstr[1] "Пакет Ñодержит Ñти %d ÑÑылки:" msgstr[2] "Пакет Ñодержит Ñти %d ÑÑылок:" msgstr[3] "Пакет Ñодержит Ñти %d ÑÑылок:" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "Пакет Ñодержит полную иÑторию." -#: bundle.c:194 +#: bundle.c:195 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" @@ -1114,53 +1146,53 @@ msgstr[1] "Пакет требует Ñти %d ÑÑылки:" msgstr[2] "Пакет требует Ñти %d ÑÑылок:" msgstr[3] "Пакет требует Ñти %d ÑÑылок:" -#: bundle.c:253 +#: bundle.c:254 msgid "Could not spawn pack-objects" msgstr "Ðе удалоÑÑŒ Ñоздать объекты пакета" -#: bundle.c:264 +#: bundle.c:265 msgid "pack-objects died" msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° pack-objects" -#: bundle.c:304 +#: bundle.c:307 msgid "rev-list died" msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° rev-list" -#: bundle.c:353 +#: bundle.c:356 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "ÑÑылка «%s» иÑключена в ÑоответÑтвии Ñ Ð¾Ð¿Ñ†Ð¸Ñми rev-list" -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 +#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "неопознанный аргумент: %s" -#: bundle.c:451 +#: bundle.c:454 msgid "Refusing to create empty bundle." msgstr "Отклонение ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿ÑƒÑтого пакета." -#: bundle.c:463 +#: bundle.c:466 #, c-format msgid "cannot create '%s'" msgstr "не удалоÑÑŒ Ñоздать «%s»" -#: bundle.c:491 +#: bundle.c:494 msgid "index-pack died" msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° index-pack" -#: color.c:300 +#: color.c:301 #, c-format msgid "invalid color value: %.*s" msgstr "недопуÑтимое значение цвета: %.*s" -#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 -#: builtin/am.c:1489 builtin/am.c:2126 +#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 +#: builtin/am.c:1469 builtin/am.c:2107 #, c-format msgid "could not parse %s" msgstr "не удалоÑÑŒ разобрать %s" -#: commit.c:42 +#: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s не ÑвлÑетÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼!" @@ -1176,161 +1208,161 @@ msgstr "Предупреждение: Ñообщение коммита не ÑÐ msgid "memory exhausted" msgstr "памÑÑ‚ÑŒ иÑчерпана" -#: config.c:191 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "отноÑительные уÑловные Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ должны иÑходить из файлов" -#: config.c:711 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "ошибка в %d Ñтроке двоичного объекта %s" -#: config.c:715 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "ошибка в %d Ñтроке файла %s" -#: config.c:719 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "ошибка в %d Ñтроке Ñтандартного ввода" -#: config.c:723 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ошибка в %d Ñтроке двоичного объекта Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s" -#: config.c:727 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "ошибка в %d Ñтроке коммандной Ñтроки %s" -#: config.c:731 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "ошибка в %d Ñтроке в %s" -#: config.c:859 +#: config.c:868 msgid "out of range" msgstr "вне диапазона" -#: config.c:859 +#: config.c:868 msgid "invalid unit" msgstr "неправильное чиÑло" -#: config.c:865 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s»: %s" -#: config.c:870 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s» в двоичном объекте %s: %s" -#: config.c:873 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s» в файле %s: %s" -#: config.c:876 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s» на Ñтандартном вводе: %s" -#: config.c:879 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s» в двоичном объекте Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s: %s" -#: config.c:882 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s» на коммандной Ñтроке %s: %s" -#: config.c:885 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "неправильное чиÑловое значение «%s» Ð´Ð»Ñ Â«%s» в %s: %s" -#: config.c:980 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Ñбой Ñ€Ð°Ð·Ð²Ð¾Ñ€Ð°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¿ÑƒÑ‚Ð¸ каталога пользователÑ: «%s»" -#: config.c:1075 config.c:1086 +#: config.c:1084 config.c:1095 #, c-format msgid "bad zlib compression level %d" msgstr "неправильный уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ zlib %d" -#: config.c:1203 +#: config.c:1212 #, c-format msgid "invalid mode for object creation: %s" msgstr "недопуÑтимый режим ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: %s" -#: config.c:1359 +#: config.c:1368 #, c-format msgid "bad pack compression level %d" msgstr "неправильный уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %d" -#: config.c:1557 +#: config.c:1564 msgid "unable to parse command-line config" msgstr "не удалоÑÑŒ разобрать конфигурацию из командной Ñтроки" -#: config.c:1611 +#: config.c:1894 msgid "unknown error occurred while reading the configuration files" msgstr "произошла неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при чтении файлов конфигурации" -#: config.c:1970 +#: config.c:2064 #, c-format msgid "Invalid %s: '%s'" msgstr "ÐедейÑтвительный %s: «%s»" -#: config.c:1991 +#: config.c:2085 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "неизвеÑтное значение «%s» Ð´Ð»Ñ core.untrackedCache; иÑпользую Ñтандартное значение «keep»" -#: config.c:2017 +#: config.c:2111 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "значение «%d» Ð´Ð»Ñ splitIndex.maxPercentChange должно быть от 0 до 100" -#: config.c:2028 +#: config.c:2122 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "не удалоÑÑŒ разобрать «%s» в конфигурации из командной Ñтроки" -#: config.c:2030 +#: config.c:2124 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ «%s» в файле «%s» на Ñтроке %d" -#: config.c:2089 +#: config.c:2183 #, c-format msgid "%s has multiple values" msgstr "%s имеет неÑколько значений" -#: config.c:2423 config.c:2648 +#: config.c:2517 config.c:2745 #, c-format msgid "fstat on %s failed" msgstr "Ñбой при выполнении fstat на файле %s" -#: config.c:2541 +#: config.c:2635 #, c-format msgid "could not set '%s' to '%s'" msgstr "не удалоÑÑŒ уÑтановить «%s» в «%s»" -#: config.c:2543 builtin/remote.c:774 +#: config.c:2637 builtin/remote.c:775 #, c-format msgid "could not unset '%s'" msgstr "не удалоÑÑŒ ÑброÑить значение Ð´Ð»Ñ Â«%s»" -#: connect.c:49 +#: connect.c:50 msgid "The remote end hung up upon initial contact" msgstr "Внешний Ñервер отÑоединилÑÑ Ð´Ð¾ начала ÑеанÑа ÑвÑзи" -#: connect.c:51 +#: connect.c:52 msgid "" "Could not read from remote repository.\n" "\n" @@ -1338,7 +1370,7 @@ msgid "" "and the repository exists." msgstr "Ðе удалоÑÑŒ прочитать из внешнего репозиториÑ.\n\nУдоÑтоверьтеÑÑŒ, что у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ необходимые права доÑтупа\nи репозиторий ÑущеÑтвует." -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 msgid "Checking connectivity" msgstr "Проверка ÑоединениÑ" @@ -1354,115 +1386,115 @@ msgstr "Ñбой запиÑи в rev-list" msgid "failed to close rev-list's stdin" msgstr "Ñбой Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñтандартного ввода у rev-list" -#: convert.c:201 +#: convert.c:205 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory." msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь Ñвои оригинальные концы Ñтрок в рашей рабочей копии." -#: convert.c:205 +#: convert.c:209 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "CRLF будет заменен на LF в %s." -#: convert.c:211 +#: convert.c:215 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory." msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь Ñвои оригинальные концы Ñтрок в рашей рабочей копии." -#: convert.c:215 +#: convert.c:219 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF будет заменен на CRLF в %s" -#: date.c:97 +#: date.c:116 msgid "in the future" msgstr "в будущем" -#: date.c:103 -#, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" -msgstr[0] "%lu Ñекунду назад" -msgstr[1] "%lu Ñекунды назад" -msgstr[2] "%lu Ñекунд назад" -msgstr[3] "%lu Ñекунд назад" - -#: date.c:110 -#, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" -msgstr[0] "%lu минуту назад" -msgstr[1] "%lu минуты назад" -msgstr[2] "%lu минут назад" -msgstr[3] "%lu минут назад" - -#: date.c:117 -#, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" -msgstr[0] "%lu Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´" -msgstr[1] "%lu чаÑа назад" -msgstr[2] "%lu чаÑов назад" -msgstr[3] "%lu чаÑов назад" - -#: date.c:124 -#, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" -msgstr[0] "%lu день назад" -msgstr[1] "%lu Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´" -msgstr[2] "%lu дней назад" -msgstr[3] "%lu дней назад" - -#: date.c:130 -#, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" -msgstr[0] "%lu неделю назад" -msgstr[1] "%lu недели назад" -msgstr[2] "%lu недель назад" -msgstr[3] "%lu недель назад" - -#: date.c:137 -#, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" -msgstr[0] "%lu меÑÑц назад" -msgstr[1] "%lu меÑÑца назад" -msgstr[2] "%lu меÑÑцев назад" -msgstr[3] "%lu меÑÑцев назад" - -#: date.c:148 -#, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "%lu год" -msgstr[1] "%lu года" -msgstr[2] "%lu лет" -msgstr[3] "%lu лет" +#: date.c:122 +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "%<PRIuMAX> Ñекунда назад" +msgstr[1] "%<PRIuMAX> Ñекунды назад" +msgstr[2] "%<PRIuMAX> Ñекунд назад" +msgstr[3] "%<PRIuMAX> Ñекунды назад" + +#: date.c:129 +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "%<PRIuMAX> минута назад" +msgstr[1] "%<PRIuMAX> минуты назад" +msgstr[2] "%<PRIuMAX> минут назад" +msgstr[3] "%<PRIuMAX> минуты назад" + +#: date.c:136 +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "%<PRIuMAX> Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´" +msgstr[1] "%<PRIuMAX> чаÑа назад" +msgstr[2] "%<PRIuMAX> чаÑов назад" +msgstr[3] "%<PRIuMAX> чаÑа назад" + +#: date.c:143 +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "%<PRIuMAX> день назад" +msgstr[1] "%<PRIuMAX> Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´" +msgstr[2] "%<PRIuMAX> дней назад" +msgstr[3] "%<PRIuMAX> Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´" + +#: date.c:149 +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "%<PRIuMAX> неделю назад" +msgstr[1] "%<PRIuMAX> недели назад" +msgstr[2] "%<PRIuMAX> недель назад" +msgstr[3] "%<PRIuMAX> недели назад" + +#: date.c:156 +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "%<PRIuMAX> меÑÑц назад" +msgstr[1] "%<PRIuMAX> меÑÑца назад" +msgstr[2] "%<PRIuMAX> меÑÑцев назад" +msgstr[3] "%<PRIuMAX> меÑÑца назад" + +#: date.c:167 +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> год" +msgstr[1] "%<PRIuMAX> года" +msgstr[2] "%<PRIuMAX> лет" +msgstr[3] "%<PRIuMAX> года" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:151 +#: date.c:170 #, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "%s и %lu меÑÑц назад" -msgstr[1] "%s и %lu меÑÑца назад" -msgstr[2] "%s и %lu меÑÑцев назад" -msgstr[3] "%s и %lu меÑÑцев назад" +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s, %<PRIuMAX> меÑÑц назад" +msgstr[1] "%s, %<PRIuMAX> меÑÑца назад" +msgstr[2] "%s, %<PRIuMAX> меÑÑцев назад" +msgstr[3] "%s, %<PRIuMAX> меÑÑца назад" -#: date.c:156 date.c:161 +#: date.c:175 date.c:180 #, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "%lu год назад" -msgstr[1] "%lu года назад" -msgstr[2] "%lu лет назад" -msgstr[3] "%lu лет назад" +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "%<PRIuMAX> год назад" +msgstr[1] "%<PRIuMAX> года назад" +msgstr[2] "%<PRIuMAX> лет назад" +msgstr[3] "%<PRIuMAX> года назад" #: diffcore-order.c:24 #, c-format @@ -1473,352 +1505,376 @@ msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ orderfile «%s»" msgid "Performing inexact rename detection" msgstr "ВыполнÑетÑÑ Ð½ÐµÑ‚Ð¾Ñ‡Ð½Ð¾Ðµ определение переименованиÑ" -#: diff.c:62 +#: diff.c:63 #, c-format msgid "option '%s' requires a value" msgstr "параметр «%s» требует ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ" -#: diff.c:124 +#: diff.c:125 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Сбой разбора величины Ñреза (cut-off) у dirstat «%s»\n" -#: diff.c:129 +#: diff.c:130 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "ÐеизвеÑтный параметр dirstat: «%s»\n" -#: diff.c:281 +#: diff.c:282 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "ÐеизвеÑтное Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ «diff.submodule»: «%s»" -#: diff.c:344 +#: diff.c:342 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "Ðайдены ошибки в переменной «diff.dirstat»:\n%s" -#: diff.c:3102 +#: diff.c:3101 #, c-format msgid "external diff died, stopping at %s" msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при внешнем Ñравнении, оÑтанов на %s" -#: diff.c:3428 +#: diff.c:3427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check и -s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: diff.c:3518 +#: diff.c:3517 msgid "--follow requires exactly one pathspec" msgstr "--follow требует ровно одного Ñпецификатора пути" -#: diff.c:3681 +#: diff.c:3680 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" -#: diff.c:3695 +#: diff.c:3694 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Сбой разбора параметра опции --submodule: «%s»" -#: diff.c:4719 +#: diff.c:4716 msgid "inexact rename detection was skipped due to too many files." msgstr "неточное определение Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ñ‹Ð»Ð¾ пропущено из-за Ñлишком большого количеÑтва файлов." -#: diff.c:4722 +#: diff.c:4719 msgid "only found copies from modified paths due to too many files." msgstr "найдены только копии из измененных путей из-за Ñлишком большого количеÑтва файлов." -#: diff.c:4725 +#: diff.c:4722 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "возможно вы захотите уÑтановить переменную %s в как минимум значение %d и повторить вызов команды." -#: dir.c:1899 +#: dir.c:1948 msgid "failed to get kernel name and information" msgstr "не удалоÑÑŒ получить Ð¸Ð¼Ñ Ñдра и информацию" -#: dir.c:2018 +#: dir.c:2067 msgid "Untracked cache is disabled on this system or location." msgstr "КÑш неотÑлеживаемых файлов отключен на Ñтой ÑиÑтеме или в Ñтом меÑте." -#: dir.c:2776 dir.c:2781 +#: dir.c:2846 dir.c:2851 #, c-format msgid "could not create directories for %s" msgstr "не удалоÑÑŒ Ñоздать каталоги Ð´Ð»Ñ %s" -#: dir.c:2806 +#: dir.c:2876 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "не удалоÑÑŒ перемеÑтить каталог git Ñ Â«%s» в «%s»" -#: entry.c:280 +#: entry.c:281 #, c-format msgid "could not stat file '%s'" msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° «%s»" -#: fetch-pack.c:249 +#: fetch-pack.c:251 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: ожидаетÑÑ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð° ÑпиÑка Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ðµ чаÑти" -#: fetch-pack.c:261 +#: fetch-pack.c:263 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack: ожидаетÑÑ ACK/NAK, а получено EOF" -#: fetch-pack.c:280 builtin/archive.c:63 +#: fetch-pack.c:282 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "ошибка внешнего репозиториÑ: %s" -#: fetch-pack.c:281 +#: fetch-pack.c:283 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ожидаетÑÑ ACK/NAK, а получено «%s»" -#: fetch-pack.c:333 +#: fetch-pack.c:335 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc требует multi_ack_detailed" -#: fetch-pack.c:419 +#: fetch-pack.c:421 #, c-format msgid "invalid shallow line: %s" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока чаÑтичного получениÑ: %s" -#: fetch-pack.c:425 +#: fetch-pack.c:427 #, c-format msgid "invalid unshallow line: %s" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока полного получениÑ: %s" -#: fetch-pack.c:427 +#: fetch-pack.c:429 #, c-format msgid "object not found: %s" msgstr "объект не найден: %s" -#: fetch-pack.c:430 +#: fetch-pack.c:432 #, c-format msgid "error in object: %s" msgstr "ошибка в объекте: %s" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "no shallow found: %s" msgstr "чаÑтичный клон не найден: %s" -#: fetch-pack.c:435 +#: fetch-pack.c:437 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "ожидалоÑÑŒ shallow/unshallow, а получено %s" -#: fetch-pack.c:474 +#: fetch-pack.c:476 #, c-format msgid "got %s %d %s" msgstr "получено %s %d %s" -#: fetch-pack.c:488 +#: fetch-pack.c:490 #, c-format msgid "invalid commit %s" msgstr "недопуÑтимый коммит %s" -#: fetch-pack.c:521 +#: fetch-pack.c:523 msgid "giving up" msgstr "оÑтанавливаю дальнейшие попытки" -#: fetch-pack.c:531 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "готово" -#: fetch-pack.c:543 +#: fetch-pack.c:545 #, c-format msgid "got %s (%d) %s" msgstr "получено %s (%d) %s" -#: fetch-pack.c:589 +#: fetch-pack.c:591 #, c-format msgid "Marking %s as complete" msgstr "Помечаю %s как завершенный" -#: fetch-pack.c:737 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "уже еÑÑ‚ÑŒ %s (%s)" -#: fetch-pack.c:775 +#: fetch-pack.c:813 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не удалоÑÑŒ запуÑтить программу разбора данных" -#: fetch-pack.c:783 +#: fetch-pack.c:821 msgid "protocol error: bad pack header" msgstr "ошибка протокола: неправильный заголовок потока" -#: fetch-pack.c:839 +#: fetch-pack.c:877 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не удалоÑÑŒ запуÑтить программу %s" -#: fetch-pack.c:855 +#: fetch-pack.c:893 #, c-format msgid "%s failed" msgstr "%s завершен Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹" -#: fetch-pack.c:857 +#: fetch-pack.c:895 msgid "error in sideband demultiplexer" msgstr "произошла ошибка в программе разбора данных" -#: fetch-pack.c:884 +#: fetch-pack.c:922 msgid "Server does not support shallow clients" msgstr "Сервер не поддерживает клиентов Ñ Ñ‡Ð°Ñтичным клонированием" -#: fetch-pack.c:888 +#: fetch-pack.c:926 msgid "Server supports multi_ack_detailed" msgstr "Сервер поддерживает multi_ack_detailed" -#: fetch-pack.c:891 +#: fetch-pack.c:929 msgid "Server supports no-done" msgstr "Сервер поддерживает no-done" -#: fetch-pack.c:897 +#: fetch-pack.c:935 msgid "Server supports multi_ack" msgstr "Сервер поддерживает multi_ack" -#: fetch-pack.c:901 +#: fetch-pack.c:939 msgid "Server supports side-band-64k" msgstr "Сервер поддерживает side-band-64k" -#: fetch-pack.c:905 +#: fetch-pack.c:943 msgid "Server supports side-band" msgstr "Сервер поддерживает side-band" -#: fetch-pack.c:909 +#: fetch-pack.c:947 msgid "Server supports allow-tip-sha1-in-want" msgstr "Сервер поддерживает allow-tip-sha1-in-want" -#: fetch-pack.c:913 +#: fetch-pack.c:951 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Сервер поддерживает allow-reachable-sha1-in-want" -#: fetch-pack.c:923 +#: fetch-pack.c:961 msgid "Server supports ofs-delta" msgstr "Сервер поддерживает ofs-delta" -#: fetch-pack.c:930 +#: fetch-pack.c:968 #, c-format msgid "Server version is %.*s" msgstr "ВерÑÐ¸Ñ Ñервера %.*s" -#: fetch-pack.c:936 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "Сервер не поддерживает --shallow-since" -#: fetch-pack.c:940 +#: fetch-pack.c:978 msgid "Server does not support --shallow-exclude" msgstr "Сервер не поддерживает --shallow-exclude" -#: fetch-pack.c:942 +#: fetch-pack.c:980 msgid "Server does not support --deepen" msgstr "Сервер не поддерживает --deepen" -#: fetch-pack.c:953 +#: fetch-pack.c:991 msgid "no common commits" msgstr "не общих коммитов" -#: fetch-pack.c:965 +#: fetch-pack.c:1003 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: ошибка при получении данных." -#: fetch-pack.c:1127 +#: fetch-pack.c:1165 msgid "no matching remote head" msgstr "нет ÑоотвеÑтвующего внешнего ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° ветку" -#: fetch-pack.c:1149 +#: fetch-pack.c:1187 #, c-format msgid "no such remote ref %s" msgstr "нет такой внешней ÑÑылки %s" -#: fetch-pack.c:1152 +#: fetch-pack.c:1190 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сервер не поддерживает Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½ÐµÐ¾Ð±ÑŠÑвленного объекта %s" -#: gpg-interface.c:185 +#: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "gpg не удалоÑÑŒ подпиÑать данные" -#: gpg-interface.c:215 +#: gpg-interface.c:211 msgid "could not create temporary file" msgstr "не удалоÑÑŒ Ñоздать временный файл" -#: gpg-interface.c:217 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Ñбой запиÑи отÑоединенной подпиÑи в «%s»" -#: graph.c:96 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "игнорирую недопуÑтимый цвет «%.*s» в log.graphColors" -#: grep.c:1796 +#: grep.c:1981 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: не удалоÑÑŒ прочеÑÑ‚ÑŒ %s" -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "не удалоÑÑŒ выполнить stat «%s»" -#: grep.c:1824 +#: grep.c:2009 #, c-format msgid "'%s': short read" msgstr "«%s»: Ñлишком мало данных прочитано" -#: help.c:218 +#: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "доÑтупные команды git в «%s»" -#: help.c:225 +#: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "команды git, доÑтупные в других меÑтах вашего $PATH" -#: help.c:256 +#: help.c:217 msgid "These are common Git commands used in various situations:" msgstr "Стандартные команды Git иÑпользуемые в различных ÑитуациÑÑ…:" -#: help.c:321 +#: help.c:281 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "«%s» похоже на команду git, но нам не удалоÑÑŒ ее запуÑтить. Возможно, git-%s не работает?" -#: help.c:376 +#: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ой-ёй! Ваша ÑиÑтема не Ñообщает ни о каких командах Git вообще." -#: help.c:398 +#: help.c:358 #, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" -msgstr "Ð’ÐИМÐÐИЕ: Ð’Ñ‹ вызвали команду Git «%s», но такой не ÑущеÑтвует.\nПродолжаем Ñ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼, что вы имели в виду «%s»" +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "Внимание: Ð’Ñ‹ запуÑтили не ÑущеÑтвующую команду Git «%s»." -#: help.c:403 +#: help.c:363 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "через %0.1f Ñекунд автоматичеÑки…" +msgid "Continuing under the assumption that you meant '%s'." +msgstr "Продолжаю, предполагаÑ, что вы имели в виду «%s»." -#: help.c:410 +#: help.c:368 +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "Продолжу через %0.1f Ñекунд, предполагаÑ, что вы имели в виду «%s»." + +#: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: «%s» не ÑвлÑетÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ git. Смотрите «git --help»." -#: help.c:414 help.c:480 +#: help.c:380 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "\nСамые похожие команды:" +msgstr[1] "\nСамые похожие команды:" +msgstr[2] "\nСамые похожие команды:" +msgstr[3] "\nСамые похожие команды:" + +#: help.c:395 +msgid "git version [<options>]" +msgstr "git version [<options>]" + +#: help.c:456 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s — %s" + +#: help.c:460 msgid "" "\n" "Did you mean this?" @@ -1830,12 +1886,7 @@ msgstr[1] "\nВозможно, вы имели в виду что-то из ÑÑ‚ msgstr[2] "\nВозможно, вы имели в виду что-то из Ñтого?" msgstr[3] "\nВозможно, вы имели в виду что-то из Ñтого?" -#: help.c:476 -#, c-format -msgid "%s: %s - %s" -msgstr "%s: %s — %s" - -#: ident.c:343 +#: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1850,35 +1901,35 @@ msgid "" "\n" msgstr "\n*** ПожалуйÑта, Ñкажите мне кто вы еÑÑ‚ÑŒ.\n\nЗапуÑтите\n\n git config --global user.email \"you@example.com\"\n git config --global user.name \"Ваше ИмÑ\"\n\nÐ´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ñ… данных аккаунта по умолчанию.\nПропуÑтите параметр --global Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… только Ð´Ð»Ñ Ñтого репозиториÑ.\n\n" -#: ident.c:367 +#: ident.c:366 msgid "no email was given and auto-detection is disabled" msgstr "Ð°Ð´Ñ€ÐµÑ Ñлектронной почты не указан и автоопределение отключено" -#: ident.c:372 +#: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "не удалоÑÑŒ выполнить автоопределение адреÑа Ñлектронной почты (получено «%s»)" -#: ident.c:382 +#: ident.c:381 msgid "no name was given and auto-detection is disabled" msgstr "Ð¸Ð¼Ñ Ð½Ðµ указано и автоопределение отключено" -#: ident.c:388 +#: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "не удалоÑÑŒ выполнить автоопределение имени (получено «%s»)" -#: ident.c:396 +#: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "пуÑтое Ð¸Ð¼Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð° (Ð´Ð»Ñ <%s>) не разрешено" -#: ident.c:402 +#: ident.c:401 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "Ð¸Ð¼Ñ ÑоÑтоит только из неразрешенных Ñимоволов: %s" -#: ident.c:417 builtin/commit.c:611 +#: ident.c:416 builtin/commit.c:612 #, c-format msgid "invalid date format: %s" msgstr "неправильный формат даты: %s" @@ -1904,237 +1955,237 @@ msgstr "Ðе удалоÑÑŒ Ñоздать «%s.lock»: %s" msgid "failed to read the cache" msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÐºÑша" -#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 -#: builtin/checkout.c:607 builtin/clone.c:749 +#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 +#: builtin/checkout.c:591 builtin/clone.c:753 msgid "unable to write new index file" msgstr "не удалоÑÑŒ запиÑать новый файл индекÑа" -#: merge-recursive.c:209 +#: merge-recursive.c:210 msgid "(bad commit)\n" msgstr "(плохой коммит)\n" -#: merge-recursive.c:231 merge-recursive.c:239 +#: merge-recursive.c:232 merge-recursive.c:240 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "Ñбой addinfo_cache Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ «%s»" -#: merge-recursive.c:303 +#: merge-recursive.c:304 msgid "error building trees" msgstr "ошибка при поÑтроении деревьев" -#: merge-recursive.c:727 +#: merge-recursive.c:728 #, c-format msgid "failed to create path '%s'%s" msgstr "не удалоÑÑŒ Ñоздать путь «%s»%s" -#: merge-recursive.c:738 +#: merge-recursive.c:739 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Удаление %s, чтобы оÑвободить меÑто Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð²\n" -#: merge-recursive.c:752 merge-recursive.c:771 +#: merge-recursive.c:753 merge-recursive.c:772 msgid ": perhaps a D/F conflict?" msgstr ": возможно, конфликт каталогов/файлов?" -#: merge-recursive.c:761 +#: merge-recursive.c:762 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "отказ потери неотÑлеживаемого файла в «%s»" -#: merge-recursive.c:803 builtin/cat-file.c:34 +#: merge-recursive.c:804 builtin/cat-file.c:36 #, c-format msgid "cannot read object %s '%s'" msgstr "невозможно прочитать объект %s «%s»" -#: merge-recursive.c:805 +#: merge-recursive.c:806 #, c-format msgid "blob expected for %s '%s'" msgstr "ожидаетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¹ объект Ð´Ð»Ñ %s «%s»" -#: merge-recursive.c:829 +#: merge-recursive.c:830 #, c-format msgid "failed to open '%s': %s" msgstr "не удалоÑÑŒ открыть «%s»: %s" -#: merge-recursive.c:840 +#: merge-recursive.c:841 #, c-format msgid "failed to symlink '%s': %s" msgstr "не удалоÑÑŒ Ñоздать Ñимвольную ÑÑылку «%s»: %s" -#: merge-recursive.c:845 +#: merge-recursive.c:846 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "не понÑтно, что делать Ñ %06o %s «%s»" -#: merge-recursive.c:985 +#: merge-recursive.c:986 msgid "Failed to execute internal merge" msgstr "Ðе удалоÑÑŒ запуÑтить внутреннее ÑлиÑние" -#: merge-recursive.c:989 +#: merge-recursive.c:990 #, c-format msgid "Unable to add %s to database" msgstr "Ðе удалоÑÑŒ добавить %s в базу данных" -#: merge-recursive.c:1092 +#: merge-recursive.c:1093 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "КОÐФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. ВерÑÐ¸Ñ %s из %s оÑтавлена в дереве." -#: merge-recursive.c:1097 +#: merge-recursive.c:1098 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "КОÐФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. ВерÑÐ¸Ñ %s из %s оÑтавлена в дереве." -#: merge-recursive.c:1104 +#: merge-recursive.c:1105 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "КОÐФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. ВерÑÐ¸Ñ %s из %s оÑтавлена в дереве на %s." -#: merge-recursive.c:1109 +#: merge-recursive.c:1110 #, 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 "КОÐФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. ВерÑÐ¸Ñ %s из %s оÑтавлена в дереве на %s." -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "rename" msgstr "переименование" -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "renamed" msgstr "переименовано" -#: merge-recursive.c:1200 +#: merge-recursive.c:1201 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s — Ñто каталог в %s, добавлÑем как %s вмеÑто Ñтого" -#: merge-recursive.c:1225 +#: merge-recursive.c:1226 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "КОÐФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1231 msgid " (left unresolved)" msgstr " (оÑтавлено неразрешенным)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1293 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "КОÐФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»" -#: merge-recursive.c:1325 +#: merge-recursive.c:1326 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Переименовываю %s в %s и %s в %s вмеÑто Ñтого" -#: merge-recursive.c:1528 +#: merge-recursive.c:1529 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "КОÐФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»" -#: merge-recursive.c:1543 +#: merge-recursive.c:1544 #, c-format msgid "Adding merged %s" msgstr "Добавление Ñлитого %s" -#: merge-recursive.c:1550 merge-recursive.c:1780 +#: merge-recursive.c:1551 merge-recursive.c:1781 #, c-format msgid "Adding as %s instead" msgstr "Добавление вмеÑто Ñтого как %s" -#: merge-recursive.c:1607 +#: merge-recursive.c:1608 #, c-format msgid "cannot read object %s" msgstr "невозможно прочитать объект «%s»" -#: merge-recursive.c:1610 +#: merge-recursive.c:1611 #, c-format msgid "object %s is not a blob" msgstr "объект %s не ÑвлÑетÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¼ объектом" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modify" msgstr "изменение" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modified" msgstr "изменено" -#: merge-recursive.c:1689 +#: merge-recursive.c:1690 msgid "content" msgstr "Ñодержимое" -#: merge-recursive.c:1696 +#: merge-recursive.c:1697 msgid "add/add" msgstr "добавление/добавление" -#: merge-recursive.c:1732 +#: merge-recursive.c:1733 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "ПропуÑк %s (Ñлиты одинаковые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ°Ðº ÑущеÑтвующие)" -#: merge-recursive.c:1746 +#: merge-recursive.c:1747 #, c-format msgid "Auto-merging %s" msgstr "ÐвтоÑлиÑние %s" -#: merge-recursive.c:1750 git-submodule.sh:944 +#: merge-recursive.c:1751 git-submodule.sh:945 msgid "submodule" msgstr "подмодуль" -#: merge-recursive.c:1751 +#: merge-recursive.c:1752 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОÐФЛИКТ (%s): Конфликт ÑлиÑÐ½Ð¸Ñ Ð² %s" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: merge-recursive.c:1871 +#: merge-recursive.c:1872 msgid "file/directory" msgstr "файл/каталог" -#: merge-recursive.c:1877 +#: merge-recursive.c:1878 msgid "directory/file" msgstr "каталог/файл" -#: merge-recursive.c:1883 +#: merge-recursive.c:1884 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "КОÐФЛИКТ (%s): Уже ÑущеÑтвует каталог Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s» в «%s». Добавление «%s» как «%s»" -#: merge-recursive.c:1892 +#: merge-recursive.c:1893 #, c-format msgid "Adding %s" msgstr "Добавление %s" -#: merge-recursive.c:1929 +#: merge-recursive.c:1930 msgid "Already up-to-date!" msgstr "Уже обновлено!" -#: merge-recursive.c:1938 +#: merge-recursive.c:1939 #, c-format msgid "merging of trees %s and %s failed" msgstr "Ñбой ÑлиÑÐ½Ð¸Ñ Ð´ÐµÑ€ÐµÐ²ÑŒÐµÐ² «%s» и «%s»" -#: merge-recursive.c:2021 +#: merge-recursive.c:2022 msgid "Merging:" msgstr "СлиÑние:" -#: merge-recursive.c:2034 +#: merge-recursive.c:2035 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -2143,16 +2194,16 @@ msgstr[1] "найдено %u общих предка:" msgstr[2] "найдено %u общих предков:" msgstr[3] "найдено %u общих предков:" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 msgid "merge returned no commit" msgstr "ÑлиÑние не вернуло коммит" -#: merge-recursive.c:2136 +#: merge-recursive.c:2137 #, c-format msgid "Could not parse object '%s'" msgstr "Ðе удалоÑÑŒ разобрать объект «%s»" -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 msgid "Unable to write index." msgstr "Ðе удаетÑÑ Ð·Ð°Ð¿Ð¸Ñать индекÑ." @@ -2168,23 +2219,24 @@ msgstr "Ð’Ñ‹ не закончили предыдущее ÑлиÑние замРmsgid "You have not concluded your notes merge (%s exists)." msgstr "Ð’Ñ‹ не закончили предыдущее ÑлиÑние заметок (%s ÑущеÑтвует)." -#: notes-utils.c:41 +#: notes-utils.c:42 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¸Ñ‚ÑŒ неинициализированное или не имеющее ÑÑылок дерево заметок" -#: notes-utils.c:100 +#: notes-utils.c:101 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Ðеправильное значение notes.rewriteMode: «%s»" -#: notes-utils.c:110 +#: notes-utils.c:111 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Отказ в перезапиÑи заметок в %s (за пределами refs/notes/)" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#: notes-utils.c:141 #, c-format msgid "Bad %s value: '%s'" msgstr "Ðеправильное значение переменной %s: «%s»" @@ -2194,28 +2246,28 @@ msgstr "Ðеправильное значение переменной %s: «%s msgid "unable to parse object: %s" msgstr "не удалоÑÑŒ разобрать объект: %s" -#: parse-options.c:572 +#: parse-options.c:573 msgid "..." msgstr "…" -#: parse-options.c:590 +#: parse-options.c:591 #, c-format msgid "usage: %s" msgstr "иÑпользование: %s" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#: parse-options.c:597 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:597 +#: parse-options.c:600 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:631 +#: parse-options.c:634 msgid "-NUM" msgstr "-КОЛИЧЕСТВО" @@ -2224,151 +2276,151 @@ msgstr "-КОЛИЧЕСТВО" msgid "malformed object name '%s'" msgstr "Ðеправильное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»" -#: path.c:810 +#: path.c:890 #, c-format msgid "Could not make %s writable by group" msgstr "Ðе удалоÑÑŒ предоÑтавить доÑтуп к %s на запиÑÑŒ" -#: pathspec.c:125 +#: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "УправлÑющий Ñимвол «\\» не разрешен как поÑледний Ñимвол в значении attr" -#: pathspec.c:143 +#: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." msgstr "Разрешен только один Ñпецификатор «attr:»." -#: pathspec.c:146 +#: pathspec.c:150 msgid "attr spec must not be empty" msgstr "Ñпецификатор attr не должен быть пуÑтой" -#: pathspec.c:189 +#: pathspec.c:193 #, c-format msgid "invalid attribute name %s" msgstr "недопуÑтимое Ð¸Ð¼Ñ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð° %s" -#: pathspec.c:254 +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "глобальные опции Ñпецификаторов пути «glob» и «noglob» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: pathspec.c:261 +#: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ñпецификатора пути «literal» не ÑовмеÑтима Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ глобальными Ñпецификаторами доÑтупа" -#: pathspec.c:301 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "неправильный параметр Ð´Ð»Ñ Ð¼Ð°Ð³Ð¸Ñ‡ÐµÑкого Ñлова «prefix» в Ñпецификаторе пути " -#: pathspec.c:322 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "неправильное магичеÑкое Ñлово «%.*s» в Ñпецификаторе пути «%s»" -#: pathspec.c:327 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Пропущено «)» в конце магичеÑкого Ñлова Ñпецификатора пути «%s»" -#: pathspec.c:365 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Ðереализованное магичеÑкое Ñлово «%c» Ñпецификатора пути «%s»" -#: pathspec.c:421 pathspec.c:443 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Спецификатор пути «%s» в подмодуле «%.*s»" - -#: pathspec.c:483 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: «literal» и «glob» не ÑовмеÑтимы" -#: pathspec.c:496 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: «%s» вне репозиториÑ" -#: pathspec.c:584 +#: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "«%s» (мнемоника: «%c»)" -#: pathspec.c:594 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магичеÑкие Ñлова в Ñпецификаторе пути не поддерживаютÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹: %s" -#: pathspec.c:644 +#: pathspec.c:575 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please" " use . instead if you meant to match all paths" msgstr "пуÑтые Ñтроки как Ñпецификаторы пути будут Ñделаны недопуÑтимыми в Ñледующих верÑиÑÑ…. иÑпользуйте вмеÑто них «.», что значит ÑоотвеÑтвие вÑем путÑм" -#: pathspec.c:668 +#: pathspec.c:599 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "Ñпецификатор пути «%s» находитÑÑ Ð·Ð° ÑимволичеÑкой ÑÑылкой" -#: pretty.c:982 +#: pretty.c:963 msgid "unable to parse --pretty format" msgstr "не удалоÑÑŒ разобрать формат Ð´Ð»Ñ --pretty" -#: read-cache.c:1442 +#: read-cache.c:1443 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "index.version указан, но значение недейÑтвительное.\nИÑпользую верÑию %i" -#: read-cache.c:1452 +#: read-cache.c:1453 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "GIT_INDEX_VERSION указан, но значение недейÑтвительное.\nИÑпользую верÑию %i" -#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#: read-cache.c:2308 builtin/merge.c:1019 +#, c-format +msgid "could not close '%s'" +msgstr "не удалоÑÑŒ закрыть «%s»" + +#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 #, c-format msgid "could not stat '%s'" msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Â«%s»" -#: read-cache.c:2388 +#: read-cache.c:2396 #, c-format msgid "unable to open git dir: %s" msgstr "не удалоÑÑŒ открыть каталог git: %s" -#: read-cache.c:2400 +#: read-cache.c:2408 #, c-format msgid "unable to unlink: %s" msgstr "не удалоÑÑŒ отÑоединить: %s" -#: refs.c:620 builtin/merge.c:844 +#: refs.c:622 #, c-format msgid "Could not open '%s' for writing" msgstr "Ðе удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи" -#: refs.c:1667 +#: refs.c:1769 msgid "ref updates forbidden inside quarantine environment" msgstr "обновление ÑÑылок запрещено в изолированном окружении" -#: refs/files-backend.c:1631 +#: refs/files-backend.c:1664 #, c-format msgid "could not delete reference %s: %s" msgstr "не удалоÑÑŒ удалить ÑÑылку %s: %s" -#: refs/files-backend.c:1634 +#: refs/files-backend.c:1667 #, c-format msgid "could not delete references: %s" msgstr "не удалоÑÑŒ удалить ÑÑылки: %s" -#: refs/files-backend.c:1643 +#: refs/files-backend.c:1676 #, c-format msgid "could not remove reference %s" msgstr "не удалоÑÑŒ удалить ÑÑылки %s" -#: ref-filter.c:35 wt-status.c:1780 +#: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "иÑчез" @@ -2387,290 +2439,290 @@ msgstr "позади %d" msgid "ahead %d, behind %d" msgstr "впереди %d, позади %d" -#: ref-filter.c:104 +#: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" msgstr "ожидаемый формат: %%(color:<color>)" -#: ref-filter.c:106 +#: ref-filter.c:107 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "неопознанный цвет: %%(color:%s)" -#: ref-filter.c:120 +#: ref-filter.c:121 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "ОжидаетÑÑ Ñ†ÐµÐ»Ð¾Ñ‡Ð¸Ñленное значение refname:lstrip=%s" -#: ref-filter.c:124 +#: ref-filter.c:125 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "ОжидаетÑÑ Ñ†ÐµÐ»Ð¾Ñ‡Ð¸Ñленное значение refname:rstrip=%s" -#: ref-filter.c:126 +#: ref-filter.c:127 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "неопознанный аргумент %%(%s): %s" -#: ref-filter.c:166 +#: ref-filter.c:167 #, c-format msgid "%%(body) does not take arguments" msgstr "параметр %%(body) не принимает аргументы" -#: ref-filter.c:173 +#: ref-filter.c:174 #, c-format msgid "%%(subject) does not take arguments" msgstr "параметр %%(subject) не принимает аргументы" -#: ref-filter.c:180 +#: ref-filter.c:181 #, c-format msgid "%%(trailers) does not take arguments" msgstr "параметр %%(trailers) не принимает аргументы" -#: ref-filter.c:199 +#: ref-filter.c:200 #, c-format msgid "positive value expected contents:lines=%s" msgstr "положительное значение ожидает contents:lines=%s" -#: ref-filter.c:201 +#: ref-filter.c:202 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "неопознанный аргумент %%(contents): %s" -#: ref-filter.c:214 +#: ref-filter.c:215 #, c-format msgid "positive value expected objectname:short=%s" msgstr "ожидаетÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ значение objectname:short=%s" -#: ref-filter.c:218 +#: ref-filter.c:219 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "неопознанный аргумент %%(objectname): %s" -#: ref-filter.c:245 +#: ref-filter.c:246 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "ожидаемый формат: %%(align:<width>,<position>)" -#: ref-filter.c:257 +#: ref-filter.c:258 #, c-format msgid "unrecognized position:%s" msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ:%s" -#: ref-filter.c:261 +#: ref-filter.c:262 #, c-format msgid "unrecognized width:%s" msgstr "Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð°:%s" -#: ref-filter.c:267 +#: ref-filter.c:268 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "неопознанный аргумент %%(align): %s" -#: ref-filter.c:271 +#: ref-filter.c:272 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "ожидаетÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð° Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ чаÑтицы %%(align)" -#: ref-filter.c:286 +#: ref-filter.c:287 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "неопознанный аргумент %%(if): %s" -#: ref-filter.c:371 +#: ref-filter.c:378 #, c-format msgid "malformed field name: %.*s" msgstr "неправильное Ð¸Ð¼Ñ Ð¿Ð¾Ð»Ñ: %.*s" -#: ref-filter.c:397 +#: ref-filter.c:404 #, c-format msgid "unknown field name: %.*s" msgstr "неизвеÑтное Ð¸Ð¼Ñ Ð¿Ð¾Ð»Ñ: %.*s" -#: ref-filter.c:501 +#: ref-filter.c:508 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "формат: чаÑтица %%(if) иÑпользована без чаÑтицы %%(then)" -#: ref-filter.c:561 +#: ref-filter.c:568 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "формат: чаÑтица %%(then) иÑпользована без чаÑтицы %%(if)" -#: ref-filter.c:563 +#: ref-filter.c:570 #, c-format msgid "format: %%(then) atom used more than once" msgstr "формат: чаÑтица %%(then) иÑпользована более одного раза" -#: ref-filter.c:565 +#: ref-filter.c:572 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "формат: чаÑтица %%(then) иÑпользована поÑле %%(else)" -#: ref-filter.c:591 +#: ref-filter.c:598 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "формат: чаÑтица %%(else) иÑпользована без чаÑтицы %%(if)" -#: ref-filter.c:593 +#: ref-filter.c:600 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "формат: чаÑтица %%(else) иÑпользована без чаÑтицы %%(then)" -#: ref-filter.c:595 +#: ref-filter.c:602 #, c-format msgid "format: %%(else) atom used more than once" msgstr "формат: чаÑтица %%(else) иÑпользована более одного раза" -#: ref-filter.c:608 +#: ref-filter.c:615 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "формат: чаÑтица %%(end) иÑпользована без ÑоответÑтвующей чаÑтицы" -#: ref-filter.c:663 +#: ref-filter.c:670 #, c-format msgid "malformed format string %s" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока формата %s" -#: ref-filter.c:1247 +#: ref-filter.c:1254 #, c-format msgid "(no branch, rebasing %s)" msgstr "(нет ветки, перемещение %s)" -#: ref-filter.c:1250 +#: ref-filter.c:1257 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(нет ветки, двоичный поиÑк начат на %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: ref-filter.c:1256 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#: ref-filter.c:1265 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD отделён на %s)" -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: ref-filter.c:1261 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#: ref-filter.c:1272 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD отделён Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ %s)" -#: ref-filter.c:1265 +#: ref-filter.c:1276 msgid "(no branch)" msgstr "(нет ветки)" -#: ref-filter.c:1420 ref-filter.c:1451 +#: ref-filter.c:1426 ref-filter.c:1457 #, c-format msgid "missing object %s for %s" msgstr "не найден объект %s Ð´Ð»Ñ %s" -#: ref-filter.c:1423 ref-filter.c:1454 +#: ref-filter.c:1429 ref-filter.c:1460 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "Ñбой при выполнении parse_object_buffer на %s Ð´Ð»Ñ %s" -#: ref-filter.c:1692 +#: ref-filter.c:1760 #, c-format msgid "malformed object at '%s'" msgstr "Повреждённый объект «%s»" -#: ref-filter.c:1759 +#: ref-filter.c:1827 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнорирую ÑÑылку Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¼ именем %s" -#: ref-filter.c:1764 +#: ref-filter.c:1832 #, c-format msgid "ignoring broken ref %s" msgstr "игнорирую неправильную ÑÑылку %s" -#: ref-filter.c:2028 +#: ref-filter.c:2095 #, c-format msgid "format: %%(end) atom missing" msgstr "format: пропущена чаÑтица %%(end)" -#: ref-filter.c:2109 +#: ref-filter.c:2176 #, c-format msgid "malformed object name %s" msgstr "неправильное Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s" -#: remote.c:754 +#: remote.c:747 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÑŒ одновременно %s и %s в %s" -#: remote.c:758 +#: remote.c:751 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s обычно отÑлеживает %s, а не %s" -#: remote.c:762 +#: remote.c:755 #, c-format msgid "%s tracks both %s and %s" msgstr "%s отÑлеживает и %s и %s" -#: remote.c:770 +#: remote.c:763 msgid "Internal error" msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°" -#: remote.c:1685 remote.c:1787 +#: remote.c:1680 remote.c:1782 msgid "HEAD does not point to a branch" msgstr "HEAD не указывает на ветку" -#: remote.c:1694 +#: remote.c:1689 #, c-format msgid "no such branch: '%s'" msgstr "нет такой ветки: «%s»" -#: remote.c:1697 +#: remote.c:1692 #, c-format msgid "no upstream configured for branch '%s'" msgstr "вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° не наÑтроена Ð´Ð»Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»" -#: remote.c:1703 +#: remote.c:1698 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» не Ñохранена как отÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ°" -#: remote.c:1718 +#: remote.c:1713 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "назначение Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ «%s» на внешнем Ñервере «%s» не имеет локальной отÑлеживаемой ветки" -#: remote.c:1730 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ветка «%s» не имеет внешнего Ñервера Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸" -#: remote.c:1741 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Ñпецификаторы пути Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ «%s» не включают в ÑÐµÐ±Ñ Â«%s»" -#: remote.c:1754 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "отправка не имеет точки Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ (push.default выÑтавлен в «nothing»)" -#: remote.c:1776 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "не удалоÑÑŒ выполнить «simple» отправку в единÑтвенную точку назначениÑ" -#: remote.c:2081 +#: remote.c:2076 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Ваша ветка базируетÑÑ Ð½Ð° «%s», но вышеÑтоÑщий репозиторий иÑчез.\n" -#: remote.c:2085 +#: remote.c:2080 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "(Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿ÑƒÑтите «git branch --unset-upstream»)\n" -#: remote.c:2088 +#: remote.c:2083 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Ваша ветка обновлена в ÑоответÑтвии Ñ Â«%s».\n" -#: remote.c:2092 +#: remote.c:2087 #, 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" @@ -2679,11 +2731,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита. msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n" -#: remote.c:2098 +#: remote.c:2093 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (иÑпользуйте «git push», чтобы опубликовать ваши локальные коммиты)\n" -#: remote.c:2101 +#: remote.c:2096 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2693,11 +2745,11 @@ msgstr[1] "Ваша ветка отÑтает от «%s» на %d коммита msgstr[2] "Ваша ветка отÑтает от «%s» на %d коммитов и может быть перемотана вперед.\n" msgstr[3] "Ваша ветка отÑтает от «%s» на %d коммитов и может быть перемотана вперед.\n" -#: remote.c:2109 +#: remote.c:2104 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (иÑпользуйте «git pull», чтобы обновить вашу локальную ветку)\n" -#: remote.c:2112 +#: remote.c:2107 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2710,150 +2762,145 @@ msgstr[1] "Ваша ветка и «%s» разделилиÑÑŒ\nи теперь msgstr[2] "Ваша ветка и «%s» разделилиÑÑŒ\nи теперь имеют %d и %d разных коммитов в каждой ÑоответÑтвенно.\n" msgstr[3] "Ваша ветка и «%s» разделилиÑÑŒ\nи теперь имеют %d и %d разных коммитов в каждой ÑоответÑтвенно.\n" -#: remote.c:2122 +#: remote.c:2117 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (иÑпользуйте «git pull», чтобы Ñлить внешнюю ветку в вашу)\n" -#: revision.c:2158 +#: revision.c:2187 msgid "your current branch appears to be broken" msgstr "похоже, ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° повреждена" -#: revision.c:2161 +#: revision.c:2190 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» еще не Ñодержит ни одного коммита" -#: revision.c:2355 +#: revision.c:2384 msgid "--first-parent is incompatible with --bisect" msgstr "опцию --first-parent Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --bisect" -#: run-command.c:125 +#: run-command.c:644 msgid "open /dev/null failed" msgstr "Ñбой Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ /dev/null" -#: run-command.c:127 -#, c-format -msgid "dup2(%d,%d) failed" -msgstr "dup2(%d,%d) Ñбой" - -#: send-pack.c:150 +#: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "не удалоÑÑŒ разобрать ÑÑ‚Ð°Ñ‚ÑƒÑ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ раÑпаковки: %s" -#: send-pack.c:152 +#: send-pack.c:153 #, c-format msgid "remote unpack failed: %s" msgstr "Ñбой при внешней раÑпаковке %s" -#: send-pack.c:315 +#: send-pack.c:316 msgid "failed to sign the push certificate" msgstr "Ñбой подпиÑÐ°Ð½Ð¸Ñ Ñертификата отправки" -#: send-pack.c:428 +#: send-pack.c:429 msgid "the receiving end does not support --signed push" msgstr "Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽÑ‰Ð°Ñ Ñторона не поддерживает отправку Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --signed" -#: send-pack.c:430 +#: send-pack.c:431 msgid "" "not sending a push certificate since the receiving end does not support " "--signed push" msgstr "не отправлÑем Ñертификат Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, так как Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽÑ‰Ð°Ñ Ñторона не поддерживает отправку Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --signed" -#: send-pack.c:442 +#: send-pack.c:443 msgid "the receiving end does not support --atomic push" msgstr "Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽÑ‰Ð°Ñ Ñторона не поддерживает отправку Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --atomic" -#: send-pack.c:447 +#: send-pack.c:448 msgid "the receiving end does not support push options" msgstr "Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽÑ‰Ð°Ñ Ñторона не поддерживает отправку Ñ Ð¾Ð¿Ñ†Ð¸Ñми" -#: sequencer.c:215 +#: sequencer.c:216 msgid "revert" msgstr "обратить изменениÑ" -#: sequencer.c:217 +#: sequencer.c:218 msgid "cherry-pick" msgstr "копировать коммит" -#: sequencer.c:219 +#: sequencer.c:220 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:221 +#: sequencer.c:222 #, c-format msgid "Unknown action: %d" msgstr "ÐеизвеÑтное дейÑтвие: %d" -#: sequencer.c:278 +#: sequencer.c:279 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð², пометьте иÑправленные пути\nÑ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git add <пути>» или «git rm <пути>»" -#: sequencer.c:281 +#: sequencer.c:282 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð², пометьте иÑправленные пути\nÑ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git add <пути>» или «git rm <пути>»\nи Ñделайте коммит Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git commit»" -#: sequencer.c:294 sequencer.c:1682 +#: sequencer.c:295 sequencer.c:1685 #, c-format msgid "could not lock '%s'" msgstr "не удалоÑÑŒ заблокировать «%s»" -#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 #, c-format msgid "could not write to '%s'" msgstr "не удалоÑÑŒ запиÑать в «%s»" -#: sequencer.c:301 +#: sequencer.c:302 #, c-format msgid "could not write eol to '%s'" msgstr "не удалоÑÑŒ запиÑать eol в «%s»" -#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 #, c-format msgid "failed to finalize '%s'." msgstr "не удалоÑÑŒ завершить «%s»." -#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 -#: builtin/commit.c:749 builtin/merge.c:1018 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 +#: builtin/commit.c:750 builtin/merge.c:1017 #, c-format msgid "could not read '%s'" msgstr "не удалоÑÑŒ прочитать «%s»" -#: sequencer.c:355 +#: sequencer.c:356 #, c-format msgid "your local changes would be overwritten by %s." msgstr "ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ перезапиÑаны %s." -#: sequencer.c:359 +#: sequencer.c:360 msgid "commit your changes or stash them to proceed." msgstr "Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚ÑŒÑ‚Ðµ ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ ÑпрÑчьте их." -#: sequencer.c:388 +#: sequencer.c:389 #, c-format msgid "%s: fast-forward" msgstr "%s: перемотка вперед" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". -#: sequencer.c:470 +#. "rebase -i". +#: sequencer.c:472 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Ðе удалоÑÑŒ запиÑать файл индекÑа" -#: sequencer.c:489 +#: sequencer.c:491 msgid "could not resolve HEAD commit\n" msgstr "не удалоÑÑŒ раÑпознать HEAD коммит\n" -#: sequencer.c:509 +#: sequencer.c:511 msgid "unable to update cache tree\n" msgstr "не удалоÑÑŒ обновить дерево кÑша\n" -#: sequencer.c:592 +#: sequencer.c:595 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2870,17 +2917,17 @@ msgid "" " git rebase --continue\n" msgstr "у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð¿Ñ€Ð¾Ð¸Ð½Ð´ÐµÐºÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² рабочем каталоге. ЕÑли Ñти Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ быть объеденены Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð¸Ð¼ коммитом, то запуÑтите:\n\n git commit --amend %s\n\nЕÑли же они должны быть помещены в новый коммит, то запуÑтите:\n\n git commit %s\n\nÐ’ любом Ñлучае, поÑле того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n" -#: sequencer.c:694 +#: sequencer.c:697 #, c-format msgid "could not parse commit %s\n" msgstr "не удалоÑÑŒ разобрать коммит %s\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse parent commit %s\n" msgstr "не удалоÑÑŒ разобрать родительÑкий коммит %s\n" -#: sequencer.c:821 +#: sequencer.c:824 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2888,7 +2935,7 @@ msgid "" "\t%.*s" msgstr "Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ€Ð²Ð°Ñ Ñтрока ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ:\n\n\t%.*s" -#: sequencer.c:827 +#: sequencer.c:830 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2896,229 +2943,229 @@ msgid "" "\t%.*s" msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¿ÐµÑ€Ð²Ð°Ñ Ñтрока ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ:\n\n\t%.*s" -#: sequencer.c:833 sequencer.c:858 +#: sequencer.c:836 sequencer.c:861 #, c-format msgid "This is a combination of %d commits." msgstr "Ðто объединение %d коммитов." -#: sequencer.c:842 +#: sequencer.c:845 msgid "need a HEAD to fixup" msgstr "нужен HEAD Ð´Ð»Ñ Ð¸ÑправлениÑ" -#: sequencer.c:844 +#: sequencer.c:847 msgid "could not read HEAD" msgstr "не удалоÑÑŒ прочитать HEAD" -#: sequencer.c:846 +#: sequencer.c:849 msgid "could not read HEAD's commit message" msgstr "не удалоÑÑŒ прочитать Ñообщение коммита текущего HEAD" -#: sequencer.c:852 +#: sequencer.c:855 #, c-format msgid "cannot write '%s'" msgstr "не удалоÑÑŒ запиÑать «%s»" -#: sequencer.c:861 git-rebase--interactive.sh:445 +#: sequencer.c:864 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "Ðто 1-е Ñообщение коммита:" -#: sequencer.c:869 +#: sequencer.c:872 #, c-format msgid "could not read commit message of %s" msgstr "не удалоÑÑŒ прочитать Ñообщение коммита Ð´Ð»Ñ %s" -#: sequencer.c:876 +#: sequencer.c:879 #, c-format msgid "This is the commit message #%d:" msgstr "Ðто Ñообщение коммита номер #%d:" -#: sequencer.c:881 +#: sequencer.c:884 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Сообщение коммита номер #%d будет пропущено:" -#: sequencer.c:886 +#: sequencer.c:889 #, c-format msgid "unknown command: %d" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %d" -#: sequencer.c:952 +#: sequencer.c:955 msgid "your index file is unmerged." msgstr "ваш Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ Ñлит." -#: sequencer.c:970 +#: sequencer.c:973 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "коммит %s — Ñто коммит-ÑлиÑние, но Ð¾Ð¿Ñ†Ð¸Ñ -m не указана." -#: sequencer.c:978 +#: sequencer.c:981 #, c-format msgid "commit %s does not have parent %d" msgstr "у коммита %s нет предка %d" -#: sequencer.c:982 +#: sequencer.c:985 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "оÑÐ½Ð¾Ð²Ð½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° указана, но коммит %s не ÑвлÑетÑÑ ÑлиÑнием." -#: sequencer.c:988 +#: sequencer.c:991 #, 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. -#: sequencer.c:1009 +#: sequencer.c:1012 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: не удалоÑÑŒ разобрать родительÑкий коммит Ð´Ð»Ñ %s" -#: sequencer.c:1071 sequencer.c:1827 +#: sequencer.c:1075 sequencer.c:1830 #, c-format msgid "could not rename '%s' to '%s'" msgstr "не удалоÑÑŒ переименовать «%s» в «%s»" -#: sequencer.c:1122 +#: sequencer.c:1126 #, c-format msgid "could not revert %s... %s" msgstr "не удалоÑÑŒ обратить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° %s… %s" -#: sequencer.c:1123 +#: sequencer.c:1127 #, c-format msgid "could not apply %s... %s" msgstr "не удалоÑÑŒ применить коммит %s… %s" -#: sequencer.c:1165 +#: sequencer.c:1169 msgid "empty commit set passed" msgstr "передан пуÑтой набор коммитов" -#: sequencer.c:1175 +#: sequencer.c:1179 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа" -#: sequencer.c:1182 +#: sequencer.c:1186 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Ñбой Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа" -#: sequencer.c:1303 +#: sequencer.c:1306 #, c-format msgid "invalid line %d: %.*s" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока %d: %.*s" -#: sequencer.c:1311 +#: sequencer.c:1314 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ «%s» без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ³Ð¾ коммита" -#: sequencer.c:1344 +#: sequencer.c:1347 #, c-format msgid "could not read '%s'." msgstr "не удалоÑÑŒ прочитать «%s»." -#: sequencer.c:1356 +#: sequencer.c:1359 msgid "please fix this using 'git rebase --edit-todo'." msgstr "пожалуйÑта иÑправьте Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git rebase --edit-todo»." -#: sequencer.c:1358 +#: sequencer.c:1361 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Ð½ÐµÐ¿Ñ€Ð¸Ð³Ð¾Ð´Ð½Ð°Ñ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ°Ñ€Ñ‚Ð° Ñ Ð¸Ð½ÑтрукциÑми: «%s»" -#: sequencer.c:1363 +#: sequencer.c:1366 msgid "no commits parsed." msgstr "коммиты не разобраны." -#: sequencer.c:1374 +#: sequencer.c:1377 msgid "cannot cherry-pick during a revert." msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñкопировать коммит во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑа Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°." -#: sequencer.c:1376 +#: sequencer.c:1379 msgid "cannot revert during a cherry-pick." msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° во Ð²Ñ€ÐµÐ¼Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°." -#: sequencer.c:1439 +#: sequencer.c:1442 #, c-format msgid "invalid key: %s" msgstr "недейÑтвительный ключ: %s" -#: sequencer.c:1442 +#: sequencer.c:1445 #, c-format msgid "invalid value for %s: %s" msgstr "неправильное значение %s: %s" -#: sequencer.c:1499 +#: sequencer.c:1502 #, c-format msgid "malformed options sheet: '%s'" msgstr "иÑÐ¿Ð¾Ñ€Ñ‡ÐµÐ½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° Ñ Ð¾Ð¿Ñ†Ð¸Ñми: «%s»" -#: sequencer.c:1537 +#: sequencer.c:1540 msgid "a cherry-pick or revert is already in progress" msgstr "копирование или обращение изменений коммита уже выполнÑÑŽÑ‚ÑÑ" -#: sequencer.c:1538 +#: sequencer.c:1541 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" -#: sequencer.c:1541 +#: sequencer.c:1544 #, c-format msgid "could not create sequencer directory '%s'" msgstr "не удалоÑÑŒ Ñоздать каталог Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð² «%s»" -#: sequencer.c:1555 +#: sequencer.c:1558 msgid "could not lock HEAD" msgstr "не удалоÑÑŒ заблокировать HEAD" -#: sequencer.c:1611 sequencer.c:2181 +#: sequencer.c:1614 sequencer.c:2188 msgid "no cherry-pick or revert in progress" msgstr "копирование или обращение изменений коммита уже выполнÑÑŽÑ‚ÑÑ" -#: sequencer.c:1613 +#: sequencer.c:1616 msgid "cannot resolve HEAD" msgstr "не удалоÑÑŒ определить HEAD" -#: sequencer.c:1615 sequencer.c:1649 +#: sequencer.c:1618 sequencer.c:1652 msgid "cannot abort from a branch yet to be born" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð²ÐµÑ‚ÐºÐ¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не Ñоздана" -#: sequencer.c:1635 builtin/grep.c:910 +#: sequencer.c:1638 builtin/grep.c:929 #, c-format msgid "cannot open '%s'" msgstr "не удалоÑÑŒ открыть «%s»" -#: sequencer.c:1637 +#: sequencer.c:1640 #, c-format msgid "cannot read '%s': %s" msgstr "не удалоÑÑŒ прочитать «%s»: %s" -#: sequencer.c:1638 +#: sequencer.c:1641 msgid "unexpected end of file" msgstr "неожиданный конец файла" -#: sequencer.c:1644 +#: sequencer.c:1647 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "Ñохраненный файл Ñ HEAD перед копированием коммита «%s» поврежден" -#: sequencer.c:1655 +#: sequencer.c:1658 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Похоже, что вы перемеÑтили HEAD. Перемотка не выполнÑетÑÑ, проверьте Ñвой указатель HEAD!" -#: sequencer.c:1792 sequencer.c:2080 +#: sequencer.c:1795 sequencer.c:2086 msgid "cannot read HEAD" msgstr "не удалоÑÑŒ прочитать HEAD" -#: sequencer.c:1832 builtin/difftool.c:616 +#: sequencer.c:1835 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "не удалоÑÑŒ Ñкопировать «%s» в «%s»" -#: sequencer.c:1848 +#: sequencer.c:1851 msgid "could not read index" msgstr "не удалоÑÑŒ прочитать индекÑ" -#: sequencer.c:1853 +#: sequencer.c:1856 #, c-format msgid "" "execution failed: %s\n" @@ -3128,11 +3175,11 @@ msgid "" "\n" msgstr "ошибка выполнениÑ: %s\n%sÐ’Ñ‹ можете иÑправить ошибку, а затем запуÑтить\n\n git rebase --continue\n\n" -#: sequencer.c:1859 +#: sequencer.c:1862 msgid "and made changes to the index and/or the working tree\n" msgstr "и были Ñделаны Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² индекÑе и/или в рабочем каталоге\n" -#: sequencer.c:1865 +#: sequencer.c:1868 #, c-format msgid "" "execution succeeded: %s\n" @@ -3143,107 +3190,107 @@ msgid "" "\n" msgstr "уÑпешное выполнение: %s\nно оÑталиÑÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² индекÑе и/или в рабочем каталоге\nСделайте коммит или ÑпрÑчьте ваши изменениÑ, а затем выполните\n\n git rebase --continue\n\n" -#: sequencer.c:1920 git-rebase.sh:169 +#: sequencer.c:1925 #, c-format -msgid "Applied autostash." -msgstr "Применено автоматичеÑкое прÑтанье." +msgid "Applied autostash.\n" +msgstr "Применены автоматичеÑки ÑпрÑтанные изменениÑ.\n" -#: sequencer.c:1932 +#: sequencer.c:1937 #, c-format msgid "cannot store %s" msgstr "не удалоÑÑŒ Ñохранить %s" -#: sequencer.c:1934 git-rebase.sh:173 +#: sequencer.c:1940 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "Применение автоматичеÑкого прÑÑ‚Ð°Ð½ÑŒÑ Ð²Ñ‹Ð·Ð²Ð°Ð»Ð¾ конфликты.\nВаши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑпрÑтаны и в безопаÑноÑти.\nÐ’Ñ‹ можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" +msgstr "Применение автоматичеÑки ÑпрÑтанных изменений вызвало конфликты.\nВаши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑпрÑтаны и в безопаÑноÑти.\nÐ’Ñ‹ можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" -#: sequencer.c:2016 +#: sequencer.c:2022 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "ОÑтановлено на %s … %.*s\n" -#: sequencer.c:2058 +#: sequencer.c:2064 #, c-format msgid "unknown command %d" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° %d" -#: sequencer.c:2088 +#: sequencer.c:2094 msgid "could not read orig-head" msgstr "не удалоÑÑŒ прочитать orig-head" -#: sequencer.c:2092 +#: sequencer.c:2099 msgid "could not read 'onto'" msgstr "не удалоÑÑŒ прочитать «onto»" -#: sequencer.c:2099 +#: sequencer.c:2106 #, c-format msgid "could not update %s" msgstr "не удалоÑÑŒ обновить %s" -#: sequencer.c:2106 +#: sequencer.c:2113 #, c-format msgid "could not update HEAD to %s" msgstr "не удалоÑÑŒ обновить HEAD на %s" -#: sequencer.c:2190 +#: sequencer.c:2197 msgid "cannot rebase: You have unstaged changes." msgstr "не удалоÑÑŒ выполнить перемещение коммитов: У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ непроиндекÑированные изменениÑ." -#: sequencer.c:2195 +#: sequencer.c:2202 msgid "could not remove CHERRY_PICK_HEAD" msgstr "не удалоÑÑŒ удалить CHERRY_PICK_HEAD" -#: sequencer.c:2204 +#: sequencer.c:2211 msgid "cannot amend non-existing commit" msgstr "не удалоÑÑŒ иÑправить неÑущеÑтвующий коммит" -#: sequencer.c:2206 +#: sequencer.c:2213 #, c-format msgid "invalid file: '%s'" msgstr "недопуÑтимый файл: «%s»" -#: sequencer.c:2208 +#: sequencer.c:2215 #, c-format msgid "invalid contents: '%s'" msgstr "недопуÑтимое Ñодержимое: «%s»" -#: sequencer.c:2211 +#: sequencer.c:2218 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "\nУ Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ Ð½ÐµÐ·Ð°ÐºÐ¾Ð¼Ð¼Ð¸Ñ‡ÐµÐ½Ð½Ñ‹Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² рабочем каталоге. Сделайте коммит, а затем запуÑтите «git rebase --continue» Ñнова." -#: sequencer.c:2221 +#: sequencer.c:2228 msgid "could not commit staged changes." msgstr "не удалоÑÑŒ закоммитить проиндекÑированные изменениÑ." -#: sequencer.c:2301 +#: sequencer.c:2308 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не удалоÑÑŒ Ñкопировать коммит %s" -#: sequencer.c:2305 +#: sequencer.c:2312 #, c-format msgid "%s: bad revision" msgstr "%s: Ð¿Ð»Ð¾Ñ…Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ" -#: sequencer.c:2338 +#: sequencer.c:2345 msgid "can't revert as initial commit" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ изначальный коммит" -#: setup.c:165 +#: setup.c:171 #, 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 <команда> -- <путь>…» Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿ÑƒÑ‚ÐµÐ¹, которые не ÑущеÑтвуют локально." -#: setup.c:178 +#: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3251,7 +3298,7 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "неоднозначный аргумент «%s»: неизвеÑÑ‚Ð½Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ Ð¸Ð»Ð¸ не путь в рабочем каталоге.\nИÑпользуйте «--» Ð´Ð»Ñ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿ÑƒÑ‚ÐµÐ¹ от редакций, вот так:\n«git <команда> [<редакциÑ>…] -- [<файл>…]»" -#: setup.c:228 +#: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3259,68 +3306,68 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "неоднозначный аргумент «%s»: ÑвлÑетÑÑ Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾ и редакцией и именем файла.\nИÑпользуйте «--» Ð´Ð»Ñ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿ÑƒÑ‚ÐµÐ¹ от редакций, вот так:\n«git <команда> [<редакциÑ>…] -- [<файл>…]»" -#: setup.c:475 +#: setup.c:504 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "ÐžÐ¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ git Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ <= %d, а обнаружена %d" -#: setup.c:483 +#: setup.c:512 msgid "unknown repository extensions found:" msgstr "обнаружены неизвеÑтные раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ:" -#: setup.c:776 +#: setup.c:810 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "Ðе найден git репозитоий (или один из его каталогов): %s" -#: setup.c:778 builtin/index-pack.c:1646 +#: setup.c:812 builtin/index-pack.c:1652 msgid "Cannot come back to cwd" msgstr "Ðе удалоÑÑŒ вернутьÑÑ Ð² текущий рабочий каталог" -#: setup.c:1010 +#: setup.c:1050 msgid "Unable to read current working directory" msgstr "Ðе удалоÑÑŒ прочитать текущий рабочий каталог" -#: setup.c:1022 setup.c:1028 +#: setup.c:1062 setup.c:1068 #, c-format msgid "Cannot change to '%s'" msgstr "Ðе удалоÑÑŒ изменить на «%s»" -#: setup.c:1041 +#: setup.c:1081 #, 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 не уÑтановлен)." -#: setup.c:1106 +#: setup.c:1173 #, 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Владелец файлов должен вÑегда иметь права на чтение и на запиÑÑŒ." -#: sha1_file.c:559 +#: sha1_file.c:560 #, c-format msgid "path '%s' does not exist" msgstr "путь «%s» не ÑущеÑтвует" -#: sha1_file.c:585 +#: sha1_file.c:586 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ÑÑылаемый репозиторий «%s» как ÑвÑзанное ÑоÑтоÑние, пока не поддерживаетÑÑ." -#: sha1_file.c:591 +#: sha1_file.c:592 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ÑÑылаемый репозиторий «%s» не ÑвлÑетÑÑ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼." -#: sha1_file.c:597 +#: sha1_file.c:598 #, c-format msgid "reference repository '%s' is shallow" msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñ‡Ð°Ñтичным" -#: sha1_file.c:605 +#: sha1_file.c:606 #, c-format msgid "reference repository '%s' is grafted" msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñращенным" @@ -3329,26 +3376,26 @@ msgstr "ÑÑылаемый репозиторий «%s» ÑвлÑетÑÑ Ñра msgid "offset before end of packfile (broken .idx?)" msgstr "Ñдвиг до конца файла пакета (возможно, повреждён файл .idx?)" -#: sha1_file.c:2721 +#: sha1_file.c:2729 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "Ñдвиг до начала индекÑа пакета Ð´Ð»Ñ %s (повреждён индекÑ?)" -#: sha1_file.c:2725 +#: sha1_file.c:2733 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Ñдвиг за пределами индекÑа пакета Ð´Ð»Ñ %s (обрезан индекÑ?)" -#: sha1_name.c:409 +#: sha1_name.c:419 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "Ñокращённый SHA1 идентификатор %s неоднозначен" -#: sha1_name.c:420 +#: sha1_name.c:430 msgid "The candidates are:" msgstr "Возможно, вы имели в виду:" -#: sha1_name.c:580 +#: sha1_name.c:589 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" @@ -3361,71 +3408,81 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "Обычно Git не Ñоздает ÑÑылки, оканчивающиеÑÑ Ð½Ð° 40 шеÑтнадцатеричных\nÑимволов, потому, что они будут игнорироватьÑÑ, когда вы проÑто\nукажете Ñто 40-Ñимвольное шеÑтнадцатеричное чиÑло. Такие ÑÑылки\nмогли быть Ñозданы по ошибке. Ðапример, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git checkout -b $br $(git rev-parse …)\n\n, еÑли «$br» оказалÑÑ Ð¿ÑƒÑтым, то ÑÑылка Ñ 40-Ñимвольным\nшеÑтнадцатеричным чиÑлом будет Ñоздана. ПожалуйÑта, проÑмотрите Ñти\nÑÑылки и, возможно, удалите их. Ð’Ñ‹ можете отключить Ñто Ñообщение\nзапуÑтив «git config advice.objectNameWarning false»" -#: submodule.c:67 submodule.c:101 +#: submodule.c:70 submodule.c:104 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "Ðе удалоÑÑŒ изменить не Ñлитый .gitmodules, Ñначала разрешите конфликты" -#: submodule.c:71 submodule.c:105 +#: submodule.c:74 submodule.c:108 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Ðе удалоÑÑŒ найти раздел в .gitmodules, где путь равен %s" -#: submodule.c:79 +#: submodule.c:82 #, c-format msgid "Could not update .gitmodules entry %s" msgstr " Ðе удалоÑÑŒ обновить .gitmodules запиÑÑŒ %s" -#: submodule.c:112 +#: submodule.c:115 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Ðе удалоÑÑŒ удалить запиÑÑŒ в .gitmodules Ð´Ð»Ñ %s" -#: submodule.c:123 +#: submodule.c:126 msgid "staging updated .gitmodules failed" msgstr "Ñбой индекÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ .gitmodules" -#: submodule.c:161 +#: submodule.c:165 msgid "negative values not allowed for submodule.fetchJobs" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать отприцательные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ submodule.fetchJobs" -#: submodule.c:1194 +#: submodule.c:376 +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "в пуÑтом подмодуле «%s»" + +#: submodule.c:407 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Спецификатор пути «%s» в подмодуле «%.*s»" + +#: submodule.c:1337 #, c-format msgid "'%s' not recognized as a git repository" msgstr "«%s» не раÑпознан как репозиторий git" -#: submodule.c:1332 +#: submodule.c:1475 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "не удалоÑÑŒ запуÑтить «git status» в подмодуле «%s»" -#: submodule.c:1345 +#: submodule.c:1488 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "не удалоÑÑŒ запуÑтить «git status» в подмодуле «%s»" -#: submodule.c:1421 +#: submodule.c:1581 #, c-format msgid "submodule '%s' has dirty index" msgstr "подмодуль «%s» имеет изменённый индекÑ" -#: submodule.c:1678 +#: submodule.c:1845 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "relocate_gitdir Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«%s» Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ более одного рабочего дерева не поддерживаетÑÑ" -#: submodule.c:1690 submodule.c:1746 +#: submodule.c:1857 submodule.c:1913 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "не удалоÑÑŒ запроÑить Ð¸Ð¼Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«%s»" -#: submodule.c:1694 builtin/submodule--helper.c:678 +#: submodule.c:1861 builtin/submodule--helper.c:678 #: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "не удалоÑÑŒ Ñоздать каталог «%s»" -#: submodule.c:1697 +#: submodule.c:1864 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3433,101 +3490,101 @@ msgid "" "'%s'\n" msgstr "Перемещение каталога git Ð´Ð»Ñ Â«%s%s» из\n«%s» в\n«%s»\n" -#: submodule.c:1781 +#: submodule.c:1948 #, c-format msgid "could not recurse into submodule '%s'" msgstr "не удалоÑÑŒ рекурÑивно зайти в подмодуль «%s»" -#: submodule.c:1825 +#: submodule.c:1992 msgid "could not start ls-files in .." msgstr "не удалоÑÑŒ выполнить stat ls-files в .." -#: submodule.c:1845 +#: submodule.c:2012 msgid "BUG: returned path string doesn't match cwd?" msgstr "ОШИБКÐ: Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð½Ð°Ñ Ñтрока не ÑоответÑвует cwd?" -#: submodule.c:1864 +#: submodule.c:2031 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree вернул неожиданный код %d" -#: submodule-config.c:380 +#: submodule-config.c:420 #, c-format msgid "invalid value for %s" msgstr "неправильное значение %s" -#: trailer.c:240 +#: trailer.c:241 #, c-format msgid "running trailer command '%s' failed" msgstr "Ñбой при запуÑке команды Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÐµÐ»Ñ Â«%s»" -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 -#: trailer.c:543 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 +#: trailer.c:544 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "неизвеÑтное значение «%s» Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° «%s»" -#: trailer.c:525 trailer.c:530 builtin/remote.c:289 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "больше одного %s" -#: trailer.c:702 +#: trailer.c:703 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "пуÑÑ‚Ð°Ñ Ð¿Ð¾ÑледнÑÑ Ð»ÐµÐºÑема в завершителе «%.*s»" -#: trailer.c:722 +#: trailer.c:723 #, c-format msgid "could not read input file '%s'" msgstr "не удалоÑÑŒ прочитать входной файл «%s»" -#: trailer.c:725 +#: trailer.c:726 msgid "could not read from stdin" msgstr "не удалоÑÑŒ прочитать из Ñтандартного ввода" -#: trailer.c:949 builtin/am.c:44 +#: trailer.c:950 builtin/am.c:45 #, c-format msgid "could not stat %s" msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ %s" -#: trailer.c:951 +#: trailer.c:952 #, c-format msgid "file %s is not a regular file" msgstr "файл %s не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом" -#: trailer.c:953 +#: trailer.c:954 #, c-format msgid "file %s is not writable by user" msgstr "файл %s не доÑтупен на запиÑÑŒ пользователю" -#: trailer.c:965 +#: trailer.c:966 msgid "could not open temporary file" msgstr "не удалоÑÑŒ Ñоздать временный файл" -#: trailer.c:1001 +#: trailer.c:1002 #, c-format msgid "could not rename temporary file to %s" msgstr "не удалоÑÑŒ переименовать временный файл в %s" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Будет уÑтановлен вышеÑтоÑщий репозиторий Ð´Ð»Ñ Â«%s» на «%s» Ñ Â«%s»\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "транÑпорт: неправильный параметр глубины «%s»" -#: transport.c:889 +#: transport.c:890 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "Подмодули по указанным путÑм Ñодержат изменениÑ, которые не найдены ни на одном из внешних репозиториев:\n" -#: transport.c:893 +#: transport.c:894 #, c-format msgid "" "\n" @@ -3543,11 +3600,11 @@ msgid "" "\n" msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды cd и выполнить\n\n\tgit push\n\nÐ´Ð»Ñ Ð¸Ñ… отправки на внешний репозиторий.\n" -#: transport.c:901 +#: transport.c:902 msgid "Aborting." msgstr "Прерываю." -#: transport-helper.c:1080 +#: transport-helper.c:1071 #, c-format msgid "Could not read ref %s" msgstr "Ðе удалоÑÑŒ прочитать ÑÑылку %s" @@ -3568,183 +3625,183 @@ msgstr "пуÑтое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° в запиÑи дерева" msgid "too-short tree file" msgstr "Ñлишком короткий файл дерева" -#: unpack-trees.c:104 +#: unpack-trees.c:105 #, 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Сделайте коммит или ÑпрÑчьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ переключением веток." -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при переключении на ÑоÑтоÑние:\n%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:110 #, 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Сделайте коммит или ÑпрÑчьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ ÑлиÑнием веток." -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при ÑлиÑнии:\n%%s" -#: unpack-trees.c:114 +#: unpack-trees.c:115 #, 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." -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "Ваши локальные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² указанных файлах будут перезапиÑаны при %s:\n%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:122 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "Обновление указанных каталогов приведет к потере неотÑлеживаемых файлов в них:\n%s" -#: unpack-trees.c:125 +#: unpack-trees.c:126 #, 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ПеремеÑтите Ñти файлы или удалите их перед переключением веток." -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при переключении на ÑоÑтоÑние:\n%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:131 #, 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ПеремеÑтите Ñти файлы или удалите их перед переключением веток." -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при ÑлиÑнии:\n%%s" -#: unpack-trees.c:135 +#: unpack-trees.c:136 #, 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." -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:143 #, 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ПеремеÑтите Ñти файлы или удалите их перед переключением веток." -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" "%%s" msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при переключении на ÑоÑтоÑние:\n%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:148 #, 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ПеремеÑтите Ñти файлы или удалите их перед переключением веток." -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при ÑлиÑнии:\n%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, 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." -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "Указанные неотÑлеживаемые файлы в рабочем каталоге будут перезапиÑаны при %s:\n%%s" -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "ЗапиÑÑŒ «%s» чаÑтично Ñовпадает Ñ Â«%s». Ðе удалоÑÑŒ назначить ÑоответÑтвие." -#: unpack-trees.c:164 +#: unpack-trees.c:165 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" "%s" msgstr "Ðе удалоÑÑŒ обновить чаÑтичное ÑоÑтоÑние: Ñледующие Ñлементы не поÑледней верÑии:\n%s" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout update:\n" "%s" msgstr "Указанные файлы из рабочего каталога будут перезапиÑаны при обновлении чаÑтичного ÑоÑтоÑниÑ:\n%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be removed by sparse checkout update:\n" "%s" msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении чаÑтичного ÑоÑтоÑниÑ:\n%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "Ðе удолоÑÑŒ обновить подмодуль:\n%s" -#: unpack-trees.c:247 +#: unpack-trees.c:248 #, c-format msgid "Aborting\n" msgstr "Прерываю\n" -#: unpack-trees.c:272 +#: unpack-trees.c:277 #, c-format msgid "submodule update strategy not supported for submodule '%s'" msgstr "ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð½Ðµ поддерживаетÑÑ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¼ «%s»" -#: unpack-trees.c:340 +#: unpack-trees.c:346 msgid "Checking out files" msgstr "РаÑпаковка файлов" @@ -3777,238 +3834,246 @@ msgstr "неправильный номер порта" msgid "invalid '..' path segment" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ пути «..»" -#: worktree.c:285 +#: worktree.c:245 #, c-format msgid "failed to read '%s'" msgstr "не удалоÑÑŒ прочитать «%s»" -#: wrapper.c:222 wrapper.c:392 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸ запиÑи" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 -#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 -#: builtin/pull.c:341 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 +#: builtin/am.c:849 builtin/merge.c:1014 #, c-format msgid "could not open '%s' for reading" msgstr "не удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ" -#: wrapper.c:581 wrapper.c:602 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "«%s» недоÑтупно" -#: wrapper.c:610 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "не удалоÑÑŒ получить текущий рабочий каталог" -#: wrapper.c:634 +#: wrapper.c:656 #, c-format msgid "could not write to %s" msgstr "не удалоÑÑŒ запиÑать в %s" -#: wrapper.c:636 +#: wrapper.c:658 #, c-format msgid "could not close %s" msgstr "не удалоÑÑŒ закрыть %s" -#: wt-status.c:151 +#: wt-status.c:152 msgid "Unmerged paths:" msgstr "Ðе Ñлитые пути:" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (иÑпользуйте «git reset %s <файл>…», чтобы убрать из индекÑа)" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:181 wt-status.c:208 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (иÑпользуйте «git rm --cached <файл>…», чтобы убрать из индекÑа)" -#: wt-status.c:184 +#: wt-status.c:185 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (иÑпользуйте «git add <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:187 wt-status.c:191 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (иÑпользуйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)" -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (иÑпользуйте «git rm <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:199 wt-status.c:958 +#: wt-status.c:200 wt-status.c:981 msgid "Changes to be committed:" msgstr "ИзменениÑ, которые будут включены в коммит:" -#: wt-status.c:217 wt-status.c:967 +#: wt-status.c:218 wt-status.c:990 msgid "Changes not staged for commit:" msgstr "ИзменениÑ, которые не в индекÑе Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°:" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (иÑпользуйте «git add <файл>…», чтобы добавить файл в индекÑ)" -#: wt-status.c:223 +#: wt-status.c:224 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (иÑпользуйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекÑа)" -#: wt-status.c:224 +#: wt-status.c:225 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working " "directory)" msgstr " (иÑпользуйте «git checkout -- <файл>…», чтобы отменить изменениÑ\n в рабочем каталоге)" -#: wt-status.c:226 +#: wt-status.c:227 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (Ñделайте коммит или отмените Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² неотÑлеживаемом или измененном Ñодержимом в подмодулÑÑ…)" -#: wt-status.c:238 +#: wt-status.c:239 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (иÑпользуйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)" -#: wt-status.c:253 +#: wt-status.c:254 msgid "both deleted:" msgstr "оба удалены:" -#: wt-status.c:255 +#: wt-status.c:256 msgid "added by us:" msgstr "добавлено нами:" -#: wt-status.c:257 +#: wt-status.c:258 msgid "deleted by them:" msgstr "удалено ими:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by them:" msgstr "добавлено ими:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by us:" msgstr "удалено нами:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both added:" msgstr "оба добавлены:" -#: wt-status.c:265 +#: wt-status.c:266 msgid "both modified:" msgstr "оба изменены:" -#: wt-status.c:275 +#: wt-status.c:276 msgid "new file:" msgstr "новый файл:" -#: wt-status.c:277 +#: wt-status.c:278 msgid "copied:" msgstr "Ñкопировано:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "deleted:" msgstr "удалено:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "modified:" msgstr "изменено:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "renamed:" msgstr "переименовано:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "typechange:" msgstr "изменен тип:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unknown:" msgstr "неизвеÑтно:" -#: wt-status.c:289 +#: wt-status.c:290 msgid "unmerged:" msgstr "не Ñлитые:" -#: wt-status.c:371 +#: wt-status.c:372 msgid "new commits, " msgstr "новые коммиты, " -#: wt-status.c:373 +#: wt-status.c:374 msgid "modified content, " msgstr "изменено Ñодержимое, " -#: wt-status.c:375 +#: wt-status.c:376 msgid "untracked content, " msgstr "неотÑлеживаемое Ñодержимое, " -#: wt-status.c:831 +#: wt-status.c:821 +#, 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 запиÑей" +msgstr[3] "У Ð²Ð°Ñ ÑÐµÐ¹Ñ‡Ð°Ñ ÑпрÑтаны %d запиÑи" + +#: wt-status.c:853 msgid "Submodules changed but not updated:" msgstr "Измененные, но не обновленные подмодули:" -#: wt-status.c:833 +#: wt-status.c:855 msgid "Submodule changes to be committed:" msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² подмодулÑÑ…, которые будут закоммичены:" -#: wt-status.c:914 +#: wt-status.c:937 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "Ðе трогайте Ñтроку выше Ñтой.\nÐ’ÑÑ‘, что ниже — будет удалено." -#: wt-status.c:1026 +#: wt-status.c:1049 msgid "You have unmerged paths." msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ не Ñлитые пути." -#: wt-status.c:1029 +#: wt-status.c:1052 msgid " (fix conflicts and run \"git commit\")" msgstr " (разрешите конфликты, затем запуÑтите «git commit»)" -#: wt-status.c:1031 +#: wt-status.c:1054 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (иÑпользуйте «git merge --abort», чтобы оÑтановить операцию ÑлиÑниÑ)" -#: wt-status.c:1036 +#: wt-status.c:1059 msgid "All conflicts fixed but you are still merging." msgstr "Ð’Ñе конфликты иÑправлены, но вы вÑе еще в процеÑÑе ÑлиÑниÑ." -#: wt-status.c:1039 +#: wt-status.c:1062 msgid " (use \"git commit\" to conclude merge)" msgstr " (иÑпользуйте «git commit», чтобы завершить ÑлиÑние)" -#: wt-status.c:1049 +#: wt-status.c:1072 msgid "You are in the middle of an am session." msgstr "Ð’Ñ‹ в процеÑÑе ÑеÑÑии am." -#: wt-status.c:1052 +#: wt-status.c:1075 msgid "The current patch is empty." msgstr "Текущий патч пуÑтой." -#: wt-status.c:1056 +#: wt-status.c:1079 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (разрешите конфликты, затем запуÑтите «git am --continue»)" -#: wt-status.c:1058 +#: wt-status.c:1081 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (иÑпользуйте «git am --skip», чтобы пропуÑтить Ñтот патч)" -#: wt-status.c:1060 +#: wt-status.c:1083 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (иÑпользуйте «git am --abort», чтобы воÑÑтановить оригинальную ветку)" -#: wt-status.c:1189 +#: wt-status.c:1214 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo отÑутÑтвует." -#: wt-status.c:1191 +#: wt-status.c:1216 msgid "No commands done." msgstr "Команды не выполнены." -#: wt-status.c:1194 +#: wt-status.c:1219 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" @@ -4017,16 +4082,16 @@ msgstr[1] "ПоÑледнÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° выполнена (%d команд msgstr[2] "ПоÑледнÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° выполнена (%d команд выполнено):" msgstr[3] "ПоÑледнÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° выполнена (%d команд выполнено):" -#: wt-status.c:1205 +#: wt-status.c:1230 #, c-format msgid " (see more in file %s)" msgstr " (Ñмотрите дополнительно в файле %s)" -#: wt-status.c:1210 +#: wt-status.c:1235 msgid "No commands remaining." msgstr "Команд больше не оÑталоÑÑŒ." -#: wt-status.c:1213 +#: wt-status.c:1238 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -4035,150 +4100,154 @@ msgstr[1] "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ (%d кРmsgstr[2] "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ (%d команд оÑталоÑÑŒ):" msgstr[3] "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ (%d команд оÑталоÑÑŒ):" -#: wt-status.c:1221 +#: wt-status.c:1246 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (иÑпользуйте «git rebase --edit-todo», чтобы проÑмотреть и изменить)" -#: wt-status.c:1234 +#: wt-status.c:1259 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰Ð°ÐµÑ‚Ðµ ветку «%s» над «%s»." -#: wt-status.c:1239 +#: wt-status.c:1264 msgid "You are currently rebasing." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰Ð°ÐµÑ‚Ðµ ветку." -#: wt-status.c:1253 +#: wt-status.c:1278 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (разрешите конфликты, затем запуÑтите «git rebase --continue»)" -#: wt-status.c:1255 +#: wt-status.c:1280 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (иÑпользуйте «git rebase --skip», чтобы пропуÑтить Ñтот патч)" -#: wt-status.c:1257 +#: wt-status.c:1282 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (иÑпользуйте «git rebase --abort», чтобы перейти на оригинальную ветку)" -#: wt-status.c:1263 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (вÑе конфликты разрешены: запуÑтите «git rebase --continue»)" -#: wt-status.c:1267 +#: wt-status.c:1292 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ñете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1272 +#: wt-status.c:1297 msgid "You are currently splitting a commit during a rebase." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ñете коммит при перемещении ветки." -#: wt-status.c:1275 +#: wt-status.c:1300 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "(Как только ваш рабочий каталог будет чиÑтый, запуÑтите «git rebase --continue»)" -#: wt-status.c:1279 +#: wt-status.c:1304 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÐµÑ‚Ðµ коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1284 +#: wt-status.c:1309 msgid "You are currently editing a commit during a rebase." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÐµÑ‚Ðµ коммит при перемещении ветки." -#: wt-status.c:1287 +#: wt-status.c:1312 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (иÑпользуйте «git commit --amend», чтобы иÑправить текущий коммит)" -#: wt-status.c:1289 +#: wt-status.c:1314 msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (иÑпользуйте «git rebase --continue», когда будете довольны изменениÑми)" -#: wt-status.c:1299 +#: wt-status.c:1324 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Ð’Ñ‹ копируете коммит %s." -#: wt-status.c:1304 +#: wt-status.c:1329 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (разрешите конфликты, затем запуÑтите «git cherry-pick --continue»)" -#: wt-status.c:1307 +#: wt-status.c:1332 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (вÑе конфликты разрешены: запуÑтите «git cherry-pick --continue»)" -#: wt-status.c:1309 +#: wt-status.c:1334 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (иÑпользуйте «git cherry-pick --abort», чтобы отменить ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°)" -#: wt-status.c:1318 +#: wt-status.c:1343 #, c-format msgid "You are currently reverting commit %s." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ð±Ñ€Ð°Ñ‰Ð°ÐµÑ‚Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° %s." -#: wt-status.c:1323 +#: wt-status.c:1348 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (разрешите конфликты, затем запуÑтите «git revert --continue»)" -#: wt-status.c:1326 +#: wt-status.c:1351 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (вÑе конфликты разрешены: запуÑтите «git revert --continue»)" -#: wt-status.c:1328 +#: wt-status.c:1353 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (иÑпользуйте «git revert --abort», чтобы отменить операцию Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммита)" -#: wt-status.c:1339 +#: wt-status.c:1364 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð² процеÑÑе двоичного поиÑка, начатого Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»." -#: wt-status.c:1343 +#: wt-status.c:1368 msgid "You are currently bisecting." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð² процеÑÑе двоичного поиÑка." -#: wt-status.c:1346 +#: wt-status.c:1371 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (иÑпользуйте «git bisect reset», чтобы вернутьÑÑ Ð½Ð° иÑходную ветку)" -#: wt-status.c:1543 +#: wt-status.c:1568 msgid "On branch " msgstr "Ðа ветке " -#: wt-status.c:1549 +#: wt-status.c:1574 msgid "interactive rebase in progress; onto " msgstr "интерактивное перемещение в процеÑÑе; над " -#: wt-status.c:1551 +#: wt-status.c:1576 msgid "rebase in progress; onto " msgstr "перемещение в процеÑÑе; над " -#: wt-status.c:1556 +#: wt-status.c:1581 msgid "HEAD detached at " msgstr "HEAD отделён на " -#: wt-status.c:1558 +#: wt-status.c:1583 msgid "HEAD detached from " msgstr "HEAD отделён Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ " -#: wt-status.c:1561 +#: wt-status.c:1586 msgid "Not currently on any branch." msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð½Ð¸ на одной из веток" -#: wt-status.c:1579 +#: wt-status.c:1606 msgid "Initial commit" msgstr "Ðачальный коммит" -#: wt-status.c:1593 +#: wt-status.c:1607 +msgid "No commits yet" +msgstr "Еще нет коммитов" + +#: wt-status.c:1621 msgid "Untracked files" msgstr "ÐеотÑлеживаемые файлы" -#: wt-status.c:1595 +#: wt-status.c:1623 msgid "Ignored files" msgstr "Игнорируемые файлы" -#: wt-status.c:1599 +#: wt-status.c:1627 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4186,252 +4255,279 @@ msgid "" "new files yourself (see 'git help status')." msgstr "%.2f Ñекунды занÑл вывод ÑпиÑка неотÑлеживаемых файлов. «status -uno» возможно может уÑкорить Ñто, но будьте внимательны, и не забудьте добавить новые файлы вручную (Ñмотрите «git help status» Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñтей)." -#: wt-status.c:1605 +#: wt-status.c:1633 #, c-format msgid "Untracked files not listed%s" msgstr "ÐеотÑлеживаемые файлы не показаны%s" -#: wt-status.c:1607 +#: wt-status.c:1635 msgid " (use -u option to show untracked files)" msgstr "(иÑпользуйте опцию «-u», чтобы показать неотÑлеживаемые файлы)" -#: wt-status.c:1613 +#: wt-status.c:1641 msgid "No changes" msgstr "Ðет изменений" -#: wt-status.c:1618 +#: wt-status.c:1646 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "нет изменений добавленных Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°\n(иÑпользуйте «git add» и/или «git commit -a»)\n" -#: wt-status.c:1621 +#: wt-status.c:1649 #, c-format msgid "no changes added to commit\n" msgstr "нет изменений добавленных Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°\n" -#: wt-status.c:1624 +#: wt-status.c:1652 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "ничего не добавлено в коммит, но еÑÑ‚ÑŒ неотÑлеживаемые файлы (иÑпользуйте «git add», чтобы отÑлеживать их)\n" -#: wt-status.c:1627 +#: wt-status.c:1655 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ничего не добавлено в коммит, но еÑÑ‚ÑŒ неотÑлеживаемые файлы\n" -#: wt-status.c:1630 +#: wt-status.c:1658 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "нечего коммитить (Ñоздайте/Ñкопируйте файлы, затем запуÑтите «git add», чтобы отÑлеживать их)\n" -#: wt-status.c:1633 wt-status.c:1638 +#: wt-status.c:1661 wt-status.c:1666 #, c-format msgid "nothing to commit\n" msgstr "нечего коммитить\n" -#: wt-status.c:1636 +#: wt-status.c:1664 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "нечего коммитить (иÑпользуйте опцию «-u», чтобы показать неотÑлеживаемые файлы)\n" -#: wt-status.c:1640 +#: wt-status.c:1668 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" -#: wt-status.c:1749 -msgid "Initial commit on " -msgstr "Ðачальный коммит на " +#: wt-status.c:1780 +msgid "No commits yet on " +msgstr "Еще нет коммитов в" -#: wt-status.c:1753 +#: wt-status.c:1784 msgid "HEAD (no branch)" msgstr "HEAD (нет ветки)" -#: wt-status.c:1782 wt-status.c:1790 +#: wt-status.c:1813 wt-status.c:1821 msgid "behind " msgstr "позади" -#: wt-status.c:1785 wt-status.c:1788 +#: wt-status.c:1816 wt-status.c:1819 msgid "ahead " msgstr "впереди " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2280 +#: wt-status.c:2311 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "не удалоÑÑŒ выполнить %s: У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ непроиндекÑированные изменениÑ." -#: wt-status.c:2286 +#: wt-status.c:2317 msgid "additionally, your index contains uncommitted changes." msgstr "к тому же, в вашем индекÑе еÑÑ‚ÑŒ незакоммиченные изменениÑ." -#: wt-status.c:2288 +#: wt-status.c:2319 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "не удалоÑÑŒ выполнить %s: Ð’ вашем индекÑе еÑÑ‚ÑŒ незакоммиченные изменениÑ." -#: compat/precompose_utf8.c:57 builtin/clone.c:432 +#: compat/precompose_utf8.c:58 builtin/clone.c:436 #, c-format msgid "failed to unlink '%s'" msgstr "Ñбой отÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Â«%s»" -#: builtin/add.c:22 +#: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<опции>] [--] <Ñпецификатор-пути>…" -#: builtin/add.c:80 +#: builtin/add.c:82 #, c-format msgid "unexpected diff status %c" msgstr "неожиданный ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ð¹ %c" -#: builtin/add.c:85 builtin/commit.c:291 +#: builtin/add.c:87 builtin/commit.c:292 msgid "updating files failed" msgstr "Ñбой при обновлении файлов" -#: builtin/add.c:95 +#: builtin/add.c:97 #, c-format msgid "remove '%s'\n" msgstr "удалить «%s»\n" -#: builtin/add.c:149 +#: builtin/add.c:151 msgid "Unstaged changes after refreshing the index:" msgstr "ÐепроиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа:" -#: builtin/add.c:209 builtin/rev-parse.c:872 +#: builtin/add.c:211 builtin/rev-parse.c:873 msgid "Could not read the index" msgstr "Ðе удалоÑÑŒ прочитать индекÑ" -#: builtin/add.c:220 +#: builtin/add.c:222 #, c-format msgid "Could not open '%s' for writing." msgstr "Ðе удалоÑÑŒ открыть «%s» Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи." -#: builtin/add.c:224 +#: builtin/add.c:226 msgid "Could not write patch" msgstr "Ðе удалоÑÑŒ запиÑать патч" -#: builtin/add.c:227 +#: builtin/add.c:229 msgid "editing patch failed" msgstr "Ñбой при редактировании патча" -#: builtin/add.c:230 +#: builtin/add.c:232 #, c-format msgid "Could not stat '%s'" msgstr "Ðе удалоÑÑŒ выполнить stat Ð´Ð»Ñ Â«%s»" -#: builtin/add.c:232 +#: builtin/add.c:234 msgid "Empty patch. Aborted." msgstr "ПуÑтой патч. ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð°." -#: builtin/add.c:237 +#: builtin/add.c:239 #, c-format msgid "Could not apply '%s'" msgstr "Ðе удалоÑÑŒ применить «%s»" -#: builtin/add.c:247 +#: builtin/add.c:249 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Следующие пути игнорируютÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших файлов .gitignore:\n" -#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 +#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "пробный запуÑк" -#: builtin/add.c:269 +#: builtin/add.c:272 msgid "interactive picking" msgstr "интерактивный выбор" -#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 +#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 msgid "select hunks interactively" msgstr "интерактивный выбор блоков" -#: builtin/add.c:271 +#: builtin/add.c:274 msgid "edit current diff and apply" msgstr "отредактировать текущий файл различий и применить его" -#: builtin/add.c:272 +#: builtin/add.c:275 msgid "allow adding otherwise ignored files" msgstr "разрешить добавление игнорируемых иначе файлов" -#: builtin/add.c:273 +#: builtin/add.c:276 msgid "update tracked files" msgstr "обновить отÑлеживаемые файлы" -#: builtin/add.c:274 +#: builtin/add.c:277 msgid "record only the fact that the path will be added later" msgstr "запиÑать только факт, что путь будет добавлен позже" -#: builtin/add.c:275 +#: builtin/add.c:278 msgid "add changes from all tracked and untracked files" msgstr "добавить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð· вÑех отÑлеживаемых и неотÑлеживаемых файлов" -#: builtin/add.c:278 +#: builtin/add.c:281 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" -#: builtin/add.c:280 +#: builtin/add.c:283 msgid "don't add, only refresh the index" msgstr "не добавлÑÑ‚ÑŒ, только обновить индекÑ" -#: builtin/add.c:281 +#: builtin/add.c:284 msgid "just skip files which cannot be added because of errors" msgstr "пропуÑкать файлы, которые не могут быть добавлены из-за ошибок" -#: builtin/add.c:282 +#: builtin/add.c:285 msgid "check if - even missing - files are ignored in dry run" msgstr "удоÑтоверитьÑÑ, что даже недоÑтающие файлы будут проигнорированы при пробном запуÑке" -#: builtin/add.c:283 builtin/update-index.c:951 +#: builtin/add.c:286 builtin/update-index.c:952 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:952 +#: builtin/add.c:286 builtin/update-index.c:953 msgid "override the executable bit of the listed files" msgstr "переопределить бит Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð° указанных файлах" -#: builtin/add.c:305 +#: builtin/add.c:288 +msgid "warn when adding an embedded repository" +msgstr "предупреждать при добавлении вÑтроенного git репозиториÑ" + +#: builtin/add.c:303 +#, 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»." + +#: builtin/add.c:331 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "добавление вÑтроенного git репозиториÑ: %s" + +#: builtin/add.c:349 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "ИÑпользуйте -f, еÑли вы дейÑтвительно хотите добавить их.\n" -#: builtin/add.c:312 +#: builtin/add.c:357 msgid "adding files failed" msgstr "ошибка при добавлении файлов" -#: builtin/add.c:348 +#: builtin/add.c:394 msgid "-A and -u are mutually incompatible" msgstr "-A и -u Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/add.c:355 +#: builtin/add.c:401 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "ÐžÐ¿Ñ†Ð¸Ñ --ignore-missing может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ вмеÑте Ñ --dry-run" -#: builtin/add.c:359 +#: builtin/add.c:405 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "параметр --chmod «%s» должен быть -x или +x" -#: builtin/add.c:374 +#: builtin/add.c:420 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Ðичего не указано, ничего не добавлено.\n" -#: builtin/add.c:375 +#: builtin/add.c:421 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Возможно, вы имели в виду «git add .»?\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 -#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 +#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 +#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "файл индекÑа поврежден" -#: builtin/am.c:412 +#: builtin/am.c:413 msgid "could not parse author script" msgstr "не удалоÑÑŒ разобрать Ñценарий авторÑтва" @@ -4479,7 +4575,7 @@ msgstr "недопуÑтимое Ñмещение чаÑового поÑÑа" msgid "Patch format detection failed." msgstr "Сбой Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° патча." -#: builtin/am.c:991 builtin/clone.c:397 +#: builtin/am.c:991 builtin/clone.c:401 #, c-format msgid "failed to create directory '%s'" msgstr "не удалоÑÑŒ Ñоздать каталог «%s»" @@ -4488,296 +4584,298 @@ msgstr "не удалоÑÑŒ Ñоздать каталог «%s»" msgid "Failed to split patches." msgstr "Ðе удалоÑÑŒ разделить патчи на чаÑти." -#: builtin/am.c:1127 builtin/commit.c:376 +#: builtin/am.c:1120 builtin/commit.c:377 msgid "unable to write index file" msgstr "не удалоÑÑŒ запиÑать индекÑ" -#: builtin/am.c:1178 +#: builtin/am.c:1171 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Когда вы уÑтраните Ñту проблему, запуÑтите «%s --continue»." -#: builtin/am.c:1179 +#: builtin/am.c:1172 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "ЕÑли вы хотите пропуÑтить Ñтот патч, то запуÑтите «%s --skip»." -#: builtin/am.c:1180 +#: builtin/am.c:1173 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Чтобы вернутьÑÑ Ð½Ð° предыдущую ветку и оÑтановить применение изменений, запуÑтите «%s --abort»." -#: builtin/am.c:1315 -msgid "Patch is empty. Was it split wrong?" -msgstr "Патч пуÑÑ‚. Возможно, он был неправильно разделён?" +#: builtin/am.c:1304 +msgid "Patch is empty." +msgstr "Патч пуÑтой." -#: builtin/am.c:1386 builtin/log.c:1557 +#: builtin/am.c:1370 #, c-format -msgid "invalid ident line: %s" -msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока идентификации: %s" +msgid "invalid ident line: %.*s" +msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока идентификации: %.*s" -#: builtin/am.c:1413 +#: builtin/am.c:1392 #, c-format msgid "unable to parse commit %s" msgstr "не удалоÑÑŒ разобрать коммит %s" -#: builtin/am.c:1606 +#: builtin/am.c:1586 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Ð’ репозитории отÑутÑтвуют двоичные объекты, необходимые Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ°Ñ‚Ð° к трехходовому ÑлиÑнию." -#: builtin/am.c:1608 +#: builtin/am.c:1588 msgid "Using index info to reconstruct a base tree..." msgstr "ИÑпользую Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ Ñ€ÐµÐºÐ¾Ð½Ñтрукции базового дерева…" -#: builtin/am.c:1627 +#: builtin/am.c:1607 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "Ð’Ñ‹ вручную изменÑли патч?\nОн не накладываетÑÑ Ð±ÐµÐ· ошибок на двоичные объекты, запиÑанные в его заголовке." -#: builtin/am.c:1633 +#: builtin/am.c:1613 msgid "Falling back to patching base and 3-way merge..." msgstr "Откат к применению изменений к базовому коммиту Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ трехходового ÑлиÑниÑ…" -#: builtin/am.c:1658 +#: builtin/am.c:1638 msgid "Failed to merge in the changes." msgstr "Ðе удалоÑÑŒ Ñлить изменениÑ." -#: builtin/am.c:1682 builtin/merge.c:631 +#: builtin/am.c:1662 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree не удалоÑÑŒ запиÑать дерево" -#: builtin/am.c:1689 +#: builtin/am.c:1669 msgid "applying to an empty history" msgstr "применение к пуÑтой иÑтории" -#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 -#: builtin/merge.c:827 +#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 +#: builtin/merge.c:828 msgid "failed to write commit object" msgstr "Ñбой запиÑи объекта коммита" -#: builtin/am.c:1735 builtin/am.c:1739 +#: builtin/am.c:1715 builtin/am.c:1719 #, c-format msgid "cannot resume: %s does not exist." msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð½Ð¸Ñ‚ÑŒ: %s не ÑущеÑтвует " -#: builtin/am.c:1755 +#: builtin/am.c:1735 msgid "cannot be interactive without stdin connected to a terminal." msgstr "не удалоÑÑŒ иÑпользовать интерактивное поведение, без stdin подключенного к терминалу." -#: builtin/am.c:1760 +#: builtin/am.c:1740 msgid "Commit Body is:" msgstr "Тело коммита:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: builtin/am.c:1770 +#: builtin/am.c:1750 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - проÑмотреть патч/[a] - применить вÑÑ‘: " -#: builtin/am.c:1820 +#: builtin/am.c:1800 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð½Ðµ пуÑтой: Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÑ‚ÑŒ патчи (в индекÑе: %s)" -#: builtin/am.c:1860 builtin/am.c:1932 +#: builtin/am.c:1840 builtin/am.c:1912 #, c-format msgid "Applying: %.*s" msgstr "Применение: %.*s" -#: builtin/am.c:1876 +#: builtin/am.c:1856 msgid "No changes -- Patch already applied." msgstr "Ðет изменений — Патч уже применен." -#: builtin/am.c:1884 +#: builtin/am.c:1864 #, c-format msgid "Patch failed at %s %.*s" msgstr "Ошибка Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ на %s %.*s" -#: builtin/am.c:1890 +#: builtin/am.c:1870 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "Копию изменений, которые не удалоÑÑŒ применить, вы можете найти в: %s" -#: builtin/am.c:1935 +#: builtin/am.c:1915 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "Ðет изменений — возможно, вы забыли вызвать «git add»?\nЕÑли ничего не оÑталоÑÑŒ Ð´Ð»Ñ Ð¸Ð½Ð´ÐµÐºÑации, то, Ñкорее вÑего, что-то другое уже Ñделало те же изменениÑ; возможно, вам Ñледует пропуÑтить Ñтот патч." -#: builtin/am.c:1942 +#: builtin/am.c:1922 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" -msgstr "У Ð²Ð°Ñ Ð²Ñе еще имеютÑÑ Ð½Ðµ Ñлитые пути в индекÑе.\nВозможно, вы забыли вызвать «git add»?" +"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» Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ файла, чтобы пометить его как «удалено ими»." -#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 -#: builtin/reset.c:316 +#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 +#: builtin/reset.c:331 #, c-format msgid "Could not parse object '%s'." msgstr "Ðе удалоÑÑŒ разобрать объект «%s»." -#: builtin/am.c:2102 +#: builtin/am.c:2083 msgid "failed to clean index" msgstr "не удалоÑÑŒ очиÑтить индекÑ" -#: builtin/am.c:2136 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "Похоже, что вы перемеÑтили HEAD Ñ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° поÑледней ошибки Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«am».\nПеремотка на ORIG_HEAD не выполнÑетÑÑ" -#: builtin/am.c:2199 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Ðеправильное значение Ð´Ð»Ñ --patch-format: %s" -#: builtin/am.c:2232 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]" -#: builtin/am.c:2233 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<опции>] (--continue | --skip | --abort)" -#: builtin/am.c:2239 +#: builtin/am.c:2220 msgid "run interactively" msgstr "запуÑтить в интерактивном режиме" -#: builtin/am.c:2241 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "иÑторичеÑÐºÐ°Ñ Ð¾Ð¿Ñ†Ð¸Ñ â€” ничего не делает" -#: builtin/am.c:2243 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "разрешить откатитьÑÑ Ðº трехходовому ÑлиÑнию, еÑли нужно" -#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:178 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:180 msgid "be quiet" msgstr "тихий режим" -#: builtin/am.c:2246 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "добавить Ñтроку Signed-off-by к Ñообщению коммита" -#: builtin/am.c:2249 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "перекодировать в utf8 (по умолчанию)" -#: builtin/am.c:2251 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "передать флаг -k в git-mailinfo" -#: builtin/am.c:2253 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "передать флаг -b в git-mailinfo" -#: builtin/am.c:2255 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "передать флаг -m в git-mailinfo" -#: builtin/am.c:2257 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "передать флаг --keep-cr в git-mailsplit Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° mbox" -#: builtin/am.c:2260 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "не передавать --keep-cr флаг в git-mailsplit вне завиÑимоÑти от am.keepcr" -#: builtin/am.c:2263 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "обрезать вÑе до Ñтроки обрезки" -#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 -#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 -#: builtin/am.c:2292 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "передать его в git-apply" -#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 +#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 +#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 +#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 +#: parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 -#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 msgid "format" msgstr "формат" -#: builtin/am.c:2289 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "формат, в котором находÑÑ‚ÑÑ Ð¿Ð°Ñ‚Ñ‡Ð¸" -#: builtin/am.c:2295 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "переопределить Ñообщение об ошибке, еÑли не удалоÑÑŒ наложить изменениÑ" -#: builtin/am.c:2297 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "продолжить применение изменений поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð»Ð¸ÐºÑ‚Ð°" -#: builtin/am.c:2300 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "Ñиноним Ð´Ð»Ñ --continue" -#: builtin/am.c:2303 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "пропуÑтить текущий патч" -#: builtin/am.c:2306 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "воÑÑтановить оригинальную ветку и отменить операцию Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹." -#: builtin/am.c:2310 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "Ñоврать о дате коммитера" -#: builtin/am.c:2312 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "иÑпользовать текущее Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº Ð²Ñ€ÐµÐ¼Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ñтва" -#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 -#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 +#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2315 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "подпиÑать коммиты Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG" -#: builtin/am.c:2318 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(внутреннее иÑпользование Ð´Ð»Ñ git-rebase)" -#: builtin/am.c:2333 +#: builtin/am.c:2317 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "ÐžÐ¿Ñ†Ð¸Ñ -b/--binary уже долгое Ð²Ñ€ÐµÐ¼Ñ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ не делает и будет удалена Ñ Ñледующих верÑиÑÑ… Git. ПожалуйÑта, не иÑпользуйте ее." -#: builtin/am.c:2340 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "Ñбой Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа" -#: builtin/am.c:2355 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "предыдущий каталог Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ %s еще ÑущеÑтвует, но передан mbox." -#: builtin/am.c:2379 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "Ðайден забытый каталог %s.\nИÑпользуйте «git am --abort», чтобы удалить его." -#: builtin/am.c:2385 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð² не в процеÑÑе выполнениÑ, не продолжаем." @@ -4827,160 +4925,130 @@ msgstr "выполнить «git bisect next»" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "обновить BISECT_HEAD вмеÑто перехода на текущий коммит" -#: builtin/blame.c:33 +#: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<опции>] [<опции-редакции>] [<редакциÑ>] [--] <файл>" -#: builtin/blame.c:38 +#: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<опции-rev-list> документированы в git-rev-list(1)" -#: builtin/blame.c:1777 -msgid "Blaming lines" -msgstr "ПроÑмотр авторов Ñтрок" - -#: builtin/blame.c:2573 +#: builtin/blame.c:668 msgid "Show blame entries as we find them, incrementally" msgstr "Показать запиÑи авторÑтва поÑтепенно, в процеÑÑе нахождениÑ" -#: builtin/blame.c:2574 +#: builtin/blame.c:669 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Ðе показывать SHA-1 Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð², не входÑщих в границы запроÑа (По умолчанию: отключено)" -#: builtin/blame.c:2575 +#: builtin/blame.c:670 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Ðе воÑпринимать корневые коммиты как граничные (По умолчанию: отключено)" -#: builtin/blame.c:2576 +#: builtin/blame.c:671 msgid "Show work cost statistics" msgstr "Показать ÑтатиÑтику раÑходов на выполнение запроÑа" -#: builtin/blame.c:2577 +#: builtin/blame.c:672 msgid "Force progress reporting" msgstr "Принудительно выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ" -#: builtin/blame.c:2578 +#: builtin/blame.c:673 msgid "Show output score for blame entries" msgstr "Показать оценку Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñей авторÑтва" -#: builtin/blame.c:2579 +#: builtin/blame.c:674 msgid "Show original filename (Default: auto)" msgstr "Показать оригинальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° (По умолчанию: автоматичеÑки)" -#: builtin/blame.c:2580 +#: builtin/blame.c:675 msgid "Show original linenumber (Default: off)" msgstr "Показать оригинальные номера Ñтрок (По умолчанию: отключено)" -#: builtin/blame.c:2581 +#: builtin/blame.c:676 msgid "Show in a format designed for machine consumption" msgstr "Показать в формате Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ разбора" -#: builtin/blame.c:2582 +#: builtin/blame.c:677 msgid "Show porcelain format with per-line commit information" msgstr "Показать в машиночитаемом формате, Ñ Ð¿Ð¾Ñтрочной информацией о коммите" -#: builtin/blame.c:2583 +#: builtin/blame.c:678 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "ИÑпользовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)" -#: builtin/blame.c:2584 +#: builtin/blame.c:679 msgid "Show raw timestamp (Default: off)" msgstr "Показать необработанные временные метки (По умолчанию: отключено)" -#: builtin/blame.c:2585 +#: builtin/blame.c:680 msgid "Show long commit SHA1 (Default: off)" msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)" -#: builtin/blame.c:2586 +#: builtin/blame.c:681 msgid "Suppress author name and timestamp (Default: off)" msgstr "Ðе показывать Ð¸Ð¼Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð° и временные метки (По умолчанию: отключено)" -#: builtin/blame.c:2587 +#: builtin/blame.c:682 msgid "Show author email instead of name (Default: off)" msgstr "Показать почту автора вмеÑто имени (По умолчанию: отключено)" -#: builtin/blame.c:2588 +#: builtin/blame.c:683 msgid "Ignore whitespace differences" msgstr "Игнорировать Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð² пробелах" -#: builtin/blame.c:2595 +#: builtin/blame.c:690 msgid "Use an experimental heuristic to improve diffs" msgstr "ИÑпользовать ÑкÑперементальную ÑвриÑтику, чтобы улучшить файлы различий" -#: builtin/blame.c:2597 +#: builtin/blame.c:692 msgid "Spend extra cycles to find better match" msgstr "Потратить больше времени, Ð´Ð»Ñ Ð½Ð°Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐ¸Ñ… Ñовпадений" -#: builtin/blame.c:2598 +#: builtin/blame.c:693 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "ИÑпользовать редакции из <файла> вмеÑто вызова git-rev-list" -#: builtin/blame.c:2599 +#: builtin/blame.c:694 msgid "Use <file>'s contents as the final image" msgstr "ИÑпользовать Ñодержимое <файла> как финальный Ñнимок" -#: builtin/blame.c:2600 builtin/blame.c:2601 +#: builtin/blame.c:695 builtin/blame.c:696 msgid "score" msgstr "мин-длина" -#: builtin/blame.c:2600 +#: builtin/blame.c:695 msgid "Find line copies within and across files" msgstr "Ðайти копирование Ñтрок в пределах и между файлами" -#: builtin/blame.c:2601 +#: builtin/blame.c:696 msgid "Find line movements within and across files" msgstr "Ðайти Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñтрок в пределах и между файлами" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "n,m" msgstr "начало,конец" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "Process only line range n,m, counting from 1" msgstr "Обработать только Ñтроки в диапазоне начало,конец, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ 1" -#: builtin/blame.c:2649 +#: builtin/blame.c:744 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. -#: builtin/blame.c:2697 +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#: builtin/blame.c:795 msgid "4 years, 11 months ago" msgstr "4 года и 11 меÑÑцев назад" -#: builtin/blame.c:2777 -msgid "--contents and --reverse do not blend well." -msgstr "--contents и --reverse не очень ÑочетаютÑÑ." - -#: builtin/blame.c:2797 -msgid "cannot use --contents with final commit object name" -msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать --contents Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ финального имени объекта" - -#: builtin/blame.c:2802 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "при --reverse и --first-parent вмеÑте нужно указывать конкретный поÑледний коммит" - -#: builtin/blame.c:2829 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "при указании --reverse и --first-parent вмеÑте, требуетÑÑ Ñ‚Ð°ÐºÐ¶Ðµ указать диапазон по цепочке первого родителÑ" - -#: builtin/blame.c:2840 -#, c-format -msgid "no such path %s in %s" -msgstr "нет такого пути %s в %s" - -#: builtin/blame.c:2851 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "невозможно прочитать объект %s Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ %s" - -#: builtin/blame.c:2870 +#: builtin/blame.c:882 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -4989,141 +5057,145 @@ msgstr[1] "файл %s Ñодержит только %lu Ñтроки" msgstr[2] "файл %s Ñодержит только %lu Ñтрок" msgstr[3] "файл %s Ñодержит только %lu Ñтроки" -#: builtin/branch.c:26 +#: builtin/blame.c:928 +msgid "Blaming lines" +msgstr "ПроÑмотр авторов Ñтрок" + +#: builtin/branch.c:27 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<опции>] [-l] [-f] <имÑ-ветки> [<точка-начала>]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<опции>] [-r] (-d | -D) <имÑ-ветки>…" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<опции>] (-m | -M) [<ÑтараÑ-ветка>] <новаÑ-ветка>" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<опции>] [-r | -a] [--points-at]" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<опции>] [-r | -a] [--format]" -#: builtin/branch.c:144 +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "удаление ветки «%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ð»Ð° Ñлита Ñ\n «%s», но не Ñлита Ñ HEAD." -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "не удаление ветки «%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не Ñлита Ñ\n «%s», Ñ…Ð¾Ñ‚Ñ ÑƒÐ¶Ðµ Ñлита Ñ HEAD." -#: builtin/branch.c:162 +#: builtin/branch.c:163 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Ðе удалоÑÑŒ найти объект коммита Ð´Ð»Ñ Â«%s»" -#: builtin/branch.c:166 +#: builtin/branch.c:167 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "Ветка «%s» не Ñлита полноÑтью.\nЕÑли вы уверены, что хотите ее удалить, запуÑтите «git branch -D %s»." -#: builtin/branch.c:179 +#: builtin/branch.c:180 msgid "Update of config-file failed" msgstr "Ðе удалоÑÑŒ обновить файл конфигурации" -#: builtin/branch.c:210 +#: builtin/branch.c:211 msgid "cannot use -a with -d" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно ключи -a и -d" -#: builtin/branch.c:216 +#: builtin/branch.c:217 msgid "Couldn't look up commit object for HEAD" msgstr "Ðе удалоÑÑŒ найти объект коммита Ð´Ð»Ñ HEAD" -#: builtin/branch.c:230 +#: builtin/branch.c:231 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ветку «%s» Ñ‚.к. она активна на «%s»" -#: builtin/branch.c:245 +#: builtin/branch.c:246 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "внешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s» не найдена." -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "branch '%s' not found." msgstr "ветка «%s» не найдена." -#: builtin/branch.c:261 +#: builtin/branch.c:262 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ отÑлеживаемой ветки «%s»" -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting branch '%s'" msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»" -#: builtin/branch.c:269 +#: builtin/branch.c:270 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "ВнешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s удалена (была %s).\n" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ветка %s удалена (была %s).\n" -#: builtin/branch.c:441 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being rebased at %s" msgstr "ПроизводитÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ðµ ветки %s на %s" -#: builtin/branch.c:445 +#: builtin/branch.c:449 #, c-format msgid "Branch %s is being bisected at %s" msgstr "ПроизводитÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ð¹ поиÑк в ветке %s на %s" -#: builtin/branch.c:460 +#: builtin/branch.c:464 msgid "cannot rename the current branch while not on any." msgstr "невозможно переименовать текущую ветку, еÑли вы не находитеÑÑŒ ни на одной из них." -#: builtin/branch.c:470 +#: builtin/branch.c:474 #, c-format msgid "Invalid branch name: '%s'" msgstr "ÐедейÑтвительное Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸: «%s»" -#: builtin/branch.c:487 +#: builtin/branch.c:491 msgid "Branch rename failed" msgstr "Сбой Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑ‚ÐºÐ¸" -#: builtin/branch.c:490 +#: builtin/branch.c:494 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Переименована неправильно Ð½Ð°Ð·Ð²Ð°Ð½Ð½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° «%s»" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Ветка переименована в %s, но HEAD не обновлен!" -#: builtin/branch.c:502 +#: builtin/branch.c:506 msgid "Branch is renamed, but update of config-file failed" msgstr "Ветка переименована, но произошел Ñбой Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации" -#: builtin/branch.c:518 +#: builtin/branch.c:522 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5131,220 +5203,220 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "Измените опиÑание Ð´Ð»Ñ Ð²ÐµÑ‚ÐºÐ¸:\n %s\nСтроки, начинающиеÑÑ Ñ Â«%c» будут вырезаны.\n" -#: builtin/branch.c:551 +#: builtin/branch.c:555 msgid "Generic options" msgstr "Общие параметры" -#: builtin/branch.c:553 +#: builtin/branch.c:557 msgid "show hash and subject, give twice for upstream branch" msgstr "показывать Ñ…Ñш-Ñумму и тему, укажите дважды Ð´Ð»Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки" -#: builtin/branch.c:554 +#: builtin/branch.c:558 msgid "suppress informational messages" msgstr "не выводить информационные ÑообщениÑ" -#: builtin/branch.c:555 +#: builtin/branch.c:559 msgid "set up tracking mode (see git-pull(1))" msgstr "уÑтановить режим отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки (Ñм. git-pull(1))" -#: builtin/branch.c:557 +#: builtin/branch.c:561 msgid "change upstream info" msgstr "изменить информацию о вышеÑтоÑщей ветке" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "upstream" msgstr "вышеÑтоÑщаÑ" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "change the upstream info" msgstr "изменить информацию о вышеÑтоÑщей ветке" -#: builtin/branch.c:560 +#: builtin/branch.c:564 msgid "Unset the upstream info" msgstr "Убрать информацию о вышеÑтоÑщей ветке" -#: builtin/branch.c:561 +#: builtin/branch.c:565 msgid "use colored output" msgstr "иÑпользовать цветной вывод" -#: builtin/branch.c:562 +#: builtin/branch.c:566 msgid "act on remote-tracking branches" msgstr "выполнить дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° отÑлеживаемых внешних ветках" -#: builtin/branch.c:564 builtin/branch.c:566 +#: builtin/branch.c:568 builtin/branch.c:570 msgid "print only branches that contain the commit" msgstr "вывод только веток, которые Ñодержат коммит" -#: builtin/branch.c:565 builtin/branch.c:567 +#: builtin/branch.c:569 builtin/branch.c:571 msgid "print only branches that don't contain the commit" msgstr "вывод только веток, которые не Ñодержат коммит" -#: builtin/branch.c:570 +#: builtin/branch.c:574 msgid "Specific git-branch actions:" msgstr "Специфичные Ð´Ð»Ñ git-branch дейÑтвиÑ:" -#: builtin/branch.c:571 +#: builtin/branch.c:575 msgid "list both remote-tracking and local branches" msgstr "показать ÑпиÑок и отÑлеживаемых и локальных веток" -#: builtin/branch.c:573 +#: builtin/branch.c:577 msgid "delete fully merged branch" msgstr "удалить полноÑтью Ñлитую ветку" -#: builtin/branch.c:574 +#: builtin/branch.c:578 msgid "delete branch (even if not merged)" msgstr "удалить ветку (даже никуда не Ñлитую)" -#: builtin/branch.c:575 +#: builtin/branch.c:579 msgid "move/rename a branch and its reflog" msgstr "перемеÑтить/переименовать ветки и ее журнал ÑÑылок" -#: builtin/branch.c:576 +#: builtin/branch.c:580 msgid "move/rename a branch, even if target exists" msgstr "перемеÑтить/переименовать ветку, даже еÑли целевое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ ÑущеÑтвует" -#: builtin/branch.c:577 +#: builtin/branch.c:581 msgid "list branch names" msgstr "показать ÑпиÑок имен веток" -#: builtin/branch.c:578 +#: builtin/branch.c:582 msgid "create the branch's reflog" msgstr "Ñоздать журнал ÑÑылок ветки" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "edit the description for the branch" msgstr "изменить опиÑание ветки" -#: builtin/branch.c:581 +#: builtin/branch.c:585 msgid "force creation, move/rename, deletion" msgstr "принудительное Ñоздание, перемещение или удаление ветки" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "print only branches that are merged" msgstr "вывод только Ñлитых веток" -#: builtin/branch.c:583 +#: builtin/branch.c:587 msgid "print only branches that are not merged" msgstr "вывод только не Ñлитых веток" -#: builtin/branch.c:584 +#: builtin/branch.c:588 msgid "list branches in columns" msgstr "показать ÑпиÑок веток по Ñтолбцам" -#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 +#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "key" msgstr "ключ" -#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 msgid "field name to sort on" msgstr "Ð¸Ð¼Ñ Ð¿Ð¾Ð»Ñ, по которому выполнить Ñортировку" -#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 -#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:429 +#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 +#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 +#: builtin/tag.c:430 msgid "object" msgstr "объект" -#: builtin/branch.c:589 +#: builtin/branch.c:593 msgid "print only branches of the object" msgstr "вывод только веток, определенного объекта" -#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 +#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 msgid "sorting and filtering are case insensitive" msgstr "Ñортировка и Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½Ðµ завиÑÑÑ‚ от региÑтра" -#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 -#: builtin/verify-tag.c:38 +#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "иÑпользовать формат Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð°" -#: builtin/branch.c:611 +#: builtin/branch.c:615 msgid "Failed to resolve HEAD as a valid ref." msgstr "Ðе удалоÑÑŒ определить HEAD как дейÑтвительную ÑÑылку." -#: builtin/branch.c:615 builtin/clone.c:724 +#: builtin/branch.c:619 builtin/clone.c:728 msgid "HEAD not found below refs/heads!" msgstr "HEAD не найден в refs/heads!" -#: builtin/branch.c:638 +#: builtin/branch.c:642 msgid "--column and --verbose are incompatible" msgstr "--column и --verbose Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/branch.c:649 builtin/branch.c:701 +#: builtin/branch.c:653 builtin/branch.c:705 msgid "branch name required" msgstr "требуетÑÑ Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸" -#: builtin/branch.c:677 +#: builtin/branch.c:681 msgid "Cannot give description to detached HEAD" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð´Ð°Ñ‚ÑŒ опиÑание отделённому HEAD" -#: builtin/branch.c:682 +#: builtin/branch.c:686 msgid "cannot edit description of more than one branch" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ опиÑание более одной ветки за раз" -#: builtin/branch.c:689 +#: builtin/branch.c:693 #, c-format msgid "No commit on branch '%s' yet." msgstr "Еще нет коммита на ветке «%s»." -#: builtin/branch.c:692 +#: builtin/branch.c:696 #, c-format msgid "No branch named '%s'." msgstr "Ðет ветки Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s»." -#: builtin/branch.c:707 +#: builtin/branch.c:711 msgid "too many branches for a rename operation" msgstr "Ñлишком много веток Ð´Ð»Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ переименованиÑ" -#: builtin/branch.c:712 +#: builtin/branch.c:716 msgid "too many branches to set new upstream" msgstr "Ñлишком много веток Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ñ‹Ñ… вышеÑтоÑщих" -#: builtin/branch.c:716 +#: builtin/branch.c:720 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "невозможно уÑтановить вышеÑтоÑщий репозиторий Ð´Ð»Ñ HEAD на %s, так как он не указывает ни на одну ветку." -#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 +#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 #, c-format msgid "no such branch '%s'" msgstr "нет такой ветки «%s»" -#: builtin/branch.c:723 +#: builtin/branch.c:727 #, c-format msgid "branch '%s' does not exist" msgstr "ветка «%s» не ÑущеÑтвует" -#: builtin/branch.c:735 +#: builtin/branch.c:739 msgid "too many branches to unset upstream" msgstr "Ñлишком много веток Ð´Ð»Ñ ÑƒÐ±Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщих" -#: builtin/branch.c:739 +#: builtin/branch.c:743 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "невозможно убрать вышеÑтоÑщий репозиторий Ð´Ð»Ñ HEAD, так как он не указывает ни на одну ветку." -#: builtin/branch.c:745 +#: builtin/branch.c:749 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Ветка «%s» не имеет информации о вышеÑтоÑщей ветке" -#: builtin/branch.c:759 +#: builtin/branch.c:763 msgid "it does not make sense to create 'HEAD' manually" msgstr "не имеет ÑмыÑла Ñоздавать «HEAD» вручную" -#: builtin/branch.c:765 +#: builtin/branch.c:769 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "параметры -a и -r Ð´Ð»Ñ Â«git branch» не имеют ÑмыÑла Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ имени ветки" -#: builtin/branch.c:768 +#: builtin/branch.c:772 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using " "--track or --set-upstream-to\n" msgstr "Флаг --set-upstream уÑтарел и будет удален в будущем. ВмеÑто него иÑпользуйте --track или --set-upstream-to\n" -#: builtin/branch.c:785 +#: builtin/branch.c:789 #, c-format msgid "" "\n" @@ -5365,313 +5437,313 @@ msgstr "ТребуетÑÑ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¹ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ðº msgid "Need a repository to unbundle." msgstr "ТребуетÑÑ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¹ Ð´Ð»Ñ Ñ€Ð°Ñпаковки." -#: builtin/cat-file.c:513 +#: builtin/cat-file.c:519 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | " "-p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <тип> | --textconv | --filters) [--path=<путь>] <объект>" -#: builtin/cat-file.c:514 +#: builtin/cat-file.c:520 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | " "--filters]" msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:551 +#: builtin/cat-file.c:557 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<тип> может быть одним из: blob, tree, commit, tag" -#: builtin/cat-file.c:552 +#: builtin/cat-file.c:558 msgid "show object type" msgstr "показать тип объекта" -#: builtin/cat-file.c:553 +#: builtin/cat-file.c:559 msgid "show object size" msgstr "показать размер объекта" -#: builtin/cat-file.c:555 +#: builtin/cat-file.c:561 msgid "exit with zero when there's no error" msgstr "выйти Ñ Ð½ÑƒÐ»ÐµÐ²Ñ‹Ð¼ кодом возврата, еÑли нет ошибки" -#: builtin/cat-file.c:556 +#: builtin/cat-file.c:562 msgid "pretty-print object's content" msgstr "Ñтруктурированный вывод Ñодержимого объекта" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:564 msgid "for blob objects, run textconv on object's content" msgstr "запуÑтить texconv на Ñодержимом двоичных объектов " -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:566 msgid "for blob objects, run filters on object's content" msgstr "запуÑк фильтров на Ñодержимом двоичных объектов " -#: builtin/cat-file.c:561 git-submodule.sh:943 +#: builtin/cat-file.c:567 git-submodule.sh:944 msgid "blob" msgstr "двоичный объект" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:568 msgid "use a specific path for --textconv/--filters" msgstr "иÑпользовать определенный путь Ð´Ð»Ñ --textconv/--filters" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:570 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "разрешить -s и -t работать Ñ Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ объектами" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:571 msgid "buffer --batch output" msgstr "буфферировать вывод --batch" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:573 msgid "show info and content of objects fed from the standard input" msgstr "показать информацию и Ñодержимое объектов, переданных из Ñтандартного ввода" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:576 msgid "show info about objects fed from the standard input" msgstr "показать информацию об объектах, переданных из Ñтандартного ввода" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:579 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "переходить по Ñимвольным ÑÑылкам внутри дерева (иÑпользуетÑÑ Ñ Ð¾Ð¿Ñ†Ð¸Ñми --batch и --batch-check)" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:581 msgid "show all objects with --batch or --batch-check" msgstr "показать вÑе объекты Ñ Ð¾Ð¿Ñ†Ð¸Ñми --batch или --batch-check" -#: builtin/check-attr.c:11 +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…" -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…]" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "вывеÑти вÑе атрибуты уÑтановленные Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "иÑпользовать только .gitattributes из индекÑа" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 msgid "read file names from stdin" msgstr "прочитать имена файлов из Ñтандартного ввода" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "окончание ввода и вывода запиÑей по ÐУЛЕВОМУ Ñимволу" -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 +#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 msgid "suppress progress reporting" msgstr "не выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "показать не Ñовпадающие введенные пути" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "игнорировать Ð¸Ð½Ð´ÐµÐºÑ Ð¿Ñ€Ð¸ проверке" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:158 msgid "cannot specify pathnames with --stdin" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ пути вмеÑте Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --stdin" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:161 msgid "-z only makes sense with --stdin" msgstr "-z имеет ÑмыÑл только вмеÑте Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --stdin" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:163 msgid "no path specified" msgstr "не указан путь" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:167 msgid "--quiet is only valid with a single pathname" msgstr "--quiet можно иÑпользовать только при указании одного пути" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:169 msgid "cannot have both --quiet and --verbose" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --quiet и --verbose" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:172 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching можно иÑпользовать только вмеÑте Ñ --verbose" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<опции>] <контакт>…" -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "также читать контакты из Ñтандартного ввода" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "не удалоÑÑŒ разобрать контакт: %s" -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "не указаны контакты" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<опции>] [--] [<файл>…]" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:145 msgid "stage should be between 1 and 3 or all" msgstr "Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть между 1 и 3 или all" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:161 msgid "check out all files in the index" msgstr "переключитьÑÑ Ð½Ð° ÑоÑтоÑние вÑех файлов из индекÑа" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:162 msgid "force overwrite of existing files" msgstr "Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÑŒ ÑущеÑтвующих файлов" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:164 msgid "no warning for existing files and files not in index" msgstr "не выводить Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑущеÑтвующих и непроиндекÑированных файлов" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:166 msgid "don't checkout new files" msgstr "не Ñоздавать новые файлы" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:168 msgid "update stat information in the index file" msgstr "обновить ÑтатиÑтику доÑтупа в файле индекÑа" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:172 msgid "read list of paths from the standard input" msgstr "прочитать ÑпиÑок путей из Ñтандартного ввода" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:174 msgid "write the content to temporary files" msgstr "запиÑать Ñодержимое во временные файлы" -#: builtin/checkout-index.c:174 builtin/column.c:30 +#: builtin/checkout-index.c:175 builtin/column.c:31 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:477 +#: builtin/worktree.c:478 msgid "string" msgstr "Ñтрока" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:176 msgid "when creating files, prepend <string>" msgstr "добавить Ñпереди <Ñтроку> при Ñоздании файлов" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:178 msgid "copy out the files from named stage" msgstr "копировать файлы из указанного индекÑа" -#: builtin/checkout.c:27 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<опции>] <ветка>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<опции>] [<ветка>] -- <файл>…" -#: builtin/checkout.c:153 builtin/checkout.c:186 +#: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have our version" msgstr "путь «%s» не имеет нашей верÑии" -#: builtin/checkout.c:155 builtin/checkout.c:188 +#: builtin/checkout.c:137 builtin/checkout.c:170 #, c-format msgid "path '%s' does not have their version" msgstr "путь «%s» не имеет их верÑии" -#: builtin/checkout.c:171 +#: builtin/checkout.c:153 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "путь «%s» не имеет вÑех необходимых верÑий" -#: builtin/checkout.c:215 +#: builtin/checkout.c:197 #, c-format msgid "path '%s' does not have necessary versions" msgstr "путь «%s» не имеет необходимых верÑий" -#: builtin/checkout.c:232 +#: builtin/checkout.c:214 #, c-format msgid "path '%s': cannot merge" msgstr "путь «%s»: не удалоÑÑŒ Ñлить" -#: builtin/checkout.c:249 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Ðе удалоÑÑŒ добавить результат ÑлиÑÐ½Ð¸Ñ Â«%s»" -#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 -#: builtin/checkout.c:278 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать при обновлении путей" -#: builtin/checkout.c:281 builtin/checkout.c:284 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ %s" -#: builtin/checkout.c:287 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÑ‚ÑŒ пути и переключатьÑÑ Ð½Ð° ветку «%s» одновременно." -#: builtin/checkout.c:358 builtin/checkout.c:365 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "путь «%s» не Ñлит" -#: builtin/checkout.c:513 +#: builtin/checkout.c:497 msgid "you need to resolve your current index first" msgstr "Ñначала нужно разрешить конфликты в вашем текущем индекÑе" -#: builtin/checkout.c:644 +#: builtin/checkout.c:628 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Ðе удалоÑÑŒ Ñоздать журнал ÑÑылок Ð´Ð»Ñ Â«%s»: %s\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:669 msgid "HEAD is now at" msgstr "HEAD ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð°" -#: builtin/checkout.c:689 builtin/clone.c:678 +#: builtin/checkout.c:673 builtin/clone.c:682 msgid "unable to update HEAD" msgstr "не удалоÑÑŒ обновить HEAD" -#: builtin/checkout.c:693 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "Уже на «%s»\n" -#: builtin/checkout.c:700 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Переключение и ÑÐ±Ñ€Ð¾Ñ Ð²ÐµÑ‚ÐºÐ¸ «%s»\n" -#: builtin/checkout.c:702 builtin/checkout.c:1090 +#: builtin/checkout.c:686 builtin/checkout.c:1075 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Переключено на новую ветку «%s»\n" -#: builtin/checkout.c:704 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "Переключено на ветку «%s»\n" -#: builtin/checkout.c:755 +#: builtin/checkout.c:739 #, c-format msgid " ... and %d more.\n" msgstr " … и еще %d.\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:745 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5688,7 +5760,7 @@ msgstr[1] "Предупреждение: вы оÑтавлÑете позади msgstr[2] "Предупреждение: вы оÑтавлÑете позади %d коммитов не Ñоединенные ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n" msgstr[3] "Предупреждение: вы оÑтавлÑете позади %d коммитов не Ñоединенные ни Ñ Ð¾Ð´Ð½Ð¾Ð¹ из ваших веток:\n\n%s\n" -#: builtin/checkout.c:780 +#: builtin/checkout.c:764 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5707,198 +5779,196 @@ msgstr[1] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ msgstr[2] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки, то ÑÐµÐ¹Ñ‡Ð°Ñ Ñамое времÑ\nÑделать Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git branch <имÑ-новой-ветки> %s\n" msgstr[3] "ЕÑли вы хотите Ñохранить их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки, то ÑÐµÐ¹Ñ‡Ð°Ñ Ñамое времÑ\nÑделать Ñто Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:\n\n git branch <имÑ-новой-ветки> %s\n" -#: builtin/checkout.c:816 +#: builtin/checkout.c:800 msgid "internal error in revision walk" msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° при хождении по редакциÑм" -#: builtin/checkout.c:820 +#: builtin/checkout.c:804 msgid "Previous HEAD position was" msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ HEAD была" -#: builtin/checkout.c:847 builtin/checkout.c:1085 +#: builtin/checkout.c:832 builtin/checkout.c:1070 msgid "You are on a branch yet to be born" msgstr "Ð’Ñ‹ находитеÑÑŒ на еще не Ñозданной ветке" -#: builtin/checkout.c:991 +#: builtin/checkout.c:976 #, c-format msgid "only one reference expected, %d given." msgstr "ожидаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна ÑÑылка, а передано %d." -#: builtin/checkout.c:1031 builtin/worktree.c:214 +#: builtin/checkout.c:1016 builtin/worktree.c:215 #, c-format msgid "invalid reference: %s" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑÑылка: %s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1045 #, c-format msgid "reference is not a tree: %s" msgstr "в дереве нет такой ÑÑылки: %s" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1084 msgid "paths cannot be used with switching branches" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать пути при переключении веток" -#: builtin/checkout.c:1102 builtin/checkout.c:1106 +#: builtin/checkout.c:1087 builtin/checkout.c:1091 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать «%s» при переключении веток" -#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 +#: builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ Â«%s»" -#: builtin/checkout.c:1126 +#: builtin/checkout.c:1111 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ветку на не коммит «%s»" -#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 -#: builtin/worktree.c:331 +#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 +#: builtin/worktree.c:330 msgid "branch" msgstr "ветка" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1145 msgid "create and checkout a new branch" msgstr "Ñоздать и переключитьÑÑ Ð½Ð° новую ветку" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1147 msgid "create/reset and checkout a branch" msgstr "Ñоздать/ÑброÑить и перключитьÑÑ Ð½Ð° новую ветку" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1148 msgid "create reflog for new branch" msgstr "Ñоздать журнал ÑÑылок Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки" -#: builtin/checkout.c:1164 builtin/worktree.c:333 +#: builtin/checkout.c:1149 builtin/worktree.c:332 msgid "detach HEAD at named commit" msgstr "отÑоединить HEAD на указанном коммите" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1150 msgid "set upstream info for new branch" msgstr "уÑтановить информацию о вышеÑтоÑщей ветке Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ ветки" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new-branch" msgstr "новаÑ-ветка" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new unparented branch" msgstr "Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ‚ÐºÐ° без родителей" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1153 msgid "checkout our version for unmerged files" msgstr "переключитьÑÑ Ð½Ð° нашу верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1155 msgid "checkout their version for unmerged files" msgstr "переключитьÑÑ Ð½Ð° их верÑию Ð´Ð»Ñ Ð½Ðµ Ñлитых файлов" -#: builtin/checkout.c:1172 +#: builtin/checkout.c:1157 msgid "force checkout (throw away local modifications)" msgstr "принудительное переключение на ÑоÑтоÑние (отбраÑывает вÑе локальные изменениÑ)" -#: builtin/checkout.c:1173 +#: builtin/checkout.c:1158 msgid "perform a 3-way merge with the new branch" msgstr "выполнить трехходовое ÑлиÑние Ñ Ð½Ð¾Ð²Ð¾Ð¹ веткой" -#: builtin/checkout.c:1174 builtin/merge.c:234 +#: builtin/checkout.c:1159 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "обновить игнорируемые файлы (по умолчанию)" -#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 +#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 msgid "style" msgstr "Ñтиль" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1161 msgid "conflict style (merge or diff3)" msgstr "Ñтиль конфликтов ÑлиÑÐ½Ð¸Ñ (merge или diff3)" -#: builtin/checkout.c:1179 +#: builtin/checkout.c:1164 msgid "do not limit pathspecs to sparse entries only" msgstr "не ограничивать Ñпецификаторы пути только чаÑтичными запиÑÑми" -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1166 msgid "second guess 'git checkout <no-such-branch>'" msgstr "переÑмотр «git checkout <нет-такой-ветки>»" -#: builtin/checkout.c:1183 +#: builtin/checkout.c:1168 msgid "do not check if another worktree is holding the given ref" msgstr "не проверÑÑ‚ÑŒ, что другое дерево уже Ñодержит указанную ÑÑылку" -#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 -#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:172 +#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 +#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "принудительно выводить прогреÑÑ" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1203 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B и --orphan Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1220 msgid "--track needs a branch name" msgstr "--track требует Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1225 msgid "Missing branch name; try -b" msgstr "Пропущено Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸; попробуйте -b" -#: builtin/checkout.c:1282 +#: builtin/checkout.c:1261 msgid "invalid path specification" msgstr "недопуÑтимый Ñпецификатор пути" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1268 #, c-format -msgid "" -"Cannot update paths and switch to branch '%s' at the same time.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" -msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пути и одновременно переключитьÑÑ Ð½Ð° ветку «%s».\nÐ’Ñ‹ хотели переключитьÑÑ Ð½Ð° «%s», что не может быть определено как коммит?" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "«%s» не ÑвлÑетÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼, поÑтому невозможно Ñоздать из него ветку «%s»" -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1272 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach не принимает путь «%s» как аргумент" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1276 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "git checkout: --ours/--theirs, --force and --merge Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно при применении ÑоÑтоÑÐ½Ð¸Ñ Ð¸Ð½Ð´ÐµÐºÑа." -#: builtin/clean.c:25 +#: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…" -#: builtin/clean.c:29 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "Удаление %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "Будет удалено %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "ПропуÑк Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "Будет пропущен репозиторий %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "Ñбой ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s" -#: builtin/clean.c:297 git-add--interactive.perl:614 +#: builtin/clean.c:298 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -5907,7 +5977,7 @@ msgid "" " - (empty) select nothing\n" msgstr "Справка по выделению:\n1 - выбрать указанный Ñлемент\nfoo - выбрать Ñлемент Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ префикÑом\n - (пуÑто) не выбирать ничего\n" -#: builtin/clean.c:301 git-add--interactive.perl:623 +#: builtin/clean.c:302 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -5920,38 +5990,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "Справка по выделению:\n1 - выбрать один Ñлемент\n3-5 - выбрать диапазон Ñлементов\n2-3,6-9 - выбрать неÑколько диапазонов\nfoo - выбрать Ñлемент Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ префикÑом\n-… - убрать выделение Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ñ… Ñлементов\n* - выбрать вÑе Ñлементы\n - (пуÑто) завершить выделение\n" -#: builtin/clean.c:517 git-add--interactive.perl:589 -#: git-add--interactive.perl:594 +#: builtin/clean.c:518 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Хм (%s)?\n" -#: builtin/clean.c:659 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблоны Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð²Ð¾Ð´Ð°>> " -#: builtin/clean.c:696 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕÐИЕ: Ðе удалоÑÑŒ найти Ñлементы ÑоответÑтвующие: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "Укажите Ñлементы Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:759 #, c-format msgid "Remove %s [y/N]? " msgstr "Удалить %s [y - да/N - нет]? " -#: builtin/clean.c:783 git-add--interactive.perl:1660 +#: builtin/clean.c:784 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "До ÑвиданиÑ.\n" -#: builtin/clean.c:791 +#: builtin/clean.c:792 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -5962,15 +6032,15 @@ msgid "" "? - help for prompt selection" msgstr "clean - начать очиÑтку\nfilter by pattern - иÑключить удаление Ñлементов\nselect by numbers - иÑключить удаление Ñлементов по номерам\nask each - запрашивать подтверждение на удаление каждого Ñлемента (как «rm -i»)\nquit - прекратить очиÑтку\nhelp - Ñтот Ñкран\n? - Ñправка по выделению" -#: builtin/clean.c:818 git-add--interactive.perl:1736 +#: builtin/clean.c:819 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Команды ***" -#: builtin/clean.c:819 git-add--interactive.perl:1733 +#: builtin/clean.c:820 git-add--interactive.perl:1689 msgid "What now" msgstr "Что теперь" -#: builtin/clean.c:827 +#: builtin/clean.c:828 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Удалить Ñледующие Ñлементы:" @@ -5982,408 +6052,412 @@ msgstr[3] "Удалить Ñледующие Ñлементы:" msgid "No more files to clean, exiting." msgstr "Больше нет файлов Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñтки, выходим." -#: builtin/clean.c:875 +#: builtin/clean.c:906 msgid "do not print names of files removed" msgstr "не выводить имена удалÑемых файлов" -#: builtin/clean.c:877 +#: builtin/clean.c:908 msgid "force" msgstr "принудительно" -#: builtin/clean.c:878 +#: builtin/clean.c:909 msgid "interactive cleaning" msgstr "Ð¸Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð¾Ñ‡Ð¸Ñтка" -#: builtin/clean.c:880 +#: builtin/clean.c:911 msgid "remove whole directories" msgstr "удалить каталоги полноÑтью" -#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 -#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 -#: builtin/name-rev.c:350 builtin/show-ref.c:176 +#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 +#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "шаблон" -#: builtin/clean.c:882 +#: builtin/clean.c:913 msgid "add <pattern> to ignore rules" msgstr "добавить <шаблон> в правила игнорированиÑ" -#: builtin/clean.c:883 +#: builtin/clean.c:914 msgid "remove ignored files, too" msgstr "также удалить игнорируемые файлы" -#: builtin/clean.c:885 +#: builtin/clean.c:916 msgid "remove only ignored files" msgstr "удалить только игнорируемые файлы" -#: builtin/clean.c:903 +#: builtin/clean.c:934 msgid "-x and -X cannot be used together" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно -x и -X" -#: builtin/clean.c:907 +#: builtin/clean.c:938 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to" " clean" msgstr "clean.requireForce уÑтановлен как true и ни одна из опций -i, -n или -f не указана; отказ очиÑтки" -#: builtin/clean.c:910 +#: builtin/clean.c:941 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "clean.requireForce уÑтановлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очиÑтки" -#: builtin/clone.c:37 +#: builtin/clone.c:38 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" -#: builtin/clone.c:80 +#: builtin/clone.c:82 msgid "don't create a checkout" msgstr "не переключать рабочую копию на HEAD" -#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 +#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 msgid "create a bare repository" msgstr "Ñоздать голый репозиторий" -#: builtin/clone.c:85 +#: builtin/clone.c:87 msgid "create a mirror repository (implies bare)" msgstr "Ñоздать зеркало Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ (включает в ÑÐµÐ±Ñ Ð¸ параметр bare)" -#: builtin/clone.c:87 +#: builtin/clone.c:89 msgid "to clone from a local repository" msgstr "Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· локального репозиториÑ" -#: builtin/clone.c:89 +#: builtin/clone.c:91 msgid "don't use local hardlinks, always copy" msgstr "не иÑпользовать жеÑткие ÑÑылки, вÑегда копировать файлы" -#: builtin/clone.c:91 +#: builtin/clone.c:93 msgid "setup as shared repository" msgstr "наÑтроить как общедоÑтупный репозиторий" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "pathspec" msgstr "Ñпецификатор-пути" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "initialize submodules in the clone" msgstr "инициализировать подмодули в клоне" -#: builtin/clone.c:100 +#: builtin/clone.c:102 msgid "number of submodules cloned in parallel" msgstr "количеÑтво подмодулей, которые будут клонированы парралельно" -#: builtin/clone.c:101 builtin/init-db.c:475 +#: builtin/clone.c:103 builtin/init-db.c:476 msgid "template-directory" msgstr "каталог-шаблонов" -#: builtin/clone.c:102 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "каталог, шаблоны из которого будут иÑпользованы" -#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 #: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "ÑÑылаемый репозиторий" -#: builtin/clone.c:108 +#: builtin/clone.c:110 msgid "use --reference only while cloning" msgstr "иÑпользуйте --reference только при клонировании" -#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 +#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "имÑ" -#: builtin/clone.c:110 +#: builtin/clone.c:112 msgid "use <name> instead of 'origin' to track upstream" msgstr "иÑпользовать <имÑ> вмеÑто «origin» Ð´Ð»Ñ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÑˆÐµÑтоÑщего репозиториÑ" -#: builtin/clone.c:112 +#: builtin/clone.c:114 msgid "checkout <branch> instead of the remote's HEAD" msgstr "переключитьÑÑ Ð½Ð° <ветку>, вмеÑто HEAD внешнего репозиториÑ" -#: builtin/clone.c:114 +#: builtin/clone.c:116 msgid "path to git-upload-pack on the remote" msgstr "путь к git-upload-pack на внешнем репозитории" -#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 -#: builtin/pull.c:202 +#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/pull.c:205 msgid "depth" msgstr "глубина" -#: builtin/clone.c:116 +#: builtin/clone.c:118 msgid "create a shallow clone of that depth" msgstr "Ñделать чаÑтичный клон указанной глубины" -#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 +#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 #: parse-options.h:142 msgid "time" msgstr "времÑ" -#: builtin/clone.c:118 +#: builtin/clone.c:120 msgid "create a shallow clone since a specific time" msgstr "Ñделать чаÑтичный клон до определенного времени" -#: builtin/clone.c:119 builtin/fetch.c:124 +#: builtin/clone.c:121 builtin/fetch.c:119 msgid "revision" msgstr "редакциÑ" -#: builtin/clone.c:120 builtin/fetch.c:125 +#: builtin/clone.c:122 builtin/fetch.c:120 msgid "deepen history of shallow clone, excluding rev" msgstr "углубить иÑторию чаÑтичного клона иÑÐºÐ»ÑŽÑ‡Ð°Ñ Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸ÑŽ" -#: builtin/clone.c:122 +#: builtin/clone.c:124 msgid "clone only one branch, HEAD or --branch" msgstr "клонировать только одну ветку, HEAD или --branch" -#: builtin/clone.c:124 +#: builtin/clone.c:126 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "не клонировать метки, а также наÑтроить, чтобы не клонировалиÑÑŒ и в дальнейшем" + +#: builtin/clone.c:128 msgid "any cloned submodules will be shallow" msgstr "вÑе Ñклонированные подмодули будут чаÑтичными клонами" -#: builtin/clone.c:125 builtin/init-db.c:484 +#: builtin/clone.c:129 builtin/init-db.c:485 msgid "gitdir" msgstr "каталог-git" -#: builtin/clone.c:126 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "размеÑтить каталог git отдельно от рабочей копии" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "key=value" msgstr "ключ=значение" -#: builtin/clone.c:128 +#: builtin/clone.c:132 msgid "set config inside the new repository" msgstr "уÑтановить параметры внутри нового репозиториÑ" -#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "иÑпользовать только IPv4 адреÑа" -#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "иÑпользовать только IPv6 адреÑа" -#: builtin/clone.c:268 +#: builtin/clone.c:272 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "Ð˜Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° не может быть угадано.\nУкажите Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ параметра командной Ñтроки" -#: builtin/clone.c:321 +#: builtin/clone.c:325 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "информациÑ: Ðе удалоÑÑŒ добавить альтернативу Ð´Ð»Ñ Â«%s»: %s\n" -#: builtin/clone.c:393 +#: builtin/clone.c:397 #, c-format msgid "failed to open '%s'" msgstr "не удалоÑÑŒ открыть «%s»" -#: builtin/clone.c:401 +#: builtin/clone.c:405 #, c-format msgid "%s exists and is not a directory" msgstr "%s уже ÑущеÑтвует и не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼" -#: builtin/clone.c:415 +#: builtin/clone.c:419 #, c-format msgid "failed to stat %s\n" msgstr "не удалоÑÑŒ выполнить stat %s\n" -#: builtin/clone.c:437 +#: builtin/clone.c:441 #, c-format msgid "failed to create link '%s'" msgstr "не удалоÑÑŒ Ñоздать ÑÑылку «%s»" -#: builtin/clone.c:441 +#: builtin/clone.c:445 #, c-format msgid "failed to copy file to '%s'" msgstr "не удалоÑÑŒ копировать файл в «%s»" -#: builtin/clone.c:466 +#: builtin/clone.c:470 #, c-format msgid "done.\n" msgstr "готово.\n" -#: builtin/clone.c:478 +#: builtin/clone.c:482 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "Клонирование прошло уÑпешно, но во Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÑоÑтоÑÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° ошибка.\nС помощь команды «git status» вы можете проÑмотреть, какие файлы были обновлены, а повторить попытку Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð° ветку Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git checkout -f HEAD»\n" -#: builtin/clone.c:555 +#: builtin/clone.c:559 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Ðе удалоÑÑŒ найти внешнюю ветку %s Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ." -#: builtin/clone.c:650 +#: builtin/clone.c:654 msgid "remote did not send all necessary objects" msgstr "внешний репозиторий приÑлал не вÑе необходимые объекты" -#: builtin/clone.c:666 +#: builtin/clone.c:670 #, c-format msgid "unable to update %s" msgstr "не удалоÑÑŒ обновить %s" -#: builtin/clone.c:715 +#: builtin/clone.c:719 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "внешний HEAD ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующую ÑÑылку, Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ð½Ð° такую верÑию.\n" -#: builtin/clone.c:746 +#: builtin/clone.c:750 msgid "unable to checkout working tree" msgstr "не удалоÑÑŒ переключитьÑÑ Ð½Ð° верÑию в рабочем каталоге" -#: builtin/clone.c:786 +#: builtin/clone.c:792 msgid "unable to write parameters to config file" msgstr "не удалоÑÑŒ запиÑать параметры в файл конфигурации" -#: builtin/clone.c:849 +#: builtin/clone.c:855 msgid "cannot repack to clean up" msgstr "не удалоÑÑŒ выполнить перепаковку Ð´Ð»Ñ Ð¾Ñ‡Ð¸Ñтки" -#: builtin/clone.c:851 +#: builtin/clone.c:857 msgid "cannot unlink temporary alternates file" msgstr "не удалоÑÑŒ отÑоединить временные альтернативные файлы" -#: builtin/clone.c:884 builtin/receive-pack.c:1900 +#: builtin/clone.c:890 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "Слишком много аргументов." -#: builtin/clone.c:888 +#: builtin/clone.c:894 msgid "You must specify a repository to clone." msgstr "Ð’Ñ‹ должны указать репозиторий Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ." -#: builtin/clone.c:901 +#: builtin/clone.c:907 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare и --origin %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." -#: builtin/clone.c:904 +#: builtin/clone.c:910 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare и --separate-git-dir Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." -#: builtin/clone.c:917 +#: builtin/clone.c:923 #, c-format msgid "repository '%s' does not exist" msgstr "репозиторий «%s» не ÑущеÑтвует" -#: builtin/clone.c:923 builtin/fetch.c:1337 +#: builtin/clone.c:929 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "глубина %s не ÑвлÑетÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ чиÑлом" -#: builtin/clone.c:933 +#: builtin/clone.c:939 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевой путь «%s» уже ÑущеÑтвует и не ÑвлÑетÑÑ Ð¿ÑƒÑтым каталогом." -#: builtin/clone.c:943 +#: builtin/clone.c:949 #, c-format msgid "working tree '%s' already exists." msgstr "рабочий каталог «%s» уже ÑущеÑтвует." -#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 -#: builtin/worktree.c:221 builtin/worktree.c:251 +#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 +#: builtin/worktree.c:222 builtin/worktree.c:252 #, c-format msgid "could not create leading directories of '%s'" msgstr "не удалоÑÑŒ Ñоздать родительÑкие каталоги Ð´Ð»Ñ Â«%s»" -#: builtin/clone.c:961 +#: builtin/clone.c:967 #, c-format msgid "could not create work tree dir '%s'" msgstr "не удалоÑÑŒ Ñоздать рабочий каталог «%s»" -#: builtin/clone.c:973 +#: builtin/clone.c:979 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клонирование в голый репозиторий «%s»…\n" -#: builtin/clone.c:975 +#: builtin/clone.c:981 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клонирование в «%s»…\n" -#: builtin/clone.c:999 +#: builtin/clone.c:1005 msgid "" "clone --recursive is not compatible with both --reference and --reference-" "if-able" msgstr "клонирование Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --recursive Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно ни Ñ --reference, ни Ñ --reference-if-able" -#: builtin/clone.c:1055 +#: builtin/clone.c:1067 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth игнорируетÑÑ Ð½Ð° локальных клонах; вмеÑто Ñтого иÑпользуйте file://." -#: builtin/clone.c:1057 +#: builtin/clone.c:1069 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since игнорируетÑÑ Ð½Ð° локальных клонах; иÑпользуйте file:// вмеÑто Ñтого." -#: builtin/clone.c:1059 +#: builtin/clone.c:1071 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude игнорируетÑÑ Ð½Ð° локальных клонах; иÑпользуйте file:// вмеÑто Ñтого." -#: builtin/clone.c:1062 +#: builtin/clone.c:1074 msgid "source repository is shallow, ignoring --local" msgstr "иÑходный репозиторий ÑвлÑетÑÑ Ñ‡Ð°Ñтичным, --local игнорируетÑÑ" -#: builtin/clone.c:1067 +#: builtin/clone.c:1079 msgid "--local is ignored" msgstr "--local игнорируетÑÑ" -#: builtin/clone.c:1071 +#: builtin/clone.c:1083 #, c-format msgid "Don't know how to clone %s" msgstr "Ðе знаю как клонировать %s" -#: builtin/clone.c:1126 builtin/clone.c:1134 +#: builtin/clone.c:1138 builtin/clone.c:1146 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "ВнешнÑÑ Ð²ÐµÑ‚ÐºÐ° %s не найдена в вышеÑтоÑщем репозитории %s" -#: builtin/clone.c:1137 +#: builtin/clone.c:1149 msgid "You appear to have cloned an empty repository." msgstr "Похоже, что вы клонировали пуÑтой репозиторий." -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<опции>]" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "запроÑить переменные конфигурации" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "иÑпользовать Ñхему раÑположениÑ" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð°" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "РаÑÑтоÑние отÑтупа Ñлева" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "РаÑÑтоÑние отÑтупа Ñправа" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "РаÑÑтоÑние отÑтупа между колонками" -#: builtin/column.c:51 +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "параметр --command должен быть первым" -#: builtin/commit.c:38 +#: builtin/commit.c:39 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<опции>] [--] <Ñпецификатор-пути>…" -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<опции>] [--] <Ñпецификатор-пути>…" -#: builtin/commit.c:48 +#: builtin/commit.c:49 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6398,7 +6472,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "Ваше Ð¸Ð¼Ñ Ð¸Ð»Ð¸ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð° наÑтроены автоматичеÑки на оÑновании вашего\nимени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ имени машины. ПожалуйÑта, проверьте, что они \nопределены правильно.\nÐ’Ñ‹ можете отключить Ñто уведомление уÑтановив их напрÑмую. ЗапуÑтите Ñледующую\nкоманду и Ñледуйте инÑтрукциÑм вашего текÑтового редактора, длÑ\nÑ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ файла конфигурации:\n\n git config --global --edit\n\nПоÑле Ñтого, изменить авторÑтво Ñтой коммита можно будет Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды:\n\n git commit --amend --reset-author\n" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6412,14 +6486,14 @@ msgid "" " git commit --amend --reset-author\n" msgstr "Ваше Ð¸Ð¼Ñ Ð¸Ð»Ð¸ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð°Ñ Ð¿Ð¾Ñ‡Ñ‚Ð° наÑтроены автоматичеÑки на оÑновании вашего\nимени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ имени машины. ПожалуйÑта, проверьте, что они \nопределены правильно.\nÐ’Ñ‹ можете отключить Ñто уведомление уÑтановив их напрÑмую:\n\n git config --global user.name \"Ваше ИмÑ\"\n git config --global user.email you@example.com\n\nПоÑле Ñтого, изменить авторÑтво Ñтой коммита можно будет Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды:\n\n git commit --amend --reset-author\n" -#: builtin/commit.c:73 +#: builtin/commit.c:74 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "Ð’Ñ‹ попроÑили иÑправить поÑледний коммит, но Ð´ÐµÐ»Ð°Ñ Ñто вы Ñделаете\nпуÑтой коммит. Ð’Ñ‹ можете повторить Ñту команду Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --allow-empty\nили вы можете удалить коммит полноÑтью Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ команды \n«git reset HEAD^».\n" -#: builtin/commit.c:78 +#: builtin/commit.c:79 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -6428,11 +6502,11 @@ msgid "" "\n" msgstr "Копируемый коммит теперь пуÑÑ‚, возможно поÑле Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\nЕÑли вы вÑе равно хотите Ñделать пуÑтой коммит, иÑпользуйте:\n\n git commit --allow-empty\n\n" -#: builtin/commit.c:85 +#: builtin/commit.c:86 msgid "Otherwise, please use 'git reset'\n" msgstr "Ð’ противном Ñлучае, иÑпользуйте «git reset»\n" -#: builtin/commit.c:88 +#: builtin/commit.c:89 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6442,98 +6516,98 @@ msgid "" "the remaining commits.\n" msgstr "ЕÑли вы хотите пропуÑтит Ñтот коммит, иÑпользуйте команду:\n\n git reset\n\nПоÑле Ñтого «git cherry-pick --continue» продолжит копирование оÑтавшихÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð².\n" -#: builtin/commit.c:318 +#: builtin/commit.c:319 msgid "failed to unpack HEAD tree object" msgstr "Ñбой раÑпаковки объекта дерева HEAD" -#: builtin/commit.c:359 +#: builtin/commit.c:360 msgid "unable to create temporary index" msgstr "не удалоÑÑŒ Ñоздать временный индекÑ" -#: builtin/commit.c:365 +#: builtin/commit.c:366 msgid "interactive add failed" msgstr "Ñбой интерактивного добавлениÑ" -#: builtin/commit.c:378 +#: builtin/commit.c:379 msgid "unable to update temporary index" msgstr "не удалоÑÑŒ обновить временный индекÑ" -#: builtin/commit.c:380 +#: builtin/commit.c:381 msgid "Failed to update main cache tree" msgstr "Сбой при обновлении оÑновного кÑша дерева" -#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 +#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 msgid "unable to write new_index file" msgstr "не удалоÑÑŒ запиÑать файл new_index" -#: builtin/commit.c:458 +#: builtin/commit.c:459 msgid "cannot do a partial commit during a merge." msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ ÑлиÑниÑ." -#: builtin/commit.c:460 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a cherry-pick." msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñоздать чаÑтичный коммит во Ð²Ñ€ÐµÐ¼Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°." -#: builtin/commit.c:469 +#: builtin/commit.c:470 msgid "cannot read the index" msgstr "не удалоÑÑŒ прочитать индекÑ" -#: builtin/commit.c:488 +#: builtin/commit.c:489 msgid "unable to write temporary index file" msgstr "не удалоÑÑŒ запиÑать временный файл индекÑа" -#: builtin/commit.c:582 +#: builtin/commit.c:583 #, c-format msgid "commit '%s' lacks author header" msgstr "у коммита «%s» отÑутÑтвует автор в заголовке" -#: builtin/commit.c:584 +#: builtin/commit.c:585 #, c-format msgid "commit '%s' has malformed author line" msgstr "у коммита «%s» Ñтрока автора в неправильном формате" -#: builtin/commit.c:603 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "параметр --author в неправильном формате" -#: builtin/commit.c:655 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ñимвол комментариÑ, который\nне иÑпользуетÑÑ Ð² текущем Ñообщении коммита" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 #, c-format msgid "could not lookup commit %s" msgstr "не удалоÑÑŒ запроÑить коммит %s" -#: builtin/commit.c:704 builtin/shortlog.c:294 +#: builtin/commit.c:705 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(чтение файла журнала из Ñтандартного ввода)\n" -#: builtin/commit.c:706 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "не удалоÑÑŒ прочитать файл журнала из Ñтандартного ввода" -#: builtin/commit.c:710 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "не удалоÑÑŒ прочитать файл журнала «%s»" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "не удалоÑÑŒ прочитать SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:743 msgid "could not read MERGE_MSG" msgstr "не удалоÑÑŒ прочитать MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "не удалоÑÑŒ запиÑать шаблон опиÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" -#: builtin/commit.c:814 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -6543,7 +6617,7 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить ÑлиÑние.\nЕÑли Ñто ошибка, пожалуйÑта удалите файл\n\t%s\nи попробуйте Ñнова.\n" -#: builtin/commit.c:819 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -6553,14 +6627,14 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетеÑÑŒ закоммитить при копировании коммита.\nЕÑли Ñто не так, то удалите файл\n\t%s\nи попробуйте Ñнова.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "ПожалуйÑта, введите Ñообщение коммита Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… изменений. Строки,\nначинающиеÑÑ Ñ Â«%c» будут проигнорированы, а пуÑтое Ñообщение\nотменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6568,484 +6642,484 @@ msgid "" "An empty message aborts the commit.\n" msgstr "ПожалуйÑта, введите Ñообщение коммита Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… изменений. Строки,\nначинающиеÑÑ Ñ Â«%c» будут оÑтавлены; вы можете удалить их вручную,\nеÑли хотите. ПуÑтое Ñообщение отменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n" -#: builtin/commit.c:859 +#: builtin/commit.c:857 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sÐвтор: %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:865 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:874 +#: builtin/commit.c:872 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sКоммитер: %.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:889 msgid "Cannot read index" msgstr "Ðе удалоÑÑŒ прочитать индекÑ" -#: builtin/commit.c:954 +#: builtin/commit.c:951 msgid "Error building trees" msgstr "Ошибка при поÑтроении деревьев" -#: builtin/commit.c:968 builtin/tag.c:273 +#: builtin/commit.c:965 builtin/tag.c:274 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "ПожалуйÑта, укажите Ñообщение, при указании опций -m или -F.\n" -#: builtin/commit.c:1071 +#: builtin/commit.c:1068 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author «%s» не в формате Â«Ð˜Ð¼Ñ <почта>» и не Ñовпадает Ñ ÑущеÑтвующим автором" -#: builtin/commit.c:1086 builtin/commit.c:1325 +#: builtin/commit.c:1083 builtin/commit.c:1328 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ðеправильный режим неотÑлеживаемых файлов «%s»" -#: builtin/commit.c:1124 +#: builtin/commit.c:1121 msgid "--long and -z are incompatible" msgstr "--long и -z Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/commit.c:1154 +#: builtin/commit.c:1151 msgid "Using both --reset-author and --author does not make sense" msgstr "Указание одновременно опций --reset-author и --author не имеет ÑмыÑла" -#: builtin/commit.c:1163 +#: builtin/commit.c:1160 msgid "You have nothing to amend." msgstr "Ðечего иÑправлÑÑ‚ÑŒ." -#: builtin/commit.c:1166 +#: builtin/commit.c:1163 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ð’Ñ‹ в процеÑÑе ÑлиÑÐ½Ð¸Ñ â€” ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ." -#: builtin/commit.c:1168 +#: builtin/commit.c:1165 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Ð’Ñ‹ в процеÑÑе ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° — ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸ÑправлÑÑ‚ÑŒ." -#: builtin/commit.c:1171 +#: builtin/commit.c:1168 msgid "Options --squash and --fixup cannot be used together" msgstr "Опции --squash и --fixup не могут иÑпользоватьÑÑ Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾" -#: builtin/commit.c:1181 +#: builtin/commit.c:1178 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна из опций -c/-C/-F/--fixup." -#: builtin/commit.c:1183 +#: builtin/commit.c:1180 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "ÐžÐ¿Ñ†Ð¸Ñ -m не может иÑпользоватьÑÑ Ñ -c/-C/-F/--fixup." -#: builtin/commit.c:1191 +#: builtin/commit.c:1188 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одновременно Ñ Ð¾Ð¿Ñ†Ð¸Ñми -C, -c или --amend." -#: builtin/commit.c:1208 +#: builtin/commit.c:1205 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ одна из опций --include/--only/--all/--interactive/--patch." -#: builtin/commit.c:1210 +#: builtin/commit.c:1207 msgid "No paths with --include/--only does not make sense." msgstr "Указание путей каталогов Ñ Ð¾Ð¿Ñ†Ð¸Ñми --include/--only не имеет ÑмыÑла." -#: builtin/commit.c:1212 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "Пути Ñвно указаны пути без опций -i или -o; предполагаю опцию --only…" - -#: builtin/commit.c:1224 builtin/tag.c:551 +#: builtin/commit.c:1219 builtin/tag.c:552 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ðеправильное значение режима очиÑтки %s" -#: builtin/commit.c:1229 +#: builtin/commit.c:1224 msgid "Paths with -a does not make sense." msgstr "С опцией -a указание пути не имеет ÑмыÑла." -#: builtin/commit.c:1339 builtin/commit.c:1612 +#: builtin/commit.c:1342 builtin/commit.c:1617 msgid "show status concisely" msgstr "кратко показать ÑтатуÑ" -#: builtin/commit.c:1341 builtin/commit.c:1614 +#: builtin/commit.c:1344 builtin/commit.c:1619 msgid "show branch information" msgstr "показать информацию о верÑии" -#: builtin/commit.c:1343 +#: builtin/commit.c:1346 +msgid "show stash information" +msgstr "показать информацию о ÑпрÑтанном" + +#: builtin/commit.c:1348 msgid "version" msgstr "верÑиÑ" -#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:448 +#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 +#: builtin/worktree.c:449 msgid "machine-readable output" msgstr "машиночитаемый вывод" -#: builtin/commit.c:1346 builtin/commit.c:1618 +#: builtin/commit.c:1351 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "показать ÑÑ‚Ð°Ñ‚ÑƒÑ Ð² длинном формате (по умолчанию)" -#: builtin/commit.c:1349 builtin/commit.c:1621 +#: builtin/commit.c:1354 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "завершать запиÑи ÐУЛЕВЫМ байтом" -#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:411 +#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 +#: builtin/fast-export.c:986 builtin/tag.c:412 msgid "mode" msgstr "режим" -#: builtin/commit.c:1352 builtin/commit.c:1624 +#: builtin/commit.c:1357 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "показать неотÑлеживаемые файлы, опциональные режимы: all (вÑе), normal (как обычно), no (нет). (По умолчанию: all)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1360 msgid "show ignored files" msgstr "показать игнорируемые файлы" -#: builtin/commit.c:1356 parse-options.h:155 +#: builtin/commit.c:1361 parse-options.h:155 msgid "when" msgstr "когда" -#: builtin/commit.c:1357 +#: builtin/commit.c:1362 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² подмодулÑÑ…, опционально когда: all (вÑегда), dirty (измененные), untracked (неотÑлеживаемые). (По умолчанию: all)" -#: builtin/commit.c:1359 +#: builtin/commit.c:1364 msgid "list untracked files in columns" msgstr "показать неотÑлеживаемые файлы по Ñтолбцам" -#: builtin/commit.c:1435 +#: builtin/commit.c:1440 msgid "couldn't look up newly created commit" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñить новоÑозданный коммит" -#: builtin/commit.c:1437 +#: builtin/commit.c:1442 msgid "could not parse newly created commit" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñ€Ð°Ð·Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ новоÑозданный коммит" -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "detached HEAD" msgstr "отделённый HEAD" -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid " (root-commit)" msgstr " (корневой коммит)" -#: builtin/commit.c:1582 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "не выводить Ñводку поÑле уÑпешного коммита" -#: builtin/commit.c:1583 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "добавить ÑпиÑок изменений в шаблон ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" -#: builtin/commit.c:1585 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Опции ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" -#: builtin/commit.c:1586 builtin/tag.c:409 +#: builtin/commit.c:1591 builtin/tag.c:410 msgid "read message from file" msgstr "прочитать Ñообщение из файла" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "author" msgstr "автор" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "подменить автора коммита" -#: builtin/commit.c:1588 builtin/gc.c:357 +#: builtin/commit.c:1593 builtin/gc.c:358 msgid "date" msgstr "дата" -#: builtin/commit.c:1588 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "подменить дату коммита" -#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:407 +#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 +#: builtin/notes.c:564 builtin/tag.c:408 msgid "message" msgstr "Ñообщение" -#: builtin/commit.c:1589 +#: builtin/commit.c:1594 msgid "commit message" msgstr "Ñообщение коммита" -#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "коммит" -#: builtin/commit.c:1590 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "иÑпользовать и отредактировать Ñообщение от указанного коммита" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "иÑпользовать Ñообщение указанного коммита" -#: builtin/commit.c:1592 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "иÑпользовать форматированное Ñообщение Ð°Ð²Ñ‚Ð¾ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ коммита" -#: builtin/commit.c:1593 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "иÑпользовать форматированное Ñообщение Ð°Ð²Ñ‚Ð¾ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑƒÐ¿Ð»Ð¾Ñ‚Ð½ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ коммита" -#: builtin/commit.c:1594 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "коммит теперь за моим авторÑтвом (иÑпользуетÑÑ Ñ -C/-c/--amend)" -#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 +#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "добавить Signed-off-by:" -#: builtin/commit.c:1596 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "иÑпользовать указанный файл шаблона" -#: builtin/commit.c:1597 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "принудительно редактировать коммит" -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "default" msgstr "по-умолчанию" -#: builtin/commit.c:1598 builtin/tag.c:412 +#: builtin/commit.c:1603 builtin/tag.c:413 msgid "how to strip spaces and #comments from message" msgstr "как удалÑÑ‚ÑŒ пробелы и #комментарии из ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" -#: builtin/commit.c:1599 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "включить ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ„Ð°Ð¹Ð»Ð¾Ð² в шаблон ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" -#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 -#: builtin/revert.c:112 +#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "подпиÑать коммит Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG" -#: builtin/commit.c:1604 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Опции Ñодержимого коммита" -#: builtin/commit.c:1605 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "закоммитить вÑе измененные файлы" -#: builtin/commit.c:1606 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "добавить указанные файлы в Ð¸Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" -#: builtin/commit.c:1607 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "интерактивное добавление файлов" -#: builtin/commit.c:1608 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "интерактивное добавление изменений" -#: builtin/commit.c:1609 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "закоммитить только указанные файлы" -#: builtin/commit.c:1610 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "пропуÑтить перехватчик pre-commit и commit-msg" -#: builtin/commit.c:1611 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "показать, что будет закоммичено" -#: builtin/commit.c:1622 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "иÑправить предыдущий коммит" -#: builtin/commit.c:1623 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "пропуÑтить перехватчик post-rewrite" -#: builtin/commit.c:1628 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "разрешить запиÑÑŒ пуÑтого коммита" -#: builtin/commit.c:1630 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "разрешить запиÑÑŒ изменений Ñ Ð¿ÑƒÑтым Ñообщением" -#: builtin/commit.c:1659 +#: builtin/commit.c:1665 msgid "could not parse HEAD commit" msgstr "не удалоÑÑŒ разобрать HEAD коммит" -#: builtin/commit.c:1707 +#: builtin/commit.c:1710 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Файл MERGE_HEAD поврежден (%s)" -#: builtin/commit.c:1714 +#: builtin/commit.c:1717 msgid "could not read MERGE_MODE" msgstr "не удалоÑÑŒ прочитать MERGE_MODE" -#: builtin/commit.c:1733 +#: builtin/commit.c:1736 #, c-format msgid "could not read commit message: %s" msgstr "не удалоÑÑŒ открыть Ñообщение коммита: %s" -#: builtin/commit.c:1744 +#: builtin/commit.c:1747 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Отмена коммита; вы не изменили Ñообщение.\n" -#: builtin/commit.c:1749 +#: builtin/commit.c:1752 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Отмена коммита из-за пуÑтого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n" -#: builtin/commit.c:1797 +#: builtin/commit.c:1800 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "Репозиторий был обновлен, но не удалоÑÑŒ запиÑать файл new_index. УдоÑтоверьтеÑÑŒ, что на диÑке еÑÑ‚ÑŒ Ñвободное меÑто и квота не иÑчерпана, а поÑле Ñтого запуÑтите «git reset HEAD» Ð´Ð»Ñ Ð²Ð¾ÑÑтановлениÑ." -#: builtin/config.c:9 +#: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<опции>]" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "Config file location" msgstr "Размещение файла конфигурации" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use global config file" msgstr "иÑпользовать глобальный файл конфигурации" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use system config file" msgstr "иÑпользовать ÑиÑтемный файл конфигурации" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use repository config file" msgstr "иÑпользовать файл конфигурации репозиториÑ" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use given config file" msgstr "иÑпользовать указанный файл конфигурации" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "blob-id" msgstr "идент-двоичн-объекта" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "read config from given blob object" msgstr "прочитать наÑтройки из указанного двоичного объекта" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "Action" msgstr "ДейÑтвие" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get value: name [value-regex]" msgstr "получить значение: Ð¸Ð¼Ñ [шаблон-значений]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get all values: key [value-regex]" msgstr "получить вÑе значениÑ: ключ [шаблон-значений]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get values for regexp: name-regex [value-regex]" msgstr "получить Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ шаблону: шаблон-имен [шаблон-значений]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get value specific for the URL: section[.var] URL" msgstr "получить значение, Ñпецифичное Ð´Ð»Ñ URL: раздел[.переменнаÑ] URL" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "replace all matching variables: name value [value_regex]" msgstr "заменить вÑе ÑоответÑтвующие переменные: Ð¸Ð¼Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ [шаблон-значений]" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "add a new variable: name value" msgstr "добавить новую переменную: Ð¸Ð¼Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove a variable: name [value-regex]" msgstr "удалить переменную: Ð¸Ð¼Ñ [шаблон-значений]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove all matches: name [value-regex]" msgstr "удалить вÑе Ñовпадающие: Ð¸Ð¼Ñ [шаблон-значений]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "rename section: old-name new-name" msgstr "переименовать раздел: Ñтарое-Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ðµ-имÑ" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "remove a section: name" msgstr "удалить раздел: имÑ" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "list all" msgstr "показать веÑÑŒ ÑпиÑок" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "open an editor" msgstr "открыть в редакторе" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color configured: slot [default]" msgstr "найти наÑтроенный цвет: раздел [по-умолчанию]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color setting: slot [stdout-is-tty]" msgstr "проверить, ÑущеÑтвует ли наÑтроенный цвет: раздел [stdout-еÑÑ‚ÑŒ-tty]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "Type" msgstr "Тип" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is \"true\" or \"false\"" msgstr "значение — Ñто «true» (правда) или «false» (ложь)" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is decimal number" msgstr "значение — Ñто деÑÑтичное чиÑло" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is --bool or --int" msgstr "значение — Ñто --bool или --int" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is a path (file or directory name)" msgstr "значение — Ñто путь (к файлу или каталогу)" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "Other" msgstr "Другое" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "terminate values with NUL byte" msgstr "завершать Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÐУЛЕВЫМ байтом" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "show variable names only" msgstr "показывать только имена переменных" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "respect include directives on lookup" msgstr "учитывать директивы include (Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²) при запроÑе" -#: builtin/config.c:86 +#: builtin/config.c:87 msgid "show origin of config (file, standard input, blob, command line)" msgstr "показать иÑточник наÑтройки (файл, Ñтандартный ввод, двоичный объект, ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока)" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "не удалоÑÑŒ разобрать значение цвета по умолчанию" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7055,181 +7129,185 @@ msgid "" "#\temail = %s\n" msgstr "# Ðто файл конфигурации Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Git.\n[user]\n# ПожалуйÑта, адаптируйте и раÑкомментируйте Ñледующие Ñтроки:\n#\tuser = %s\n#\temail = %s\n" -#: builtin/config.c:615 +#: builtin/config.c:499 +msgid "--local can only be used inside a git repository" +msgstr "--local можно иÑпользовать только внутри git репозиториÑ" + +#: builtin/config.c:621 #, c-format msgid "cannot create configuration file %s" msgstr "не удалоÑÑŒ Ñоздать файл конфигурации %s" -#: builtin/config.c:627 +#: builtin/config.c:633 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñать неÑколько значений одним\n ИÑпользуйте регулÑрные выражениÑ, параметры --add или --replace-all, чтобы изменить %s." -#: builtin/count-objects.c:86 +#: builtin/count-objects.c:87 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:96 +#: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "вывод размеров в удобочитаемом Ð´Ð»Ñ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ° виде" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<опции>] [<указатель-коммита>…]" -#: builtin/describe.c:19 +#: builtin/describe.c:20 msgid "git describe [<options>] --dirty" msgstr "git describe [<опции>] --dirty" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "head" msgstr "указатель на ветку" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "lightweight" msgstr "легковеÑный" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "annotated" msgstr "аннотированный" -#: builtin/describe.c:250 +#: builtin/describe.c:253 #, c-format msgid "annotated tag %s not available" msgstr "Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° %s не доÑтупна" -#: builtin/describe.c:254 +#: builtin/describe.c:257 #, c-format msgid "annotated tag %s has no embedded name" msgstr "Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° %s не Ñодержит вÑтроенного названиÑ" -#: builtin/describe.c:256 +#: builtin/describe.c:259 #, c-format msgid "tag '%s' is really '%s' here" msgstr "метка «%s» уже здеÑÑŒ «%s»" -#: builtin/describe.c:283 builtin/log.c:487 +#: builtin/describe.c:286 builtin/log.c:489 #, c-format msgid "Not a valid object name %s" msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s" -#: builtin/describe.c:286 +#: builtin/describe.c:289 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным объектом «%s»" -#: builtin/describe.c:303 +#: builtin/describe.c:306 #, c-format msgid "no tag exactly matches '%s'" msgstr "нет меток, точно ÑоответÑтвующих «%s»" -#: builtin/describe.c:305 +#: builtin/describe.c:308 #, c-format msgid "searching to describe %s\n" msgstr "поиÑк опиÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ %s\n" -#: builtin/describe.c:352 +#: builtin/describe.c:355 #, c-format msgid "finished search at %s\n" msgstr "поиÑк окончен на %s\n" -#: builtin/describe.c:379 +#: builtin/describe.c:382 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "Ðет аннотированных меток, которые могут опиÑать «%s».\nÐо имеютÑÑ Ð½ÐµÐ°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ метки: попробуйте добавить параметр --tags." -#: builtin/describe.c:383 +#: builtin/describe.c:386 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "Ðет меток, которые могут опиÑать «%s….\nПопробуйте добавить параметр --always или Ñоздать какие-нибудь метки." -#: builtin/describe.c:413 +#: builtin/describe.c:416 #, c-format msgid "traversed %lu commits\n" msgstr "поÑещено %lu коммитов\n" -#: builtin/describe.c:416 +#: builtin/describe.c:419 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "более %i меток найдено; показано поÑледние %i\nоÑтановлен поиÑк поÑле %s\n" -#: builtin/describe.c:438 +#: builtin/describe.c:441 msgid "find the tag that comes after the commit" msgstr "поиÑк метки, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¸Ð´ÐµÑ‚ поÑле коммита" -#: builtin/describe.c:439 +#: builtin/describe.c:442 msgid "debug search strategy on stderr" msgstr "вывод отладочной информации Ñтратегии поиÑка на Ñтандартный вывод" -#: builtin/describe.c:440 +#: builtin/describe.c:443 msgid "use any ref" msgstr "иÑпользовать любую ÑÑылку" -#: builtin/describe.c:441 +#: builtin/describe.c:444 msgid "use any tag, even unannotated" msgstr "иÑпользовать любую метку, даже неаннотированную" -#: builtin/describe.c:442 +#: builtin/describe.c:445 msgid "always use long format" msgstr "вÑегда иÑпользовать длинный формат вывода" -#: builtin/describe.c:443 +#: builtin/describe.c:446 msgid "only follow first parent" msgstr "Ñледовать только за первым родителем" -#: builtin/describe.c:446 +#: builtin/describe.c:449 msgid "only output exact matches" msgstr "выводить только точные ÑовпадениÑ" -#: builtin/describe.c:448 +#: builtin/describe.c:451 msgid "consider <n> most recent tags (default: 10)" msgstr "раÑÑматривать поÑледние <n> меток (по умолчанию: 10)" -#: builtin/describe.c:450 +#: builtin/describe.c:453 msgid "only consider tags matching <pattern>" msgstr "раÑÑматривать только метки по <шаблону>" -#: builtin/describe.c:452 +#: builtin/describe.c:455 msgid "do not consider tags matching <pattern>" msgstr "не учитывать метки, которые ÑоответÑтвуют <шаблону>" -#: builtin/describe.c:454 builtin/name-rev.c:357 +#: builtin/describe.c:457 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "еÑли не найдено, показать Ñокращенный номер редакции коммита" -#: builtin/describe.c:455 builtin/describe.c:458 +#: builtin/describe.c:458 builtin/describe.c:461 msgid "mark" msgstr "пометка" -#: builtin/describe.c:456 +#: builtin/describe.c:459 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)" -#: builtin/describe.c:459 +#: builtin/describe.c:462 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)" -#: builtin/describe.c:477 +#: builtin/describe.c:480 msgid "--long is incompatible with --abbrev=0" msgstr "--long неÑовмеÑтимо Ñ --abbrev=0" -#: builtin/describe.c:506 +#: builtin/describe.c:509 msgid "No names found, cannot describe anything." msgstr "Имена не найдены, не могу ничего опиÑать." -#: builtin/describe.c:549 +#: builtin/describe.c:552 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty неÑовмеÑтимо Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ указателей коммитов" -#: builtin/describe.c:551 +#: builtin/describe.c:554 msgid "--broken is incompatible with commit-ishes" msgstr "--broken неÑовмеÑтимо Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ указателей коммитов" @@ -7238,345 +7316,347 @@ msgstr "--broken неÑовмеÑтимо Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ указател msgid "'%s': not a regular file or symlink" msgstr "«%s»: не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом или Ñимвольной ÑÑылкой" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "неправильный параметр: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:359 msgid "Not a git repository" msgstr "Ðе найден git репозитоий" -#: builtin/diff.c:401 +#: builtin/diff.c:402 #, c-format msgid "invalid object '%s' given." msgstr "передан неправильный объект «%s»." -#: builtin/diff.c:410 +#: builtin/diff.c:411 #, c-format msgid "more than two blobs given: '%s'" msgstr "передано больше двух двоичных объектов: «%s»" -#: builtin/diff.c:417 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "передан необработанный объект «%s»." -#: builtin/difftool.c:28 +#: builtin/difftool.c:29 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]" -#: builtin/difftool.c:241 +#: builtin/difftool.c:249 #, c-format msgid "failed: %d" msgstr "Ñбой: %d" -#: builtin/difftool.c:283 +#: builtin/difftool.c:291 #, c-format msgid "could not read symlink %s" msgstr "не удалоÑÑŒ прочитать Ñимвольную ÑÑылку %s" -#: builtin/difftool.c:285 +#: builtin/difftool.c:293 #, c-format msgid "could not read symlink file %s" msgstr "не удалоÑÑŒ прочитать файл Ñимвольной ÑÑылки %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:301 #, c-format msgid "could not read object %s for symlink %s" msgstr "не удалоÑÑŒ прочитать объект %s Ð´Ð»Ñ Ñимвольной ÑÑылки %s" -#: builtin/difftool.c:395 +#: builtin/difftool.c:403 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "комбинированные форматы различий файлов(«-c» и «--cc») не поддерживаютÑÑ Ð² режиме ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð²(«-d» и «--dir-diff»)." -#: builtin/difftool.c:609 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "оба файла изменены: «%s» и «%s»." -#: builtin/difftool.c:611 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "рабочий каталог был покинут." -#: builtin/difftool.c:622 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "временные файлы уже находÑÑ‚ÑÑ Ð² «%s»." -#: builtin/difftool.c:623 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "возможно вы хотите их удалить или воÑÑтановить." -#: builtin/difftool.c:669 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "иÑпользовать «diff.guitool» вмеÑто «diff.tool»" -#: builtin/difftool.c:671 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "выполнить пофайловое Ñравнение вÑего каталога" -#: builtin/difftool.c:673 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "не Ñпрашивать перед запуÑком утилиты ÑравнениÑ" -#: builtin/difftool.c:679 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "иÑпользовать Ñимвольные ÑÑылки в режиме ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°" -#: builtin/difftool.c:680 +#: builtin/difftool.c:700 msgid "<tool>" msgstr "<утилита>" -#: builtin/difftool.c:681 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "иÑпользовать указанную утилиту ÑравнениÑ" -#: builtin/difftool.c:683 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "вывеÑти ÑпиÑок утилит, которые можно иÑпользовать Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ «--tool»" -#: builtin/difftool.c:686 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit" " code" msgstr "выходить из «git-difftool», еÑли Ð²Ñ‹Ð·Ð²Ð°Ð½Ð½Ð°Ñ ÑƒÑ‚Ð¸Ð»Ð¸Ñ‚Ð° ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ Ð²ÐµÑ€Ð½ÑƒÐ»Ð° не нулевой код возврата" -#: builtin/difftool.c:688 +#: builtin/difftool.c:708 msgid "<command>" msgstr "<команда>" -#: builtin/difftool.c:689 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "иÑпользовать оÑобую команду Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра различий" -#: builtin/difftool.c:713 +#: builtin/difftool.c:733 msgid "no <tool> given for --tool=<tool>" msgstr "не передана <утилита> Ð´Ð»Ñ --tool=<утилита>" -#: builtin/difftool.c:720 +#: builtin/difftool.c:740 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "не передана <команда> Ð´Ð»Ñ --extcmd=<команда>" -#: builtin/fast-export.c:25 +#: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [опции-rev-list]" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:982 msgid "show progress after <n> objects" msgstr "показать прогреÑÑ Ð¿Ð¾Ñле <n> объектов" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:984 msgid "select handling of signed tags" msgstr "выбор обработки подпиÑанных меток" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:987 msgid "select handling of tags that tag filtered objects" msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:990 msgid "Dump marks to this file" msgstr "ЗапиÑать пометки в Ñтот файл" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:992 msgid "Import marks from this file" msgstr "Импортировать пометки из Ñтого файла" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:994 msgid "Fake a tagger when tags lack one" msgstr "Подделать автора метки, еÑли у метки он отÑутÑтвует" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:996 msgid "Output full tree for each commit" msgstr "ВывеÑти полное дерево Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ коммита" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:998 msgid "Use the done feature to terminate the stream" msgstr "ИÑпользовать пометку Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð² конце потока" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:999 msgid "Skip output of blob data" msgstr "ПропуÑтить вывод данных двоичных объектов" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "refspec" msgstr "Ñпецификатор ÑÑылки" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1001 msgid "Apply refspec to exported refs" msgstr "Применить Ñпецификатор ÑÑылки к ÑкÑпортируемым ÑÑылкам" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "anonymize output" msgstr "Ñделать вывод анонимным" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<опции>] [<репозиторий> [<Ñпецификатор-ÑÑылки>…]]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] <group>" msgstr "git fetch [<опции>] <группа>" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<опции>]" -#: builtin/fetch.c:95 builtin/pull.c:175 +#: builtin/fetch.c:90 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "извлечь Ñо вÑех внешних репозиториев" -#: builtin/fetch.c:97 builtin/pull.c:178 +#: builtin/fetch.c:92 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "допиÑать к .git/FETCH_HEAD вмеÑто перезапиÑи" -#: builtin/fetch.c:99 builtin/pull.c:181 +#: builtin/fetch.c:94 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "путь к программе упаковки пакета на машине Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¼ репозиторием" -#: builtin/fetch.c:100 builtin/pull.c:183 +#: builtin/fetch.c:95 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÑŒ локальной ветки" -#: builtin/fetch.c:102 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "извлечь Ñ Ð½ÐµÑкольких внешних репозиториев" -#: builtin/fetch.c:104 builtin/pull.c:185 +#: builtin/fetch.c:99 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "извлечь вÑе метки и ÑвÑзанные объекты" -#: builtin/fetch.c:106 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "не извлекать вÑе метки (--no-tags)" -#: builtin/fetch.c:108 +#: builtin/fetch.c:103 msgid "number of submodules fetched in parallel" msgstr "количеÑтво подмодулей, которые будут Ñкачаны парралельно" -#: builtin/fetch.c:110 builtin/pull.c:188 +#: builtin/fetch.c:105 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "почиÑтить отÑлеживаемые внешние ветки, которых уже нет на внешнем репозитории" -#: builtin/fetch.c:111 builtin/pull.c:191 +#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 msgid "on-demand" msgstr "по требованию" -#: builtin/fetch.c:112 builtin/pull.c:192 +#: builtin/fetch.c:107 msgid "control recursive fetching of submodules" msgstr "управление рекурÑивным извлечением подмодулей" -#: builtin/fetch.c:116 builtin/pull.c:200 +#: builtin/fetch.c:111 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "оÑтавить загруженный пакет данных" -#: builtin/fetch.c:118 +#: builtin/fetch.c:113 msgid "allow updating of HEAD ref" msgstr "разрешить обновление ÑÑылки HEAD" -#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 +#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "улугубить иÑторию чаÑтичного клона" -#: builtin/fetch.c:123 +#: builtin/fetch.c:118 msgid "deepen history of shallow repository based on time" msgstr "углубить иÑторию чаÑтичного клона оÑновываÑÑÑŒ на времени" -#: builtin/fetch.c:129 builtin/pull.c:206 +#: builtin/fetch.c:124 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "преобразовать в полный репозиторий" -#: builtin/fetch.c:131 builtin/log.c:1440 +#: builtin/fetch.c:126 builtin/log.c:1450 msgid "dir" msgstr "каталог" -#: builtin/fetch.c:132 +#: builtin/fetch.c:127 msgid "prepend this to submodule path output" msgstr "приÑоединÑÑ‚ÑŒ Ñто Ñпереди к выводу путей подмодулÑ" -#: builtin/fetch.c:135 -msgid "default mode for recursion" -msgstr "режим по умолчанию Ð´Ð»Ñ Ñ€ÐµÐºÑƒÑ€Ñии" +#: builtin/fetch.c:130 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "наÑтроить по умолчанию рекурÑивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)" -#: builtin/fetch.c:137 builtin/pull.c:209 +#: builtin/fetch.c:134 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "принимать ÑÑылки, которые обновлÑÑŽÑ‚ .git/shallow" -#: builtin/fetch.c:138 builtin/pull.c:211 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "refmap" msgstr "ÑоответÑтвие-ÑÑылок" -#: builtin/fetch.c:139 builtin/pull.c:212 +#: builtin/fetch.c:136 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "указать ÑоответÑтвие ÑÑылок при извлечении" -#: builtin/fetch.c:395 +#: builtin/fetch.c:394 msgid "Couldn't find remote ref HEAD" msgstr "Ðе удалоÑÑŒ найти ÑÑылку HEAD на внешнем репозитории" -#: builtin/fetch.c:513 +#: builtin/fetch.c:512 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "Ð¾Ð¿Ñ†Ð¸Ñ fetch.output Ñодержит неправильное значение Ð´Ð»Ñ %s" -#: builtin/fetch.c:606 +#: builtin/fetch.c:605 #, c-format msgid "object %s not found" msgstr "объект %s не найден" -#: builtin/fetch.c:610 +#: builtin/fetch.c:609 msgid "[up to date]" msgstr "[актуально]" -#: builtin/fetch.c:623 builtin/fetch.c:703 +#: builtin/fetch.c:622 builtin/fetch.c:702 msgid "[rejected]" msgstr "[отклонено]" -#: builtin/fetch.c:624 +#: builtin/fetch.c:623 msgid "can't fetch in current branch" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÑŒ текущую ветку" -#: builtin/fetch.c:633 +#: builtin/fetch.c:632 msgid "[tag update]" msgstr "[обновление метки]" -#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 -#: builtin/fetch.c:698 +#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 +#: builtin/fetch.c:697 msgid "unable to update local ref" msgstr "не удалоÑÑŒ обновить локальную ÑÑылку" -#: builtin/fetch.c:653 +#: builtin/fetch.c:652 msgid "[new tag]" msgstr "[Ð½Ð¾Ð²Ð°Ñ Ð¼ÐµÑ‚ÐºÐ°]" -#: builtin/fetch.c:656 +#: builtin/fetch.c:655 msgid "[new branch]" msgstr "[Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ‚ÐºÐ°]" -#: builtin/fetch.c:659 +#: builtin/fetch.c:658 msgid "[new ref]" msgstr "[Ð½Ð¾Ð²Ð°Ñ ÑÑылка]" -#: builtin/fetch.c:698 +#: builtin/fetch.c:697 msgid "forced update" msgstr "принудительное обновление" -#: builtin/fetch.c:703 +#: builtin/fetch.c:702 msgid "non-fast-forward" msgstr "без перемотки вперед" -#: builtin/fetch.c:748 +#: builtin/fetch.c:747 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s не отправил вÑе необходимые объекты\n" -#: builtin/fetch.c:768 +#: builtin/fetch.c:767 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s отклонено из-за того, что чаÑтичные корни не разрешено обновлÑÑ‚ÑŒ" @@ -7607,7 +7687,7 @@ msgstr " (%s Ñтала виÑÑщей веткой)" msgid "[deleted]" msgstr "[удалено]" -#: builtin/fetch.c:955 builtin/remote.c:1022 +#: builtin/fetch.c:955 builtin/remote.c:1023 msgid "(none)" msgstr "(нет)" @@ -7636,7 +7716,7 @@ msgstr "Ðе знаю как извлечь Ñ %s" msgid "Fetching %s\n" msgstr "Извлечение из %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "Ðе удалоÑÑŒ извлечь %s" @@ -7667,101 +7747,101 @@ msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --depth Ð msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow не имеет ÑмыÑла на полном репозитории" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1349 msgid "fetch --all does not take a repository argument" msgstr "fetch --all не принимает Ð¸Ð¼Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ ÐºÐ°Ðº аргумент" -#: builtin/fetch.c:1354 +#: builtin/fetch.c:1351 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all не имеет ÑмыÑла при указании Ñпецификаторов ÑÑылок" -#: builtin/fetch.c:1365 +#: builtin/fetch.c:1362 #, c-format msgid "No such remote or remote group: %s" msgstr "Ðет такого внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð»Ð¸ группы: %s" -#: builtin/fetch.c:1373 +#: builtin/fetch.c:1370 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Получение группы и указание Ñпецификаций ÑÑылок не имеет ÑмыÑла" -#: builtin/fmt-merge-msg.c:14 +#: builtin/fmt-merge-msg.c:15 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <Ñообщение>] [--log[=<n>] | --no-log] [--file <файл>]" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "отправить в журнал <n> запиÑей из короткого журнала" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "Ñокращение Ð´Ð»Ñ --log (уÑтаревшее)" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "текÑÑ‚" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "иÑпользовать <текÑÑ‚> как начальное Ñообщение" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "файл Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<опции>] [<шаблон>]" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <объект>]" -#: builtin/for-each-ref.c:11 +#: builtin/for-each-ref.c:12 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" msgstr "git for-each-ref [(--merged | --no-merged) [<коммит>]]" -#: builtin/for-each-ref.c:12 +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<коммит>]] [--no-contains [<коммит>]]" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ процеÑÑора" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ perl" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ python" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "выводить указатели меÑта Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð² подходÑщем формате Ð´Ð»Ñ Tcl" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "показать только <n> Ñовпадающих ÑÑылок" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "вывод только ÑÑылок, которые указывают на переданный объект" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "вывод только Ñлитых ÑÑылок" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "вывод только не Ñлитых ÑÑылок" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "вывод только ÑÑылок, которые Ñодержат коммит" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "вывод только ÑÑылок, которые не Ñодержат коммит" @@ -7825,21 +7905,21 @@ msgstr "показать подробные имена Ð´Ð»Ñ Ð½ÐµÐ´Ð¾Ñтупн msgid "Checking objects" msgstr "Проверка объектов" -#: builtin/gc.c:25 +#: builtin/gc.c:26 msgid "git gc [<options>]" msgstr "git gc [<опции>]" -#: builtin/gc.c:78 +#: builtin/gc.c:79 #, c-format msgid "Failed to fstat %s: %s" msgstr "Ðе удалоÑÑŒ выполнить fstat %s: %s" -#: builtin/gc.c:310 +#: builtin/gc.c:311 #, c-format msgid "Can't stat %s" msgstr "Ðе удалоÑÑŒ выполнить stat Ð´Ð»Ñ %s" -#: builtin/gc.c:319 +#: builtin/gc.c:320 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7849,489 +7929,501 @@ msgid "" "%s" msgstr "ПоÑледний запуÑк gc Ñообщил Ñледующее. ПожалуйÑта, иÑправьте ошибку и удалите %s.\nÐвтоматичеÑÐºÐ°Ñ Ð¾Ñ‡Ð¸Ñтка Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ будет производитьÑÑ, пока Ñтот файл не удалён.\n\n%s" -#: builtin/gc.c:358 +#: builtin/gc.c:359 msgid "prune unreferenced objects" msgstr "почиÑтить объекты, на которые нет ÑÑылок" -#: builtin/gc.c:360 +#: builtin/gc.c:361 msgid "be more thorough (increased runtime)" msgstr "проверÑÑ‚ÑŒ более внимательно (занимает больше времени)" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "enable auto-gc mode" msgstr "включить режим auto-gc" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "force running gc even if there may be another gc running" msgstr "принудительно запуÑтить gc, даже еÑÑ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ gc уже запущена" -#: builtin/gc.c:379 +#: builtin/gc.c:380 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Ðе удалоÑÑŒ разобрать значение %s Ð´Ð»Ñ gc.logexpiry" -#: builtin/gc.c:407 +#: builtin/gc.c:408 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "ÐвтоматичеÑÐºÐ°Ñ ÑƒÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð² фоне, Ð´Ð»Ñ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ производительноÑти.\n" -#: builtin/gc.c:409 +#: builtin/gc.c:410 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "ÐвтоматичеÑÐºÐ°Ñ ÑƒÐ¿Ð°ÐºÐ¾Ð²ÐºÐ° репозиториÑ, Ð´Ð»Ñ Ð¾Ð¿Ñ‚Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð¹ производительноÑти.\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Смотрите «git help gc» руководÑтва по ручной очиÑтке.\n" -#: builtin/gc.c:431 +#: builtin/gc.c:436 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "gc уже запущен на Ñтом компьютере «%s» pid %<PRIuMAX> (еÑли нет, иÑпользуйте --force)" -#: builtin/gc.c:475 +#: builtin/gc.c:480 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove " "them." msgstr "ИмеетÑÑ Ñлишком много объектов, на которые нет ÑÑылок; запуÑтите «git prune» Ð´Ð»Ñ Ð¸Ñ… удалениÑ." -#: builtin/grep.c:25 +#: builtin/grep.c:27 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<опции>] [-e] <шаблон> [<редакциÑ>…] [[--] <путь>…]" -#: builtin/grep.c:232 +#: builtin/grep.c:235 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: Ñбой ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÐ°: %s" -#: builtin/grep.c:290 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "указано недопуÑтимое количеÑтво потоков (%d) Ð´Ð»Ñ %s" -#: builtin/grep.c:769 builtin/grep.c:810 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "нет поддержки потоков, игнорирование %s" + +#: builtin/grep.c:788 builtin/grep.c:829 #, c-format msgid "unable to read tree (%s)" msgstr "не удалоÑÑŒ прочитать дерево (%s)" -#: builtin/grep.c:829 +#: builtin/grep.c:848 #, c-format msgid "unable to grep from object of type %s" msgstr "не удалоÑÑŒ выполнить grep из объекта типа %s" -#: builtin/grep.c:893 +#: builtin/grep.c:912 #, c-format msgid "switch `%c' expects a numerical value" msgstr "параметр «%c» ожидает чиÑловое значение" -#: builtin/grep.c:980 +#: builtin/grep.c:999 msgid "search in index instead of in the work tree" msgstr "иÑкать в индекÑе, а не в рабочем каталоге" -#: builtin/grep.c:982 +#: builtin/grep.c:1001 msgid "find in contents not managed by git" msgstr "иÑкать в Ñодержимом не управлÑемым git" -#: builtin/grep.c:984 +#: builtin/grep.c:1003 msgid "search in both tracked and untracked files" msgstr "иÑкать и в отÑлеживаемых, и в неотÑлеживаемых файлах" -#: builtin/grep.c:986 +#: builtin/grep.c:1005 msgid "ignore files specified via '.gitignore'" msgstr "игнорировать файлы указанные в «.gitignore»" -#: builtin/grep.c:988 +#: builtin/grep.c:1007 msgid "recursively search in each submodule" msgstr "рекурÑивный поиÑк по вÑем подмодулÑм" -#: builtin/grep.c:990 +#: builtin/grep.c:1009 msgid "basename" msgstr "базовое имÑ" -#: builtin/grep.c:991 +#: builtin/grep.c:1010 msgid "prepend parent project's basename to output" msgstr "добавить базовое Ð¸Ð¼Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð° Ñпереди ко вÑему выводимому" -#: builtin/grep.c:994 +#: builtin/grep.c:1013 msgid "show non-matching lines" msgstr "иÑкать в неÑовпадающих Ñтроках" -#: builtin/grep.c:996 +#: builtin/grep.c:1015 msgid "case insensitive matching" msgstr "без учета региÑтра" -#: builtin/grep.c:998 +#: builtin/grep.c:1017 msgid "match patterns only at word boundaries" msgstr "иÑкать ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° только на границах Ñлов" -#: builtin/grep.c:1000 +#: builtin/grep.c:1019 msgid "process binary files as text" msgstr "обработка двоичных файлов как текÑта" -#: builtin/grep.c:1002 +#: builtin/grep.c:1021 msgid "don't match patterns in binary files" msgstr "не иÑкать ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° в двоичных файлах" -#: builtin/grep.c:1005 +#: builtin/grep.c:1024 msgid "process binary files with textconv filters" msgstr "обрабатыватьÑÑ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ðµ файлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ фильтров textconv" -#: builtin/grep.c:1007 +#: builtin/grep.c:1026 msgid "descend at most <depth> levels" msgstr "на глубине макÑиму <глубина> уровней" -#: builtin/grep.c:1011 +#: builtin/grep.c:1030 msgid "use extended POSIX regular expressions" msgstr "иÑпользовать раÑширенные регулÑрные Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ POSIX" -#: builtin/grep.c:1014 +#: builtin/grep.c:1033 msgid "use basic POSIX regular expressions (default)" msgstr "иÑпользовать базовые регулÑрные Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ POSIX (по умолчанию)" -#: builtin/grep.c:1017 +#: builtin/grep.c:1036 msgid "interpret patterns as fixed strings" msgstr "интерпретировать шаблоны как фикÑированные Ñтроки" -#: builtin/grep.c:1020 +#: builtin/grep.c:1039 msgid "use Perl-compatible regular expressions" msgstr "иÑпользовать Perl-ÑовмеÑтимые регулÑрные выражениÑ" -#: builtin/grep.c:1023 +#: builtin/grep.c:1042 msgid "show line numbers" msgstr "вывеÑти номера Ñтрок" -#: builtin/grep.c:1024 +#: builtin/grep.c:1043 msgid "don't show filenames" msgstr "не выводить имена файлов" -#: builtin/grep.c:1025 +#: builtin/grep.c:1044 msgid "show filenames" msgstr "выводить имена файлов" -#: builtin/grep.c:1027 +#: builtin/grep.c:1046 msgid "show filenames relative to top directory" msgstr "выводить имена файлов отноÑительно каталога репозиториÑ" -#: builtin/grep.c:1029 +#: builtin/grep.c:1048 msgid "show only filenames instead of matching lines" msgstr "выводить только имена файлов, а не Ñовпадающие Ñтроки" -#: builtin/grep.c:1031 +#: builtin/grep.c:1050 msgid "synonym for --files-with-matches" msgstr "Ñиноним Ð´Ð»Ñ --files-with-matches" -#: builtin/grep.c:1034 +#: builtin/grep.c:1053 msgid "show only the names of files without match" msgstr "выводить только неÑовпадающие имена файлов" -#: builtin/grep.c:1036 +#: builtin/grep.c:1055 msgid "print NUL after filenames" msgstr "выводить двоичный ÐОЛЬ поÑле ÑпиÑка имен файлов" -#: builtin/grep.c:1038 +#: builtin/grep.c:1057 msgid "show the number of matches instead of matching lines" msgstr "выводить количеÑтво Ñовпадений, а не Ñовпадающие Ñтроки" -#: builtin/grep.c:1039 +#: builtin/grep.c:1058 msgid "highlight matches" msgstr "подÑвечивать ÑовпадениÑ" -#: builtin/grep.c:1041 +#: builtin/grep.c:1060 msgid "print empty line between matches from different files" msgstr "выводить пуÑтую Ñтроку поÑле Ñовпадений из разных файлов" -#: builtin/grep.c:1043 +#: builtin/grep.c:1062 msgid "show filename only once above matches from same file" msgstr "выводить Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° только раз на неÑколько Ñовпадений в одном файле" -#: builtin/grep.c:1046 +#: builtin/grep.c:1065 msgid "show <n> context lines before and after matches" msgstr "показать <n> Ñтрок контекÑта перед и поÑле ÑовпадениÑ" -#: builtin/grep.c:1049 +#: builtin/grep.c:1068 msgid "show <n> context lines before matches" msgstr "показать <n> Ñтрок контекÑта перед Ñовпадением" -#: builtin/grep.c:1051 +#: builtin/grep.c:1070 msgid "show <n> context lines after matches" msgstr "показать <n> Ñтрок контекÑта поÑле ÑовпадениÑ" -#: builtin/grep.c:1053 +#: builtin/grep.c:1072 msgid "use <n> worker threads" msgstr "иÑпользовать <кол> рабочих потоков" -#: builtin/grep.c:1054 +#: builtin/grep.c:1073 msgid "shortcut for -C NUM" msgstr "тоже, что и -C КОЛИЧЕСТВО" -#: builtin/grep.c:1057 +#: builtin/grep.c:1076 msgid "show a line with the function name before matches" msgstr "показать Ñтроку Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ функции перед Ñовпадением" -#: builtin/grep.c:1059 +#: builtin/grep.c:1078 msgid "show the surrounding function" msgstr "показать окружающую функцию" -#: builtin/grep.c:1062 +#: builtin/grep.c:1081 msgid "read patterns from file" msgstr "прочитать шаблоны из файла" -#: builtin/grep.c:1064 +#: builtin/grep.c:1083 msgid "match <pattern>" msgstr "поиÑк ÑоответÑтвий Ñ <шаблоном>" -#: builtin/grep.c:1066 +#: builtin/grep.c:1085 msgid "combine patterns specified with -e" msgstr "объединить шаблоны указанные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ -e" -#: builtin/grep.c:1078 +#: builtin/grep.c:1097 msgid "indicate hit with exit status without output" msgstr "ничего не выводить, указать на Ñовпадение Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ кода выхода" -#: builtin/grep.c:1080 +#: builtin/grep.c:1099 msgid "show only matches from files that match all patterns" msgstr "показать только ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð· файлов в которых Ñовпадают вÑе шаблоны" -#: builtin/grep.c:1082 +#: builtin/grep.c:1101 msgid "show parse tree for grep expression" msgstr "показать дерево разбора Ð´Ð»Ñ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¸Ñка" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "pager" msgstr "пейджер" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "show matching files in the pager" msgstr "показать Ñовпадающие файлы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ программы-пейджера" -#: builtin/grep.c:1089 +#: builtin/grep.c:1108 msgid "allow calling of grep(1) (ignored by this build)" msgstr "разрешить вызов grep(1) (игнорируетÑÑ Ð² Ñтой Ñборке)" -#: builtin/grep.c:1153 +#: builtin/grep.c:1172 msgid "no pattern given." msgstr "не задан шаблон." -#: builtin/grep.c:1189 +#: builtin/grep.c:1204 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ ревизии" -#: builtin/grep.c:1195 +#: builtin/grep.c:1211 #, c-format msgid "unable to resolve revision: %s" msgstr "не удалоÑÑŒ определить редакцию: %s" -#: builtin/grep.c:1228 builtin/index-pack.c:1485 +#: builtin/grep.c:1245 builtin/index-pack.c:1490 #, c-format msgid "invalid number of threads specified (%d)" msgstr "указано неправильное количеÑтво потоков (%d)" -#: builtin/grep.c:1251 +#: builtin/grep.c:1250 +msgid "no threads support, ignoring --threads" +msgstr "нет поддержки потоков, игнорирование --threads" + +#: builtin/grep.c:1281 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager работает только в рабочем каталоге" -#: builtin/grep.c:1274 +#: builtin/grep.c:1304 msgid "option not supported with --recurse-submodules." msgstr "Ð¾Ð¿Ñ†Ð¸Ñ Ð½Ðµ поддерживаетÑÑ Ð¾Ð´Ð½Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾ Ñ --recurse-submodules." -#: builtin/grep.c:1280 +#: builtin/grep.c:1310 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached или --untracked Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --no-index." -#: builtin/grep.c:1286 +#: builtin/grep.c:1316 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard не может иÑпользоватьÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ñлеживаемого Ñодержимого." -#: builtin/grep.c:1294 +#: builtin/grep.c:1324 msgid "both --cached and trees are given." msgstr "указано одновременно --cached и дерево." -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…" -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "type" msgstr "тип" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "object type" msgstr "тип объекта" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "write the object into the object database" msgstr "запиÑÑŒ объекта в базу данных объектов" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "read the object from stdin" msgstr "прочитать объект из Ñтандартного ввода" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "store file as is without filters" msgstr "Ñохранить файл без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "Ñ…Ñшировать любой муÑор и Ñоздавать поврежденные объекты Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "process file as it were from this path" msgstr "обработать файл так, будто он находитÑÑ Ð¿Ð¾ указанному пути" -#: builtin/help.c:42 +#: builtin/help.c:43 msgid "print all available commands" msgstr "вывеÑти ÑпиÑок вÑех доÑтупных команд" -#: builtin/help.c:43 +#: builtin/help.c:44 msgid "exclude guides" msgstr "иÑключить руководÑтва" -#: builtin/help.c:44 +#: builtin/help.c:45 msgid "print list of useful guides" msgstr "вывеÑти ÑпиÑок полезных руководÑтв" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "show man page" msgstr "открыть руководÑтво в формате man" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "show manual in web browser" msgstr "открыть руководÑтво в веб-браузере" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "show info page" msgstr "открыть руководÑтво в формате info" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]" -#: builtin/help.c:66 +#: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "неопознанный формат руководÑтва «%s»" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "Сбой при запуÑке emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "Сбой при определении верÑии emacsclient." -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "верÑÐ¸Ñ emacsclient «%d» Ñлишком ÑÑ‚Ð°Ñ€Ð°Ñ (< 22)." -#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 +#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 #, c-format msgid "failed to exec '%s'" msgstr "Ñбой при запуÑке «%s»" -#: builtin/help.c:207 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "«%s»: путь Ð´Ð»Ñ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ программы проÑмотра man.\nВмеÑто Ñтого иÑпользуйте «man.<программа>.cmd»." -#: builtin/help.c:219 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "«%s»: команда Ð´Ð»Ñ Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ программы проÑмотра man.\nВмеÑто Ñтого иÑпользуйте «man.<программа>.path»." -#: builtin/help.c:336 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "«%s»: неизвеÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° проÑмотра man." -#: builtin/help.c:353 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "программа проÑмотра man не обработала запроÑ" -#: builtin/help.c:361 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "программа проÑмотра info не обработала запроÑ" -#: builtin/help.c:403 +#: builtin/help.c:404 msgid "Defining attributes per path" msgstr "Определение атрибутов Ð´Ð»Ñ Ð¿ÑƒÑ‚ÐµÐ¹ файлов или каталогов" -#: builtin/help.c:404 +#: builtin/help.c:405 msgid "Everyday Git With 20 Commands Or So" msgstr "ПовÑедневный Git Ñ 20 командами или около того" -#: builtin/help.c:405 +#: builtin/help.c:406 msgid "A Git glossary" msgstr "ГлоÑÑарий Git" -#: builtin/help.c:406 +#: builtin/help.c:407 msgid "Specifies intentionally untracked files to ignore" msgstr "Указание Ñпециально игнорируемых файлов" -#: builtin/help.c:407 +#: builtin/help.c:408 msgid "Defining submodule properties" msgstr "Определение ÑвойÑтв подмодулей" -#: builtin/help.c:408 +#: builtin/help.c:409 msgid "Specifying revisions and ranges for Git" msgstr "Указание редакций и диапазонов Ð´Ð»Ñ Git" -#: builtin/help.c:409 +#: builtin/help.c:410 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Учебное введение в Git (Ð´Ð»Ñ Ð²ÐµÑ€Ñии 1.5.1 или новее)" -#: builtin/help.c:410 +#: builtin/help.c:411 msgid "An overview of recommended workflows with Git" msgstr "Обзор рекомендуемых поÑледовательноÑтей выполнÑемых дейÑтвий Ñ Git" -#: builtin/help.c:422 +#: builtin/help.c:423 msgid "The common Git guides are:\n" msgstr "ОÑновные руководÑтва Git:\n" -#: builtin/help.c:440 +#: builtin/help.c:441 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "«git %s» — Ñто Ñокращение Ð´Ð»Ñ Â«%s»" -#: builtin/help.c:462 builtin/help.c:479 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "иÑпользование: %s%s" -#: builtin/index-pack.c:154 +#: builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "не удалоÑÑŒ открыть %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "object type mismatch at %s" msgstr "неÑоответÑтвие типа объекта на %s" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, c-format msgid "did not receive expected object %s" msgstr "ожидаемый объект не получен на %s" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "object %s: expected type %s, found %s" msgstr "объект %s: ожидаемый тип %s, получен %s" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:270 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" @@ -8340,46 +8432,46 @@ msgstr[1] "не удалоÑÑŒ заполнить %d байта" msgstr[2] "не удалоÑÑŒ заполнить %d байтов" msgstr[3] "не удалоÑÑŒ заполнить %d байтов" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "early EOF" msgstr "неожиданный конец файла" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "read error on input" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð²Ð²Ð¾Ð´Ð°" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:293 msgid "used more bytes than were available" msgstr "иÑпользовано больше байт, чем было доÑтупно" -#: builtin/index-pack.c:299 +#: builtin/index-pack.c:300 msgid "pack too large for current definition of off_t" msgstr "пакет Ñлишком большой Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ off_t" -#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "размер пакета превышает макÑимальный допуÑтимый" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "unable to create '%s'" msgstr "не удалоÑÑŒ Ñоздать «%s»" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:324 #, c-format msgid "cannot open packfile '%s'" msgstr "не удалоÑÑŒ открыть файл пакета «%s»" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:338 msgid "pack signature mismatch" msgstr "неÑоответÑтвие подпиÑи пакета" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:340 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "верÑÐ¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %<PRIu32> не поддерживаетÑÑ" -#: builtin/index-pack.c:357 +#: builtin/index-pack.c:358 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "пакет Ñодержит плохой объект по Ñмещению %<PRIuMAX>: %s" @@ -8419,14 +8511,14 @@ msgstr[3] "преждевременное окончание файла паке msgid "serious inflate inconsistency" msgstr "Ñерьезное неÑоответÑтвие при раÑпаковке" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 #: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "ÐÐЙДЕÐРКОЛЛИЗИЯ SHA1 С %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:257 +#: builtin/index-pack.c:751 builtin/pack-objects.c:167 +#: builtin/pack-objects.c:261 #, c-format msgid "unable to read %s" msgstr "не удалоÑÑŒ прочитать %s" @@ -8446,62 +8538,62 @@ msgstr "не удалоÑÑŒ прочитать ÑущеÑтвующий объе msgid "invalid blob object %s" msgstr "неправильный файл двоичного объекта %s" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:851 #, c-format msgid "invalid %s" msgstr "неправильный %s" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:854 msgid "Error in object" msgstr "Ошибка в объекте" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c:856 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Ðе вÑе дочерние объекты %s доÑтижимы" -#: builtin/index-pack.c:927 builtin/index-pack.c:958 +#: builtin/index-pack.c:928 builtin/index-pack.c:959 msgid "failed to apply delta" msgstr "Ñбой при применении дельты" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Receiving objects" msgstr "Получение объектов" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Indexing objects" msgstr "ИндекÑирование объектов" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1164 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакет поврежден (неÑоответÑтвие SHA1)" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1169 msgid "cannot fstat packfile" msgstr "не удалоÑÑŒ выполнить fstat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° пакета" -#: builtin/index-pack.c:1168 +#: builtin/index-pack.c:1172 msgid "pack has junk at the end" msgstr "файл пакета Ñодержит муÑор в конце" -#: builtin/index-pack.c:1179 +#: builtin/index-pack.c:1184 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Ð±ÐµÐ·ÑƒÐ¼Ð½Ð°Ñ Ð¿ÑƒÑ‚Ð°Ð½Ð¸Ñ†Ð° в parse_pack_objects()" -#: builtin/index-pack.c:1202 +#: builtin/index-pack.c:1207 msgid "Resolving deltas" msgstr "Определение изменений" -#: builtin/index-pack.c:1213 +#: builtin/index-pack.c:1218 #, c-format msgid "unable to create thread: %s" msgstr "не удалоÑÑŒ Ñоздать поток: %s" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1260 msgid "confusion beyond insanity" msgstr "Ð±ÐµÐ·ÑƒÐ¼Ð½Ð°Ñ Ð¿ÑƒÑ‚Ð°Ð½Ð¸Ñ†Ð°" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" @@ -8510,12 +8602,12 @@ msgstr[1] "завершено Ñ %d локальными объектами" msgstr[2] "завершено Ñ %d локальными объектами" msgstr[3] "завершено Ñ %d локальными объектами" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1278 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма в конце %s (диÑк поврежден?)" -#: builtin/index-pack.c:1277 +#: builtin/index-pack.c:1282 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -8524,59 +8616,54 @@ msgstr[1] "пакет Ñодержит %d неразрешенные Ð´ÐµÐ»ÑŒÑ‚Ñ msgstr[2] "пакет Ñодержит %d неразрешенных дельт" msgstr[3] "пакет Ñодержит %d неразрешенных дельт" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1306 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ñжать приÑоединенный объект (%d)" -#: builtin/index-pack.c:1377 +#: builtin/index-pack.c:1382 #, c-format msgid "local object %s is corrupt" msgstr "локальный объект %s поврежден" -#: builtin/index-pack.c:1403 +#: builtin/index-pack.c:1408 msgid "error while closing pack file" msgstr "ошибка при закрытии файла пакета" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1420 #, c-format msgid "cannot write keep file '%s'" msgstr "не удалоÑÑŒ запиÑать файл ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Â«%s»" -#: builtin/index-pack.c:1423 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot close written keep file '%s'" msgstr "не удалоÑÑŒ закрыть запиÑанный файл ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ Â«%s»" -#: builtin/index-pack.c:1433 +#: builtin/index-pack.c:1438 msgid "cannot store pack file" msgstr "не удалоÑÑŒ Ñохранить файл пакета" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1446 msgid "cannot store index file" msgstr "не удалоÑÑŒ Ñохранить файл индекÑа" -#: builtin/index-pack.c:1479 +#: builtin/index-pack.c:1484 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "плохой pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "нет поддержки потоков, игнорирование %s" - -#: builtin/index-pack.c:1547 +#: builtin/index-pack.c:1552 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Ðе удалоÑÑŒ открыть ÑущеÑтвующий файл пакета «%s»" -#: builtin/index-pack.c:1549 +#: builtin/index-pack.c:1554 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Ðе удалоÑÑŒ открыть ÑущеÑтвующий файл индекÑа Ð´Ð»Ñ Â«%s»" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1602 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -8585,7 +8672,7 @@ msgstr[1] "не дельты: %d объекта" msgstr[2] "не дельты: %d объектов" msgstr[3] "не дельты: %d объектов" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1609 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -8594,141 +8681,141 @@ msgstr[1] "длина цепочки = %d: %lu объекта" msgstr[2] "длина цепочки = %d: %lu объектов" msgstr[3] "длина цепочки = %d: %lu объектов" -#: builtin/index-pack.c:1616 +#: builtin/index-pack.c:1622 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑ‚Ð° «%s» не оканчиваетÑÑ Ð½Ð° «.pack»" -#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 -#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 +#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 +#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 #, c-format msgid "bad %s" msgstr "плохой %s" -#: builtin/index-pack.c:1737 +#: builtin/index-pack.c:1743 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать без --stdin" -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1745 msgid "--stdin requires a git repository" msgstr "Ð¾Ð¿Ñ†Ð¸Ñ --stdin требует Ð½Ð°Ð»Ð¸Ñ‡Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ git" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1753 msgid "--verify with no packfile name given" msgstr "--verify без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ файла пакета" -#: builtin/init-db.c:54 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ Â«%s»" -#: builtin/init-db.c:60 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "не удалоÑÑŒ выполнить stat Ð´Ð»Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° «%s»" -#: builtin/init-db.c:65 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "не удалоÑÑŒ выполнить opendir Ð´Ð»Ñ Â«%s»" -#: builtin/init-db.c:76 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "не удалоÑÑŒ выполнить readlink Ð´Ð»Ñ Â«%s»" -#: builtin/init-db.c:78 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "не удалоÑÑŒ Ñоздать Ñимвольную ÑÑылку «%s» на «%s»" -#: builtin/init-db.c:84 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "не удалоÑÑŒ Ñкопировать файл «%s» в «%s»" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "игнорирование шаблона %s" -#: builtin/init-db.c:119 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "шаблоны не найдены %s" -#: builtin/init-db.c:134 +#: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "не копирую шаблоны из «%s»: %s" -#: builtin/init-db.c:327 +#: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "не удаетÑÑ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ файл типа %d" -#: builtin/init-db.c:330 +#: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "не удаетÑÑ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить файл %s в %s" -#: builtin/init-db.c:347 builtin/init-db.c:350 +#: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "%s уже ÑущеÑтвует" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Переинициализирован ÑущеÑтвующий общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Переинициализирован ÑущеÑтвующий репозиторий Git в %s%s\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Инициализирован пуÑтой общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Инициализирован пуÑтой репозиторий Git в %s%s\n" -#: builtin/init-db.c:457 +#: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] " "[--shared[=<permissions>]] [<directory>]" msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доÑтупа>]] [<каталог>]" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 msgid "permissions" msgstr "права-доÑтупа" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "укажите, еÑли репозиторий git будет иÑпользоватьÑÑ Ð½ÐµÑколькими пользователÑми" -#: builtin/init-db.c:515 builtin/init-db.c:520 +#: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "не удалоÑÑŒ выполнить mkdir %s" -#: builtin/init-db.c:524 +#: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "не удалоÑÑŒ выполнить chdir в %s" -#: builtin/init-db.c:545 +#: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "%s (или --work-tree=<каталог>) Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ %s (или --git-dir=<каталог>)" -#: builtin/init-db.c:573 +#: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "Ðе удалоÑÑŒ получить доÑтуп к рабочему каталогу «%s»" @@ -8759,325 +8846,330 @@ msgstr "завершители Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ" msgid "no input file given for in-place editing" msgstr "ничего не передано, Ð´Ð»Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² на меÑте" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git show [<options>] <object>..." msgstr "git show [<опции>] <объект>…" -#: builtin/log.c:89 +#: builtin/log.c:90 #, c-format msgid "invalid --decorate option: %s" msgstr "неправильный параметр Ð´Ð»Ñ --decorate: %s" -#: builtin/log.c:144 +#: builtin/log.c:147 msgid "suppress diff output" msgstr "не выводить различиÑ" -#: builtin/log.c:145 +#: builtin/log.c:148 msgid "show source" msgstr "показать иÑточник" -#: builtin/log.c:146 +#: builtin/log.c:149 msgid "Use mail map file" msgstr "ИÑпользовать файл ÑоответÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… адреÑов" -#: builtin/log.c:147 +#: builtin/log.c:150 msgid "decorate options" msgstr "опции формата вывода ÑÑылок" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Process line range n,m in file, counting from 1" msgstr "Обработать диапазон Ñтрок n,m из файла, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ 1" -#: builtin/log.c:246 +#: builtin/log.c:249 #, c-format msgid "Final output: %d %s\n" msgstr "Финальный вывод: %d %s\n" -#: builtin/log.c:493 +#: builtin/log.c:497 #, c-format msgid "git show %s: bad file" msgstr "git show %s: плохой файл" -#: builtin/log.c:507 builtin/log.c:601 +#: builtin/log.c:512 builtin/log.c:606 #, c-format msgid "Could not read object %s" msgstr "Ðе удалоÑÑŒ прочитать объект %s" -#: builtin/log.c:625 +#: builtin/log.c:630 #, c-format msgid "Unknown type: %d" msgstr "ÐеизвеÑтный тип объекта: %d" -#: builtin/log.c:746 +#: builtin/log.c:751 msgid "format.headers without value" msgstr "в format.headers не указано значение" -#: builtin/log.c:846 +#: builtin/log.c:852 msgid "name of output directory is too long" msgstr "Ñлишком длинное Ð¸Ð¼Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ каталога" -#: builtin/log.c:861 +#: builtin/log.c:868 #, c-format msgid "Cannot open patch file %s" msgstr "Ðу удалоÑÑŒ открыть файл изменений %s" -#: builtin/log.c:875 +#: builtin/log.c:885 msgid "Need exactly one range." msgstr "Ðужен только один диапазон." -#: builtin/log.c:885 +#: builtin/log.c:895 msgid "Not a range." msgstr "Ðе ÑвлÑетÑÑ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð¾Ð¼." -#: builtin/log.c:991 +#: builtin/log.c:1001 msgid "Cover letter needs email format" msgstr "Сопроводительное пиÑьмо должно быть в формате Ñлектронной почты" -#: builtin/log.c:1071 +#: builtin/log.c:1081 #, c-format msgid "insane in-reply-to: %s" msgstr "ошибка в поле in-reply-to: %s" -#: builtin/log.c:1098 +#: builtin/log.c:1108 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<опции>] [<начинаÑ-Ñ> | <диапазон-редакций>]" -#: builtin/log.c:1148 +#: builtin/log.c:1158 msgid "Two output directories?" msgstr "Два выходных каталога?" -#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 +#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 #, c-format msgid "Unknown commit %s" msgstr "ÐеизвеÑтный коммит %s" -#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 +#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Ðе удалоÑÑŒ разрешить «%s» как ÑÑылку." -#: builtin/log.c:1270 +#: builtin/log.c:1280 msgid "Could not find exact merge base." msgstr "Ðе удалоÑÑŒ найти точную базу ÑлиÑниÑ." -#: builtin/log.c:1274 +#: builtin/log.c:1284 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "Ðе удалоÑÑŒ получить вышеÑтоÑщую ветку. ЕÑли вы хотите запиÑать базовый коммит автомитичеÑки, то иÑпользуйте git branch --set-upstream-to Ð´Ð»Ñ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную." -#: builtin/log.c:1294 +#: builtin/log.c:1304 msgid "Failed to find exact merge base" msgstr "Ðе удалоÑÑŒ найти точную базу ÑлиÑниÑ" -#: builtin/log.c:1305 +#: builtin/log.c:1315 msgid "base commit should be the ancestor of revision list" msgstr "базовый коммит должен быть предком ÑпиÑка редакций" -#: builtin/log.c:1309 +#: builtin/log.c:1319 msgid "base commit shouldn't be in revision list" msgstr "базовый коммит не должен быть в ÑпиÑке редакций" -#: builtin/log.c:1358 +#: builtin/log.c:1368 msgid "cannot get patch id" msgstr "не удалоÑÑŒ получить идентификатор патча" -#: builtin/log.c:1415 +#: builtin/log.c:1425 msgid "use [PATCH n/m] even with a single patch" msgstr "выводить [PATCH n/m] даже когда один патч" -#: builtin/log.c:1418 +#: builtin/log.c:1428 msgid "use [PATCH] even with multiple patches" msgstr "выводить [PATCH] даже когда неÑколько патчей" -#: builtin/log.c:1422 +#: builtin/log.c:1432 msgid "print patches to standard out" msgstr "выводить патчи на Ñтандартный вывод" -#: builtin/log.c:1424 +#: builtin/log.c:1434 msgid "generate a cover letter" msgstr "генерировать Ñопроводительное пиÑьмо" -#: builtin/log.c:1426 +#: builtin/log.c:1436 msgid "use simple number sequence for output file names" msgstr "иÑпользовать проÑтую поÑледовательноÑÑ‚ÑŒ чиÑел Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½ выходных файлов" -#: builtin/log.c:1427 +#: builtin/log.c:1437 msgid "sfx" msgstr "ÑуффикÑ" -#: builtin/log.c:1428 +#: builtin/log.c:1438 msgid "use <sfx> instead of '.patch'" msgstr "иÑпользовать ÑÑƒÑ„Ñ„Ð¸ÐºÑ <ÑуффикÑ> вмеÑто «.patch»" -#: builtin/log.c:1430 +#: builtin/log.c:1440 msgid "start numbering patches at <n> instead of 1" msgstr "начать нумерацию патчей Ñ <n>, а не Ñ 1" -#: builtin/log.c:1432 +#: builtin/log.c:1442 msgid "mark the series as Nth re-roll" msgstr "пометить Ñерию как Ñнную попытку" -#: builtin/log.c:1434 +#: builtin/log.c:1444 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "ИÑпользовать [RFC PATCH] вмеÑто [PATCH]" -#: builtin/log.c:1437 +#: builtin/log.c:1447 msgid "Use [<prefix>] instead of [PATCH]" msgstr "ИÑпользовать [<префикÑ>] вмеÑто [PATCH]" -#: builtin/log.c:1440 +#: builtin/log.c:1450 msgid "store resulting files in <dir>" msgstr "Ñохранить результирующие файлы в <каталог>" -#: builtin/log.c:1443 +#: builtin/log.c:1453 msgid "don't strip/add [PATCH]" msgstr "не обрезать/добавлÑÑ‚ÑŒ [PATCH]" -#: builtin/log.c:1446 +#: builtin/log.c:1456 msgid "don't output binary diffs" msgstr "не выводить двоичные различиÑ" -#: builtin/log.c:1448 +#: builtin/log.c:1458 msgid "output all-zero hash in From header" msgstr "выводить нулевую Ñ…Ñш-Ñумму в заголовке From" -#: builtin/log.c:1450 +#: builtin/log.c:1460 msgid "don't include a patch matching a commit upstream" msgstr "не включать патч, еÑли коммит уже еÑÑ‚ÑŒ в вышеÑтоÑщей ветке" -#: builtin/log.c:1452 +#: builtin/log.c:1462 msgid "show patch format instead of default (patch + stat)" msgstr "выводить в формате патча, а не в Ñтандартном (патч + ÑтатиÑтика)" -#: builtin/log.c:1454 +#: builtin/log.c:1464 msgid "Messaging" msgstr "Передача Ñообщений" -#: builtin/log.c:1455 +#: builtin/log.c:1465 msgid "header" msgstr "заголовок" -#: builtin/log.c:1456 +#: builtin/log.c:1466 msgid "add email header" msgstr "добавить заголовок ÑообщениÑ" -#: builtin/log.c:1457 builtin/log.c:1459 +#: builtin/log.c:1467 builtin/log.c:1469 msgid "email" msgstr "почта" -#: builtin/log.c:1457 +#: builtin/log.c:1467 msgid "add To: header" msgstr "добавить заголовок To:" -#: builtin/log.c:1459 +#: builtin/log.c:1469 msgid "add Cc: header" msgstr "добавить заголовок Cc:" -#: builtin/log.c:1461 +#: builtin/log.c:1471 msgid "ident" msgstr "идентификатор" -#: builtin/log.c:1462 +#: builtin/log.c:1472 msgid "set From address to <ident> (or committer ident if absent)" msgstr "уÑтановить Ð°Ð´Ñ€ÐµÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»Ñ Ð½Ð° <идентификатор> (или на идентификатор коммитера, еÑли отÑутÑтвует)" -#: builtin/log.c:1464 +#: builtin/log.c:1474 msgid "message-id" msgstr "идентификатор-ÑообщениÑ" -#: builtin/log.c:1465 +#: builtin/log.c:1475 msgid "make first mail a reply to <message-id>" msgstr "Ñделать первое пиÑьмо ответом на <идентификатор-ÑообщениÑ>" -#: builtin/log.c:1466 builtin/log.c:1469 +#: builtin/log.c:1476 builtin/log.c:1479 msgid "boundary" msgstr "вложение" -#: builtin/log.c:1467 +#: builtin/log.c:1477 msgid "attach the patch" msgstr "приложить патч" -#: builtin/log.c:1470 +#: builtin/log.c:1480 msgid "inline the patch" msgstr "включить патч в текÑÑ‚ пиÑьма" -#: builtin/log.c:1474 +#: builtin/log.c:1484 msgid "enable message threading, styles: shallow, deep" msgstr "включить в пиÑьмах иерархичноÑÑ‚ÑŒ, Ñтили: shallow (чаÑтичную), deep (глубокую)" -#: builtin/log.c:1476 +#: builtin/log.c:1486 msgid "signature" msgstr "подпиÑÑŒ" -#: builtin/log.c:1477 +#: builtin/log.c:1487 msgid "add a signature" msgstr "добавить подпиÑÑŒ" -#: builtin/log.c:1478 +#: builtin/log.c:1488 msgid "base-commit" msgstr "базовый коммит" -#: builtin/log.c:1479 +#: builtin/log.c:1489 msgid "add prerequisite tree info to the patch series" msgstr "добавить информацию о требовании дерева к Ñерии патчей" -#: builtin/log.c:1481 +#: builtin/log.c:1491 msgid "add a signature from a file" msgstr "добавить подпиÑÑŒ из файла" -#: builtin/log.c:1482 +#: builtin/log.c:1492 msgid "don't print the patch filenames" msgstr "не выводить имена файлов патчей" -#: builtin/log.c:1572 +#: builtin/log.c:1567 +#, c-format +msgid "invalid ident line: %s" +msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока идентификации: %s" + +#: builtin/log.c:1582 msgid "-n and -k are mutually exclusive." msgstr "-n и -k Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/log.c:1574 +#: builtin/log.c:1584 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc и -k Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." -#: builtin/log.c:1582 +#: builtin/log.c:1592 msgid "--name-only does not make sense" msgstr "--name-only не имеет ÑмыÑла" -#: builtin/log.c:1584 +#: builtin/log.c:1594 msgid "--name-status does not make sense" msgstr "--name-status не имеет ÑмыÑла" -#: builtin/log.c:1586 +#: builtin/log.c:1596 msgid "--check does not make sense" msgstr "--check не имеет ÑмыÑла" -#: builtin/log.c:1616 +#: builtin/log.c:1626 msgid "standard output, or directory, which one?" msgstr "Ñтандартный вывод или каталог?" -#: builtin/log.c:1618 +#: builtin/log.c:1628 #, c-format msgid "Could not create directory '%s'" msgstr "Ðе удалоÑÑŒ Ñоздать каталог «%s»" -#: builtin/log.c:1712 +#: builtin/log.c:1722 #, c-format msgid "unable to read signature file '%s'" msgstr "не удалоÑÑŒ прочитать файл подпиÑи «%s»" -#: builtin/log.c:1784 +#: builtin/log.c:1794 msgid "Failed to create output files" msgstr "Сбой при Ñоздании выходных файлов" -#: builtin/log.c:1833 +#: builtin/log.c:1843 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<вышеÑтоÑщаÑ-ветка> [<голова> [<ограничение>]]]" -#: builtin/log.c:1887 +#: builtin/log.c:1897 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> " @@ -9227,212 +9319,217 @@ msgstr "выходить Ñ ÐºÐ¾Ð´Ð¾Ð¼ 2, еÑли ÑоответÑтвующиРmsgid "show underlying ref in addition to the object pointed by it" msgstr "показать также внутреннюю ÑÑылку в дополнение к объекту, на который она указывает" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "выводить только деревьÑ" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "проходить рекурÑивно в поддеревьÑ" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "выводить Ð´ÐµÑ€ÐµÐ²ÑŒÑ Ð¿Ñ€Ð¸ рекурÑивном проходе" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "разделÑÑ‚ÑŒ запиÑи Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÐУЛЕВОГО байта" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "включить размер объекта" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "выводить только имена файлов" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "иÑпользовать полные пути" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "вывеÑти полное дерево; не только текущий каталог (включает в ÑÐµÐ±Ñ --full-name)" -#: builtin/merge.c:46 +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "пуÑтой mbox: «%s»" + +#: builtin/merge.c:47 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<опции>] [<коммит>…]" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:103 +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "при указании параметра «m» требуетÑÑ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ значение" -#: builtin/merge.c:140 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Ðе удалоÑÑŒ найти Ñтратегию ÑлиÑÐ½Ð¸Ñ Â«%s».\n" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "ДоÑтупные Ñтратегии:" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "ДоÑтупные пользовательÑкие Ñтратегии:" -#: builtin/merge.c:196 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "не выводить ÑтатиÑтику изменений поÑле Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ ÑлиÑниÑ" -#: builtin/merge.c:199 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "вывеÑти ÑтатиÑтику изменений поÑле Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ ÑлиÑниÑ" -#: builtin/merge.c:200 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(Ñиноним Ð´Ð»Ñ --stat)" -#: builtin/merge.c:202 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "добавить (макÑимум <n>) запиÑей из короткого журнала в Ñообщение коммита у ÑлиÑниÑ" -#: builtin/merge.c:205 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "Ñоздать один коммит, вмеÑто Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑлиÑниÑ" -#: builtin/merge.c:207 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "Ñделать коммит, еÑли ÑлиÑние прошло уÑпешно (по умолчанию)" -#: builtin/merge.c:209 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:152 msgid "edit message before committing" msgstr "отредактировать Ñообщение перед выполнением коммита" -#: builtin/merge.c:210 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "разрешить перемотку вперед (по умолчанию)" -#: builtin/merge.c:212 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "отменить выполнение ÑлиÑниÑ, еÑли перемотка вперед невозможна" -#: builtin/merge.c:216 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "проверить, что указанный коммит имеет верную Ñлектронную подпиÑÑŒ GPG" -#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 -#: builtin/revert.c:108 +#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/revert.c:109 msgid "strategy" msgstr "ÑтратегиÑ" -#: builtin/merge.c:218 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:166 msgid "merge strategy to use" msgstr "иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑниÑ" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:169 msgid "option=value" msgstr "опциÑ=значение" -#: builtin/merge.c:220 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "опции Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ Ñтратегии ÑлиÑниÑ" -#: builtin/merge.c:222 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "Ñообщение коммита Ð´Ð»Ñ ÑлиÑÐ½Ð¸Ñ (Ð´Ð»Ñ ÑлиÑÐ½Ð¸Ñ Ð±ÐµÐ· перемотки вперед)" -#: builtin/merge.c:226 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "отменить выполнение проиÑходÑщего ÑлиÑниÑ" -#: builtin/merge.c:228 +#: builtin/merge.c:229 msgid "continue the current in-progress merge" msgstr "продолжить выполнение проиÑходÑщего ÑлиÑниÑ" -#: builtin/merge.c:230 builtin/pull.c:170 +#: builtin/merge.c:231 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "разрешить ÑлиÑние неÑвÑзанных иÑторий изменений" -#: builtin/merge.c:258 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "не удалоÑÑŒ выполнить stash." -#: builtin/merge.c:263 +#: builtin/merge.c:264 msgid "stash failed" msgstr "Ñбой при выполнении stash" -#: builtin/merge.c:268 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "неправильный объект: %s" -#: builtin/merge.c:287 builtin/merge.c:304 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "Ñбой при выполнении read-tree" -#: builtin/merge.c:334 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (нечего уплотнÑÑ‚ÑŒ)" -#: builtin/merge.c:345 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Уплотнение коммита — не обновлÑÑ HEAD\n" -#: builtin/merge.c:395 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Ðет ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÑлиÑÐ½Ð¸Ñ â€” не обновлÑем HEAD\n" -#: builtin/merge.c:446 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» не указывает на коммит" -#: builtin/merge.c:536 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñтрока branch.%s.mergeoptions: %s" -#: builtin/merge.c:656 +#: builtin/merge.c:657 msgid "Not handling anything other than two heads merge." msgstr "Ðе обрабатываю ничего, кроме ÑлиÑÐ½Ð¸Ñ Ð´Ð²ÑƒÑ… указателей на ветки." -#: builtin/merge.c:670 +#: builtin/merge.c:671 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "ÐеизвеÑтный параметр merge-recursive: -X%s" -#: builtin/merge.c:685 +#: builtin/merge.c:686 #, c-format msgid "unable to write %s" msgstr "не удалоÑÑŒ запиÑать %s" -#: builtin/merge.c:737 +#: builtin/merge.c:738 #, c-format msgid "Could not read from '%s'" msgstr "Ðе удалоÑÑŒ прочеÑÑ‚ÑŒ из «%s»" -#: builtin/merge.c:746 +#: builtin/merge.c:747 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "Ðе выполнÑÑŽ коммит ÑлиÑниÑ; иÑпользуйте «git commit» Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ ÑлиÑниÑ.\n" -#: builtin/merge.c:752 +#: builtin/merge.c:753 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9442,269 +9539,264 @@ msgid "" "the commit.\n" msgstr "ПожалуйÑта, введите Ñообщение коммита, Ð´Ð»Ñ Ð¾Ð±ÑŠÑÑнениÑ, зачем нужно\nÑто ÑлиÑние, оÑобенно, еÑли Ñто ÑлиÑние обновленной вышеÑтоÑщей\nветки в тематичеÑкую ветку.\n\nСтроки, начинающиеÑÑ Ñ Â«%c» будут проигнорированы, а пуÑтое\nÑообщение отменÑет процеÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°.\n" -#: builtin/merge.c:776 +#: builtin/merge.c:777 msgid "Empty commit message." msgstr "ПуÑтое Ñообщение коммита." -#: builtin/merge.c:796 +#: builtin/merge.c:797 #, c-format msgid "Wonderful.\n" msgstr "ПрекраÑно.\n" -#: builtin/merge.c:851 +#: builtin/merge.c:850 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Ðе удалоÑÑŒ провеÑти автоматичеÑкое ÑлиÑние; иÑправьте конфликты и Ñделайте коммит результата.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:889 msgid "No current branch." msgstr "Ðет текущей ветки." -#: builtin/merge.c:892 +#: builtin/merge.c:891 msgid "No remote for the current branch." msgstr "У текущей ветки нет внешнего репозиториÑ." -#: builtin/merge.c:894 +#: builtin/merge.c:893 msgid "No default upstream defined for the current branch." msgstr "Ð”Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ветки не указана вышеÑтоÑÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° по умолчанию." -#: builtin/merge.c:899 +#: builtin/merge.c:898 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ðе указана внешнÑÑ Ð¾Ñ‚ÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ‚ÐºÐ° Ð´Ð»Ñ %s на %s" -#: builtin/merge.c:946 +#: builtin/merge.c:945 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Плохое значение «%s» в переменной Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Â«%s»" -#: builtin/merge.c:1020 -#, c-format -msgid "could not close '%s'" -msgstr "не удалоÑÑŒ закрыть «%s»" - -#: builtin/merge.c:1047 +#: builtin/merge.c:1046 #, c-format msgid "not something we can merge in %s: %s" msgstr "не ÑвлÑетÑÑ Ñ‚ÐµÐ¼, что можно Ñлить в %s: %s" -#: builtin/merge.c:1081 +#: builtin/merge.c:1080 msgid "not something we can merge" msgstr "не ÑвлÑетÑÑ Ñ‚ÐµÐ¼, что можно Ñлить" -#: builtin/merge.c:1146 +#: builtin/merge.c:1145 msgid "--abort expects no arguments" msgstr "Ð¾Ð¿Ñ†Ð¸Ñ --abort не принимает аргументы" -#: builtin/merge.c:1150 +#: builtin/merge.c:1149 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ðет ÑлиÑниÑ, которое можно отменить (отÑутÑтвует файл MERGE_HEAD)." -#: builtin/merge.c:1162 +#: builtin/merge.c:1161 msgid "--continue expects no arguments" msgstr "Ð¾Ð¿Ñ†Ð¸Ñ --continue не принимает аргументы" -#: builtin/merge.c:1166 +#: builtin/merge.c:1165 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð½Ðµ проиÑходит ÑлиÑние (отÑутÑтвует файл MERGE_HEAD)." -#: builtin/merge.c:1182 +#: builtin/merge.c:1181 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Ð’Ñ‹ не завершили ÑлиÑние (приÑутÑтвует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед ÑлиÑнием." -#: builtin/merge.c:1189 +#: builtin/merge.c:1188 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Ð’Ñ‹ не завершили копирование коммита (приÑутÑтвует файл CHERRY_PICK_HEAD).\nПожалуйÑта, закоммитьте ваши изменениÑ, перед ÑлиÑнием." -#: builtin/merge.c:1192 +#: builtin/merge.c:1191 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Ð’Ñ‹ не завершили копирование коммита (приÑутÑтвует файл CHERRY_PICK_HEAD)." -#: builtin/merge.c:1201 +#: builtin/merge.c:1200 msgid "You cannot combine --squash with --no-ff." msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --squash и --no-ff." -#: builtin/merge.c:1209 +#: builtin/merge.c:1208 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Коммит не указан и параметр merge.defaultToUpstream не уÑтановлен." -#: builtin/merge.c:1226 +#: builtin/merge.c:1225 msgid "Squash commit into empty head not supported yet" msgstr "Уплотнение коммита в пуÑтую ветку еще не поддерживаетÑÑ" -#: builtin/merge.c:1228 +#: builtin/merge.c:1227 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Коммит, не ÑвлÑющийÑÑ Ð¿ÐµÑ€ÐµÐ¼Ð¾Ñ‚ÐºÐ¾Ð¹ вперед, нет ÑмыÑла делать в пуÑтую ветку." -#: builtin/merge.c:1233 +#: builtin/merge.c:1232 #, c-format msgid "%s - not something we can merge" msgstr "%s не ÑвлÑетÑÑ Ñ‚ÐµÐ¼, что можно Ñлить" -#: builtin/merge.c:1235 +#: builtin/merge.c:1234 msgid "Can merge only exactly one commit into empty head" msgstr "Можно только один коммит в пуÑтую ветку." -#: builtin/merge.c:1269 +#: builtin/merge.c:1268 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Коммит %s Ñодержит не доверенную GPG подпиÑÑŒ, предположительно от %s." -#: builtin/merge.c:1272 +#: builtin/merge.c:1271 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Коммит %s Ñодержит плохую GPG подпиÑÑŒ, предположительно от %s." -#: builtin/merge.c:1275 +#: builtin/merge.c:1274 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Коммит %s не Ñодержит GPG подпиÑÑŒ." -#: builtin/merge.c:1278 +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Коммит %s Ñодержит дейÑтвительную GPG подпиÑÑŒ, от %s.\n" -#: builtin/merge.c:1340 +#: builtin/merge.c:1339 msgid "refusing to merge unrelated histories" msgstr "отказ ÑлиÑÐ½Ð¸Ñ Ð½ÐµÑвÑзанных иÑторий изменений" -#: builtin/merge.c:1349 +#: builtin/merge.c:1348 msgid "Already up-to-date." msgstr "Уже обновлено." -#: builtin/merge.c:1359 +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "Обновление %s..%s\n" -#: builtin/merge.c:1400 +#: builtin/merge.c:1399 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Попытка тривиального ÑлиÑÐ½Ð¸Ñ Ð² индекÑе…\n" -#: builtin/merge.c:1407 +#: builtin/merge.c:1406 #, c-format msgid "Nope.\n" msgstr "Ðе вышло.\n" -#: builtin/merge.c:1432 +#: builtin/merge.c:1431 msgid "Already up-to-date. Yeeah!" msgstr "Уже обновлено. Круто!" -#: builtin/merge.c:1438 +#: builtin/merge.c:1437 msgid "Not possible to fast-forward, aborting." msgstr "Перемотка вперед невозможна, отмена." -#: builtin/merge.c:1461 builtin/merge.c:1540 +#: builtin/merge.c:1460 builtin/merge.c:1539 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Перемотка дерева к иÑходному ÑоÑтоÑнию…\n" -#: builtin/merge.c:1465 +#: builtin/merge.c:1464 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Попытка ÑлиÑÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтратегии %s…\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1530 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ðи одна ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð½Ðµ обработала ÑлиÑние.\n" -#: builtin/merge.c:1533 +#: builtin/merge.c:1532 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Сбой при ÑлиÑнии Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтратегии %s.\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1541 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "ИÑпользую %s Ð´Ð»Ñ Ð¿Ð¾Ð´Ð³Ð¾Ñ‚Ð¾Ð²ÐºÐ¸ ручного Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð².\n" -#: builtin/merge.c:1554 +#: builtin/merge.c:1553 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "ÐвтоматичеÑкое ÑлиÑние прошло уÑпешно; как и запрашивали, оÑтановлено перед выполнением коммита\n" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <коммит> <коммит>…" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <коммит>…" -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <коммит>…" -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <коммит> <коммит>" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ÑÑылка> [<коммит>]" -#: builtin/merge-base.c:217 +#: builtin/merge-base.c:218 msgid "output all common ancestors" msgstr "вывеÑти вÑех общих предков" -#: builtin/merge-base.c:219 +#: builtin/merge-base.c:220 msgid "find ancestors for a single n-way merge" msgstr "вывеÑти предков Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ многоходового ÑлиÑниÑ" -#: builtin/merge-base.c:221 +#: builtin/merge-base.c:222 msgid "list revs not reachable from others" msgstr "вывеÑти ÑпиÑок редаций, которые не доÑтижимы из друг друга" -#: builtin/merge-base.c:223 +#: builtin/merge-base.c:224 msgid "is the first one ancestor of the other?" msgstr "ÑвлÑетÑÑ Ð¿ÐµÑ€Ð²Ñ‹Ð¼ предком второго указанного коммита?" -#: builtin/merge-base.c:225 +#: builtin/merge-base.c:226 msgid "find where <commit> forked from reflog of <ref>" msgstr "найти журнале ÑÑылок <ÑÑылка> где именно <коммит> разветвилÑÑ" -#: builtin/merge-file.c:8 +#: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" msgstr "git merge-file [<опции>] [-L имÑ1 [-L orig [-L имÑ2]]] <файл1> <ориг-файл> <файл2>" -#: builtin/merge-file.c:32 +#: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "вывеÑти результат на Ñтандартный вывод" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "иÑпользовать diff3 ÑлиÑние" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "при возникновении конфликтов, иÑпользовать нашу верÑию" -#: builtin/merge-file.c:36 +#: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "при возникновении конфликтов, иÑпользовать их верÑию" -#: builtin/merge-file.c:38 +#: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "при возникновении конфликтов, иÑпользовать обе верÑии" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "при возникновении конфликтов, иÑпользовать Ñтот размер маркера" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "не предупреждать о конфликтах" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:45 msgid "set labels for file1/orig-file/file2" msgstr "уÑтановить метки Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»1/ориг-файл/файл2" @@ -9745,508 +9837,508 @@ msgstr "СлиÑние %s и %s\n" msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:152 +#: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "ввод отделённый ÐУЛЕВЫМИ Ñимволами" -#: builtin/mktree.c:153 builtin/write-tree.c:24 +#: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "допуÑтить отÑутÑтвие объектов" -#: builtin/mktree.c:154 +#: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "допуÑтить Ñоздание более одного дерева" -#: builtin/mv.c:16 +#: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<опции>] <иÑточник>… <назначение>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Каталог %s в индекÑе и не ÑвлÑетÑÑ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¼?" -#: builtin/mv.c:84 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "Чтобы продолжить, проиндекÑируйте или ÑпрÑчьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² файле .gitmodules" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s в индеÑе" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "принудительно перемещать/переименовать, даже еÑли цель ÑущеÑтвует" -#: builtin/mv.c:125 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "пропуÑкать ошибки при перемещении/переименовании" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "целевой путь «%s» не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· «%s» в «%s»\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "плохой иÑточник" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить каталог в Ñамого ÑебÑ" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить каталог в файл" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "иÑходный каталог пуÑÑ‚" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "не под верÑионным контролем" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "целевой путь уже ÑущеÑтвует" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "перезапиÑÑŒ «%s»" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "Ðе удалоÑÑŒ перезапиÑать" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "неÑколько иÑточников Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ целевого пути" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "целевой каталог не ÑущеÑтвует" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, откуда=%s, куда=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "Переименование %s в %s\n" -#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 +#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "Ñбой при переименовании «%s»" -#: builtin/name-rev.c:289 +#: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<опции>] <коммит>…" -#: builtin/name-rev.c:290 +#: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<опции>] --all" -#: builtin/name-rev.c:291 +#: builtin/name-rev.c:340 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<опции>] --stdin" -#: builtin/name-rev.c:346 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "выводить только имена (без SHA-1)" -#: builtin/name-rev.c:347 +#: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "иÑпользовать только метки Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð²" -#: builtin/name-rev.c:349 +#: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" msgstr "иÑпользовать только ÑÑылки, ÑоответÑтвующие <шаблону> " -#: builtin/name-rev.c:351 +#: builtin/name-rev.c:400 msgid "ignore refs matching <pattern>" msgstr "игнорировать ÑÑылки, ÑоответÑтвующие <шаблону>" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "вывеÑти ÑпиÑок вÑех коммитов, доÑтижимых Ñо вÑех ÑÑылок" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:403 msgid "read from stdin" msgstr "прочитать из Ñтандартного ввода" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "разрешить вывод «undefined», еÑли не найдено (по умолчанию)" -#: builtin/name-rev.c:361 +#: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "разыменовывать введенные метки (Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ иÑпользованиÑ)" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <ÑÑылка-на-заметку>] [list [<объект>]]" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>" " | (-c | -C) <object>] [<object>]" msgstr "git notes [--ref <ÑÑылка-на-заметку>] add [-f] [--allow-empty] [-m <Ñообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <ÑÑылка-на-заметку>] copy [-f] <из-объекта> <в-объект>" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |" " (-c | -C) <object>] [<object>]" msgstr "git notes [--ref <ÑÑылка-на-заметку>] append [--allow-empty] [-m <Ñообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <ÑÑылка-на-заметку>] edit [--allow-empty] [<объект>]" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <ÑÑылка-на-заметку>] show [<объект>]" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <ÑÑылка-на-заметку>] merge [-v | -q] [-s <ÑтратегиÑ>] <ÑÑылка-на-заметку>" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <ÑÑылка-на-заметку>] remove [<объект>…]" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <ÑÑылка-на-заметку>] prune [-n | -v]" -#: builtin/notes.c:36 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <ÑÑылка-на-заметку>] get-ref" -#: builtin/notes.c:41 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" msgstr "git notes [list [<объект>]]" -#: builtin/notes.c:46 +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<опции>] [<объект>]" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<опции>] <из-объекта> <в-объект>" -#: builtin/notes.c:52 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<из-объекта> <в-объект>]…" -#: builtin/notes.c:57 +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<опции>] [<объект>]" -#: builtin/notes.c:62 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" msgstr "git notes edit [<объект>]" -#: builtin/notes.c:67 +#: builtin/notes.c:68 msgid "git notes show [<object>]" msgstr "git notes show [<объект>]" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<опции>] <ÑÑылка-на-заметку>" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<опции>]" -#: builtin/notes.c:74 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<опции>]" -#: builtin/notes.c:79 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" msgstr "git notes remove [<опции>]" -#: builtin/notes.c:84 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" msgstr "git notes prune [<опции>]" -#: builtin/notes.c:89 +#: builtin/notes.c:90 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:94 +#: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "ЗапиÑать/изменить заметки Ð´Ð»Ñ Ñледующего объекта:" -#: builtin/notes.c:147 +#: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "не удалоÑÑŒ запуÑтить «show» Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»" -#: builtin/notes.c:151 +#: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "не удалоÑÑŒ прочитать вывод «show»" -#: builtin/notes.c:159 +#: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "не удалоÑÑŒ завершить «show» Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° «%s»" -#: builtin/notes.c:194 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "пожалуйÑта, укажите Ñодержимое заметки, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð¾Ð¿Ñ†Ð¸ÑŽ -m или -F" -#: builtin/notes.c:203 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "не удалоÑÑŒ запиÑать объект заметки" -#: builtin/notes.c:205 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "Ñодержимое заметки оÑталоÑÑŒ в %s" -#: builtin/notes.c:233 builtin/tag.c:516 +#: builtin/notes.c:234 builtin/tag.c:517 #, c-format msgid "cannot read '%s'" msgstr "не удалоÑÑŒ прочитать «%s»" -#: builtin/notes.c:235 builtin/tag.c:519 +#: builtin/notes.c:236 builtin/tag.c:520 #, c-format msgid "could not open or read '%s'" msgstr "не удалоÑÑŒ открыть или прочитать «%s»" -#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 -#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 +#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "не удалоÑÑŒ разрешить «%s» как ÑÑылку." -#: builtin/notes.c:257 +#: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "не удалоÑÑŒ прочитать объект «%s»." -#: builtin/notes.c:261 +#: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "не удалоÑÑŒ прочитать данные заметки из недвоичного объекта «%s»." -#: builtin/notes.c:301 +#: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ð°Ñ Ñтрока: «%s»." -#: builtin/notes.c:316 +#: builtin/notes.c:317 #, 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. -#: builtin/notes.c:345 +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#: builtin/notes.c:348 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "отказ в перезапиÑи %s заметок в %s (за пределами refs/notes/)" -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 -#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 +#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 +#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 +#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 msgid "too many parameters" msgstr "передано Ñлишком много параметров" -#: builtin/notes.c:378 builtin/notes.c:664 +#: builtin/notes.c:381 builtin/notes.c:667 #, c-format msgid "no note found for object %s." msgstr "не найдена заметка Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° %s." -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents as a string" msgstr "текÑтовое Ñодержимое заметки" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents in a file" msgstr "Ñодержимое заметки в файле" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse and edit specified note object" msgstr "иÑпользовать и отредактировать указанный объект заметки" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse specified note object" msgstr "иÑпользовать указанный объект заметки" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "allow storing empty note" msgstr "разрешить Ñохранение пуÑтой заметки" -#: builtin/notes.c:412 builtin/notes.c:483 +#: builtin/notes.c:415 builtin/notes.c:486 msgid "replace existing notes" msgstr "заменить ÑущеÑтвующие заметки" -#: builtin/notes.c:437 +#: builtin/notes.c:440 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "Ðе удалоÑÑŒ добавить заметку. Ðайдена ÑущеÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ° у объекта %s. ИÑпользуйте параметр «-f» Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñи ÑущеÑтвующих заметок." -#: builtin/notes.c:452 builtin/notes.c:531 +#: builtin/notes.c:455 builtin/notes.c:534 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "ПерезапиÑÑŒ ÑущеÑтвующих заметок у объекта %s\n" -#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 +#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 #, c-format msgid "Removing note for object %s\n" msgstr "Удаление заметки у объекта %s\n" -#: builtin/notes.c:484 +#: builtin/notes.c:487 msgid "read objects from stdin" msgstr "прочитать объекты из Ñтандартного ввода" -#: builtin/notes.c:486 +#: builtin/notes.c:489 msgid "load rewriting config for <command> (implies --stdin)" msgstr "загрузить наÑтройки перезапиÑи Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ <команда> (включает в ÑÐµÐ±Ñ --stdin)" -#: builtin/notes.c:504 +#: builtin/notes.c:507 msgid "too few parameters" msgstr "передано Ñлишком мало параметров" -#: builtin/notes.c:525 +#: builtin/notes.c:528 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" " existing notes" msgstr "Ðе удалоÑÑŒ Ñкопировать заметку. Ðайдена ÑущеÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ° у объекта %s. ИÑпользуйте параметр «-f» Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñи ÑущеÑтвующих заметок." -#: builtin/notes.c:537 +#: builtin/notes.c:540 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "нет заметок у иÑходного объекта %s. ÐÐµÐ»ÑŒÐ·Ñ Ñкопировать." -#: builtin/notes.c:589 +#: builtin/notes.c:592 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "Опции -m/-F/-c/-C Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ «edit» уÑтарели.\nИÑпользуйте вмеÑто них «git notes add -f -m/-F/-c/-C».\n" -#: builtin/notes.c:684 +#: builtin/notes.c:687 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "не удалоÑÑŒ удалить ÑÑылку NOTES_MERGE_PARTIAL" -#: builtin/notes.c:686 +#: builtin/notes.c:689 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "не удалоÑÑŒ удалить ÑÑылку NOTES_MERGE_REF" -#: builtin/notes.c:688 +#: builtin/notes.c:691 msgid "failed to remove 'git notes merge' worktree" msgstr "не удалоÑÑŒ удалить рабочий каталог «git notes merge»" -#: builtin/notes.c:708 +#: builtin/notes.c:711 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "не удалоÑÑŒ прочитать ÑÑылку NOTES_MERGE_PARTIAL" -#: builtin/notes.c:710 +#: builtin/notes.c:713 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "не удалоÑÑŒ найти коммит из NOTES_MERGE_PARTIAL." -#: builtin/notes.c:712 +#: builtin/notes.c:715 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "не удалоÑÑŒ разобрать коммит из NOTES_MERGE_PARTIAL." -#: builtin/notes.c:725 +#: builtin/notes.c:728 msgid "failed to resolve NOTES_MERGE_REF" msgstr "не удалоÑÑŒ разрешить NOTES_MERGE_REF" -#: builtin/notes.c:728 +#: builtin/notes.c:731 msgid "failed to finalize notes merge" msgstr "не удалоÑÑŒ завершить Ñлиние заметок" -#: builtin/notes.c:754 +#: builtin/notes.c:757 #, c-format msgid "unknown notes merge strategy %s" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð·Ð°Ð¼ÐµÑ‚Ð¾Ðº %s" -#: builtin/notes.c:770 +#: builtin/notes.c:773 msgid "General options" msgstr "Общие опции" -#: builtin/notes.c:772 +#: builtin/notes.c:775 msgid "Merge options" msgstr "Опции ÑлиÑниÑ" -#: builtin/notes.c:774 +#: builtin/notes.c:777 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "разрешить конфликты заметок Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ указанной Ñтратегии (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:776 +#: builtin/notes.c:779 msgid "Committing unmerged notes" msgstr "Коммит не Ñлитых заметок" -#: builtin/notes.c:778 +#: builtin/notes.c:781 msgid "finalize notes merge by committing unmerged notes" msgstr "завершить ÑлиÑние заметок коммитом не Ñлитых заметок" -#: builtin/notes.c:780 +#: builtin/notes.c:783 msgid "Aborting notes merge resolution" msgstr "Отмена Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÑлиÑÐ½Ð¸Ñ Ð·Ð°Ð¼ÐµÑ‚Ð¾Ðº" -#: builtin/notes.c:782 +#: builtin/notes.c:785 msgid "abort notes merge" msgstr "отменить ÑлиÑние заметок" -#: builtin/notes.c:793 +#: builtin/notes.c:796 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно --commit, --abort и -s/--strategy" -#: builtin/notes.c:798 +#: builtin/notes.c:801 msgid "must specify a notes ref to merge" msgstr "вы должны указать ÑÑылку заметки Ð´Ð»Ñ ÑлиÑниÑ" -#: builtin/notes.c:822 +#: builtin/notes.c:825 #, c-format msgid "unknown -s/--strategy: %s" msgstr "неизвеÑтный параметр Ð´Ð»Ñ -s/--strategy: %s" -#: builtin/notes.c:859 +#: builtin/notes.c:862 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "ÑлиÑние заметок в %s уже выполнÑетÑÑ Ð½Ð° %s" -#: builtin/notes.c:862 +#: builtin/notes.c:865 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "не удалоÑÑŒ Ñохранить Ð°Ð´Ñ€ÐµÑ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ ÑÑылки на заметку (%s)" -#: builtin/notes.c:864 +#: builtin/notes.c:867 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with" @@ -10254,218 +10346,218 @@ msgid "" "--abort'.\n" msgstr "Ðе удалоÑÑŒ автоматичеÑки Ñлить заметки. ИÑправьте конфликты в %s и закоммитьте результат Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git notes merge --commit», или прервите процеÑÑ ÑлиÑÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git notes merge --abort».\n" -#: builtin/notes.c:886 +#: builtin/notes.c:889 #, c-format msgid "Object %s has no note\n" msgstr "У объекта %s нет заметки\n" -#: builtin/notes.c:898 +#: builtin/notes.c:901 msgid "attempt to remove non-existent note is not an error" msgstr "попытка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÑущеÑтвующей заметки не ÑвлÑетÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹" -#: builtin/notes.c:901 +#: builtin/notes.c:904 msgid "read object names from the standard input" msgstr "прочитать имена объектов из Ñтандартного ввода" -#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 msgid "do not remove, show only" msgstr "не удалÑÑ‚ÑŒ, только показать ÑпиÑок" -#: builtin/notes.c:940 +#: builtin/notes.c:943 msgid "report pruned notes" msgstr "вывеÑти ÑпиÑок удаленных заметок" -#: builtin/notes.c:982 +#: builtin/notes.c:985 msgid "notes-ref" msgstr "ÑÑылка-на-заметку" -#: builtin/notes.c:983 +#: builtin/notes.c:986 msgid "use notes from <notes-ref>" msgstr "иÑпользовать заметку из <ÑÑылка-на-заметку>" -#: builtin/notes.c:1018 +#: builtin/notes.c:1021 #, c-format msgid "unknown subcommand: %s" msgstr "неизвеÑÑ‚Ð½Ð°Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<опции>…] [< <ÑпиÑок-ÑÑылок> | < <ÑпиÑок-объектов>]" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<опции>…] <имÑ-базы> [< <ÑпиÑок-ÑÑылок> | < <ÑпиÑок-объектов>]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 #, c-format msgid "deflate error (%d)" msgstr "ошибка ÑÐ¶Ð°Ñ‚Ð¸Ñ (%d)" -#: builtin/pack-objects.c:770 +#: builtin/pack-objects.c:776 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "отключение запиÑи битовых карт, так как карты были разбиты на чаÑти из-за pack.packSizeLimit" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:789 msgid "Writing objects" msgstr "ЗапиÑÑŒ объектов" -#: builtin/pack-objects.c:1063 +#: builtin/pack-objects.c:1069 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "отключение запиÑи битовых карт, так как некоторые объекты не были упакованы" -#: builtin/pack-objects.c:2426 +#: builtin/pack-objects.c:2434 msgid "Compressing objects" msgstr "Сжатие объектов" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2843 #, c-format msgid "unsupported index version %s" msgstr "Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¸Ð½Ð´ÐµÐºÑа %s" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2847 #, c-format msgid "bad index version '%s'" msgstr "Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¸Ð½Ð´ÐµÐºÑа «%s»" -#: builtin/pack-objects.c:2863 +#: builtin/pack-objects.c:2877 msgid "do not show progress meter" msgstr "не выводить прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ" -#: builtin/pack-objects.c:2865 +#: builtin/pack-objects.c:2879 msgid "show progress meter" msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ" -#: builtin/pack-objects.c:2867 +#: builtin/pack-objects.c:2881 msgid "show progress meter during object writing phase" msgstr "показать прогреÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿Ð¸Ñи объектов" -#: builtin/pack-objects.c:2870 +#: builtin/pack-objects.c:2884 msgid "similar to --all-progress when progress meter is shown" msgstr "похоже на --all-progress при включенном прогреÑÑе выполнениÑ" -#: builtin/pack-objects.c:2871 +#: builtin/pack-objects.c:2885 msgid "version[,offset]" msgstr "верÑиÑ[,Ñмещение]" -#: builtin/pack-objects.c:2872 +#: builtin/pack-objects.c:2886 msgid "write the pack index file in the specified idx format version" msgstr "запиÑать файл индекÑа пакета в указанной верÑии формата" -#: builtin/pack-objects.c:2875 +#: builtin/pack-objects.c:2889 msgid "maximum size of each output pack file" msgstr "макÑимальный размер каждого выходного файла пакета" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2891 msgid "ignore borrowed objects from alternate object store" msgstr "игнорировать чужие объекты, взÑтые из альтернативного хранилища объектов" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2893 msgid "ignore packed objects" msgstr "игнорировать упакованные объекты" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2895 msgid "limit pack window by objects" msgstr "ограничить окно пакета по количеÑтву объектов" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2897 msgid "limit pack window by memory in addition to object limit" msgstr "дополнительно к количеÑтву объектов ограничить окно пакета по памÑти" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2899 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "макÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° цепочки дельт в результирующем пакете" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2901 msgid "reuse existing deltas" msgstr "иÑпользовать повторно ÑущеÑтвующие дельты" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2903 msgid "reuse existing objects" msgstr "иÑпользовать повторно ÑущеÑтвующие объекты" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2905 msgid "use OFS_DELTA objects" msgstr "иÑпользовать объекты OFS_DELTA" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2907 msgid "use threads when searching for best delta matches" msgstr "иÑпользовать многопоточноÑÑ‚ÑŒ при поиÑке лучших Ñовпадений дельт" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2909 msgid "do not create an empty pack output" msgstr "не Ñоздавать пуÑтые выходные пакеты" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2911 msgid "read revision arguments from standard input" msgstr "прочитать аргументы редакций из Ñтандартного ввода" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2913 msgid "limit the objects to those that are not yet packed" msgstr "ограничитьÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°Ð¼Ð¸, которые еще не упакованы" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:2916 msgid "include objects reachable from any reference" msgstr "включить объекты, которые доÑтижимы по любой из ÑÑылок" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2919 msgid "include objects referred by reflog entries" msgstr "включить объекты, на которые ÑÑылаютÑÑ Ð·Ð°Ð¿Ð¸Ñи журнала ÑÑылок" -#: builtin/pack-objects.c:2908 +#: builtin/pack-objects.c:2922 msgid "include objects referred to by the index" msgstr "включить объекты, на которые ÑÑылаетÑÑ Ð¸Ð½Ð´ÐµÐºÑ" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2925 msgid "output pack to stdout" msgstr "вывеÑти пакет на Ñтандартный вывод" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2927 msgid "include tag objects that refer to objects to be packed" msgstr "включить объекты меток, которые ÑÑылаютÑÑ Ð½Ð° упаковываемые объекты" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2929 msgid "keep unreachable objects" msgstr "ÑохранÑÑ‚ÑŒ ÑÑылки на недоÑтупные объекты" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2931 msgid "pack loose unreachable objects" msgstr "паковать недоÑтижимые объекты" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2933 msgid "unpack unreachable objects newer than <time>" msgstr "раÑпаковать недоÑтупные объекты, которые новее, чем <времÑ>" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2936 msgid "create thin packs" msgstr "Ñоздавать тонкие пакеты" -#: builtin/pack-objects.c:2924 +#: builtin/pack-objects.c:2938 msgid "create packs suitable for shallow fetches" msgstr "Ñоздавать пакеты, подходÑщие Ð´Ð»Ñ Ñ‡Ð°Ñтичных извлечений" -#: builtin/pack-objects.c:2926 +#: builtin/pack-objects.c:2940 msgid "ignore packs that have companion .keep file" msgstr "игнорировать пакеты, Ñ€Ñдом Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ лежит .keep файл" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2942 msgid "pack compression level" msgstr "уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð°" -#: builtin/pack-objects.c:2930 +#: builtin/pack-objects.c:2944 msgid "do not hide commits by grafts" msgstr "не Ñкрывать коммиты ÑращениÑми" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2946 msgid "use a bitmap index if available to speed up counting objects" msgstr "по возможноÑти иÑпользовать Ð¸Ð½Ð´ÐµÐºÑ Ð² битовых картах, Ð´Ð»Ñ ÑƒÑÐºÐ¾Ñ€ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñчета объектов" -#: builtin/pack-objects.c:2934 +#: builtin/pack-objects.c:2948 msgid "write a bitmap index together with the pack index" msgstr "запиÑÑŒ индекÑа в битовых картах вмеÑте Ñ Ð¸Ð½Ð´ÐµÐºÑом пакета" -#: builtin/pack-objects.c:3061 +#: builtin/pack-objects.c:3075 msgid "Counting objects" msgstr "ПодÑчет объектов" @@ -10505,62 +10597,66 @@ msgstr "удалить объекты Ñтарее чем <дата-оконча msgid "cannot prune in a precious-objects repo" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ñ‡Ð¸Ñтить неиÑпользуемые объекты в precious-objects репозитории" -#: builtin/pull.c:51 builtin/pull.c:53 +#: builtin/pull.c:54 builtin/pull.c:56 #, c-format msgid "Invalid value for %s: %s" msgstr "Ðеправильное значение %s: %s" -#: builtin/pull.c:73 +#: builtin/pull.c:76 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<опции>] [<репозиторий> [<Ñпецификатор-ÑÑылки>…]]" -#: builtin/pull.c:121 +#: builtin/pull.c:124 +msgid "control for recursive fetching of submodules" +msgstr "управление рекурÑивным извлечением подмодулей" + +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "Опции, ÑвÑзанные Ñо ÑлиÑнием" -#: builtin/pull.c:124 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" msgstr "забрать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ перебазированиÑ, а не ÑлиÑниÑ" -#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 +#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 msgid "allow fast-forward" msgstr "разрешить перемотку вперед" -#: builtin/pull.c:157 +#: builtin/pull.c:164 msgid "automatically stash/stash pop before and after rebase" msgstr "автоматичеÑки выполнÑÑ‚ÑŒ stash/stash pop до и поÑле перемещениÑ" -#: builtin/pull.c:173 +#: builtin/pull.c:180 msgid "Options related to fetching" msgstr "Опции, ÑвÑзанные Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸ÐµÐ¼ изменений" -#: builtin/pull.c:195 +#: builtin/pull.c:198 msgid "number of submodules pulled in parallel" msgstr "количеÑтво подмодулей, которые будут получены парралельно" -#: builtin/pull.c:284 +#: builtin/pull.c:287 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Ðеправильное значение Ð´Ð»Ñ pull.ff: %s" -#: builtin/pull.c:397 +#: builtin/pull.c:399 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "Ðет претендентов Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñреди ÑÑылок, которые вы только что получили." -#: builtin/pull.c:399 +#: builtin/pull.c:401 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "Ðет претендентов Ð´Ð»Ñ ÑлиÑÐ½Ð¸Ñ Ñреди ÑÑылок, которые вы только что получили." -#: builtin/pull.c:400 +#: builtin/pull.c:402 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "Обычно Ñто означает, что вы передали Ñпецификацию ÑÑылки Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ шаблона и Ñтот шаблон ни Ñ Ñ‡ÐµÐ¼ не Ñовпал на внешнем репозитории." -#: builtin/pull.c:403 +#: builtin/pull.c:405 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10568,69 +10664,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "Ð’Ñ‹ попроÑили получить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñо внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s», но не указали ветку. Так как Ñто не репозиторий по умолчанию Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ текущей ветки, вы должны указать ветку в командной Ñтроке." -#: builtin/pull.c:408 git-parse-remote.sh:73 +#: builtin/pull.c:410 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð¸ на одной из веток." -#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "ПожалуйÑта, укажите на какую ветку вы хотите перемеÑтить изменениÑ." -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 +#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "ПожалуйÑта, укажите Ñ ÐºÐ°ÐºÐ¾Ð¹ веткой вы хотите Ñлить изменениÑ." -#: builtin/pull.c:413 builtin/pull.c:428 +#: builtin/pull.c:415 builtin/pull.c:430 msgid "See git-pull(1) for details." msgstr "Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, Ñмотрите git-pull(1)." -#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 +#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<внешний-репозиторий>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 +#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<ветка>" -#: builtin/pull.c:423 git-parse-remote.sh:75 +#: builtin/pull.c:425 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "У текущей ветки нет информации об отÑлеживании." -#: builtin/pull.c:432 git-parse-remote.sh:95 +#: builtin/pull.c:434 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "ЕÑли вы хотите указать информацию о отÑлеживаемой ветке, выполните:" -#: builtin/pull.c:437 +#: builtin/pull.c:439 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "Ваша ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚, что нужно Ñлить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñо ÑÑылкой\n«%s» из внешнего репозиториÑ, но Ñ‚Ð°ÐºÐ°Ñ ÑÑылка не была получена." -#: builtin/pull.c:754 +#: builtin/pull.c:792 msgid "ignoring --verify-signatures for rebase" msgstr "игнорирование --verify-signatures при перемещении" -#: builtin/pull.c:801 +#: builtin/pull.c:840 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash можно иÑпользовать только вмеÑте Ñ --rebase." -#: builtin/pull.c:809 +#: builtin/pull.c:848 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновление еще не начавшейÑÑ Ð²ÐµÑ‚ÐºÐ¸ Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñми, добавленными в индекÑ." -#: builtin/pull.c:812 +#: builtin/pull.c:851 msgid "pull with rebase" msgstr "получение Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸ÐµÐ¼" -#: builtin/pull.c:813 +#: builtin/pull.c:852 msgid "please commit or stash them." msgstr "Ñделайте коммит или ÑпрÑчьте их." -#: builtin/pull.c:838 +#: builtin/pull.c:877 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10638,7 +10734,7 @@ msgid "" "commit %s." msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð° %s." -#: builtin/pull.c:843 +#: builtin/pull.c:882 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10649,33 +10745,37 @@ msgid "" "to recover." msgstr "Ðе удалоÑÑŒ перемотать вперёд Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² вашем рабочем каталоге.\nПоÑле того, как вы убедитеÑÑŒ, что вы Ñохранили вÑÑ‘ необходимое из вывода\n$ git diff %s\n, запуÑтите\n$ git reset --hard\nÐ´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ñходного ÑоÑтоÑниÑ." -#: builtin/pull.c:858 +#: builtin/pull.c:897 msgid "Cannot merge multiple branches into empty head." msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñлить неÑколько веток в пуÑтой указатель на ветку." -#: builtin/pull.c:862 +#: builtin/pull.c:901 msgid "Cannot rebase onto multiple branches." msgstr "Ðевозможно перемеÑтить над неÑколькими ветками." -#: builtin/push.c:16 +#: builtin/pull.c:908 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "невозможно выполнить перемещение Ñ Ð·Ð°Ð¿Ð¸Ñанными локальными изменениÑми в подмодулÑÑ…" + +#: builtin/push.c:17 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<опции>] [<репозиторий> [<Ñпецификатор-ÑÑылки>…]]" -#: builtin/push.c:89 +#: builtin/push.c:90 msgid "tag shorthand without <tag>" msgstr "указано Ñокращение tag, но не указана Ñама <метка>" -#: builtin/push.c:99 +#: builtin/push.c:100 msgid "--delete only accepts plain target ref names" msgstr "Ð¾Ð¿Ñ†Ð¸Ñ --delete принимает только проÑтые целевые имена ÑÑылок" -#: builtin/push.c:143 +#: builtin/push.c:144 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "\nЧтобы выбрать любую из опций на поÑтоÑнной оÑнове, Ñмотрите push.default в «git help config»." -#: builtin/push.c:146 +#: builtin/push.c:147 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -10690,7 +10790,7 @@ msgid "" "%s" msgstr "Ð˜Ð¼Ñ Ð²Ñ‹ÑˆÐµÑтоÑщей ветки и вашей текущей ветки различаютÑÑ. Чтобы отправить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² вышеÑтоÑщую ветку на внешнем репозитории, иÑпользуйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² ветку Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же именем на внешнем репозитории, иÑпользуйте:\n\n git push %s %s\n%s" -#: builtin/push.c:161 +#: builtin/push.c:162 #, c-format msgid "" "You are not currently on a branch.\n" @@ -10700,7 +10800,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ðµ находитеÑÑŒ ни на одной из веток.\nЧтобы отправить иÑторию, ведущую к текущему (отделённый HEAD) ÑоÑтоÑнию, иÑпользуйте\n\n git push %s HEAD:<имÑ-внешней-ветки>\n" -#: builtin/push.c:175 +#: builtin/push.c:176 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -10709,13 +10809,13 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s не имеет вышеÑтоÑщей ветки.\nЧтобы отправить текущую ветку и уÑтановить внешнюю ветку как вышеÑтоÑщую Ð´Ð»Ñ Ñтой ветки, иÑпользуйте\n\n git push --set-upstream %s %s\n" -#: builtin/push.c:183 +#: builtin/push.c:184 #, c-format msgid "" "The current branch %s has multiple upstream branches, refusing to push." msgstr "Ваша Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ‚ÐºÐ° %s имеет неÑколько вышеÑтоÑщих веток, отказ в отправке изменений." -#: builtin/push.c:186 +#: builtin/push.c:187 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -10723,11 +10823,11 @@ msgid "" "to update which remote branch." msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»Ñете Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° внешний репозиторий «%s», который не ÑвлÑетÑÑ Ð²Ñ‹ÑˆÐµÑтоÑщим Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ текущей ветки «%s», без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ñ‚Ð¾Ð³Ð¾, что отправлÑÑ‚ÑŒ и в какую внешнюю ветку." -#: builtin/push.c:245 +#: builtin/push.c:246 msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "Ð’Ñ‹ не указали Ñпецификацию ÑÑылки Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, а push.default указан как «nothing»." -#: builtin/push.c:252 +#: builtin/push.c:253 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10735,7 +10835,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней чаÑти. Заберите и Ñлейте внешние Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ \n(например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …») перед повторной попыткой отправки\nизменений.\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, Ñмотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:258 +#: builtin/push.c:259 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" @@ -10743,7 +10843,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как верхушка отправлÑемой ветки\nпозади ее внешней чаÑти. ПереключитеÑÑŒ на ветку и заберите внешние\nÐ¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ (например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …») перед повторной\nпопыткой отправки изменений.\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, Ñмотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:264 +#: builtin/push.c:265 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" @@ -10752,33 +10852,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как внешний репозиторий Ñодержит\nизменениÑ, которых у Ð²Ð°Ñ Ð½ÐµÑ‚ в вашем локальном репозитории.\nОбычно, Ñто ÑвÑзанно Ñ Ñ‚ÐµÐ¼, что кто-то уже отправил Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² \nто же меÑто. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и Ñлить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð· внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ñебе\n(например, Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git pull …»).\nÐ”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, Ñмотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:271 +#: builtin/push.c:272 msgid "Updates were rejected because the tag already exists in the remote." msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отклонены, так как метка уже ÑущеÑтвует во внешнем репозитории." -#: builtin/push.c:274 +#: builtin/push.c:275 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "Ð’Ñ‹ не можете обновить внешнюю ÑÑылку, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ на объект, не ÑвлÑющийÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼ или обновить внешнюю ÑÑылку так, чтобы она указывала на объект, не ÑвлÑющийÑÑ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð¼, без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ «--force».\n" -#: builtin/push.c:334 +#: builtin/push.c:335 #, c-format msgid "Pushing to %s\n" msgstr "Отправка в %s\n" -#: builtin/push.c:338 +#: builtin/push.c:339 #, c-format msgid "failed to push some refs to '%s'" msgstr "не удалоÑÑŒ отправить некоторые ÑÑылки в «%s»" -#: builtin/push.c:369 +#: builtin/push.c:370 #, c-format msgid "bad repository '%s'" msgstr "плохой Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»" -#: builtin/push.c:370 +#: builtin/push.c:371 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote repository using\n" @@ -10790,112 +10890,112 @@ msgid "" " git push <name>\n" msgstr "Ðе наÑтроена точка Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸.\nЛибо укажите URL Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ командной Ñтроки, либо наÑтройте внешний репозиторий Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ\n\n git remote add <имÑ> <адреÑ>\n\nа затем отправьте Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ имени внешнего репозиториÑ\n\n git push <имÑ>\n" -#: builtin/push.c:388 +#: builtin/push.c:389 msgid "--all and --tags are incompatible" msgstr "--all и --tags Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/push.c:389 +#: builtin/push.c:390 msgid "--all can't be combined with refspecs" msgstr "--all Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñо Ñпецификаторами ÑÑылок" -#: builtin/push.c:394 +#: builtin/push.c:395 msgid "--mirror and --tags are incompatible" msgstr "--mirror и --tags Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/push.c:395 +#: builtin/push.c:396 msgid "--mirror can't be combined with refspecs" msgstr "--mirror Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñо Ñпецификаторами ÑÑылок" -#: builtin/push.c:400 +#: builtin/push.c:401 msgid "--all and --mirror are incompatible" msgstr "--all и --mirror Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/push.c:518 +#: builtin/push.c:523 msgid "repository" msgstr "репозиторий" -#: builtin/push.c:519 builtin/send-pack.c:162 +#: builtin/push.c:524 builtin/send-pack.c:163 msgid "push all refs" msgstr "отправить вÑе ÑÑылки" -#: builtin/push.c:520 builtin/send-pack.c:164 +#: builtin/push.c:525 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "Ñделать зеркало вÑех ÑÑылок" -#: builtin/push.c:522 +#: builtin/push.c:527 msgid "delete refs" msgstr "удалить ÑÑылки" -#: builtin/push.c:523 +#: builtin/push.c:528 msgid "push tags (can't be used with --all or --mirror)" msgstr "отправить метки (Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать вмеÑте Ñ --all или --mirror)" -#: builtin/push.c:526 builtin/send-pack.c:165 +#: builtin/push.c:531 builtin/send-pack.c:166 msgid "force updates" msgstr "принудительное обновление" -#: builtin/push.c:528 builtin/send-pack.c:179 +#: builtin/push.c:533 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "имÑ-ÑÑылки>:<ожидаетÑÑ" -#: builtin/push.c:529 builtin/send-pack.c:180 +#: builtin/push.c:534 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "требовать, чтобы Ñтарое значение ÑÑылки было ожидаемым" -#: builtin/push.c:532 +#: builtin/push.c:537 msgid "control recursive pushing of submodules" msgstr "управление рекурÑивной отправкой подмодулей" -#: builtin/push.c:534 builtin/send-pack.c:173 +#: builtin/push.c:539 builtin/send-pack.c:174 msgid "use thin pack" msgstr "иÑпользовать тонкие пакеты" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 -#: builtin/send-pack.c:160 +#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "receive pack program" msgstr "путь к программе упаковки на Ñервере" -#: builtin/push.c:537 +#: builtin/push.c:542 msgid "set upstream for git pull/status" msgstr "уÑтановить вышеÑтоÑщую ветку Ð´Ð»Ñ git pull/status" -#: builtin/push.c:540 +#: builtin/push.c:545 msgid "prune locally removed refs" msgstr "почиÑтить локально удаленные ÑÑылки" -#: builtin/push.c:542 +#: builtin/push.c:547 msgid "bypass pre-push hook" msgstr "пропуÑтить перехватчик pre-push" -#: builtin/push.c:543 +#: builtin/push.c:548 msgid "push missing but relevant tags" msgstr "отправить пропущенные, но нужные метки" -#: builtin/push.c:546 builtin/send-pack.c:167 +#: builtin/push.c:551 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "подпиÑать отправку Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG" -#: builtin/push.c:548 builtin/send-pack.c:174 +#: builtin/push.c:553 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "запроÑить выполнение атомарной транзакции на внешней Ñтороне" -#: builtin/push.c:549 builtin/send-pack.c:170 +#: builtin/push.c:554 builtin/send-pack.c:171 msgid "server-specific" msgstr "завиÑит-от-Ñервера" -#: builtin/push.c:549 builtin/send-pack.c:171 +#: builtin/push.c:554 builtin/send-pack.c:172 msgid "option to transmit" msgstr "передаваемые опции" -#: builtin/push.c:563 +#: builtin/push.c:568 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete неÑовмеÑтимо Ñ --all, --mirror и --tags" -#: builtin/push.c:565 +#: builtin/push.c:570 msgid "--delete doesn't make sense without any refs" msgstr "--delete не имеет ÑмыÑла без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑÑылок" -#: builtin/push.c:584 +#: builtin/push.c:589 msgid "push options must not have new line characters" msgstr "опции Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ не должны Ñодержать Ñимволы перевода Ñтрок" @@ -10906,87 +11006,87 @@ msgid "" "[--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<префикÑ>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:121 msgid "write resulting index to <file>" msgstr "запиÑать результирующий Ð¸Ð½Ð´ÐµÐºÑ Ð² <файл>" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:124 msgid "only empty the index" msgstr "проÑто очиÑтить индекÑ" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:126 msgid "Merging" msgstr "СлиÑние" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:128 msgid "perform a merge in addition to a read" msgstr "выполнить ÑлиÑние в дополнение к чтению" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:130 msgid "3-way merge if no file level merging required" msgstr "трехходовое ÑлиÑние, еÑли не требуетÑÑ ÑлиÑние на уровне файлов" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:132 msgid "3-way merge in presence of adds and removes" msgstr "трехходовое ÑлиÑние в Ñлучае приÑутÑÑ‚Ð²Ð¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ð¹ или удалений файлов" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c:134 msgid "same as -m, but discard unmerged entries" msgstr "тоже, что и -m, но отменÑет Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ Ñлитых запиÑей" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:135 msgid "<subdirectory>/" msgstr "<подкаталог>/" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:136 msgid "read the tree into the index under <subdirectory>/" msgstr "прочитать дерево в Ð¸Ð½Ð´ÐµÐºÑ Ð² <подкаталог>/" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:139 msgid "update working tree with merge result" msgstr "обновить рабочий каталог результатом ÑлиÑниÑ" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:141 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:151 +#: builtin/read-tree.c:142 msgid "allow explicitly ignored files to be overwritten" msgstr "разрешить перезапиÑÑŒ Ñвно игнорируемых файлов" -#: builtin/read-tree.c:154 +#: builtin/read-tree.c:145 msgid "don't check the working tree after merging" msgstr "не проверÑÑ‚ÑŒ рабочий каталог поÑле ÑлиÑниÑ" -#: builtin/read-tree.c:155 +#: builtin/read-tree.c:146 msgid "don't update the index or the work tree" msgstr "не обновлÑÑ‚ÑŒ Ð¸Ð½Ð´ÐµÐºÑ Ð¸Ð»Ð¸ рабочий каталог" -#: builtin/read-tree.c:157 +#: builtin/read-tree.c:148 msgid "skip applying sparse checkout filter" msgstr "пропуÑтить применение фильтра чаÑтичного Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð° ÑоÑтоÑние" -#: builtin/read-tree.c:159 +#: builtin/read-tree.c:150 msgid "debug unpack-trees" msgstr "отладка unpack-trees" -#: builtin/rebase--helper.c:7 +#: builtin/rebase--helper.c:8 msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<опции>]" -#: builtin/rebase--helper.c:19 +#: builtin/rebase--helper.c:20 msgid "continue rebase" msgstr "продолжить перемещение" -#: builtin/rebase--helper.c:21 +#: builtin/rebase--helper.c:22 msgid "abort rebase" msgstr "оÑтановить перемещение" -#: builtin/receive-pack.c:27 +#: builtin/receive-pack.c:28 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <каталог-git>" -#: builtin/receive-pack.c:795 +#: builtin/receive-pack.c:838 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" @@ -11003,7 +11103,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "По умолчанию, обновлÑÑ‚ÑŒ текущую ветку в репозитории Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹\nкопией (не голом) запрещено, так как Ñто Ñделает ÑоÑтоÑние индекÑа\nи рабочего каталога противоречивым, и вам прийдетÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ\n«git reset --hard», чтобы ÑоÑтоÑние рабочего каталога Ñнова\nÑоответÑтвовало HEAD.\n\nÐ’Ñ‹ можете уÑтановить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но Ñто не рекомендуетÑÑ, еÑли только\nвы не намерены обновить его рабочий каталог ÑпоÑобом подобным\nвышеопиÑанному.\n\nЧтобы пропуÑтить Ñто Ñообщение и вÑе равно оÑтавить поведение\nпо умолчанию, уÑтановите значение опции «receive.denyCurrentBranch»\nв «refuse»." -#: builtin/receive-pack.c:815 +#: builtin/receive-pack.c:858 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" @@ -11015,194 +11115,194 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "По умолчанию, удаление текущей ветки запрещено, так как поÑледующий\n«git clone» не Ñможет получить никаких файлов, что приведет к путанице.\n\nÐ’Ñ‹ можете уÑтановить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории, чтобы разрешить\nудаление текущей ветки Ñ Ð¸Ð»Ð¸ без предупреждающего ÑообщениÑ.\n\nЧтобы пропуÑтить Ñто Ñообщение, вы можете уÑтановить значение опции\nв «refuse»." -#: builtin/receive-pack.c:1888 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "тихий режим" -#: builtin/receive-pack.c:1902 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Ð’Ñ‹ должны указать каталог." -#: builtin/reflog.c:423 +#: builtin/reflog.c:424 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "«%s» Ð´Ð»Ñ Â«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимой меткой даты/времени" -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:541 builtin/reflog.c:546 #, c-format msgid "'%s' is not a valid timestamp" msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимой меткой даты/времени" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] " "[--mirror=<fetch|push>] <name> <url>" msgstr "git remote add [-t <ветка>] [-m <маÑтер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имÑ> <адреÑ>" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:15 builtin/remote.c:35 msgid "git remote rename <old> <new>" msgstr "git remote rename <Ñтарое-название> <новое-название>" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:16 builtin/remote.c:40 msgid "git remote remove <name>" msgstr "git remote remove <имÑ>" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:17 builtin/remote.c:45 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <имÑ> (-a | --auto | -d | --delete | <ветка>)" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <имÑ>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <имÑ>" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имÑ-внешнего-репозиториÑ>)…]" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <имÑ> <ветка>…" -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:22 builtin/remote.c:71 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <имÑ>" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <имÑ> <новый-url> [<Ñтарый-url>]" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <имÑ> <новый-url>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <имÑ> <url>" -#: builtin/remote.c:29 +#: builtin/remote.c:30 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<опции>] <имÑ> <url>" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <имÑ> <ветка>…" -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <имÑ> <ветка>…" -#: builtin/remote.c:55 +#: builtin/remote.c:56 msgid "git remote show [<options>] <name>" msgstr "git remote show [<опции>] <имÑ>" -#: builtin/remote.c:60 +#: builtin/remote.c:61 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<опции>] <имÑ>" -#: builtin/remote.c:65 +#: builtin/remote.c:66 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<опции>] [<группа> | <имÑ-внешнего-репозиториÑ>]…" -#: builtin/remote.c:94 +#: builtin/remote.c:95 #, c-format msgid "Updating %s" msgstr "Обновление %s" -#: builtin/remote.c:126 +#: builtin/remote.c:127 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "ключ --mirror небезопаÑен и не рекомендуетÑÑ Ðº иÑпользованию;\nиÑпользуйте вмеÑто него --mirror=fetch или --mirror=push" -#: builtin/remote.c:143 +#: builtin/remote.c:144 #, c-format msgid "unknown mirror argument: %s" msgstr "неизвеÑтный аргумент Ð´Ð»Ñ mirror: %s" -#: builtin/remote.c:159 +#: builtin/remote.c:160 msgid "fetch the remote branches" msgstr "извлечь внешние ветки" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "import all tags and associated objects when fetching" msgstr "импортировать вÑе метки и аÑÑоциированные объекты при извлечении" -#: builtin/remote.c:164 +#: builtin/remote.c:165 msgid "or do not fetch any tag at all (--no-tags)" msgstr "или не извлекать метки вообще (--no-tags)" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "branch(es) to track" msgstr "отÑлеживаемые ветки" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "master branch" msgstr "маÑтер ветка" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "set up remote as a mirror to push to or fetch from" msgstr "наÑтроить внешний репозиторий как зеркало Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ или Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹" -#: builtin/remote.c:181 +#: builtin/remote.c:182 msgid "specifying a master branch makes no sense with --mirror" msgstr "указание маÑтер ветки не имеет ÑмыÑла Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --mirror" -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "указание отÑлеживаемых веток имеет ÑмыÑл только при зеркальном извлечении" -#: builtin/remote.c:190 builtin/remote.c:629 +#: builtin/remote.c:191 builtin/remote.c:630 #, c-format msgid "remote %s already exists." msgstr "внешний репозиторий %s уже ÑущеÑтвует" -#: builtin/remote.c:194 builtin/remote.c:633 +#: builtin/remote.c:195 builtin/remote.c:634 #, c-format msgid "'%s' is not a valid remote name" msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым именем внешнего репозиториÑ." -#: builtin/remote.c:234 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "Ðе удалоÑÑŒ наÑтроить маÑтер ветку «%s»" -#: builtin/remote.c:336 +#: builtin/remote.c:337 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Ðе удалоÑÑŒ извлечь карту Ð´Ð»Ñ Ñпецификатора ÑÑылки %s" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:438 builtin/remote.c:446 msgid "(matching)" msgstr "(ÑоответÑтвующаÑ)" -#: builtin/remote.c:449 +#: builtin/remote.c:450 msgid "(delete)" msgstr "(удаленнаÑ)" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 +#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 #, c-format msgid "No such remote: %s" msgstr "Ðет такого внешнего репозиториÑ: %s" -#: builtin/remote.c:639 +#: builtin/remote.c:640 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Ðе удалоÑÑŒ переименовать Ñекцию конфигурации Ñ Â«%s» на «%s»" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11210,17 +11310,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "Ðе обновлÑÑŽ неÑтандартную Ñпецификатор ÑÑылки Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ\n\t%s\n\tПожалуйÑта, еÑли требуетÑÑ, обновите конфигурацию вручную." -#: builtin/remote.c:695 +#: builtin/remote.c:696 #, c-format msgid "deleting '%s' failed" msgstr "не удалоÑÑŒ удалить «%s»" -#: builtin/remote.c:729 +#: builtin/remote.c:730 #, c-format msgid "creating '%s' failed" msgstr "не удалоÑÑŒ Ñоздать «%s»" -#: builtin/remote.c:794 +#: builtin/remote.c:795 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11232,142 +11332,143 @@ msgstr[1] "Примечание: Ðекоторые ветки вне иерар msgstr[2] "Примечание: Ðекоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, иÑпользуйте:" msgstr[3] "Примечание: Ðекоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, иÑпользуйте:" -#: builtin/remote.c:808 +#: builtin/remote.c:809 #, c-format msgid "Could not remove config section '%s'" msgstr "Ðе удалоÑÑŒ удалить Ñекцию файла конфигурации «%s»" -#: builtin/remote.c:909 +#: builtin/remote.c:910 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " Ð½Ð¾Ð²Ð°Ñ (Ñледующее извлечение Ñохранит ее в remotes/%s)" -#: builtin/remote.c:912 +#: builtin/remote.c:913 msgid " tracked" msgstr " отÑлеживаетÑÑ" -#: builtin/remote.c:914 +#: builtin/remote.c:915 msgid " stale (use 'git remote prune' to remove)" msgstr " недейÑтвительна (иÑпользуйте «git remote prune», чтобы удалить)" -#: builtin/remote.c:916 +#: builtin/remote.c:917 msgid " ???" msgstr " ???" -#: builtin/remote.c:957 +#: builtin/remote.c:958 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно перемеÑтить более чем над 1 веткой" -#: builtin/remote.c:965 +#: builtin/remote.c:966 #, c-format msgid "rebases interactively onto remote %s" msgstr "перемещаетÑÑ Ð¸Ð½Ñ‚ÐµÑ€Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ над внешней веткой %s" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases onto remote %s" msgstr "перемещаетÑÑ Ð½Ð°Ð´ внешней веткой %s" -#: builtin/remote.c:969 +#: builtin/remote.c:970 #, c-format msgid " merges with remote %s" msgstr " будет Ñлита Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой %s" -#: builtin/remote.c:972 +#: builtin/remote.c:973 #, c-format msgid "merges with remote %s" msgstr "будет Ñлита Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой %s" -#: builtin/remote.c:975 +#: builtin/remote.c:976 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s и Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ веткой %s\n" -#: builtin/remote.c:1018 +#: builtin/remote.c:1019 msgid "create" msgstr "Ñоздана" -#: builtin/remote.c:1021 +#: builtin/remote.c:1022 msgid "delete" msgstr "удалена" -#: builtin/remote.c:1025 +#: builtin/remote.c:1026 msgid "up to date" msgstr "уже актуальна" -#: builtin/remote.c:1028 +#: builtin/remote.c:1029 msgid "fast-forwardable" msgstr "возможна перемотка вперед" -#: builtin/remote.c:1031 +#: builtin/remote.c:1032 msgid "local out of date" msgstr "Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ‚ÐºÐ° уÑтарела" -#: builtin/remote.c:1038 +#: builtin/remote.c:1039 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s будет принудительно отправлена в %-*s (%s)" -#: builtin/remote.c:1041 +#: builtin/remote.c:1042 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s будет отправлена в %-*s (%s)" -#: builtin/remote.c:1045 +#: builtin/remote.c:1046 #, c-format msgid " %-*s forces to %s" msgstr " %-*s будет принудительно отправлена в %s" -#: builtin/remote.c:1048 +#: builtin/remote.c:1049 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s будет отправлена в %s" -#: builtin/remote.c:1116 +#: builtin/remote.c:1117 msgid "do not query remotes" msgstr "не опрашивать внешние репозитории" -#: builtin/remote.c:1143 +#: builtin/remote.c:1144 #, c-format msgid "* remote %s" msgstr "* внешний репозиторий %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid " Fetch URL: %s" msgstr " URL Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ: %s" -#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 +#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 msgid "(no URL)" msgstr "(нет URL)" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1156 builtin/remote.c:1158 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#: builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " Push URL: %s" msgstr " URL Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 +#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 #, c-format msgid " HEAD branch: %s" msgstr " HEAD ветка: %s" -#: builtin/remote.c:1160 +#: builtin/remote.c:1164 msgid "(not queried)" msgstr "(не запрашивалÑÑ)" -#: builtin/remote.c:1162 +#: builtin/remote.c:1166 msgid "(unknown)" msgstr "(неизвеÑтно)" -#: builtin/remote.c:1166 +#: builtin/remote.c:1170 #, c-format msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD ветка (HEAD внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñ‡Ð½Ñ‹Ð¹, может быть одним из):\n" -#: builtin/remote.c:1178 +#: builtin/remote.c:1182 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -11376,11 +11477,11 @@ msgstr[1] " Внешние ветки:%s" msgstr[2] " Внешние ветки:%s" msgstr[3] " Внешние ветки:%s" -#: builtin/remote.c:1181 builtin/remote.c:1207 +#: builtin/remote.c:1185 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ запрашивалÑÑ)" -#: builtin/remote.c:1190 +#: builtin/remote.c:1194 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ‚ÐºÐ°, наÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð°Ñ Ð´Ð»Ñ Â«git pull»:" @@ -11388,11 +11489,11 @@ msgstr[1] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git msgstr[2] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git pull»:" msgstr[3] " Локальные ветки, наÑтроенные Ð´Ð»Ñ Â«git pull»:" -#: builtin/remote.c:1198 +#: builtin/remote.c:1202 msgid " Local refs will be mirrored by 'git push'" msgstr " Локальные ÑÑылки, зеркалируемые Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ «git push»" -#: builtin/remote.c:1204 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -11401,465 +11502,469 @@ msgstr[1] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«gi msgstr[2] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«git push»%s:" msgstr[3] " Локальные ÑÑылки, наÑтроенные Ð´Ð»Ñ Â«git push»%s:" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "уÑтановить refs/remotes/<имÑ>/HEAD в завиÑимоÑти от внешнего репозиториÑ" -#: builtin/remote.c:1227 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "удалить refs/remotes/<имÑ>/HEAD" -#: builtin/remote.c:1242 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Ðе удалоÑÑŒ определить внешний HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "ÐеÑколько внешних HEAD веток. Укажите Ñвно одну из них:" -#: builtin/remote.c:1254 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Ðе удалоÑÑŒ удалить %s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÑÑылка: %s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Ðе удалоÑÑŒ наÑтроить %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s будет виÑÑщей веткой!" -#: builtin/remote.c:1283 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s Ñтала виÑÑщей веткой!" -#: builtin/remote.c:1293 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "ОчиÑтка %s" -#: builtin/remote.c:1294 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [будет удалена] %s" -#: builtin/remote.c:1313 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [удалена] %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "почиÑтить внешние репозитории поÑле извлечениÑ" -#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Ðет такого внешнего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»" -#: builtin/remote.c:1437 +#: builtin/remote.c:1441 msgid "add branch" msgstr "добавить ветку" -#: builtin/remote.c:1444 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "не указан внешний репозиторий" -#: builtin/remote.c:1461 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "запроÑить URL отправки, вмеÑто URL извлечениÑ" -#: builtin/remote.c:1463 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "вернуть вÑе URL" -#: builtin/remote.c:1491 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "URL не наÑтроены Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Â«%s»" -#: builtin/remote.c:1517 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "управление URL отправки" -#: builtin/remote.c:1519 +#: builtin/remote.c:1523 msgid "add URL" msgstr "добавить URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "удалить URL" -#: builtin/remote.c:1528 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --delete" -#: builtin/remote.c:1569 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Ðеправильный шаблон Ñтарого URL: %s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Ðе найдены ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ URL: %s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ вÑе URL не-отправки" -#: builtin/remote.c:1593 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "быть многоÑловнее; должно ÑтоÑÑ‚ÑŒ перед подкомандой" -#: builtin/remote.c:1624 +#: builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s" -#: builtin/repack.c:17 +#: builtin/repack.c:18 msgid "git repack [<options>]" msgstr "git repack [<опции>]" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "Инкрементальные перепаковки не ÑовмеÑтимы Ñ Ð¸Ð½Ð´ÐµÐºÑами в битовых картах. ИÑпользуйте опцию --no-write-bitmap-index или отключите параметр конфигурации pack.writebitmaps." -#: builtin/repack.c:166 +#: builtin/repack.c:168 msgid "pack everything in a single pack" msgstr "упаковать вÑÑ‘ в один пакет" -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "same as -a, and turn unreachable objects loose" msgstr "тоже, что и -a, но дополнительно отброÑить недоÑтижимые объекты" -#: builtin/repack.c:171 +#: builtin/repack.c:173 msgid "remove redundant packs, and run git-prune-packed" msgstr "удалите лишние пакеты и запуÑтите git-prune-packed" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "передать опцию --no-reuse-delta в git-pack-objects" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-object to git-pack-objects" msgstr "передать опцию --no-reuse-object в git-pack-objects" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "do not run git-update-server-info" msgstr "не запуÑкать git-update-server-info" -#: builtin/repack.c:180 +#: builtin/repack.c:182 msgid "pass --local to git-pack-objects" msgstr "передать опцию --local в git-pack-objects" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "write bitmap index" msgstr "запиÑÑŒ индекÑа в битовых картах" -#: builtin/repack.c:183 +#: builtin/repack.c:185 msgid "approxidate" msgstr "примернаÑ-дата" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "with -A, do not loosen objects older than this" msgstr "Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ -A, не отбраÑывать объекты Ñтарее, чем указано" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -a, repack unreachable objects" msgstr "Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -a, перепаковать недоÑтупные объекты" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "size of the window used for delta compression" msgstr "размер окна, иÑпользуемый Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ñ€ÐµÑÑии дельт" -#: builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:191 builtin/repack.c:197 msgid "bytes" msgstr "количеÑтво-байт" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "same as the above, but limit memory size instead of entries count" msgstr "тоже, что и выше, но ограничить размер памÑти, а не количеÑтво запиÑей" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "limits the maximum delta depth" msgstr "ограничение на макÑимальную глубину дельт" -#: builtin/repack.c:194 +#: builtin/repack.c:196 +msgid "limits the maximum number of threads" +msgstr "ограничение на макÑимальное количеÑтво потоков" + +#: builtin/repack.c:198 msgid "maximum size of each packfile" msgstr "макÑимальный размер каждого из файлов пакета" -#: builtin/repack.c:196 +#: builtin/repack.c:200 msgid "repack objects in packs marked with .keep" msgstr "переупаковать объекты в пакеты, помеченные файлом .keep" -#: builtin/repack.c:206 +#: builtin/repack.c:210 msgid "cannot delete packs in a precious-objects repo" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ пакеты в precious-objects репозитории" -#: builtin/repack.c:210 +#: builtin/repack.c:214 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable и -A Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/repack.c:400 builtin/worktree.c:115 +#: builtin/repack.c:406 builtin/worktree.c:116 #, c-format msgid "failed to remove '%s'" msgstr "Ñбой ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Â«%s»" -#: builtin/replace.c:19 +#: builtin/replace.c:20 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <объект> <замена>" -#: builtin/replace.c:20 +#: builtin/replace.c:21 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <объект>" -#: builtin/replace.c:21 +#: builtin/replace.c:22 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <коммит> [<родитель>…]" -#: builtin/replace.c:22 +#: builtin/replace.c:23 msgid "git replace -d <object>..." msgstr "git replace -d <объект>…" -#: builtin/replace.c:23 +#: builtin/replace.c:24 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<формат>] [-l [<шаблон>]]" -#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 +#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 #, c-format msgid "Not a valid object name: '%s'" msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°: «%s»" -#: builtin/replace.c:360 +#: builtin/replace.c:361 #, c-format msgid "bad mergetag in commit '%s'" msgstr "Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° ÑлиÑÐ½Ð¸Ñ Ð² коммите «%s»" -#: builtin/replace.c:362 +#: builtin/replace.c:363 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´Ñ‘Ð½Ð½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° ÑлиÑÐ½Ð¸Ñ Ð² коммите «%s»" -#: builtin/replace.c:373 +#: builtin/replace.c:374 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "оригинальный коммит «%s» Ñодержит метку ÑлиÑÐ½Ð¸Ñ Â«%s», ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ð»Ð° отброшена; иÑпользуйте --edit вмеÑто --graft" -#: builtin/replace.c:406 +#: builtin/replace.c:407 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "оригинальный коммит «%s» Ñодержит подпиÑÑŒ gpg." -#: builtin/replace.c:407 +#: builtin/replace.c:408 msgid "the signature will be removed in the replacement commit!" msgstr "подпиÑÑŒ будет удалена в замененном коммите!" -#: builtin/replace.c:413 +#: builtin/replace.c:414 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "не удалоÑÑŒ запиÑать замену Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°: «%s»" -#: builtin/replace.c:437 +#: builtin/replace.c:438 msgid "list replace refs" msgstr "вывеÑти ÑпиÑок заменÑемых ÑÑылок" -#: builtin/replace.c:438 +#: builtin/replace.c:439 msgid "delete replace refs" msgstr "удаление заменÑемых ÑÑылок" -#: builtin/replace.c:439 +#: builtin/replace.c:440 msgid "edit existing object" msgstr "изменение ÑущеÑтвующего объекта" -#: builtin/replace.c:440 +#: builtin/replace.c:441 msgid "change a commit's parents" msgstr "изменение Ñ€Ð¾Ð´Ð¸Ñ‚ÐµÐ»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" -#: builtin/replace.c:441 +#: builtin/replace.c:442 msgid "replace the ref if it exists" msgstr "замена ÑÑылки, еÑли она ÑущеÑтвует" -#: builtin/replace.c:442 +#: builtin/replace.c:443 msgid "do not pretty-print contents for --edit" msgstr "не делать Ñтруктурированный вывод Ñодержимого Ð´Ð»Ñ --edit" -#: builtin/replace.c:443 +#: builtin/replace.c:444 msgid "use this format" msgstr "иÑпользовать Ñтот формат" -#: builtin/rerere.c:12 +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "запиÑать чиÑтые Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð¾Ð² в индекÑ" -#: builtin/reset.c:26 +#: builtin/reset.c:29 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]" -#: builtin/reset.c:27 +#: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<указатель-дерева>] [--] <пути>…" -#: builtin/reset.c:28 +#: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "mixed" msgstr "Ñмешанный" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "soft" msgstr "мÑгкий" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "hard" msgstr "жеÑткий" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "merge" msgstr "ÑлиÑнием" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "keep" msgstr "оÑтавлением" -#: builtin/reset.c:74 +#: builtin/reset.c:77 msgid "You do not have a valid HEAD." msgstr "У Ð²Ð°Ñ Ð½ÐµÑ‚ верного HEAD." -#: builtin/reset.c:76 +#: builtin/reset.c:79 msgid "Failed to find tree of HEAD." msgstr "Ðе удалоÑÑŒ найти дерево у HEAD." -#: builtin/reset.c:82 +#: builtin/reset.c:85 #, c-format msgid "Failed to find tree of %s." msgstr "Ðе удалоÑÑŒ найти дерево у %s." -#: builtin/reset.c:100 +#: builtin/reset.c:103 #, c-format msgid "HEAD is now at %s" msgstr "HEAD ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð° %s" -#: builtin/reset.c:183 +#: builtin/reset.c:186 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÑÐ±Ñ€Ð¾Ñ Ð² режиме «%s» во Ð²Ñ€ÐµÐ¼Ñ ÑлиÑниÑ." -#: builtin/reset.c:276 +#: builtin/reset.c:286 msgid "be quiet, only report errors" msgstr "тихий режим, выводить только ошибки" -#: builtin/reset.c:278 +#: builtin/reset.c:288 msgid "reset HEAD and index" msgstr "ÑброÑить HEAD и индекÑ" -#: builtin/reset.c:279 +#: builtin/reset.c:289 msgid "reset only HEAD" msgstr "ÑброÑить только HEAD" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:291 builtin/reset.c:293 msgid "reset HEAD, index and working tree" msgstr "ÑброÑить HEAD, Ð¸Ð½Ð´ÐµÐºÑ Ð¸ рабочий каталог" -#: builtin/reset.c:285 +#: builtin/reset.c:295 msgid "reset HEAD but keep local changes" msgstr "ÑброÑить HEAD, но оÑтавить локальные изменениÑ" -#: builtin/reset.c:288 +#: builtin/reset.c:301 msgid "record only the fact that removed paths will be added later" msgstr "запиÑать только факт того, что удаленные пути будут добавлены позже" -#: builtin/reset.c:305 +#: builtin/reset.c:320 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Ðе удалоÑÑŒ раÑпознать «%s» как дейÑтвительную редакцию." -#: builtin/reset.c:313 +#: builtin/reset.c:328 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Ðе удалоÑÑŒ раÑпознать «%s» как дейÑтвительное дерево." -#: builtin/reset.c:322 +#: builtin/reset.c:337 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ --{hard,mixed,soft}" -#: builtin/reset.c:331 +#: builtin/reset.c:346 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "иÑпользование опции --mixed Ñ Ð¿ÑƒÑ‚Ñми уÑтарело; иÑпользуйте «git reset -- <пути>» instead." -#: builtin/reset.c:333 +#: builtin/reset.c:348 #, c-format msgid "Cannot do %s reset with paths." msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÑÐ±Ñ€Ð¾Ñ Ð² режиме «%s» вмеÑте Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ пути." -#: builtin/reset.c:343 +#: builtin/reset.c:358 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "ÑÐ±Ñ€Ð¾Ñ Â«%s» разрешен только Ñ Ð³Ð¾Ð»Ñ‹Ð¼ репозиторием" -#: builtin/reset.c:347 +#: builtin/reset.c:362 msgid "-N can only be used with --mixed" msgstr "-N можно иÑпользовать вмеÑте Ñ --mixed" -#: builtin/reset.c:364 +#: builtin/reset.c:379 msgid "Unstaged changes after reset:" msgstr "ÐепроиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñле ÑброÑа:" -#: builtin/reset.c:370 +#: builtin/reset.c:385 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Ðе удалоÑÑŒ ÑброÑить файл индекÑа на редакцию «%s»." -#: builtin/reset.c:374 +#: builtin/reset.c:389 msgid "Could not write new index file." msgstr "Ðе удалоÑÑŒ запиÑать новый файл индекÑа." -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:358 msgid "rev-list does not support display of notes" msgstr "rev-list не поддерживает отображение заметок" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:394 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:399 msgid "keep the `--` passed as an arg" msgstr "передавать далее «--» как аргумент" -#: builtin/rev-parse.c:400 +#: builtin/rev-parse.c:401 msgid "stop parsing after the first non-option argument" msgstr "оÑтановить разбор поÑле первого аргумента не ÑвлÑющегоÑÑ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹" -#: builtin/rev-parse.c:403 +#: builtin/rev-parse.c:404 msgid "output in stuck long form" msgstr "выводить аргументы в длинном формате" -#: builtin/rev-parse.c:534 +#: builtin/rev-parse.c:535 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11868,96 +11973,96 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]\n or: git rev-parse --sq-quote [<аргумент>…]\n or: git rev-parse [<опции>] [<аргумент>…]\n\nЗапуÑтите команду «git rev-parse --parseopt -h» Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð¹ информации о первом иÑпользовании." -#: builtin/revert.c:22 +#: builtin/revert.c:23 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<опции>] <указатель-коммита>…" -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert <subcommand>" msgstr "git revert <подкоманда>" -#: builtin/revert.c:28 +#: builtin/revert.c:29 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<опции>] <указатель-коммита>…" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <подкоманда>" -#: builtin/revert.c:89 +#: builtin/revert.c:90 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ %s" -#: builtin/revert.c:98 +#: builtin/revert.c:99 msgid "end revert or cherry-pick sequence" msgstr "конец поÑледовательноÑти ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммитов" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "resume revert or cherry-pick sequence" msgstr "продолжить поÑледовательноÑÑ‚ÑŒ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммитов" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "cancel revert or cherry-pick sequence" msgstr "отмена поÑледовательноÑти ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммитов" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "don't automatically commit" msgstr "не коммитить автоматичеÑки" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "edit the commit message" msgstr "изменить Ñообщение коммита" -#: builtin/revert.c:105 +#: builtin/revert.c:106 msgid "parent-number" msgstr "номер-родителÑ" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "select mainline parent" msgstr "выбор оÑновного родителÑ" -#: builtin/revert.c:108 +#: builtin/revert.c:109 msgid "merge strategy" msgstr "ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ ÑлиÑниÑ" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "option" msgstr "опциÑ" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option for merge strategy" msgstr "Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Ñтратегии ÑлиÑниÑ" -#: builtin/revert.c:119 +#: builtin/revert.c:120 msgid "append commit name" msgstr "добавить Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°" -#: builtin/revert.c:121 +#: builtin/revert.c:122 msgid "preserve initially empty commits" msgstr "Ñохранить изначально пуÑтые коммиты" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "allow commits with empty messages" msgstr "разрешить коммиты Ñ Ð¿ÑƒÑтыми ÑообщениÑми" -#: builtin/revert.c:123 +#: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "оÑтавить избыточные, пуÑтые коммиты" -#: builtin/revert.c:211 +#: builtin/revert.c:212 msgid "revert failed" msgstr "Ñбой Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ коммита" -#: builtin/revert.c:224 +#: builtin/revert.c:225 msgid "cherry-pick failed" msgstr "Ñбой при копировании коммита" -#: builtin/rm.c:17 +#: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<опции>] [--] <файл>…" -#: builtin/rm.c:205 +#: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -11969,13 +12074,13 @@ msgstr[1] "Ñледующие файлы Ñодержат проиндекÑир msgstr[2] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÑŽÑ‰Ð¸ÐµÑÑ Ð¸ от файла, и от HEAD:" msgstr[3] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÑŽÑ‰Ð¸ÐµÑÑ Ð¸ от файла, и от HEAD:" -#: builtin/rm.c:210 +#: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" msgstr "\n(иÑпользуйте опцию «-f» Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ удалениÑ)" -#: builtin/rm.c:214 +#: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² индекÑе:" @@ -11983,13 +12088,13 @@ msgstr[1] "Ñледующие файлы Ñодержат проиндекÑир msgstr[2] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² индекÑе:" msgstr[3] "Ñледующие файлы Ñодержат проиндекÑированные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² индекÑе:" -#: builtin/rm.c:218 builtin/rm.c:227 +#: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "\n(иÑпользуйте опцию «--cached» Ð´Ð»Ñ Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°, или «-f» Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ удалениÑ)" -#: builtin/rm.c:224 +#: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "Ñледующие файлы Ñодержат локальные изменениÑ:" @@ -11997,23 +12102,23 @@ msgstr[1] "Ñледующие файлы Ñодержат локальные иРmsgstr[2] "Ñледующие файлы Ñодержат локальные изменениÑ:" msgstr[3] "Ñледующие файлы Ñодержат локальные изменениÑ:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "не выводить ÑпиÑок удаленных файлов" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "удалить только из индекÑа" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "пропуÑтить проверку актуальноÑти" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "разрешить рекурÑивное удаление" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "выход Ñ Ð½ÑƒÐ»ÐµÐ²Ñ‹Ð¼ кодом возврата, даже еÑли ничего не найдено" @@ -12032,57 +12137,57 @@ msgstr "git rm: не удалоÑÑŒ удалить %s" msgid "could not remove '%s'" msgstr "не удалоÑÑŒ удалить «%s»" -#: builtin/send-pack.c:18 +#: builtin/send-pack.c:19 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n" " --all and explicit <ref> specification are mutually exclusive." msgstr "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<Ñервер>:]<каталог> [<ÑÑылка>…]\n --all и Ñвный Ñпецификатор <ÑÑылки> взаимно иÑключающие." -#: builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "remote name" msgstr "Ð¸Ð¼Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ репозиториÑ" -#: builtin/send-pack.c:175 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "протокол без ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ ÑоÑтоÑÐ½Ð¸Ñ Ð´Ð»Ñ RPC" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "прочитать ÑÑылки из Ñтандартного ввода" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "вывеÑти ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¾Ñ‚ Ñкрипта внешнего Ñервера" -#: builtin/shortlog.c:13 +#: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:249 msgid "Group by committer rather than author" msgstr "Группировать по коммитеру, а не по автору" -#: builtin/shortlog.c:250 +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "отÑортировать вывод по количеÑтву коммитов у автора" -#: builtin/shortlog.c:252 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "Ðе выводить опиÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð², а только их количеÑтво" -#: builtin/shortlog.c:254 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "Показать почту каждого из авторов" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок на выводе" -#: builtin/show-branch.c:10 +#: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -12090,11 +12195,11 @@ msgid "" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n\t\t[--current] [--color[=<когда>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics] [(<редакциÑ> | <шаблон>)…]" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ÑÑылка>]" -#: builtin/show-branch.c:374 +#: builtin/show-branch.c:376 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" @@ -12103,90 +12208,90 @@ msgstr[1] "игнорирование %s; невозможно Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ msgstr[2] "игнорирование %s; невозможно обработать больше %d ÑÑылок" msgstr[3] "игнорирование %s; невозможно обработать больше %d ÑÑылки" -#: builtin/show-branch.c:536 +#: builtin/show-branch.c:530 #, c-format msgid "no matching refs with %s" msgstr "нет Ñовпадающих запиÑей Ñ %s" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:626 msgid "show remote-tracking and local branches" msgstr "показать ÑпиÑок и отÑлеживаемых внешних и локальных веток" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:628 msgid "show remote-tracking branches" msgstr "показать ÑпиÑок отÑлеживаемых внешних веток" -#: builtin/show-branch.c:636 +#: builtin/show-branch.c:630 msgid "color '*!+-' corresponding to the branch" msgstr "окрашивать «*!+-» в ÑоответÑтвии Ñ Ð²ÐµÑ‚ÐºÐ¾Ð¹" -#: builtin/show-branch.c:638 +#: builtin/show-branch.c:632 msgid "show <n> more commits after the common ancestor" msgstr "показать <n> коммитов поÑле общего предка" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:634 msgid "synonym to more=-1" msgstr "Ñиноним Ð´Ð»Ñ more=-1" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:635 msgid "suppress naming strings" msgstr "не выводить именованные Ñтроки" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:637 msgid "include the current branch" msgstr "включить в вывод текущую ветку" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:639 msgid "name commits with their object names" msgstr "именовать коммиты их именами объектов" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:641 msgid "show possible merge bases" msgstr "вывеÑти возможные базы ÑлиÑниÑ" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:643 msgid "show refs unreachable from any other ref" msgstr "вывеÑти ÑÑылки, недоÑтупные из любых других ÑÑылок" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:645 msgid "show commits in topological order" msgstr "вывеÑти коммиты в топологичеÑком порÑдке" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:648 msgid "show only commits not on the first branch" msgstr "вывеÑти только коммиты, отÑутÑтвующие в первой ветке" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:650 msgid "show merges reachable from only one tip" msgstr "вывеÑти ÑлиÑниÑ, доÑтижимые только из одной из верхушек" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:652 msgid "topologically sort, maintaining date order where possible" msgstr "топологичеÑÐºÐ°Ñ Ñортировка, Ñ Ñохранением порÑдка дат, еÑли возможно" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:655 msgid "<n>[,<base>]" msgstr "<n>[,<база>]" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" msgstr "показать <n> поÑледних запиÑей в журнале ÑÑылок, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð±Ð°Ð·Ñ‹" -#: builtin/show-branch.c:696 +#: builtin/show-branch.c:690 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-" "base" msgstr "--reflog неÑовмеÑтимо Ñ --all, --remotes, --independent и --merge-base" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" msgstr "не указаны ветки и HEAD не дейÑтвительный" -#: builtin/show-branch.c:723 +#: builtin/show-branch.c:717 msgid "--reflog option needs one branch name" msgstr "параметр --reflog требует ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ одной ветки" -#: builtin/show-branch.c:726 +#: builtin/show-branch.c:720 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." @@ -12195,12 +12300,12 @@ msgstr[1] "только %d запиÑи могут быть показаны оРmsgstr[2] "только %d запиÑей могут быть показаны одновременно." msgstr[3] "только %d запиÑи могут быть показаны одновременно." -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:724 #, c-format msgid "no such ref %s" msgstr "нет такой ÑÑылки %s" -#: builtin/show-branch.c:814 +#: builtin/show-branch.c:808 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." @@ -12209,12 +12314,12 @@ msgstr[1] "невозможно обработать больше %d Ñ€ÐµÐ´Ð°ÐºÑ msgstr[2] "невозможно обработать больше %d редакций." msgstr[3] "невозможно обработать больше %d редакции." -#: builtin/show-branch.c:818 +#: builtin/show-branch.c:812 #, c-format msgid "'%s' is not a valid ref." msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимой ÑÑылкой на коммит." -#: builtin/show-branch.c:821 +#: builtin/show-branch.c:815 #, c-format msgid "cannot find commit %s (%s)" msgstr "не удалоÑÑŒ найти коммит %s (%s)" @@ -12261,33 +12366,33 @@ msgstr "не печатать результат на Ñтандартный Ð²Ñ msgid "show refs from stdin that aren't in local repository" msgstr "вывеÑти ÑÑылки Ñо Ñтандартного ввода, которых нет в локальном репозитории" -#: builtin/stripspace.c:17 +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "пропуÑтить и удалить вÑе Ñтроки, начинающиеÑÑ Ñ Ñимвола комметариÑ" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "добавить перед каждой Ñтрокой Ñимвол ÐºÐ¾Ð¼Ð¼ÐµÑ‚Ð°Ñ€Ð¸Ñ Ð¸ пробел" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "Ðет такой ÑÑылки: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "ОжидалоÑÑŒ полное Ð¸Ð¼Ñ ÑÑылки, а получено %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:72 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не удалоÑÑŒ обрезать один компонент url «%s»" @@ -12480,79 +12585,75 @@ msgstr "рекурÑивно по подмодулÑм" msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<путь>…]" -#: builtin/submodule--helper.c:1226 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "подкоманда submodule--helper должна вызыватьÑÑ Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸ÐµÐ¼ подкоманды" - -#: builtin/submodule--helper.c:1233 +#: builtin/submodule--helper.c:1232 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s не поддерживает параметр --super-prefix" -#: builtin/submodule--helper.c:1239 +#: builtin/submodule--helper.c:1238 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "«%s» не ÑвлÑетÑÑ Ð¿Ð¾Ð´ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ submodule--helper" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<опции>] <имÑ> [<ÑÑылка>]" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <имÑ>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:41 msgid "suppress error message for non-symbolic (detached) refs" msgstr "не выводить ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках Ð´Ð»Ñ Ð½ÐµÑимвольных (отÑоединенных) ÑÑылок" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:42 msgid "delete symbolic ref" msgstr "удалить Ñимвольные ÑÑылки" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:43 msgid "shorten ref output" msgstr "укороченный вывод ÑÑылок" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason" msgstr "причина" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason of the update" msgstr "причина обновлениÑ" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <Ñообщение> | -F <файл>] <имÑ-метки> [<редакциÑ>]" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "git tag -d <tagname>..." msgstr "git tag -d <имÑ-метки>…" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "git tag -l [-n[<количеÑтво>]] [--contains <коммит>] [--no-contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]" -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<формат>] <имÑ-метки>…" -#: builtin/tag.c:83 +#: builtin/tag.c:84 #, c-format msgid "tag '%s' not found." msgstr "метка «%s» не найдена." -#: builtin/tag.c:99 +#: builtin/tag.c:100 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Метка «%s» удалена (была %s)\n" -#: builtin/tag.c:128 +#: builtin/tag.c:129 #, c-format msgid "" "\n" @@ -12561,7 +12662,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "\nВведите Ñообщение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸:\n %s\nСтроки, начинающиеÑÑ Ñ Â«%c» будут проигнорированы.\n" -#: builtin/tag.c:132 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -12570,586 +12671,586 @@ msgid "" "Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" msgstr "\nВведите Ñообщение Ð´Ð»Ñ Ð¼ÐµÑ‚ÐºÐ¸:\n %s\nСтроки, начинающиеÑÑ Ñ Â«%c» будут оÑтавлены; вы можете удалить их вручную, еÑли хотите.\n" -#: builtin/tag.c:210 +#: builtin/tag.c:211 msgid "unable to sign the tag" msgstr "не удалоÑÑŒ подпиÑать метку" -#: builtin/tag.c:212 +#: builtin/tag.c:213 msgid "unable to write tag file" msgstr "не удалоÑÑŒ запиÑать файл метки" -#: builtin/tag.c:236 +#: builtin/tag.c:237 msgid "bad object type." msgstr "неправильный тип объекта" -#: builtin/tag.c:282 +#: builtin/tag.c:283 msgid "no tag message?" msgstr "нет опиÑÐ°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸?" -#: builtin/tag.c:289 +#: builtin/tag.c:290 #, c-format msgid "The tag message has been left in %s\n" msgstr "Сообщение метки было оÑтавлено в %s\n" -#: builtin/tag.c:397 +#: builtin/tag.c:398 msgid "list tag names" msgstr "ÑпиÑок названий меток" -#: builtin/tag.c:399 +#: builtin/tag.c:400 msgid "print <n> lines of each tag message" msgstr "печатать <n> Ñтрок опиÑÐ°Ð½Ð¸Ñ Ð¾Ñ‚ каждой метки" -#: builtin/tag.c:401 +#: builtin/tag.c:402 msgid "delete tags" msgstr "удалить метки" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "verify tags" msgstr "проверить метки" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "Tag creation options" msgstr "ÐаÑтройки ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "annotated tag, needs a message" msgstr "Ð´Ð»Ñ Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ð¹ метки нужно Ñообщение" -#: builtin/tag.c:408 +#: builtin/tag.c:409 msgid "tag message" msgstr "опиÑание метки" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "annotated and GPG-signed tag" msgstr "Ð°Ð½Ð½Ð¾Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¸ подпиÑÐ°Ð½Ð½Ð°Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ GPG метка" -#: builtin/tag.c:414 +#: builtin/tag.c:415 msgid "use another key to sign the tag" msgstr "иÑпользовать другой ключ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð¼ÐµÑ‚ÐºÐ¸" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "replace the tag if exists" msgstr "замена метки, еÑли она ÑущеÑтвует" -#: builtin/tag.c:416 builtin/update-ref.c:368 +#: builtin/tag.c:417 builtin/update-ref.c:369 msgid "create a reflog" msgstr "Ñоздать журнал ÑÑылок" -#: builtin/tag.c:418 +#: builtin/tag.c:419 msgid "Tag listing options" msgstr "ÐаÑтройки вывода ÑпиÑка меток" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "show tag list in columns" msgstr "показать ÑпиÑок меток по Ñтолбцам" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:421 builtin/tag.c:423 msgid "print only tags that contain the commit" msgstr "вывод только меток, которые Ñодержат коммит" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:422 builtin/tag.c:424 msgid "print only tags that don't contain the commit" msgstr "вывод только меток, которые не Ñодержат коммит" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "print only tags that are merged" msgstr "вывод только Ñлитых меток" -#: builtin/tag.c:425 +#: builtin/tag.c:426 msgid "print only tags that are not merged" msgstr "вывод только не Ñлитых меток" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags of the object" msgstr "вывод только меток, определенного объекта" -#: builtin/tag.c:469 +#: builtin/tag.c:470 msgid "--column and -n are incompatible" msgstr "--column и -n Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/tag.c:491 +#: builtin/tag.c:492 msgid "-n option is only allowed in list mode" msgstr "опцию -n можно иÑпользовать только в режиме ÑпиÑка" -#: builtin/tag.c:493 +#: builtin/tag.c:494 msgid "--contains option is only allowed in list mode" msgstr "опцию --contains можно иÑпользовать только в режиме ÑпиÑка" -#: builtin/tag.c:495 +#: builtin/tag.c:496 msgid "--no-contains option is only allowed in list mode" msgstr "опцию --no-contains можно иÑпользовать только в режиме ÑпиÑка" -#: builtin/tag.c:497 +#: builtin/tag.c:498 msgid "--points-at option is only allowed in list mode" msgstr "опцию --points-at можно иÑпользовать только в режиме ÑпиÑка" -#: builtin/tag.c:499 +#: builtin/tag.c:500 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "опции --merged и --no-merged можно иÑпользовать только в режиме ÑпиÑка" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "only one -F or -m option is allowed." msgstr "-F и -m Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно." -#: builtin/tag.c:529 +#: builtin/tag.c:530 msgid "too many params" msgstr "передано Ñлишком много параметров" -#: builtin/tag.c:535 +#: builtin/tag.c:536 #, c-format msgid "'%s' is not a valid tag name." msgstr "«%s» не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым именем метки." -#: builtin/tag.c:540 +#: builtin/tag.c:541 #, c-format msgid "tag '%s' already exists" msgstr "метка «%s» уже ÑущеÑтвует" -#: builtin/tag.c:570 +#: builtin/tag.c:571 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Метка «%s» обновлена (была %s)\n" -#: builtin/unpack-objects.c:493 +#: builtin/unpack-objects.c:494 msgid "Unpacking objects" msgstr "РаÑпаковка объектов" -#: builtin/update-index.c:79 +#: builtin/update-index.c:80 #, c-format msgid "failed to create directory %s" msgstr "не удалоÑÑŒ Ñоздать каталог %s" -#: builtin/update-index.c:85 +#: builtin/update-index.c:86 #, c-format msgid "failed to stat %s" msgstr "не удалоÑÑŒ выполнить stat %s" -#: builtin/update-index.c:95 +#: builtin/update-index.c:96 #, c-format msgid "failed to create file %s" msgstr "не удалоÑÑŒ Ñоздать файл %s" -#: builtin/update-index.c:103 +#: builtin/update-index.c:104 #, c-format msgid "failed to delete file %s" msgstr "не удалоÑÑŒ удалить файл %s" -#: builtin/update-index.c:110 builtin/update-index.c:216 +#: builtin/update-index.c:111 builtin/update-index.c:217 #, c-format msgid "failed to delete directory %s" msgstr "не удалоÑÑŒ удалить каталог %s" -#: builtin/update-index.c:135 +#: builtin/update-index.c:136 #, c-format msgid "Testing mtime in '%s' " msgstr "Проверка mtime в «%s» " -#: builtin/update-index.c:149 +#: builtin/update-index.c:150 msgid "directory stat info does not change after adding a new file" msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑтатиÑтики каталога не изменÑетÑÑ Ð¿Ð¾Ñле Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ файла" -#: builtin/update-index.c:162 +#: builtin/update-index.c:163 msgid "directory stat info does not change after adding a new directory" msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑтатиÑтики каталога не изменÑетÑÑ Ð¿Ð¾Ñле Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ каталога" -#: builtin/update-index.c:175 +#: builtin/update-index.c:176 msgid "directory stat info changes after updating a file" msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑтатиÑтики каталога изменÑетÑÑ Ð¿Ð¾Ñле Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ файла" -#: builtin/update-index.c:186 +#: builtin/update-index.c:187 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑтатиÑтики каталога изменÑетÑÑ Ð¿Ð¾Ñле Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ файла внутри подкаталога" -#: builtin/update-index.c:197 +#: builtin/update-index.c:198 msgid "directory stat info does not change after deleting a file" msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑтатиÑтики каталога не изменÑетÑÑ Ð¿Ð¾Ñле ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: builtin/update-index.c:210 +#: builtin/update-index.c:211 msgid "directory stat info does not change after deleting a directory" msgstr "Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑтатиÑтики каталога не изменÑетÑÑ Ð¿Ð¾Ñле ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°" -#: builtin/update-index.c:217 +#: builtin/update-index.c:218 msgid " OK" msgstr " OK" -#: builtin/update-index.c:568 +#: builtin/update-index.c:569 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<опции>] [--] [<файл>…]" -#: builtin/update-index.c:923 +#: builtin/update-index.c:924 msgid "continue refresh even when index needs update" msgstr "продолжить обновление, даже еÑли Ð¸Ð½Ð´ÐµÐºÑ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ обновлениÑ" -#: builtin/update-index.c:926 +#: builtin/update-index.c:927 msgid "refresh: ignore submodules" msgstr "обновление: игнорировать подмодули" -#: builtin/update-index.c:929 +#: builtin/update-index.c:930 msgid "do not ignore new files" msgstr "не игнорировать новые файлы" -#: builtin/update-index.c:931 +#: builtin/update-index.c:932 msgid "let files replace directories and vice-versa" msgstr "разрешить файлам заменÑÑ‚ÑŒ каталоги и наоборот" -#: builtin/update-index.c:933 +#: builtin/update-index.c:934 msgid "notice files missing from worktree" msgstr "замечать файлы отÑутÑтвующие в рабочем каталоге" -#: builtin/update-index.c:935 +#: builtin/update-index.c:936 msgid "refresh even if index contains unmerged entries" msgstr "обновить, даже еÑли в индекÑе имеютÑÑ Ð½Ðµ Ñлитые запиÑи" -#: builtin/update-index.c:938 +#: builtin/update-index.c:939 msgid "refresh stat information" msgstr "обновить информацию о ÑтатуÑе файлов" -#: builtin/update-index.c:942 +#: builtin/update-index.c:943 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "как --refresh, но игнорировать наÑтройку assume-unchanged" -#: builtin/update-index.c:946 +#: builtin/update-index.c:947 msgid "<mode>,<object>,<path>" msgstr "<режим доÑтупа>,<объект>,<путь>" -#: builtin/update-index.c:947 +#: builtin/update-index.c:948 msgid "add the specified entry to the index" msgstr "добавить указанную запиÑÑŒ в индекÑ" -#: builtin/update-index.c:956 +#: builtin/update-index.c:957 msgid "mark files as \"not changing\"" msgstr "пометить файлы как «не измененные»" -#: builtin/update-index.c:959 +#: builtin/update-index.c:960 msgid "clear assumed-unchanged bit" msgstr "убрать пометку assumed-unchanged" -#: builtin/update-index.c:962 +#: builtin/update-index.c:963 msgid "mark files as \"index-only\"" msgstr "пометить файлы как «только в индекÑе»" -#: builtin/update-index.c:965 +#: builtin/update-index.c:966 msgid "clear skip-worktree bit" msgstr "убрать пометку skip-worktree" -#: builtin/update-index.c:968 +#: builtin/update-index.c:969 msgid "add to index only; do not add content to object database" msgstr "только добавить в индекÑ; не добавлÑÑ‚ÑŒ Ñодержимое в базу данных объектов" -#: builtin/update-index.c:970 +#: builtin/update-index.c:971 msgid "remove named paths even if present in worktree" msgstr "удалить указанные пути, даже еÑли они ÑущеÑтвуют в рабочем каталоге" -#: builtin/update-index.c:972 +#: builtin/update-index.c:973 msgid "with --stdin: input lines are terminated by null bytes" msgstr "Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --stdin: Ñтроки на вводе отделÑÑŽÑ‚ÑÑ ÐУЛЕВЫМ байтом" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "read list of paths to be updated from standard input" msgstr "прочитать ÑпиÑок обновлÑемых путей из Ñтандартного ввода" -#: builtin/update-index.c:978 +#: builtin/update-index.c:979 msgid "add entries from standard input to the index" msgstr "добавить запиÑи из Ñтандартного ввода в индекÑ" -#: builtin/update-index.c:982 +#: builtin/update-index.c:983 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "заново заполнить Ð¸Ð½Ð´ÐµÐºÑ #2 и #3 Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ñ… путей" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "only update entries that differ from HEAD" msgstr "обновить только запиÑи, которые отличаютÑÑ Ð¾Ñ‚ HEAD" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "ignore files missing from worktree" msgstr "игнорировать файлы, отÑутÑтвующие в рабочем каталоге" -#: builtin/update-index.c:993 +#: builtin/update-index.c:994 msgid "report actions to standard output" msgstr "вывеÑти выполнÑемые дейÑÑ‚Ð²Ð¸Ñ Ð½Ð° Ñтандартный вывод" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(Ð´Ð»Ñ Ð¼Ð°ÑˆÐ¸Ð½Ð½Ð¾Ð¹ обработки) забыть Ñохраненные неразрешенные конфликты" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1000 msgid "write index in this format" msgstr "запиÑать Ð¸Ð½Ð´ÐµÐºÑ Ð² указанном формате" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1002 msgid "enable or disable split index" msgstr "разрешить или запретить раздельный индекÑ" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1004 msgid "enable/disable untracked cache" msgstr "включить/отключить кÑш неотÑлеживаемых файлов" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "test if the filesystem supports untracked cache" msgstr "проверить, что Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема поддерживает кÑш неотÑлеживаемых файлов" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1008 msgid "enable untracked cache without testing the filesystem" msgstr "включить кÑш неотÑлеживаемых файлов без проверки файловой ÑиÑтемы" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1108 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "параметр core.splitIndex уÑтановлен в false; удалите или измените его, еÑли вы дейÑтвительно хотите включить разделенный индекÑ" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1117 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "параметр core.splitIndex уÑтановлен в true; удалите или измените его, еÑли вы дейÑтвительно хотите отключить разделенный индекÑ" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1128 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "параметр core.untrackedCache уÑтановлен true; удалите или измените его, еÑли вы дейÑтвительно хотите удалить кÑш неотÑлеживаемых файлов" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "Untracked cache disabled" msgstr "КÑш неотÑлеживаемых файлов отключен" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1140 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want" " to enable the untracked cache" msgstr "параметр core.untrackedCache уÑтановлен false; удалите или измените его, еÑли вы дейÑтвительно хотите включить кÑш неотÑлеживаемых файлов" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1144 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "КÑш неотÑлеживаемых файлов включен Ð´Ð»Ñ Â«%s»" -#: builtin/update-ref.c:9 +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<опции>] -d <имÑ-ÑÑылки> [<Ñтарое-значение>]" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "git update-ref [<опции>] <имÑ-ÑÑылки> <новое-значение> [<Ñтарое-значение>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<опции>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "удалить ÑÑылку" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "обновить <имÑ-ÑÑылки> а не то, на что она указывает" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "ввод отделённый ÐУЛЕВЫМИ Ñимволами" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "прочитать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð· Ñтандартного ввода" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "обновить информацию о Ñерверах Ñ Ð½ÑƒÐ»Ñ" -#: builtin/verify-commit.c:17 +#: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <коммит>…" -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:73 msgid "print commit contents" msgstr "вывеÑти Ñодержимое коммита" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "выводить Ñырой вывод ÑтатуÑа от gpg" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <пакет>…" -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "быть многоÑловнее" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "вывеÑти только ÑтатиÑтику" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<формат>] <метка>…" -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "вывеÑти Ñодержимое метки" -#: builtin/worktree.c:15 +#: builtin/worktree.c:16 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<опции>] <путь> [<ветка>]" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree list [<options>]" msgstr "git worktree list [<опции>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<опции>] <путь>" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<опции>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree unlock <path>" msgstr "git worktree unlock <путь>" -#: builtin/worktree.c:43 +#: builtin/worktree.c:44 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Удаление рабочих каталогов/%s: не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼" -#: builtin/worktree.c:49 +#: builtin/worktree.c:50 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Удаление рабочих каталогов/%s: файл gitdir не ÑущеÑтвует" -#: builtin/worktree.c:54 +#: builtin/worktree.c:55 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Удаление рабочих каталогов/%s: не удалоÑÑŒ прочитать файл gitdir (%s)" -#: builtin/worktree.c:65 +#: builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Удаление рабочих каталогов/%s: недейÑтвительный файл gitdir" -#: builtin/worktree.c:81 +#: builtin/worktree.c:82 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Удаление рабочих каталогов/%s: gitdir указывает на неÑущеÑтвующее раÑположение" -#: builtin/worktree.c:128 +#: builtin/worktree.c:129 msgid "report pruned working trees" msgstr "вывеÑти ÑпиÑок удаленных рабочих каталогов" -#: builtin/worktree.c:130 +#: builtin/worktree.c:131 msgid "expire working trees older than <time>" msgstr "удалить рабочие каталоги Ñтарее чем <дата-окончаниÑ>" -#: builtin/worktree.c:204 +#: builtin/worktree.c:205 #, c-format msgid "'%s' already exists" msgstr "«%s» уже ÑущеÑтвует" -#: builtin/worktree.c:235 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "не удалоÑÑŒ Ñоздать каталог «%s»" -#: builtin/worktree.c:274 +#: builtin/worktree.c:275 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Подготовка %s (идентификатор %s)" -#: builtin/worktree.c:328 +#: builtin/worktree.c:327 msgid "checkout <branch> even if already checked out in other worktree" msgstr "переключитьÑÑ Ð½Ð° <ветка> даже еÑли она уже активна в другом рабочеÑм каталоге" -#: builtin/worktree.c:330 +#: builtin/worktree.c:329 msgid "create a new branch" msgstr "Ñоздать новую ветку" -#: builtin/worktree.c:332 +#: builtin/worktree.c:331 msgid "create or reset a branch" msgstr "Ñоздать или перейти на ветку" -#: builtin/worktree.c:334 +#: builtin/worktree.c:333 msgid "populate the new working tree" msgstr "наполнить новый рабочий каталог" -#: builtin/worktree.c:335 +#: builtin/worktree.c:334 msgid "keep the new working tree locked" msgstr "держать рабочий каталог заблокированным" -#: builtin/worktree.c:343 +#: builtin/worktree.c:342 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B и --detach Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: builtin/worktree.c:478 +#: builtin/worktree.c:479 msgid "reason for locking" msgstr "причина блокировки" -#: builtin/worktree.c:490 builtin/worktree.c:523 +#: builtin/worktree.c:491 builtin/worktree.c:524 #, c-format msgid "'%s' is not a working tree" msgstr "«%s» не ÑвлÑетÑÑ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ð¼ каталогом" -#: builtin/worktree.c:492 builtin/worktree.c:525 +#: builtin/worktree.c:493 builtin/worktree.c:526 msgid "The main working tree cannot be locked or unlocked" msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован" -#: builtin/worktree.c:497 +#: builtin/worktree.c:498 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "«%s» уже заблокирован, причина: %s" -#: builtin/worktree.c:499 +#: builtin/worktree.c:500 #, c-format msgid "'%s' is already locked" msgstr "«%s» уже заблокирован" -#: builtin/worktree.c:527 +#: builtin/worktree.c:528 #, c-format msgid "'%s' is not locked" msgstr "«%s» не заблокирован" -#: builtin/write-tree.c:13 +#: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<префикÑ>/]" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "<префикÑ>/" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "вывеÑти объект дерева Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° Ñ <префикÑ>" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ при отладке" -#: upload-pack.c:22 +#: upload-pack.c:23 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<опции>] <каталог>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "выход поÑле обмена одним запроÑом/ответом" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "выходить Ñразу поÑле начального объÑÐ²Ð»ÐµÐ½Ð¸Ñ ÑпиÑка ÑÑылок" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "не проверÑÑ‚ÑŒ <каталог>/.git/ еÑли <каталог> не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼ Git" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "прервать передачу поÑле <кол> Ñекунд проÑтоÑ" -#: credential-cache--daemon.c:223 +#: credential-cache--daemon.c:224 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13158,31 +13259,31 @@ msgid "" "\tchmod 0700 %s" msgstr "Права доÑтупа к вашему каталогу Ñокетов Ñлишком Ñвободны; друге пользователи могуи читать ваши закÑшированные пароли доÑтупа. Обдумайте запуÑк команды:\n\n\tchmod 0700 %s" -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "вывод отладочных Ñообщений на stderr" -#: git.c:14 +#: git.c:15 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "«git help -а» и «git help -g» выводит ÑпиÑок доÑтупных подкоманд и\nнекоторые руководÑтва по темам. ЗапуÑтите «git help <команда>» или\n«git help <термин>», чтобы прочеÑÑ‚ÑŒ о конкретных подкоманде или теме." -#: http.c:336 +#: http.c:337 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "отрицательное значение http.postbuffer; иÑпользую Ñтандартное значение %d" -#: http.c:357 +#: http.c:358 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Ð”ÐµÐ»ÐµÐ³Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ полномочий не поддерживаетÑÑ Ñ cURL < 7.22.0" -#: http.c:366 +#: http.c:367 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Public key pinning не поддерживаетÑÑ Ñ cURL < 7.44.0" -#: http.c:1766 +#: http.c:1764 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13190,7 +13291,7 @@ msgid "" " redirect: %s" msgstr "не удалоÑÑŒ обновить базовый url из переадреÑации:\n запрошено: %s\n переадреÑовано: %s" -#: remote-curl.c:323 +#: remote-curl.c:324 #, c-format msgid "redirecting to %s" msgstr "переадреÑÐ°Ñ†Ð¸Ñ Ð½Ð° %s" @@ -13555,6 +13656,10 @@ msgstr "Когда вы разрешите Ñтот конфликт, Ð·Ð°Ð¿ÑƒÑ msgid "Could not move back to $head_name" msgstr "Ðе удалоÑÑŒ перейти назад на $head_name" +#: git-rebase.sh:169 +msgid "Applied autostash." +msgstr "Применены автоматичеÑки ÑпрÑтанные изменениÑ." + #: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" @@ -13626,7 +13731,7 @@ msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: нет такой ветки: $bran #: git-rebase.sh:562 msgid "Cannot autostash" -msgstr "Ðе удалоÑÑŒ выполнить автоматичеÑкое прÑтанье" +msgstr "Ðе удалоÑÑŒ автоматичеÑки ÑпрÑтать изменениÑ" #: git-rebase.sh:567 #, sh-format @@ -13661,39 +13766,39 @@ msgstr "Сначала перематываем указатель текущеРmsgid "Fast-forwarded $branch_name to $onto_name." msgstr "Перемотана вперед $branch_name до $onto_name." -#: git-stash.sh:53 +#: git-stash.sh:54 msgid "git stash clear with parameters is unimplemented" msgstr "git stash очиÑтка Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð°Ð¼Ð¸ не реализована" -#: git-stash.sh:94 +#: git-stash.sh:95 msgid "You do not have the initial commit yet" msgstr "У Ð²Ð°Ñ ÐµÑ‰Ðµ нет начального коммита" -#: git-stash.sh:109 +#: git-stash.sh:110 msgid "Cannot save the current index state" msgstr "Ðе удалоÑÑŒ Ñохранить текущее ÑоÑтоÑние индекÑа" -#: git-stash.sh:124 +#: git-stash.sh:125 msgid "Cannot save the untracked files" msgstr "Ðевозможно Ñохранить неотÑлеживаемые файлы" -#: git-stash.sh:144 git-stash.sh:157 +#: git-stash.sh:145 git-stash.sh:158 msgid "Cannot save the current worktree state" msgstr "Ðе удалоÑÑŒ Ñохранить текущее ÑоÑтоÑние рабочего каталога" -#: git-stash.sh:161 +#: git-stash.sh:162 msgid "No changes selected" msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ выбраны" -#: git-stash.sh:164 +#: git-stash.sh:165 msgid "Cannot remove temporary index (can't happen)" msgstr "Ðе удалоÑÑŒ удалить временный Ð¸Ð½Ð´ÐµÐºÑ (не должно ÑлучатьÑÑ)" -#: git-stash.sh:177 +#: git-stash.sh:178 msgid "Cannot record working tree state" msgstr "Ðе удалоÑÑŒ запиÑать ÑоÑтоÑние рабочего каталога" -#: git-stash.sh:209 +#: git-stash.sh:210 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Ðе удалоÑÑŒ обновить $ref_stash Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ $w_commit" @@ -13707,114 +13812,114 @@ msgstr "Ðе удалоÑÑŒ обновить $ref_stash Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ $w_com #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:265 +#: git-stash.sh:266 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "ошибка: неизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ Ð´Ð»Ñ Â«stash save»: $option\n Ð”Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑообщениÑ, иÑпользуйте git stash save -- «$option»" -#: git-stash.sh:278 +#: git-stash.sh:281 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать --patch и --include-untracked или --all одновременно" -#: git-stash.sh:286 +#: git-stash.sh:289 msgid "No local changes to save" msgstr "Ðет локальных изменений Ð´Ð»Ñ ÑохранениÑ" -#: git-stash.sh:291 +#: git-stash.sh:294 msgid "Cannot initialize stash" msgstr "Ðе удалоÑÑŒ инициализировать ÑпрÑтанные изменениÑ" -#: git-stash.sh:295 +#: git-stash.sh:298 msgid "Cannot save the current status" msgstr "Ðе удалоÑÑŒ Ñохранить текущий ÑтатуÑ" -#: git-stash.sh:296 +#: git-stash.sh:299 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Рабочий каталог и ÑоÑтоÑние индекÑа Ñохранены $stash_msg" -#: git-stash.sh:323 +#: git-stash.sh:326 msgid "Cannot remove worktree changes" msgstr "Ðе удалоÑÑŒ удалить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ каталога" -#: git-stash.sh:471 +#: git-stash.sh:474 #, sh-format msgid "unknown option: $opt" msgstr "неизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ: $opt" -#: git-stash.sh:484 -msgid "No stash found." +#: git-stash.sh:487 +msgid "No stash entries found." msgstr "Ðе найдены ÑпрÑтанные изменениÑ." -#: git-stash.sh:491 +#: git-stash.sh:494 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Передано Ñлишком много редакций: $REV" -#: git-stash.sh:506 +#: git-stash.sh:509 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительной ÑÑылкой" -#: git-stash.sh:534 +#: git-stash.sh:537 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "«$args» не похоже на коммит Ñо ÑпрÑтанными изменениÑми" -#: git-stash.sh:545 +#: git-stash.sh:548 #, sh-format msgid "'$args' is not a stash reference" msgstr "«$args» не ÑвлÑетÑÑ ÑÑылкой на ÑпрÑтанные изменениÑ" -#: git-stash.sh:553 +#: git-stash.sh:556 msgid "unable to refresh index" msgstr "не удалоÑÑŒ обновить индекÑ" -#: git-stash.sh:557 +#: git-stash.sh:560 msgid "Cannot apply a stash in the middle of a merge" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑпрÑтанные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑлиÑниÑ" -#: git-stash.sh:565 +#: git-stash.sh:568 msgid "Conflicts in index. Try without --index." msgstr "Конфликты в индекÑе. Попробуйте без --index." -#: git-stash.sh:567 +#: git-stash.sh:570 msgid "Could not save index tree" msgstr "Ðе удалоÑÑŒ Ñохранить дерево индекÑа" -#: git-stash.sh:576 -msgid "Could not restore untracked files from stash" -msgstr "Ðевозможно воÑÑтановить неотÑлеживаемые файлы из ÑпÑтанных файлов" +#: git-stash.sh:579 +msgid "Could not restore untracked files from stash entry" +msgstr "Ðевозможно воÑÑтановить неотÑлеживаемые файлы из ÑпрÑтанных изменений" -#: git-stash.sh:601 +#: git-stash.sh:604 msgid "Cannot unstage modified files" msgstr "Ðевозможно убрать из индекÑа измененные файлы" -#: git-stash.sh:616 +#: git-stash.sh:619 msgid "Index was not unstashed." msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð½Ðµ был извлечён из ÑпрÑтанных изменений." -#: git-stash.sh:630 -msgid "The stash is kept in case you need it again." +#: git-stash.sh:633 +msgid "The stash entry is kept in case you need it again." msgstr "СпрÑтанные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñохранены, на Ñлучай еÑли они Ñнова вам понадобÑÑ‚ÑÑ." -#: git-stash.sh:639 +#: git-stash.sh:642 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Отброшено ${REV} ($s)" -#: git-stash.sh:640 +#: git-stash.sh:643 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Ðе удалоÑÑŒ отброÑить запиÑÑŒ из ÑпрÑтанных изменений" -#: git-stash.sh:648 +#: git-stash.sh:651 msgid "No branch name specified" msgstr "Ðе указано Ð¸Ð¼Ñ Ð²ÐµÑ‚ÐºÐ¸" -#: git-stash.sh:727 +#: git-stash.sh:730 msgid "(To restore them type \"git stash apply\")" msgstr "(Чтобы воÑÑтановить их, наберите «git stash apply»)" @@ -13837,7 +13942,7 @@ msgstr "«$sm_path» уже ÑодержитÑÑ Ð² индекÑе" msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "«$sm_path» уже ÑодержитÑÑ Ð² индекÑе и не ÑвлÑетÑÑ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¼" -#: git-submodule.sh:218 +#: git-submodule.sh:219 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13845,22 +13950,22 @@ msgid "" "Use -f if you really want to add it." msgstr "Следующие пути игнорируютÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из ваших файлов .gitignore:\n$sm_path\nИÑпользуйте опцию -f, еÑли вы дейÑтвительно хотите его добавить." -#: git-submodule.sh:236 +#: git-submodule.sh:237 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "ДобавлÑÑŽ ÑущеÑтвующий репозиторий из «$sm_path» в индекÑ" -#: git-submodule.sh:238 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "«$sm_path» уже ÑущеÑтвует и не ÑвлÑетÑÑ Ð´ÐµÐ¹Ñтвительным репозиторием git" -#: git-submodule.sh:246 +#: git-submodule.sh:247 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "Каталог git Ð´Ð»Ñ Â«$sm_name» найден локально на внешних репозиториÑÑ…:" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -13869,184 +13974,184 @@ msgid "" "or you are unsure what this means choose another name with the '--name' option." msgstr "ЕÑли вы хотите повторно иÑпользовать локальный каталог git вмеÑто повторного ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð·\n $realrepo\nто иÑпользуйте параметр «--force». ЕÑли же локальный каталог git не ÑвлÑетÑÑ Ð½ÑƒÐ¶Ð½Ñ‹Ð¼ репозиторием или еÑли вы не уверены, что Ñто значит, то укажите другое Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ параметра «--name»." -#: git-submodule.sh:254 +#: git-submodule.sh:255 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "ВоÑÑтановление локального каталога git Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_name»." -#: git-submodule.sh:266 +#: git-submodule.sh:267 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Ðе удалоÑÑŒ переключитьÑÑ Ð½Ð° ÑоÑтоÑние у Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»" -#: git-submodule.sh:271 +#: git-submodule.sh:272 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Сбой Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$sm_path»" -#: git-submodule.sh:280 +#: git-submodule.sh:281 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Ðе удалоÑÑŒ зарегиÑтрировать подмодуль «$sm_path»" -#: git-submodule.sh:341 +#: git-submodule.sh:342 #, sh-format msgid "Entering '$displaypath'" msgstr "Заходим в «$displaypath»" -#: git-submodule.sh:361 +#: git-submodule.sh:362 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "ОÑтанавливаемÑÑ Ð½Ð° «$displaypath»; Ñценарий вернул не нулевой код возврата." -#: git-submodule.sh:432 +#: git-submodule.sh:433 #, sh-format msgid "pathspec and --all are incompatible" msgstr "Ñпецификатор пути и --all Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно" -#: git-submodule.sh:437 +#: git-submodule.sh:438 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "ИÑпользуйте «--all», еÑли вы дейÑтвительно хотите деинициализировать вÑе подмодули" -#: git-submodule.sh:457 +#: git-submodule.sh:458 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "Рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» уже Ñодержит каталог .git\n(иÑпользуйте «rm -rf», еÑли вы дейÑтвительно хотите удалить его Ñо вÑей иÑторией изменений)" -#: git-submodule.sh:465 +#: git-submodule.sh:466 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to" " discard them" msgstr "Рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath» Ñодержит локальные изменениÑ; иÑпользуйте «-f», чтобы отменить их" -#: git-submodule.sh:468 +#: git-submodule.sh:469 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Очищен каталог «$displaypath»" -#: git-submodule.sh:469 +#: git-submodule.sh:470 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Ðе удалоÑÑŒ удалить рабочий каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»" -#: git-submodule.sh:472 +#: git-submodule.sh:473 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Ðе удалоÑÑŒ Ñоздать пуÑтой каталог Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»" -#: git-submodule.sh:481 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "Подмодуль «$name» ($url) был ÑнÑÑ‚ Ñ Ñ€ÐµÐ³Ð¸Ñтрации по пути «$displaypath»" -#: git-submodule.sh:637 +#: git-submodule.sh:638 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Ðе удалоÑÑŒ найти текущую редакцию Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" -#: git-submodule.sh:647 +#: git-submodule.sh:648 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Ðе удалоÑÑŒ выполнить извлечение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»" -#: git-submodule.sh:652 +#: git-submodule.sh:653 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "Ðе удалоÑÑŒ найти текущую редакцию ${remote_name}/${branch} Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»" -#: git-submodule.sh:670 +#: git-submodule.sh:671 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Ðе удалоÑÑŒ выполнить извлечение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" -#: git-submodule.sh:676 +#: git-submodule.sh:677 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "Получен по пути Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath», но не Ñодержит $sha1. Сбой при прÑмом получении коммита." -#: git-submodule.sh:683 +#: git-submodule.sh:684 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Ðе удалоÑÑŒ переключитьÑÑ Ð½Ð° ÑоÑтоÑние «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" -#: git-submodule.sh:684 +#: git-submodule.sh:685 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Подмодуль по пути «$displaypath»: забрано ÑоÑтоÑние «$sha1»" -#: git-submodule.sh:688 +#: git-submodule.sh:689 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Ðе удалоÑÑŒ перемеÑтить «$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" -#: git-submodule.sh:689 +#: git-submodule.sh:690 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" -#: git-submodule.sh:694 +#: git-submodule.sh:695 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Ðе удалоÑÑŒ выполнить ÑлиÑние Ñ Â«$sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" -#: git-submodule.sh:695 +#: git-submodule.sh:696 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Подмодуль по пути «$displaypath»: Ñлито Ñ Â«$sha1»" -#: git-submodule.sh:700 +#: git-submodule.sh:701 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "Сбой Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Â«$command $sha1» Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" -#: git-submodule.sh:701 +#: git-submodule.sh:702 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»" -#: git-submodule.sh:732 +#: git-submodule.sh:733 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Ðе удалоÑÑŒ выполнить рекурÑивно Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$displaypath»" -#: git-submodule.sh:840 +#: git-submodule.sh:841 msgid "The --cached option cannot be used with the --files option" msgstr "Опцию --cached Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать одновременно Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ --files" -#: git-submodule.sh:892 +#: git-submodule.sh:893 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неизвеÑтный режим $mod_dst" -#: git-submodule.sh:912 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Предупреждение: $display_name не Ñодержит коммит $sha1_src" -#: git-submodule.sh:915 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Предупреждение: $display_name не Ñодержит коммит $sha1_dst" -#: git-submodule.sh:918 +#: git-submodule.sh:919 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Предупреждение: $display_name не Ñодержит коммиты $sha1_src и $sha1_dst" -#: git-submodule.sh:1064 +#: git-submodule.sh:1065 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Ðе удалоÑÑŒ выполнить рекурÑивно Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¿Ð¾ пути «$sm_path»" -#: git-submodule.sh:1136 +#: git-submodule.sh:1137 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ url Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Â«$displaypath»" @@ -14445,32 +14550,32 @@ 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:238 +#: git-add--interactive.perl:196 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "staged" msgstr "в индекÑе" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "unstaged" msgstr "не в индекÑе" -#: git-add--interactive.perl:288 git-add--interactive.perl:313 +#: git-add--interactive.perl:246 git-add--interactive.perl:271 msgid "binary" msgstr "двоичный" -#: git-add--interactive.perl:297 git-add--interactive.perl:351 +#: git-add--interactive.perl:255 git-add--interactive.perl:309 msgid "nothing" msgstr "ничего" -#: git-add--interactive.perl:333 git-add--interactive.perl:348 +#: git-add--interactive.perl:291 git-add--interactive.perl:306 msgid "unchanged" msgstr "нет изменений" -#: git-add--interactive.perl:644 +#: git-add--interactive.perl:602 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" @@ -14479,7 +14584,7 @@ msgstr[1] "добавлено %d пути\n" msgstr[2] "добавлено %d путей\n" msgstr[3] "добавлено %d пути\n" -#: git-add--interactive.perl:647 +#: git-add--interactive.perl:605 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" @@ -14488,7 +14593,7 @@ msgstr[1] "обновлено %d пути\n" msgstr[2] "обновлено %d путей\n" msgstr[3] "обновлено %d пути\n" -#: git-add--interactive.perl:650 +#: git-add--interactive.perl:608 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" @@ -14497,7 +14602,7 @@ msgstr[1] "обращены Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ %d путей\n" msgstr[2] "обращены Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ %d путей\n" msgstr[3] "обращены Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ %d путей\n" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:611 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" @@ -14506,67 +14611,67 @@ msgstr[1] "тронуты %d пути\n" msgstr[2] "тронуты %d путей\n" msgstr[3] "тронуты %d пути\n" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:620 msgid "Update" msgstr "Обновить" -#: git-add--interactive.perl:674 +#: git-add--interactive.perl:632 msgid "Revert" msgstr "Обратить изменениÑ" -#: git-add--interactive.perl:697 +#: git-add--interactive.perl:655 #, perl-format msgid "note: %s is untracked now.\n" msgstr "примечание: %s теперь неотÑлеживаемый.\n" -#: git-add--interactive.perl:708 +#: git-add--interactive.perl:666 msgid "Add untracked" msgstr "Добавить неотÑлеживаемый" -#: git-add--interactive.perl:714 +#: git-add--interactive.perl:672 msgid "No untracked files.\n" msgstr "Ðет неотÑлеживаемых файлов.\n" -#: git-add--interactive.perl:1030 +#: git-add--interactive.perl:985 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "ЕÑли патч применÑетÑÑ Ð±ÐµÐ· ошибок, то изменённый блок будет Ñразу помечен Ð´Ð»Ñ Ð¸Ð½Ð´ÐµÐºÑированиÑ." -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:988 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "ЕÑли патч применÑетÑÑ Ð±ÐµÐ· ошибок, то изменённый блок будет Ñразу помечен Ð´Ð»Ñ Ð¿Ñ€ÑтаньÑ." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:991 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "ЕÑли патч применÑетÑÑ Ð±ÐµÐ· ошибок, то изменённый блок будет Ñразу помечен Ð´Ð»Ñ ÑƒÐ±Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¸Ð· индекÑа." -#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 +#: git-add--interactive.perl:994 git-add--interactive.perl:1003 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "ЕÑли патч применÑетÑÑ Ð±ÐµÐ· ошибок, то изменённый блок будет Ñразу помечен Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 +#: git-add--interactive.perl:997 git-add--interactive.perl:1000 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "ЕÑли патч применÑетÑÑ Ð±ÐµÐ· ошибок, то изменённый блок будет Ñразу помечен Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹ изменений." -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1013 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "не удалоÑÑŒ открыть файл Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ° изменений Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1014 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Ручной режим Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ° изменений — Ñмотрите ниже Ð´Ð»Ñ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¾Ð³Ð¾ руководÑтва.\n" -#: git-add--interactive.perl:1065 +#: git-add--interactive.perl:1020 #, perl-format msgid "" "---\n" @@ -14576,14 +14681,14 @@ msgid "" msgstr "---\nЧтобы удалить «%s» Ñтроки, Ñделайте их ' ' Ñтроками (контекÑÑ‚).\nЧтобы удалить «%s» Ñтроки, удалите их.\nСтроки, начинающиеÑÑ Ñ %s будут удалены.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1073 +#: git-add--interactive.perl:1028 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и блок оÑтанетÑÑ Ð±ÐµÐ· изменений.\n" -#: git-add--interactive.perl:1087 +#: git-add--interactive.perl:1042 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "не удалоÑÑŒ открыть файл Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ° изменений Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ: %s" @@ -14594,13 +14699,13 @@ msgstr "не удалоÑÑŒ открыть файл Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ #. 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:1178 +#: git-add--interactive.perl:1134 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?" " " msgstr "Изменённый вами блок не применÑетÑÑ. Редактировать Ñнова (ответ «y» означает «нет»!) [y/n]? " -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1143 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -14609,7 +14714,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "y - проиндекÑировать блок изменений\nn - не индекÑировать Ñтот блок изменений\nq - выход; не индекÑировать Ñтот и поÑледующие блоки\na - проиндекÑировать Ñтот и вÑе поÑледующие блоки файла\nd - не индекÑировать Ñтот и поÑледующие блоки файла" -#: git-add--interactive.perl:1193 +#: git-add--interactive.perl:1149 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -14618,7 +14723,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "y - ÑпрÑтать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ°\nq - выход; не прÑтать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого и поÑледующих блоков\na - ÑпрÑтать Ñтот и вÑе поÑледующие блоки файла\nd - не прÑтать Ñтот и поÑледующие блоки файла" -#: git-add--interactive.perl:1199 +#: git-add--interactive.perl:1155 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -14627,7 +14732,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "y - убрать из индекÑа Ñтот блок изменений\nn - не убирать из индекÑа Ñтот блок изменений\nq - выход; не убирать из индекÑа Ñтот и поÑледующие блоки\na - убрать из индекÑа Ñтот и вÑе поÑледующие блоки файла\nd - не убирать из индекÑа Ñтот и поÑледующие блоки файла" -#: git-add--interactive.perl:1205 +#: git-add--interactive.perl:1161 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -14636,7 +14741,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "y - применить блок изменений к индекÑу\nn - не применÑÑ‚ÑŒ Ñтот блок изменений к индекÑу\nq - выход; не применÑÑ‚ÑŒ Ñтот и поÑледующие блоки\na - применить Ñтот блок и вÑе поÑледующие блоки файла\nd - не применÑÑ‚ÑŒ Ñтот и поÑледующие блоки файла" -#: git-add--interactive.perl:1211 +#: git-add--interactive.perl:1167 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -14645,7 +14750,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "y - отменить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока в рабочем каталоге\nn - не отменÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока в рабочем каталоге\nq - выход; не отменÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока и вÑех поÑледующих\na - отменить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого и вÑех поÑледующих блоков файла\nd - не отменÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого и вÑех поÑледующих блоков файла" -#: git-add--interactive.perl:1217 +#: git-add--interactive.perl:1173 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -14654,7 +14759,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "y - отменить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока в индекÑе и рабочем каталоге\nn - не отменÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока в индекÑе и рабочем каталоге\nq - выход; не отменÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока и вÑех поÑледующих\na - отменить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого и вÑех поÑледующих блоков файла\nd - не отменÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого и вÑех поÑледующих блоков файла" -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -14663,7 +14768,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "y - применить блок изменений к индекÑу и рабочему каталогу\nn - не применÑÑ‚ÑŒ Ñтот блок изменений к индекÑу и рабочему каталогу\nq - выход; не применÑÑ‚ÑŒ Ñтот и поÑледующие блоки\na - применить Ñтот блок и вÑе поÑледующие блоки файла\nd - не применÑÑ‚ÑŒ Ñтот и поÑледующие блоки файла" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1188 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -14676,154 +14781,154 @@ msgid "" "? - print help\n" msgstr "g - выбрать блок изменений на который нужно перейти\n/ - поиÑк блока изменений Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ регулÑрного выражениÑ\nj - не принимать решение по Ñтому блоку, перейти на Ñледующий без решениÑ\nJ - не принимать решение по Ñтому блоку, перейти на Ñледующий\nk - не принимать решение по Ñтому блоку, перейти на предыдущий без решениÑ\nK - не принимать решение по Ñтому блоку, перейти на предыдущий\ns - разделить текущий блок на блоки меньшего размера\ne - вручную отредактировать текущий блок\n? - вывеÑти Ñправку\n" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1219 msgid "The selected hunks do not apply to the index!\n" msgstr "Выбранные блоки не применÑÑŽÑ‚ÑÑ Ð±ÐµÐ· ошибок к индекÑу!\n" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " msgstr "Ð’Ñе равно применить их к рабочему каталогу?" -#: git-add--interactive.perl:1267 +#: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" msgstr "Ðичего не применено.\n" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1234 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "игнорирую не Ñлитое: %s\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1243 msgid "Only binary files changed.\n" msgstr "Только Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð²Ð¾Ð¸Ñ‡Ð½Ñ‹Ñ… файлов.\n" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl:1245 msgid "No changes.\n" msgstr "Ðет изменений.\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1253 msgid "Patch update" msgstr "Обновление патча" -#: git-add--interactive.perl:1349 +#: git-add--interactive.perl:1305 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "ПроиндекÑировать изменение режима доÑтупа [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1350 +#: git-add--interactive.perl:1306 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "ПроиндекÑировать удаление [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1351 +#: git-add--interactive.perl:1307 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "ПроиндекÑировать Ñтот блок изменений [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1354 +#: git-add--interactive.perl:1310 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "СпрÑтать изменение режима доÑтупа [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1311 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "СпрÑтать удаление файла [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1356 +#: git-add--interactive.perl:1312 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "СпрÑтать Ñтот блок изменений [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1315 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "Убрать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° доÑтупа из индекÑа [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1316 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "Убрать удаление из индекÑа [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1361 +#: git-add--interactive.perl:1317 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Убрать из индекÑа Ñтот блок измений [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1320 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "Применить изменение режима доÑтупа к индекÑу [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1321 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "Применить удаление к индекÑу [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1366 +#: git-add--interactive.perl:1322 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "Применить Ñтот блок к индекÑу [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1325 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " msgstr "Отменить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° доÑтупа в рабочем каталоге [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1326 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1371 +#: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "Отменить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока в рабочем каталоге [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1330 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Отменить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° доÑтупа в индекÑе и рабочем каталоге [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1331 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Отменить удаление в индекÑе и рабочем каталоге [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1376 +#: git-add--interactive.perl:1332 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Отменить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока в индекÑе и рабочем каталоге [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1335 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Применить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° доÑтупа к индекÑу и рабочему каталогу [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1336 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Применить удаление к индекÑу и рабочему каталогу [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1381 +#: git-add--interactive.perl:1337 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "Применить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтого блока к индекÑу и рабочему каталогу [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? " -#: git-add--interactive.perl:1486 +#: git-add--interactive.perl:1442 msgid "go to which hunk? " msgstr "на какой блок перейти? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1451 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ðеверный номер: «%s»\n" -#: git-add--interactive.perl:1500 +#: git-add--interactive.perl:1456 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" @@ -14832,28 +14937,28 @@ msgstr[1] "ПроÑтите, но только %d блока изменений msgstr[2] "ПроÑтите, но только %d блоков изменений доÑтупно.\n" msgstr[3] "ПроÑтите, но только %d блока изменений доÑтупно.\n" -#: git-add--interactive.perl:1526 +#: git-add--interactive.perl:1482 msgid "search for regex? " msgstr "иÑкать Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ регулÑрного выражениÑ? " -#: git-add--interactive.perl:1539 +#: git-add--interactive.perl:1495 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "РегулÑрное выражение Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка в неверном формате %s: %s\n" -#: git-add--interactive.perl:1549 +#: git-add--interactive.perl:1505 msgid "No hunk matches the given pattern\n" msgstr "Ðе найдены блоки, которые ÑоответÑтвуют указанному шаблону\n" -#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 +#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 msgid "No previous hunk\n" msgstr "Ðет предыдущего блока\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 +#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 msgid "No next hunk\n" msgstr "Ðе Ñледующего блока\n" -#: git-add--interactive.perl:1597 +#: git-add--interactive.perl:1553 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" @@ -14862,13 +14967,13 @@ msgstr[1] "Разбито на %d блока изменений.\n" msgstr[2] "Разбито на %d блоков изменений.\n" msgstr[3] "Разбито на %d блока изменений.\n" -#: git-add--interactive.perl:1649 +#: git-add--interactive.perl:1605 msgid "Review diff" msgstr "ПроÑмотреть изменениÑ" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1668 +#: git-add--interactive.perl:1624 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -14878,83 +14983,83 @@ msgid "" "add untracked - add contents of untracked files to the staged set of changes\n" msgstr "status - показать пути Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñми\nupdate - добавить ÑоÑтоÑние рабочего каталога индекÑ\nrevert - вернуть проиндекÑированный набор изменений к HEAD верÑии\npatch - выбрать и выборочно обновить блоки\ndiff - проÑмотреть Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ HEAD и индекÑом\nadd untracked - добавить Ñодержимое неотÑлеживаемых файлов в индекÑ\n" -#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 -#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 -#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 +#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 +#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 +#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 msgid "missing --" msgstr "отÑутÑтвует --" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1662 #, perl-format msgid "unknown --patch mode: %s" msgstr "неизвеÑтный режим Ð´Ð»Ñ --patch: %s" -#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 #, perl-format msgid "invalid argument %s, expecting --" msgstr "недопуÑтимый аргумент %s, ожидаетÑÑ --" -#: git-send-email.perl:121 +#: git-send-email.perl:126 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "локальный чаÑовой поÑÑ Ð¾Ñ‚Ð»Ð¸Ñ‡Ð°ÐµÑ‚ÑÑ Ð¾Ñ‚ GMT на не минутный интервал\n" -#: git-send-email.perl:128 git-send-email.perl:134 +#: git-send-email.perl:133 git-send-email.perl:139 msgid "local time offset greater than or equal to 24 hours\n" msgstr "локальный Ñдвиг времени больше или равен 24 чаÑа\n" -#: git-send-email.perl:202 git-send-email.perl:208 +#: git-send-email.perl:208 git-send-email.perl:214 msgid "the editor exited uncleanly, aborting everything" msgstr "редактор был завершен Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹, отменÑÑŽ вÑÑ‘" -#: git-send-email.perl:282 +#: git-send-email.perl:291 #, perl-format msgid "'%s' contains an intermediate version of the email you were composing.\n" msgstr "«%s» Ñодержит промежуточную верÑию пиÑьма, которое вы готовите.\n" -#: git-send-email.perl:287 +#: git-send-email.perl:296 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "«%s.final» Ñодержит подготовленное пиÑьмо.\n" -#: git-send-email.perl:305 +#: git-send-email.perl:314 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases не ÑовмеÑтимо Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ опциÑми\n" -#: git-send-email.perl:368 git-send-email.perl:623 +#: git-send-email.perl:379 git-send-email.perl:634 msgid "Cannot run git format-patch from outside a repository\n" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿ÑƒÑкать git format-patch вне репозиториÑ\n" -#: git-send-email.perl:437 +#: git-send-email.perl:448 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "ÐеизвеÑтное поле --suppress-cc: «%s»\n" -#: git-send-email.perl:466 +#: git-send-email.perl:477 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "ÐеизвеÑтный параметр --confirm: «%s»\n" -#: git-send-email.perl:498 +#: git-send-email.perl:509 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "предупреждение: Ñокращение Ð´Ð»Ñ sendmail Ñ ÐºÐ°Ð²Ñ‹Ñ‡ÐºÐ°Ð¼Ð¸ не поддерживаетÑÑ: %s\n" -#: git-send-email.perl:500 +#: git-send-email.perl:511 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "предупреждение: «:include:» не поддерживаетÑÑ: %s\n" -#: git-send-email.perl:502 +#: git-send-email.perl:513 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживаетÑÑ: %s\n" -#: git-send-email.perl:507 +#: git-send-email.perl:518 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "предупреждение: Ñтрока sendmail не раÑпознана: %s\n" -#: git-send-email.perl:589 +#: git-send-email.perl:600 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -14964,36 +15069,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "Файл «%s» ÑущеÑтвует, но Ñто также может быть и\nдиапазоном коммитов Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… нужно Ñделать патчи. \nУÑтраните неоднозначноÑть…\n\n * Указав \"./%s\" еÑли вы имеете в виду Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°; или\n * Передав опцию --format-patch еÑли вы имеете в виду диапазон коммитов.\n" -#: git-send-email.perl:610 +#: git-send-email.perl:621 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Ðе удалоÑÑŒ выполнить opendir %s: %s" -#: git-send-email.perl:634 +#: git-send-email.perl:645 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: %s: %s\nпредупреждение: патчи не были отправлены\n" -#: git-send-email.perl:645 +#: git-send-email.perl:656 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "\nФайл Ñ Ð¿Ð°Ñ‚Ñ‡ÐµÐ¼ не указан!\n\n" -#: git-send-email.perl:658 +#: git-send-email.perl:669 #, perl-format msgid "No subject line in %s?" msgstr "Ðет Ñтроки Ñ Ñ‚ÐµÐ¼Ð¾Ð¹ в %s?" -#: git-send-email.perl:668 +#: git-send-email.perl:679 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Ðе удалоÑÑŒ открыть Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи %s: %s" -#: git-send-email.perl:678 +#: git-send-email.perl:689 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15002,41 +15107,41 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "Строки, начинающиеÑÑ Ñ Â«GIT:» будут удалены.\nВозможно будет полезно включить ÑтатиÑтику добавлений\nи удалений или таблицу Ñодержимого в патч, который вы пишете.\n\nОчиÑтите Ñодержимое, еÑли вы не хотите отправлÑÑ‚ÑŒ пиÑьмо Ñ ÐºÑ€Ð°Ñ‚ÐºÐ¾Ð¹ информацией.\n" -#: git-send-email.perl:701 +#: git-send-email.perl:712 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Ðе удалоÑÑŒ открыть %s.final: %s" -#: git-send-email.perl:704 +#: git-send-email.perl:715 #, perl-format msgid "Failed to open %s: %s" msgstr "Ðе удалоÑÑŒ открыть %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:750 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "ÐŸÐ¾Ð»Ñ To/Cc/Bcc пока еще не обрабатываютÑÑ Ð¸ будут проигнорированы\n" -#: git-send-email.perl:748 +#: git-send-email.perl:759 msgid "Summary email is empty, skipping it\n" msgstr "ПиÑьмо Ñ ÐºÑ€Ð°Ñ‚ÐºÐ¾Ð¹ информацией пуÑтое, попуÑкаю его\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:780 +#: git-send-email.perl:791 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Ð’Ñ‹ уверены, что хотите иÑпользовать <%s> [y/N]? " -#: git-send-email.perl:809 +#: git-send-email.perl:820 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "Следующие файлы 8 битные, но не Ñодержат Content-Transfer-Encoding.\n" -#: git-send-email.perl:814 +#: git-send-email.perl:825 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? " -#: git-send-email.perl:822 +#: git-send-email.perl:833 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -15044,20 +15149,20 @@ msgid "" "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n" msgstr "ОтказываюÑÑŒ отправить, Ñ‚.к. патч\n\t%s\nÑодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, еÑли вы дейÑтвительно хотите отправить его.\n" -#: git-send-email.perl:841 +#: git-send-email.perl:852 msgid "To whom should the emails be sent (if anyone)?" msgstr "Кому должны быть отправлены пиÑьма (еÑли нужно)?" -#: git-send-email.perl:859 +#: git-send-email.perl:870 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: Ñокращение «%s» раÑкрываетÑÑ Ñамо в ÑебÑ\n" -#: git-send-email.perl:871 +#: git-send-email.perl:882 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID который нужно иÑпользовать в поле In-Reply-To Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ пиÑьма (еÑли нужно)? " -#: git-send-email.perl:921 git-send-email.perl:929 +#: git-send-email.perl:932 git-send-email.perl:940 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "ошибка: не удалоÑÑŒ выделить дейÑтвительный Ð°Ð´Ñ€ÐµÑ Ð¸Ð·: %s\n" @@ -15065,16 +15170,16 @@ msgstr "ошибка: не удалоÑÑŒ выделить дейÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»Ñ #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:933 +#: git-send-email.perl:944 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Что нужно Ñделать Ñ Ñтим адреÑом? ([q] - выход|[d] - отброÑить|[e] - редактировать): " -#: git-send-email.perl:1234 +#: git-send-email.perl:1245 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "путь CA «%s» не ÑущеÑтвует" -#: git-send-email.perl:1309 +#: git-send-email.perl:1320 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15091,123 +15196,128 @@ msgstr " СпиÑок Cc (получателей копии пиÑьма) Ð±Ñ #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1324 +#: git-send-email.perl:1335 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Отправить Ñто пиÑьмо? ([y] - да|[n] - нет|[q] - выход|[a] - вÑе): " -#: git-send-email.perl:1327 +#: git-send-email.perl:1338 msgid "Send this email reply required" msgstr "Отправка Ñтого ответа на пиÑьмо обÑзательна" -#: git-send-email.perl:1353 +#: git-send-email.perl:1364 msgid "The required SMTP server is not properly defined." msgstr "Требуемый SMTP Ñервер не был правильно объÑвлен." -#: git-send-email.perl:1397 +#: git-send-email.perl:1411 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Сервер не поддерживает STARTTLS! %s" -#: git-send-email.perl:1403 +#: git-send-email.perl:1416 git-send-email.perl:1420 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "Ошибка STARTTLS! %s" + +#: git-send-email.perl:1430 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "Ðе удалоÑÑŒ инициализировать SMTP. Проверьте ваши наÑтройки и попробуйте запуÑтить в параметром --smtp-debug." -#: git-send-email.perl:1421 +#: git-send-email.perl:1448 #, perl-format msgid "Failed to send %s\n" msgstr "Ðе удалоÑÑŒ отправить %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Dry-Sent %s\n" msgstr "Ð˜Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Sent %s\n" msgstr "Отправлено %s\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "Dry-OK. Log says:\n" msgstr "Ð˜Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ OK. Журнал Ñодержит:\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "OK. Log says:\n" msgstr "OK. Журнал Ñодержит:\n" -#: git-send-email.perl:1438 +#: git-send-email.perl:1465 msgid "Result: " msgstr "Результат: " -#: git-send-email.perl:1441 +#: git-send-email.perl:1468 msgid "Result: OK\n" msgstr "Результат: OK\n" -#: git-send-email.perl:1454 +#: git-send-email.perl:1481 #, perl-format msgid "can't open file %s" msgstr "не удалоÑÑŒ открыть файл %s" -#: git-send-email.perl:1501 git-send-email.perl:1521 +#: git-send-email.perl:1528 git-send-email.perl:1548 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Добавление cc: %s Ñо Ñтроки «%s»\n" -#: git-send-email.perl:1507 +#: git-send-email.perl:1534 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Добавление to: %s Ñо Ñтроки «%s»\n" -#: git-send-email.perl:1555 +#: git-send-email.perl:1582 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Добавление cc: %s Ñо Ñтроки «%s»\n" -#: git-send-email.perl:1578 +#: git-send-email.perl:1605 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Добавление cc: %s Ñо Ñтроки «%s»\n" -#: git-send-email.perl:1676 +#: git-send-email.perl:1711 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Ðе удалоÑÑŒ выполнить «%s»" -#: git-send-email.perl:1683 +#: git-send-email.perl:1718 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Добавление %s: %s из: «%s»\n" -#: git-send-email.perl:1687 +#: git-send-email.perl:1722 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) не удалоÑÑŒ закрыть поток к «%s»" -#: git-send-email.perl:1714 +#: git-send-email.perl:1749 msgid "cannot send message as 7bit" msgstr "не удалоÑÑŒ отправить Ñообщение в 7 битной кодировке" -#: git-send-email.perl:1722 +#: git-send-email.perl:1757 msgid "invalid transfer encoding" msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° передачи" -#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 #, perl-format msgid "unable to open %s: %s\n" msgstr "не удалоÑÑŒ открыть %s: %s\n" -#: git-send-email.perl:1744 +#: git-send-email.perl:1798 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: патч Ñодержит Ñтроку длиннее чем 998 Ñимволов" -#: git-send-email.perl:1760 +#: git-send-email.perl:1814 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "ПропуÑкаю %s Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸ÐµÐ¼ резервной копии «%s».\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1764 +#: git-send-email.perl:1818 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Ð’Ñ‹ дейÑтвительно хотите отправить %s? [y - да|N - нет]: " @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: git v2.14.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-07-15 11:57+0800\n" -"PO-Revision-Date: 2017-07-15 13:51+0700\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" +"PO-Revision-Date: 2017-07-25 07:06+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -1476,19 +1476,62 @@ msgstr "LF nên thay bằng CRLF trong %s" #: date.c:116 msgid "in the future" -msgstr "trong tÆ°Æ¡ng lai" +msgstr "ở thá»i tÆ°Æ¡ng lai" -#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167 -#: date.c:175 date.c:180 -msgid "%" -msgid_plural "%" -msgstr[0] "%" +#: date.c:122 +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "%<PRIuMAX> giây trÆ°á»›c" + +#: date.c:129 +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "%<PRIuMAX> phút trÆ°á»›c" + +#: date.c:136 +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "%<PRIuMAX> giá» trÆ°á»›c" + +#: date.c:143 +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "%<PRIuMAX> ngà y trÆ°á»›c" + +#: date.c:149 +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "%<PRIuMAX> tuần trÆ°á»›c" + +#: date.c:156 +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "%<PRIuMAX> tháng trÆ°á»›c" + +#: date.c:167 +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> năm" #. TRANSLATORS: "%s" is "<n> years" #: date.c:170 -msgid "%s, %" -msgid_plural "%s, %" -msgstr[0] "%s, %" +#, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s, %<PRIuMAX> tháng trÆ°á»›c" + +#: date.c:175 date.c:180 +#, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "%<PRIuMAX> năm trÆ°á»›c" #: diffcore-order.c:24 #, c-format @@ -1662,7 +1705,7 @@ msgstr "lần chuyển giao %s không hợp lệ" msgid "giving up" msgstr "chịu thua" -#: fetch-pack.c:533 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "xong" @@ -8471,7 +8514,7 @@ msgstr "Tá»± Ä‘á»™ng đóng gói kho chứa để tối Æ°u hóa hiệu suất l msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Xem \"git help gc\" để có hÆ°á»›ng dẫn cụ thể vá» cách dá»n dẹp kho git.\n" -#: builtin/gc.c:432 +#: builtin/gc.c:436 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8479,7 +8522,7 @@ msgstr "" "gc Ä‘ang được thá»±c hiện trên máy “%s†pid %<PRIuMAX> (dùng --force nếu không " "phải thế)" -#: builtin/gc.c:476 +#: builtin/gc.c:480 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -16331,44 +16374,16 @@ msgstr "Bá» qua %s vá»›i háºu tố sao lÆ°u dá»± phòng “%sâ€.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Bạn có thá»±c sá»± muốn gá»i %s? [y|N]: " -#~ msgid "Could not open file '%s'" -#~ msgstr "Không thể mở táºp tin “%sâ€" - -#~ msgid "%lu second ago" -#~ msgid_plural "%lu seconds ago" -#~ msgstr[0] "%lu giây trÆ°á»›c" - -#~ msgid "%lu minute ago" -#~ msgid_plural "%lu minutes ago" -#~ msgstr[0] "%lu phút trÆ°á»›c" +#~ msgid "%" +#~ msgid_plural "%" +#~ msgstr[0] "%" -#~ msgid "%lu hour ago" -#~ msgid_plural "%lu hours ago" -#~ msgstr[0] "%lu giá» trÆ°á»›c" +#~ msgid "%s, %" +#~ msgid_plural "%s, %" +#~ msgstr[0] "%s, %" -#~ msgid "%lu day ago" -#~ msgid_plural "%lu days ago" -#~ msgstr[0] "%lu ngà y trÆ°á»›c" - -#~ msgid "%lu week ago" -#~ msgid_plural "%lu weeks ago" -#~ msgstr[0] "%lu tuần trÆ°á»›c" - -#~ msgid "%lu month ago" -#~ msgid_plural "%lu months ago" -#~ msgstr[0] "%lu tháng trÆ°á»›c" - -#~ msgid "%lu year" -#~ msgid_plural "%lu years" -#~ msgstr[0] "%lu năm" - -#~ msgid "%s, %lu month ago" -#~ msgid_plural "%s, %lu months ago" -#~ msgstr[0] "%s, %lu tháng trÆ°á»›c" - -#~ msgid "%lu year ago" -#~ msgid_plural "%lu years ago" -#~ msgstr[0] "%lu năm trÆ°á»›c" +#~ msgid "Could not open file '%s'" +#~ msgstr "Không thể mở táºp tin “%sâ€" #~ msgid "in %0.1f seconds automatically..." #~ msgstr "trong %0.1f giây má»™t cách tá»± Ä‘á»™ng…" diff --git a/po/zh_CN.po b/po/zh_CN.po index 22d996194..51f5bc9a4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,6 +10,7 @@ # - Thynson <lanxingcan AT gmail.com> # - ws3389 <willsmith3389 AT gmail.com> # - Wang Sheng <wangsheng2008love AT 163.com> +# - ä¾äº‘ <lilydjwg AT gmail.com> # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> # @@ -112,7 +113,7 @@ # smart HTTP protocol | 智能 HTTP åè®® # squash | 压缩 # stage | n. æš‚å˜åŒºï¼ˆå³ç´¢å¼•ï¼‰; v. æš‚å˜ -# stash | n. 进度ä¿å˜; v. ä¿å˜è¿›åº¦ +# stash | n. è´®è—区; v. è´®è— # submodule | å模组 # symref | 符å·å¼•ç”¨ # tag | n. æ ‡ç¾; v. æ‰“æ ‡ç¾ @@ -135,8 +136,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-05-05 09:35+0800\n" -"PO-Revision-Date: 2017-05-09 21:54+0800\n" +"POT-Creation-Date: 2017-07-24 21:54+0800\n" +"PO-Revision-Date: 2017-08-02 08:00+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -145,37 +146,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:55 +#: advice.c:58 #, c-format msgid "hint: %.*s\n" msgstr "æ示：%.*s\n" -#: advice.c:83 +#: advice.c:86 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "æ— æ³•æ‹£é€‰ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" -#: advice.c:85 +#: advice.c:88 msgid "Committing is not possible because you have unmerged files." msgstr "æ— æ³•æäº¤ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" -#: advice.c:87 +#: advice.c:90 msgid "Merging is not possible because you have unmerged files." msgstr "æ— æ³•åˆå¹¶ï¼Œå› 为您有未åˆå¹¶çš„文件。" -#: advice.c:89 +#: advice.c:92 msgid "Pulling is not possible because you have unmerged files." msgstr "æ— æ³•æ‹‰å–ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" -#: advice.c:91 +#: advice.c:94 msgid "Reverting is not possible because you have unmerged files." msgstr "æ— æ³•å›žé€€ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" -#: advice.c:93 +#: advice.c:96 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "æ— æ³• %sï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" -#: advice.c:101 +#: advice.c:104 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." @@ -183,23 +184,23 @@ msgstr "" "请在工作区改æ£æ–‡ä»¶ï¼Œç„¶åŽé…Œæƒ…使用 'git add/rm <文件>' å‘½ä»¤æ ‡è®°\n" "解决方案并æ交。" -#: advice.c:109 +#: advice.c:112 msgid "Exiting because of an unresolved conflict." msgstr "å› ä¸ºå˜åœ¨æœªè§£å†³çš„冲çªè€Œé€€å‡ºã€‚" -#: advice.c:114 builtin/merge.c:1185 +#: advice.c:117 builtin/merge.c:1184 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD）。" -#: advice.c:116 +#: advice.c:119 msgid "Please, commit your changes before merging." msgstr "请在åˆå¹¶å‰å…ˆæ交您的修改。" -#: advice.c:117 +#: advice.c:120 msgid "Exiting because of unfinished merge." msgstr "å› ä¸ºå˜åœ¨æœªå®Œæˆçš„åˆå¹¶è€Œé€€å‡ºã€‚" -#: advice.c:123 +#: advice.c:126 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -226,82 +227,92 @@ msgstr "" " git checkout -b <new-branch-name>\n" "\n" -#: apply.c:57 +#: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白å—符选项 '%s'" -#: apply.c:73 +#: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白å—符忽略选项 '%s'" -#: apply.c:125 +#: apply.c:126 msgid "--reject and --3way cannot be used together." msgstr "--reject å’Œ --3say ä¸èƒ½åŒæ—¶ä½¿ç”¨ã€‚" -#: apply.c:127 +#: apply.c:128 msgid "--cached and --3way cannot be used together." msgstr "--cached å’Œ --3way ä¸èƒ½åŒæ—¶ä½¿ç”¨ã€‚" -#: apply.c:130 +#: apply.c:131 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" -#: apply.c:141 +#: apply.c:142 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" -#: apply.c:144 +#: apply.c:145 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" -#: apply.c:845 +#: apply.c:836 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ£åˆ™è¡¨è¾¾å¼ %s" -#: apply.c:854 +#: apply.c:845 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: apply.c:938 +#: apply.c:929 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å" -#: apply.c:977 +#: apply.c:967 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s" -#: apply.c:983 +#: apply.c:973 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´" -#: apply.c:984 +#: apply.c:974 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´" -#: apply.c:990 +#: apply.c:979 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: apply.c:1488 +#: apply.c:1008 +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "第 %d 行包å«æ— 效文件模å¼ï¼š%s" + +#: apply.c:1326 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "ä¸ä¸€è‡´çš„文件头，%d 行和 %d è¡Œ" + +#: apply.c:1498 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：æ„外的行：%.*s" -#: apply.c:1557 +#: apply.c:1567 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s" -#: apply.c:1577 +#: apply.c:1587 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -312,82 +323,82 @@ msgid_plural "" msgstr[0] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行）" msgstr[1] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行）" -#: apply.c:1589 +#: apply.c:1600 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信æ¯ä¸ç¼ºä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行）" -#: apply.c:1759 +#: apply.c:1770 msgid "new file depends on old contents" msgstr "新文件ä¾èµ–旧内容" -#: apply.c:1761 +#: apply.c:1772 msgid "deleted file still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ä»æœ‰å†…容" -#: apply.c:1795 +#: apply.c:1806 #, c-format msgid "corrupt patch at line %d" msgstr "è¡¥ä¸åœ¨ç¬¬ %d è¡ŒæŸå" -#: apply.c:1832 +#: apply.c:1843 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s ä¾èµ–旧内容" -#: apply.c:1834 +#: apply.c:1845 #, c-format msgid "deleted file %s still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ %s ä»æœ‰å†…容" -#: apply.c:1837 +#: apply.c:1848 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** è¦å‘Šï¼šæ–‡ä»¶ %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ 除" -#: apply.c:1984 +#: apply.c:1995 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå：%.*s" -#: apply.c:2021 +#: apply.c:2032 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ" -#: apply.c:2182 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®" -#: apply.c:2265 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" -#: apply.c:2269 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s" -#: apply.c:2922 +#: apply.c:2933 #, c-format msgid "invalid start of line: '%c'" msgstr "æ— æ•ˆçš„è¡Œé¦–å—符：'%c'" -#: apply.c:3041 +#: apply.c:3052 #, 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 行）" -#: apply.c:3053 +#: apply.c:3064 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文å‡å°‘到（%ld/%ld）以在第 %d 行应用补ä¸ç‰‡æ®µ" -#: apply.c:3059 +#: apply.c:3070 #, c-format msgid "" "while searching for:\n" @@ -396,561 +407,561 @@ msgstr "" "当查询：\n" "%.*s" -#: apply.c:3081 +#: apply.c:3092 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®" -#: apply.c:3089 +#: apply.c:3100 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "ä¸èƒ½åå‘应用一个缺少到 '%s' çš„åå‘æ•°æ®å—的二进制补ä¸" -#: apply.c:3135 +#: apply.c:3146 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "ä¸èƒ½åœ¨ '%s' 上应用没有完整索引行的二进制补ä¸" -#: apply.c:3145 +#: apply.c:3156 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "è¡¥ä¸åº”用到 '%s'（%s），但是和当å‰å†…容ä¸åŒ¹é…。" -#: apply.c:3153 +#: apply.c:3164 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "è¡¥ä¸åº”用到空文件 '%s'，但其并éžç©ºæ–‡ä»¶" -#: apply.c:3171 +#: apply.c:3182 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "æ— æ³•è¯»å– '%2$s' å¿…é¡»çš„ç›®æ ‡æ–‡ä»¶ %1$s" -#: apply.c:3184 +#: apply.c:3195 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补ä¸æœªåº”用到 '%s'" -#: apply.c:3190 +#: apply.c:3201 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ£ç¡®çš„结果（应为 %s，å´ä¸º %s）" -#: apply.c:3211 +#: apply.c:3222 #, c-format msgid "patch failed: %s:%ld" msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld" -#: apply.c:3333 +#: apply.c:3344 #, c-format msgid "cannot checkout %s" msgstr "ä¸èƒ½æ£€å‡º %s" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 +#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277 #, c-format msgid "failed to read %s" msgstr "æ— æ³•è¯»å– %s" -#: apply.c:3389 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读å–ä½äºŽç¬¦å·é“¾æŽ¥ä¸çš„ '%s'" -#: apply.c:3418 apply.c:3658 +#: apply.c:3429 apply.c:3669 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s å·²ç»è¢«é‡å‘½å/åˆ é™¤" -#: apply.c:3501 apply.c:3672 +#: apply.c:3512 apply.c:3683 #, c-format msgid "%s: does not exist in index" msgstr "%s：ä¸å˜åœ¨äºŽç´¢å¼•ä¸" -#: apply.c:3510 apply.c:3680 +#: apply.c:3521 apply.c:3691 #, c-format msgid "%s: does not match index" msgstr "%s：和索引ä¸åŒ¹é…" -#: apply.c:3545 +#: apply.c:3556 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺ä¹å¿…è¦çš„æ•°æ®å¯¹è±¡ä»¥è¿›è¡Œä¸‰æ–¹åˆå¹¶ã€‚" -#: apply.c:3548 +#: apply.c:3559 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回è½åˆ°ä¸‰æ–¹åˆå¹¶...\n" -#: apply.c:3564 apply.c:3568 +#: apply.c:3575 apply.c:3579 #, c-format msgid "cannot read the current contents of '%s'" msgstr "æ— æ³•è¯»å– '%s' 的当å‰å†…容" -#: apply.c:3580 +#: apply.c:3591 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "æ— æ³•å›žè½åˆ°ä¸‰æ–¹åˆå¹¶...\n" -#: apply.c:3594 +#: apply.c:3605 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补ä¸åˆ° '%s' å˜åœ¨å†²çªã€‚\n" -#: apply.c:3599 +#: apply.c:3610 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "æˆåŠŸåº”用补ä¸åˆ° '%s'。\n" -#: apply.c:3625 +#: apply.c:3636 msgid "removal patch leaves file contents" msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容" -#: apply.c:3697 +#: apply.c:3708 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: apply.c:3699 +#: apply.c:3710 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3850 apply.c:3852 +#: apply.c:3860 apply.c:3862 #, c-format msgid "invalid path '%s'" msgstr "æ— æ•ˆè·¯å¾„ '%s'" -#: apply.c:3908 +#: apply.c:3918 #, c-format msgid "%s: already exists in index" msgstr "%s：已ç»å˜åœ¨äºŽç´¢å¼•ä¸" -#: apply.c:3911 +#: apply.c:3921 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已ç»å˜åœ¨äºŽå·¥ä½œåŒºä¸" -#: apply.c:3931 +#: apply.c:3941 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模å¼ï¼ˆ%1$o）和旧模å¼ï¼ˆ%3$o）ä¸åŒ¹é…" -#: apply.c:3936 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模å¼ï¼ˆ%1$o）和 %4$s 的旧模å¼ï¼ˆ%3$o）ä¸åŒ¹é…" -#: apply.c:3956 +#: apply.c:3966 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "å—å½±å“的文件 '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸" -#: apply.c:3960 +#: apply.c:3970 #, c-format msgid "%s: patch does not apply" msgstr "%s：补ä¸æœªåº”用" -#: apply.c:3975 +#: apply.c:3985 #, c-format msgid "Checking patch %s..." msgstr "æ£€æŸ¥è¡¥ä¸ %s..." -#: apply.c:4066 +#: apply.c:4076 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "å模组 %s çš„ sha1 ä¿¡æ¯ç¼ºå¤±æˆ–æ— æ•ˆ" -#: apply.c:4073 +#: apply.c:4083 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模å¼è¢«æ”¹å˜ï¼Œä½†å®ƒä¸åœ¨å½“å‰ HEAD ä¸" -#: apply.c:4076 +#: apply.c:4086 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 ä¿¡æ¯ç¼ºå¤±æˆ–æ— æ•ˆï¼ˆ%s）。" -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 +#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败" -#: apply.c:4085 +#: apply.c:4095 #, c-format msgid "could not add %s to temporary index" msgstr "ä¸èƒ½åœ¨ä¸´æ—¶ç´¢å¼•ä¸æ·»åŠ %s" -#: apply.c:4095 +#: apply.c:4105 #, c-format msgid "could not write temporary index to %s" msgstr "ä¸èƒ½æŠŠä¸´æ—¶ç´¢å¼•å†™å…¥åˆ° %s" -#: apply.c:4233 +#: apply.c:4243 #, c-format msgid "unable to remove %s from index" msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸ç§»é™¤ %s" -#: apply.c:4268 +#: apply.c:4278 #, c-format msgid "corrupt patch for submodule %s" msgstr "å模组 %s æŸåçš„è¡¥ä¸" -#: apply.c:4274 +#: apply.c:4284 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ä¸èƒ½å¯¹æ–°å»ºæ–‡ä»¶ '%s' 调用 stat" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å˜å‚¨" -#: apply.c:4288 apply.c:4432 +#: apply.c:4298 apply.c:4442 #, c-format msgid "unable to add cache entry for %s" msgstr "æ— æ³•ä¸º %s æ·»åŠ ç¼“å˜æ¡ç›®" -#: apply.c:4329 +#: apply.c:4339 #, c-format msgid "failed to write to '%s'" msgstr "æ— æ³•å†™å…¥ '%s'" -#: apply.c:4333 +#: apply.c:4343 #, c-format msgid "closing file '%s'" msgstr "å…³é—文件 '%s'" -#: apply.c:4403 +#: apply.c:4413 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o" -#: apply.c:4501 +#: apply.c:4511 #, c-format msgid "Applied patch %s cleanly." msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。" -#: apply.c:4509 +#: apply.c:4519 msgid "internal error" msgstr "内部错误" -#: apply.c:4512 +#: apply.c:4522 #, 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 个被拒ç»..." -#: apply.c:4523 +#: apply.c:4533 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æˆªçŸ .rej 文件å为 %.*s.rej" -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 +#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" -#: apply.c:4545 +#: apply.c:4555 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段æˆåŠŸåº”用。" -#: apply.c:4549 +#: apply.c:4559 #, c-format msgid "Rejected hunk #%d." msgstr "æ‹’ç»ç¬¬ #%d 个片段。" -#: apply.c:4659 +#: apply.c:4669 #, c-format msgid "Skipped patch '%s'." msgstr "ç•¥è¿‡è¡¥ä¸ '%s'。" -#: apply.c:4667 +#: apply.c:4677 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4686 +#: apply.c:4696 msgid "unable to read index file" msgstr "æ— æ³•è¯»å–索引文件" -#: apply.c:4823 +#: apply.c:4833 #, c-format msgid "can't open patch '%s': %s" msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'：%s" -#: apply.c:4850 +#: apply.c:4860 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下ä»æœ‰ %d 个空白å—符误用" msgstr[1] "抑制下ä»æœ‰ %d 个空白å—符误用" -#: apply.c:4856 apply.c:4871 +#: apply.c:4866 apply.c:4881 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d 行有空白å—符误用。" -msgstr[1] "%d 行有空白å—符误用。" +msgstr[0] "%d 行新增了空白å—符误用。" +msgstr[1] "%d 行新增了空白å—符误用。" -#: apply.c:4864 +#: apply.c:4874 #, 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 行。" -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "æ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" -#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "path" msgstr "路径" -#: apply.c:4912 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´" -#: apply.c:4915 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "应用与给出路径å‘匹é…çš„å˜æ›´" -#: apply.c:4917 builtin/am.c:2285 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "æ•°å—" -#: apply.c:4918 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ä»Žä¼ ç»Ÿçš„ diff 路径ä¸ç§»é™¤æŒ‡å®šæ•°é‡çš„å‰å¯¼æ–œçº¿" -#: apply.c:4921 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "忽略补ä¸ä¸çš„æ·»åŠ çš„æ–‡ä»¶" -#: apply.c:4923 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计（diffstat）" -#: apply.c:4927 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "以åè¿›åˆ¶æ•°æ˜¾ç¤ºæ·»åŠ å’Œåˆ é™¤çš„è¡Œæ•°" -#: apply.c:4929 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦" -#: apply.c:4931 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用" -#: apply.c:4933 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•" -#: apply.c:4935 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº" -#: apply.c:4937 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "接å—修改工作区之外文件的补ä¸" -#: apply.c:4939 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用æ¤è¡¥ä¸ï¼ˆä¸Ž --stat/--summary/--check 选项åŒæ—¶ä½¿ç”¨ï¼‰" -#: apply.c:4941 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰æ–¹åˆå¹¶" -#: apply.c:4943 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信æ¯" -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 +#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "路径以 NUL å—符分隔" -#: apply.c:4948 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文" -#: apply.c:4949 builtin/am.c:2264 +#: apply.c:4959 builtin/am.c:2245 msgid "action" msgstr "动作" -#: apply.c:4950 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行ä¸é—´çš„空白å—符滥用" -#: apply.c:4953 apply.c:4956 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白å—符的å˜æ›´" -#: apply.c:4959 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "åå‘应用补ä¸" -#: apply.c:4961 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "æ— éœ€è‡³å°‘ä¸€è¡Œä¸Šä¸‹æ–‡" -#: apply.c:4963 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å˜åœ¨å¯¹åº”çš„ *.rej 文件ä¸" -#: apply.c:4965 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ" -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 +#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21 +#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651 +#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "冗长输出" -#: apply.c:4968 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "å…许ä¸æ£ç¡®çš„文件末尾æ¢è¡Œç¬¦" -#: apply.c:4971 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸çš„è¡Œå·" -#: apply.c:4973 builtin/am.c:2273 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "æ ¹ç›®å½•" -#: apply.c:4974 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "为所有文件åå‰æ·»åŠ <æ ¹ç›®å½•>" -#: archive.c:12 +#: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<选项>] <æ ‘æˆ–æ交> [<路径>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:14 +#: archive.c:15 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <æ ‘æˆ–æ交> [<路径>...]" -#: archive.c:15 +#: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "è·¯å¾„è§„æ ¼ '%s' 未匹é…任何文件" -#: archive.c:417 +#: archive.c:418 msgid "fmt" msgstr "æ ¼å¼" -#: archive.c:417 +#: archive.c:418 msgid "archive format" msgstr "å½’æ¡£æ ¼å¼" -#: archive.c:418 builtin/log.c:1436 +#: archive.c:419 builtin/log.c:1446 msgid "prefix" msgstr "å‰ç¼€" -#: archive.c:419 +#: archive.c:420 msgid "prepend prefix to each pathname in the archive" msgstr "为归档ä¸æ¯ä¸ªè·¯å¾„ååŠ ä¸Šå‰ç¼€" -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 +#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 +#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080 +#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" msgstr "文件" -#: archive.c:421 builtin/archive.c:89 +#: archive.c:422 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入æ¤æ–‡ä»¶" -#: archive.c:423 +#: archive.c:424 msgid "read .gitattributes in working directory" msgstr "读å–工作区ä¸çš„ .gitattributes" -#: archive.c:424 +#: archive.c:425 msgid "report archived files on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸ŠæŠ¥å‘Šå½’æ¡£æ–‡ä»¶" -#: archive.c:425 +#: archive.c:426 msgid "store only" msgstr "åªå˜å‚¨" -#: archive.c:426 +#: archive.c:427 msgid "compress faster" msgstr "压缩速度更快" -#: archive.c:434 +#: archive.c:435 msgid "compress better" msgstr "压缩效果更好" -#: archive.c:437 +#: archive.c:438 msgid "list supported archive formats" msgstr "列出支æŒçš„å½’æ¡£æ ¼å¼" -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "仓库" -#: archive.c:440 builtin/archive.c:91 +#: archive.c:441 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库（<仓库>）æå–归档文件" -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488 msgid "command" msgstr "命令" -#: archive.c:442 builtin/archive.c:93 +#: archive.c:443 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" -#: archive.c:449 +#: archive.c:450 msgid "Unexpected option --remote" msgstr "未知å‚æ•° --remote" -#: archive.c:451 +#: archive.c:452 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec åªèƒ½å’Œ --remote åŒæ—¶ä½¿ç”¨" -#: archive.c:453 +#: archive.c:454 msgid "Unexpected option --output" msgstr "未知å‚æ•° --output" -#: archive.c:475 +#: archive.c:476 #, c-format msgid "Unknown archive format '%s'" msgstr "æœªçŸ¥å½’æ¡£æ ¼å¼ '%s'" -#: archive.c:482 +#: archive.c:483 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "å‚æ•°ä¸æ”¯æŒæ¤æ ¼å¼ '%s'：-%d" -#: attr.c:212 +#: attr.c:214 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„属性å" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -958,27 +969,22 @@ msgstr "" "负值模版在 git attributes ä¸è¢«å¿½ç•¥\n" "当å—符串确实è¦ä»¥æ„Ÿå¹å·å¼€å§‹æ—¶ï¼Œä½¿ç”¨ '\\!'。" -#: bisect.c:444 -#, c-format -msgid "Could not open file '%s'" -msgstr "ä¸èƒ½æ‰“开文件 '%s'" - -#: bisect.c:449 +#: bisect.c:447 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包å«é”™è¯¯çš„å¼•ç”¨æ ¼å¼ï¼š%s" -#: bisect.c:657 +#: bisect.c:655 #, c-format msgid "We cannot bisect more!\n" msgstr "æˆ‘ä»¬æ— æ³•è¿›è¡Œæ›´å¤šçš„äºŒåˆ†æŸ¥æ‰¾ï¼\n" -#: bisect.c:710 +#: bisect.c:708 #, c-format msgid "Not a valid commit name %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交å %s" -#: bisect.c:734 +#: bisect.c:732 #, c-format msgid "" "The merge base %s is bad.\n" @@ -987,7 +993,7 @@ msgstr "" "åˆå¹¶åŸºçº¿ %s 是å的。\n" "è¿™æ„味ç€ä»‹äºŽ %s å’Œ [%s] 之间的 bug å·²ç»è¢«ä¿®å¤ã€‚\n" -#: bisect.c:739 +#: bisect.c:737 #, c-format msgid "" "The merge base %s is new.\n" @@ -996,7 +1002,7 @@ msgstr "" "åˆå¹¶åŸºçº¿ %s 是新的。\n" "介于 %s å’Œ [%s] 之间的属性已ç»è¢«ä¿®æ”¹ã€‚\n" -#: bisect.c:744 +#: bisect.c:742 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1005,7 +1011,7 @@ msgstr "" "åˆå¹¶åŸºçº¿ %s 是 %s。\n" "è¿™æ„味ç€ç¬¬ä¸€ä¸ª '%s' æ交ä½äºŽ %s å’Œ [%s] 之间。\n" -#: bisect.c:752 +#: bisect.c:750 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1016,7 +1022,7 @@ msgstr "" "è¿™ç§æƒ…况下 git äºŒåˆ†æŸ¥æ‰¾æ— æ³•æ£å¸¸å·¥ä½œã€‚\n" "您å¯èƒ½å¼„错了 %s å’Œ %s 版本？\n" -#: bisect.c:765 +#: bisect.c:763 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1027,36 +1033,36 @@ msgstr "" "æ‰€ä»¥æˆ‘ä»¬æ— æ³•ç¡®è®¤ç¬¬ä¸€ä¸ª %s æ交是å¦ä»‹äºŽ %s å’Œ %s 之间。\n" "我们ä»æ—§ç»§ç»ã€‚" -#: bisect.c:800 +#: bisect.c:798 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找ä¸ï¼šåˆå¹¶åŸºçº¿å¿…须是ç»è¿‡æµ‹è¯•çš„\n" -#: bisect.c:851 +#: bisect.c:849 #, c-format msgid "a %s revision is needed" msgstr "需è¦ä¸€ä¸ª %s 版本" -#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256 #, c-format msgid "could not create file '%s'" msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶ '%s'" -#: bisect.c:919 +#: bisect.c:917 #, c-format msgid "could not read file '%s'" msgstr "ä¸èƒ½è¯»å–文件 '%s'" -#: bisect.c:949 +#: bisect.c:947 msgid "reading bisect refs failed" msgstr "读å–二分查找引用失败" -#: bisect.c:969 +#: bisect.c:967 #, c-format msgid "%s was both %s and %s\n" msgstr "%s åŒæ—¶ä¸º %s å’Œ %s\n" -#: bisect.c:977 +#: bisect.c:975 #, c-format msgid "" "No testable commit found.\n" @@ -1065,15 +1071,16 @@ msgstr "" "没有å‘现å¯æµ‹è¯•çš„æ交。\n" "å¯èƒ½æ‚¨åœ¨è¿è¡Œæ—¶ä½¿ç”¨äº†é”™è¯¯çš„路径å‚数？\n" -#: bisect.c:996 +#: bisect.c:994 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "（大概 %d æ¥ï¼‰" msgstr[1] "（大概 %d æ¥ï¼‰" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. #: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" @@ -1081,6 +1088,40 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找ä¸ï¼šåœ¨æ¤ä¹‹åŽï¼Œè¿˜å‰© %d 个版本待测试 %s\n" msgstr[1] "二分查找ä¸ï¼šåœ¨æ¤ä¹‹åŽï¼Œè¿˜å‰© %d 个版本待测试 %s\n" +#: blame.c:1757 +msgid "--contents and --reverse do not blend well." +msgstr "--contents å’Œ --reverse ä¸èƒ½æ··ç”¨ã€‚" + +#: blame.c:1768 +msgid "cannot use --contents with final commit object name" +msgstr "ä¸èƒ½å°† --contents 和最终的æ交对象å共用" + +#: blame.c:1788 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "--reverse å’Œ --first-parent 共用，需è¦æŒ‡å®šæœ€æ–°çš„æ交" + +#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166 +#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907 +#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360 +#: builtin/shortlog.c:177 +msgid "revision walk setup failed" +msgstr "版本é历设置失败" + +#: blame.c:1815 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "--reverse å’Œ --first-parent 共用，需è¦ç¬¬ä¸€ç¥–先链上的æ交范围" + +#: blame.c:1826 +#, c-format +msgid "no such path %s in %s" +msgstr "在 %2$s ä¸æ— æ¤è·¯å¾„ %1$s" + +#: blame.c:1837 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "ä¸èƒ½ä¸ºè·¯å¾„ %2$s 读å–æ•°æ®å¯¹è±¡ %1$s" + #: branch.c:53 #, c-format msgid "" @@ -1209,7 +1250,7 @@ msgstr "æ— æ•ˆçš„åˆ†æ”¯ç‚¹ï¼š'%s'。" msgid "'%s' is already checked out at '%s'" msgstr "'%s' å·²ç»æ£€å‡ºåˆ° '%s'" -#: branch.c:364 +#: branch.c:366 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s çš„ HEAD 指å‘没有被更新" @@ -1219,92 +1260,85 @@ msgstr "工作区 %s çš„ HEAD 指å‘没有被更新" msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ä¸åƒæ˜¯ä¸€ä¸ª v2 版本的包文件" -#: bundle.c:61 +#: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 +#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" -#: bundle.c:139 +#: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "仓库ä¸ç¼ºå°‘这些必备的æ交：" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 -#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 -#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 -#: builtin/merge.c:359 builtin/shortlog.c:176 -msgid "revision walk setup failed" -msgstr "版本é历设置失败" - -#: bundle.c:185 +#: bundle.c:186 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包ä¸å«æœ‰è¿™ä¸ªå¼•ç”¨ï¼š" msgstr[1] "这个包ä¸å«æœ‰ %d 个引用：" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历å²ã€‚" -#: bundle.c:194 +#: bundle.c:195 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需è¦è¿™ä¸ªå¼•ç”¨ï¼š" msgstr[1] "è¿™ä¸ªåŒ…éœ€è¦ %d 个引用：" -#: bundle.c:253 +#: bundle.c:254 msgid "Could not spawn pack-objects" msgstr "ä¸èƒ½ç”Ÿæˆ pack-objects 进程" -#: bundle.c:264 +#: bundle.c:265 msgid "pack-objects died" msgstr "pack-objects 终æ¢" -#: bundle.c:304 +#: bundle.c:307 msgid "rev-list died" msgstr "rev-list 终æ¢" -#: bundle.c:353 +#: bundle.c:356 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 +#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的å‚数：%s" -#: bundle.c:451 +#: bundle.c:454 msgid "Refusing to create empty bundle." msgstr "ä¸èƒ½åˆ›å»ºç©ºåŒ…。" -#: bundle.c:463 +#: bundle.c:466 #, c-format msgid "cannot create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" -#: bundle.c:491 +#: bundle.c:494 msgid "index-pack died" msgstr "index-pack 终æ¢" -#: color.c:300 +#: color.c:301 #, c-format msgid "invalid color value: %.*s" msgstr "æ— æ•ˆçš„é¢œè‰²å€¼ï¼š%.*s" -#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 -#: builtin/am.c:1489 builtin/am.c:2126 +#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456 +#: builtin/am.c:1469 builtin/am.c:2107 #, c-format msgid "could not parse %s" msgstr "ä¸èƒ½è§£æž %s" -#: commit.c:42 +#: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ä¸æ˜¯ä¸€ä¸ªæ交!" @@ -1323,161 +1357,161 @@ msgstr "" msgid "memory exhausted" msgstr "内å˜è€—å°½" -#: config.c:191 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "包å«ç›¸å¯¹è·¯å¾„çš„æ¡ä»¶å¼•ç”¨å¿…é¡»æ¥è‡ªäºŽæ–‡ä»¶" -#: config.c:711 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "æ•°æ®å¯¹è±¡ %2$s ä¸é”™è¯¯çš„é…置行 %1$d" -#: config.c:715 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s ä¸é”™è¯¯çš„é…置行 %1$d" -#: config.c:719 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "æ ‡å‡†è¾“å…¥ä¸é”™è¯¯çš„é…置行 %d" -#: config.c:723 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "å模组数æ®å¯¹è±¡ %2$s ä¸é”™è¯¯çš„é…置行 %1$d" -#: config.c:727 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s ä¸é”™è¯¯çš„é…置行 %1$d" -#: config.c:731 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s ä¸é”™è¯¯çš„é…置行 %1$d" -#: config.c:859 +#: config.c:868 msgid "out of range" msgstr "超出范围" -#: config.c:859 +#: config.c:868 msgid "invalid unit" msgstr "æ— æ•ˆçš„å•ä½" -#: config.c:865 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "é…ç½®å˜é‡ '%2$s' çš„æ•°å—å–值 '%1$s' 设置错误：%3$s" -#: config.c:870 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "æ•°æ®å¯¹è±¡ %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s'：%4$s" -#: config.c:873 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "文件 %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s'：%4$s" -#: config.c:876 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "æ ‡å‡†è¾“å…¥ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s'：%3$s" -#: config.c:879 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "åæ¨¡ç»„æ•°æ® %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s'：%4$s" -#: config.c:882 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "命令行 %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s'：%4$s" -#: config.c:885 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s'：%4$s" -#: config.c:980 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "æ— æ³•æ‰©å±• '%s' ä¸çš„用户目录" -#: config.c:1075 config.c:1086 +#: config.c:1084 config.c:1095 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:1203 +#: config.c:1212 #, c-format msgid "invalid mode for object creation: %s" msgstr "æ— æ•ˆçš„å¯¹è±¡åˆ›å»ºæ¨¡å¼ï¼š%s" -#: config.c:1359 +#: config.c:1368 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1557 +#: config.c:1564 msgid "unable to parse command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œä¸çš„é…ç½®" -#: config.c:1611 +#: config.c:1894 msgid "unknown error occurred while reading the configuration files" msgstr "在读å–é…置文件时é‡åˆ°æœªçŸ¥é”™è¯¯" -#: config.c:1970 +#: config.c:2064 #, c-format msgid "Invalid %s: '%s'" msgstr "æ— æ•ˆ %s：'%s'" -#: config.c:1991 +#: config.c:2085 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "未知的 core.untrackedCache å–值 '%s'，使用默认值 'keep'" -#: config.c:2017 +#: config.c:2111 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange çš„å–值 '%d' 应该介于 0 å’Œ 100 之间" -#: config.c:2028 +#: config.c:2122 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œé…ç½®ä¸çš„ '%s'" -#: config.c:2030 +#: config.c:2124 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d è¡Œå‘现错误的é…ç½®å˜é‡ '%1$s'" -#: config.c:2089 +#: config.c:2183 #, c-format msgid "%s has multiple values" msgstr "%s 有多个å–值" -#: config.c:2423 config.c:2648 +#: config.c:2517 config.c:2745 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:2541 +#: config.c:2635 #, c-format msgid "could not set '%s' to '%s'" msgstr "ä¸èƒ½è®¾ç½® '%s' 为 '%s'" -#: config.c:2543 builtin/remote.c:774 +#: config.c:2637 builtin/remote.c:775 #, c-format msgid "could not unset '%s'" msgstr "ä¸èƒ½å–消设置 '%s'" -#: connect.c:49 +#: connect.c:50 msgid "The remote end hung up upon initial contact" msgstr "远端在连接å‘èµ·æ—¶å³æŒ‚æ–" -#: connect.c:51 +#: connect.c:52 msgid "" "Could not read from remote repository.\n" "\n" @@ -1488,7 +1522,7 @@ msgstr "" "\n" "请确认您有æ£ç¡®çš„访问æƒé™å¹¶ä¸”仓库å˜åœ¨ã€‚" -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141 msgid "Checking connectivity" msgstr "检查连接ä¸" @@ -1504,7 +1538,7 @@ msgstr "æ— æ³•å†™å…¥ rev-list" msgid "failed to close rev-list's stdin" msgstr "æ— æ³•å…³é— rev-list çš„æ ‡å‡†è¾“å…¥" -#: convert.c:201 +#: convert.c:205 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -1513,12 +1547,12 @@ msgstr "" "文件 %s ä¸çš„ CRLF 将被 LF 替æ¢ã€‚\n" "在工作区ä¸è¯¥æ–‡ä»¶ä»ä¿æŒåŽŸæœ‰çš„æ¢è¡Œç¬¦ã€‚" -#: convert.c:205 +#: convert.c:209 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "文件 %s ä¸çš„ CRLF 将被 LF 替æ¢ã€‚" -#: convert.c:211 +#: convert.c:215 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -1527,78 +1561,78 @@ msgstr "" "文件 %s ä¸çš„ LF 将被 CRLF 替æ¢ã€‚\n" "在工作区ä¸è¯¥æ–‡ä»¶ä»ä¿æŒåŽŸæœ‰çš„æ¢è¡Œç¬¦ã€‚" -#: convert.c:215 +#: convert.c:219 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "文件 %s ä¸çš„ LF 将被 CRLF 替æ¢" -#: date.c:97 +#: date.c:116 msgid "in the future" msgstr "在将æ¥" -#: date.c:103 +#: date.c:122 #, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" -msgstr[0] "%lu 秒钟å‰" -msgstr[1] "%lu 秒钟å‰" +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "%<PRIuMAX> 秒钟å‰" +msgstr[1] "%<PRIuMAX> 秒钟å‰" -#: date.c:110 +#: date.c:129 #, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" -msgstr[0] "%lu 分钟å‰" -msgstr[1] "%lu 分钟å‰" +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "%<PRIuMAX> 分钟å‰" +msgstr[1] "%<PRIuMAX> 分钟å‰" -#: date.c:117 +#: date.c:136 #, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" -msgstr[0] "%lu å°æ—¶å‰" -msgstr[1] "%lu å°æ—¶å‰" +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "%<PRIuMAX> å°æ—¶å‰" +msgstr[1] "%<PRIuMAX> å°æ—¶å‰" -#: date.c:124 +#: date.c:143 #, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" -msgstr[0] "%lu 天å‰" -msgstr[1] "%lu 天å‰" +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "%<PRIuMAX> 天å‰" +msgstr[1] "%<PRIuMAX> 天å‰" -#: date.c:130 +#: date.c:149 #, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" -msgstr[0] "%lu 周å‰" -msgstr[1] "%lu 周å‰" +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "%<PRIuMAX> 周å‰" +msgstr[1] "%<PRIuMAX> 周å‰" -#: date.c:137 +#: date.c:156 #, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" -msgstr[0] "%lu 个月å‰" -msgstr[1] "%lu 个月å‰" +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "%<PRIuMAX> 个月å‰" +msgstr[1] "%<PRIuMAX> 个月å‰" -#: date.c:148 +#: date.c:167 #, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "%lu å¹´" -msgstr[1] "%lu å¹´" +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> å¹´" +msgstr[1] "%<PRIuMAX> å¹´" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:151 +#: date.c:170 #, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "%s %lu 个月å‰" -msgstr[1] "%s %lu 个月å‰" +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s %<PRIuMAX> 个月å‰" +msgstr[1] "%s %<PRIuMAX> 个月å‰" -#: date.c:156 date.c:161 +#: date.c:175 date.c:180 #, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "%lu å¹´å‰" -msgstr[1] "%lu å¹´å‰" +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "%<PRIuMAX> å¹´å‰" +msgstr[1] "%<PRIuMAX> å¹´å‰" #: diffcore-order.c:24 #, c-format @@ -1609,29 +1643,29 @@ msgstr "æ— æ³•è¯»å–排åºæ–‡ä»¶ '%s'" msgid "Performing inexact rename detection" msgstr "æ£åœ¨è¿›è¡Œéžç²¾ç¡®çš„é‡å‘½å探测" -#: diff.c:62 +#: diff.c:63 #, c-format msgid "option '%s' requires a value" msgstr "选项 '%s' 需è¦ä¸€ä¸ªå€¼" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: diff.c:124 +#: diff.c:125 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " æ— æ³•è§£æž dirstat 截æ¢ï¼ˆcut-off）百分比 '%s'\n" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: diff.c:129 +#: diff.c:130 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat å‚æ•° '%s'\n" -#: diff.c:281 +#: diff.c:282 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "é…ç½®å˜é‡ 'diff.submodule' 未知的å–值：'%s'" -#: diff.c:344 +#: diff.c:342 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1640,20 +1674,20 @@ msgstr "" "å‘现é…ç½®å˜é‡ 'diff.dirstat' ä¸çš„错误：\n" "%s" -#: diff.c:3102 +#: diff.c:3101 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，åœæ¢åœ¨ %s" -#: diff.c:3428 +#: diff.c:3427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-onlyã€--name-statusã€--check å’Œ -s 是互斥的" -#: diff.c:3518 +#: diff.c:3517 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确è¦æ±‚åªè·Ÿä¸€ä¸ªè·¯å¾„è§„æ ¼" -#: diff.c:3681 +#: diff.c:3680 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1662,277 +1696,277 @@ msgstr "" "æ— æ³•è§£æž --dirstat/-X 选项的å‚数：\n" "%s" -#: diff.c:3695 +#: diff.c:3694 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "æ— æ³•è§£æž --submodule 选项的å‚数：'%s'" -#: diff.c:4719 +#: diff.c:4716 msgid "inexact rename detection was skipped due to too many files." msgstr "å› ä¸ºæ–‡ä»¶å¤ªå¤šï¼Œç•¥è¿‡ä¸ä¸¥æ ¼çš„é‡å‘½å检查。" -#: diff.c:4722 +#: diff.c:4719 msgid "only found copies from modified paths due to too many files." msgstr "å› ä¸ºæ–‡ä»¶å¤ªå¤šï¼Œåªåœ¨ä¿®æ”¹çš„路径ä¸æŸ¥æ‰¾æ‹·è´ã€‚" -#: diff.c:4725 +#: diff.c:4722 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您å¯èƒ½æƒ³è¦å°†å˜é‡ %s 设置为至少 %d 并å†æ¬¡æ‰§è¡Œæ¤å‘½ä»¤ã€‚" -#: dir.c:1899 +#: dir.c:1948 msgid "failed to get kernel name and information" msgstr "æ— æ³•èŽ·å¾—å†…æ ¸å称和信æ¯" -#: dir.c:2018 +#: dir.c:2067 msgid "Untracked cache is disabled on this system or location." msgstr "缓å˜æœªè·Ÿè¸ªæ–‡ä»¶åœ¨æœ¬ç³»ç»Ÿæˆ–ä½ç½®ä¸è¢«ç¦ç”¨ã€‚" -#: dir.c:2776 dir.c:2781 +#: dir.c:2846 dir.c:2851 #, c-format msgid "could not create directories for %s" msgstr "ä¸èƒ½ä¸º %s 创建目录" -#: dir.c:2806 +#: dir.c:2876 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "ä¸èƒ½ä»Ž '%s' è¿ç§» git 目录到 '%s'" -#: entry.c:280 +#: entry.c:281 #, c-format msgid "could not stat file '%s'" msgstr "ä¸èƒ½å¯¹æ–‡ä»¶ '%s' 调用 stat" -#: fetch-pack.c:249 +#: fetch-pack.c:251 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" -#: fetch-pack.c:261 +#: fetch-pack.c:263 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack：应为 ACK/NAK，å´å¾—到 EOF" -#: fetch-pack.c:280 builtin/archive.c:63 +#: fetch-pack.c:282 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "远程错误：%s" -#: fetch-pack.c:281 +#: fetch-pack.c:283 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，å´å¾—到 '%s'" -#: fetch-pack.c:333 +#: fetch-pack.c:335 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc éœ€è¦ multi_ack_detailed" -#: fetch-pack.c:419 +#: fetch-pack.c:421 #, c-format msgid "invalid shallow line: %s" msgstr "æ— æ•ˆçš„ shallow ä¿¡æ¯ï¼š%s" -#: fetch-pack.c:425 +#: fetch-pack.c:427 #, c-format msgid "invalid unshallow line: %s" msgstr "æ— æ•ˆçš„ unshallow ä¿¡æ¯ï¼š%s" -#: fetch-pack.c:427 +#: fetch-pack.c:429 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:430 +#: fetch-pack.c:432 #, c-format msgid "error in object: %s" msgstr "对象ä¸å‡ºé”™ï¼š%s" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "no shallow found: %s" msgstr "未å‘现 shallow：%s" -#: fetch-pack.c:435 +#: fetch-pack.c:437 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，å´å¾—到 %s" -#: fetch-pack.c:474 +#: fetch-pack.c:476 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:488 +#: fetch-pack.c:490 #, c-format msgid "invalid commit %s" msgstr "æ— æ•ˆæ交 %s" -#: fetch-pack.c:521 +#: fetch-pack.c:523 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:531 progress.c:235 +#: fetch-pack.c:533 progress.c:237 msgid "done" msgstr "完æˆ" -#: fetch-pack.c:543 +#: fetch-pack.c:545 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:589 +#: fetch-pack.c:591 #, c-format msgid "Marking %s as complete" msgstr "æ ‡è®° %s 为完æˆ" -#: fetch-pack.c:737 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "å·²ç»æœ‰ %s（%s）" -#: fetch-pack.c:775 +#: fetch-pack.c:813 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-packï¼šæ— æ³•æ´¾ç”Ÿ sideband 多路输出" -#: fetch-pack.c:783 +#: fetch-pack.c:821 msgid "protocol error: bad pack header" msgstr "å议错误：å的包头" -#: fetch-pack.c:839 +#: fetch-pack.c:877 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-packï¼šæ— æ³•æ´¾ç”Ÿè¿›ç¨‹ %s" -#: fetch-pack.c:855 +#: fetch-pack.c:893 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:857 +#: fetch-pack.c:895 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:884 +#: fetch-pack.c:922 msgid "Server does not support shallow clients" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ shalllow 客户端" -#: fetch-pack.c:888 +#: fetch-pack.c:926 msgid "Server supports multi_ack_detailed" msgstr "æœåŠ¡å™¨æ”¯æŒ multi_ack_detailed" -#: fetch-pack.c:891 +#: fetch-pack.c:929 msgid "Server supports no-done" msgstr "æœåŠ¡å™¨æ”¯æŒ no-done" -#: fetch-pack.c:897 +#: fetch-pack.c:935 msgid "Server supports multi_ack" msgstr "æœåŠ¡å™¨æ”¯æŒ multi_ack" -#: fetch-pack.c:901 +#: fetch-pack.c:939 msgid "Server supports side-band-64k" msgstr "æœåŠ¡å™¨æ”¯æŒ side-band-64k" -#: fetch-pack.c:905 +#: fetch-pack.c:943 msgid "Server supports side-band" msgstr "æœåŠ¡å™¨æ”¯æŒ side-band" -#: fetch-pack.c:909 +#: fetch-pack.c:947 msgid "Server supports allow-tip-sha1-in-want" msgstr "æœåŠ¡å™¨æ”¯æŒ allow-tip-sha1-in-want" -#: fetch-pack.c:913 +#: fetch-pack.c:951 msgid "Server supports allow-reachable-sha1-in-want" msgstr "æœåŠ¡å™¨æ”¯æŒ allow-reachable-sha1-in-want" -#: fetch-pack.c:923 +#: fetch-pack.c:961 msgid "Server supports ofs-delta" msgstr "æœåŠ¡å™¨æ”¯æŒ ofs-delta" -#: fetch-pack.c:930 +#: fetch-pack.c:968 #, c-format msgid "Server version is %.*s" msgstr "æœåŠ¡å™¨ç‰ˆæœ¬ %.*s" -#: fetch-pack.c:936 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ --shallow-since" -#: fetch-pack.c:940 +#: fetch-pack.c:978 msgid "Server does not support --shallow-exclude" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ --shallow-exclude" -#: fetch-pack.c:942 +#: fetch-pack.c:980 msgid "Server does not support --deepen" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ --deepen" -#: fetch-pack.c:953 +#: fetch-pack.c:991 msgid "no common commits" msgstr "没有共åŒçš„æ交" -#: fetch-pack.c:965 +#: fetch-pack.c:1003 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获å–失败。" -#: fetch-pack.c:1127 +#: fetch-pack.c:1165 msgid "no matching remote head" msgstr "没有匹é…的远程分支" -#: fetch-pack.c:1149 +#: fetch-pack.c:1187 #, c-format msgid "no such remote ref %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹å¼•ç”¨ %s" -#: fetch-pack.c:1152 +#: fetch-pack.c:1190 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "æœåŠ¡å™¨ä¸å…许请求未公开的对象 %s" -#: gpg-interface.c:185 +#: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "gpg æ— æ³•ä¸ºæ•°æ®ç¾å" -#: gpg-interface.c:215 +#: gpg-interface.c:211 msgid "could not create temporary file" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶æ–‡ä»¶" -#: gpg-interface.c:217 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "æ— æ³•å°†åˆ†ç¦»å¼ç¾å写入 '%s'" -#: graph.c:96 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors ä¸æ— 效的颜色 '%.*s'" -#: grep.c:1796 +#: grep.c:1981 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'ï¼šæ— æ³•è¯»å– %s" -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" -#: grep.c:1824 +#: grep.c:2009 #, c-format msgid "'%s': short read" msgstr "'%s'：读å–ä¸å®Œæ•´" -#: help.c:218 +#: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下å¯ç”¨çš„ git 命令" -#: help.c:225 +#: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径ä¸çš„其他地方å¯ç”¨çš„ git 命令" -#: help.c:256 +#: help.c:217 msgid "These are common Git commands used in various situations:" msgstr "这些是å„ç§åœºåˆå¸¸è§çš„ Git 命令：" -#: help.c:321 +#: help.c:281 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1941,30 +1975,50 @@ msgstr "" "'%s' åƒæ˜¯ä¸€ä¸ª git 命令，但å´æ— 法è¿è¡Œã€‚\n" "å¯èƒ½æ˜¯ git-%s å—æŸï¼Ÿ" -#: help.c:376 +#: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统ä¸æœªå‘现 Git 命令。" -#: help.c:398 +#: help.c:358 #, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" -msgstr "" -"è¦å‘Šï¼šæ‚¨è¿è¡Œä¸€ä¸ªä¸å˜åœ¨çš„ Git 命令 '%s'。继ç»æ‰§è¡Œå‡å®šæ‚¨è¦è¿è¡Œçš„\n" -"是 '%s'" +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "è¦å‘Šï¼šæ‚¨è¿è¡Œäº†ä¸€ä¸ªå¹¶ä¸å˜åœ¨çš„ Git 命令 '%s'。" + +#: help.c:363 +#, c-format +msgid "Continuing under the assumption that you meant '%s'." +msgstr "å‡å®šä½ 想è¦çš„是 '%s' 并继ç»ã€‚" -#: help.c:403 +#: help.c:368 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "在 %0.1f 秒钟åŽè‡ªåŠ¨è¿è¡Œ..." +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "å‡å®šä½ 想è¦çš„是 '%2$s'，在 %1$0.1f 秒钟åŽç»§ç»ã€‚" -#: help.c:410 +#: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' ä¸æ˜¯ä¸€ä¸ª git 命令。å‚è§ 'git --help'。" -#: help.c:414 help.c:480 +#: help.c:380 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "\n最相似的命令是" +msgstr[1] "\n最相似的命令是" + +#: help.c:395 +msgid "git version [<options>]" +msgstr "git version [<选项>]" + +#: help.c:456 +#, c-format +msgid "%s: %s - %s" +msgstr "%s：%s - %s" + +#: help.c:460 msgid "" "\n" "Did you mean this?" @@ -1978,12 +2032,7 @@ msgstr[1] "" "\n" "您指的是这其ä¸çš„æŸä¸€ä¸ªä¹ˆï¼Ÿ" -#: help.c:476 -#, c-format -msgid "%s: %s - %s" -msgstr "%s：%s - %s" - -#: ident.c:343 +#: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2008,35 +2057,35 @@ msgstr "" "æ¥è®¾ç½®æ‚¨è´¦å·çš„缺çœèº«ä»½æ ‡è¯†ã€‚\n" "å¦‚æžœä»…åœ¨æœ¬ä»“åº“è®¾ç½®èº«ä»½æ ‡è¯†ï¼Œåˆ™çœç•¥ --global å‚数。\n" -#: ident.c:367 +#: ident.c:366 msgid "no email was given and auto-detection is disabled" msgstr "未æ供邮件地å€ä¸”自动探测被ç¦ç”¨" -#: ident.c:372 +#: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "æ— æ³•è‡ªåŠ¨æŽ¢æµ‹é‚®ä»¶åœ°å€ï¼ˆå¾—到 '%s'）" -#: ident.c:382 +#: ident.c:381 msgid "no name was given and auto-detection is disabled" msgstr "未æ供姓å且自动探测被ç¦ç”¨" -#: ident.c:388 +#: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "æ— æ³•è‡ªåŠ¨æŽ¢æµ‹å§“å（得到 '%s'）" -#: ident.c:396 +#: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "ä¸å…许空的姓å（对于 <%s>）" -#: ident.c:402 +#: ident.c:401 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓åä¸ä»…包å«ç¦ç”¨å—符：%s" -#: ident.c:417 builtin/commit.c:611 +#: ident.c:416 builtin/commit.c:612 #, c-format msgid "invalid date format: %s" msgstr "æ— æ•ˆçš„æ—¥æœŸæ ¼å¼ï¼š%s" @@ -2068,78 +2117,78 @@ msgstr "ä¸èƒ½åˆ›å»º '%s.lock'：%s" msgid "failed to read the cache" msgstr "æ— æ³•è¯»å–缓å˜" -#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 -#: builtin/checkout.c:607 builtin/clone.c:749 +#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377 +#: builtin/checkout.c:591 builtin/clone.c:753 msgid "unable to write new index file" msgstr "æ— æ³•å†™æ–°çš„ç´¢å¼•æ–‡ä»¶" -#: merge-recursive.c:209 +#: merge-recursive.c:210 msgid "(bad commit)\n" msgstr "（åæ交）\n" -#: merge-recursive.c:231 merge-recursive.c:239 +#: merge-recursive.c:232 merge-recursive.c:240 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" -#: merge-recursive.c:303 +#: merge-recursive.c:304 msgid "error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘" -#: merge-recursive.c:727 +#: merge-recursive.c:728 #, c-format msgid "failed to create path '%s'%s" msgstr "æ— æ³•åˆ›å»ºè·¯å¾„ '%s'%s" -#: merge-recursive.c:738 +#: merge-recursive.c:739 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "åˆ é™¤ %s 以便为å目录留出空间\n" -#: merge-recursive.c:752 merge-recursive.c:771 +#: merge-recursive.c:753 merge-recursive.c:772 msgid ": perhaps a D/F conflict?" msgstr "：å¯èƒ½æ˜¯ä¸€ä¸ªç›®å½•/文件冲çªï¼Ÿ" -#: merge-recursive.c:761 +#: merge-recursive.c:762 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "æ‹’ç»ä¸¢å¼ƒ '%s' ä¸çš„未跟踪文件" -#: merge-recursive.c:803 builtin/cat-file.c:34 +#: merge-recursive.c:804 builtin/cat-file.c:36 #, c-format msgid "cannot read object %s '%s'" msgstr "ä¸èƒ½è¯»å–对象 %s '%s'" -#: merge-recursive.c:805 +#: merge-recursive.c:806 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数æ®å¯¹è±¡" -#: merge-recursive.c:829 +#: merge-recursive.c:830 #, c-format msgid "failed to open '%s': %s" msgstr "æ— æ³•æ‰“å¼€ '%s'：%s" -#: merge-recursive.c:840 +#: merge-recursive.c:841 #, c-format msgid "failed to symlink '%s': %s" msgstr "æ— æ³•åˆ›å»ºç¬¦å·é“¾æŽ¥ '%s'：%s" -#: merge-recursive.c:845 +#: merge-recursive.c:846 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ä¸çŸ¥é“å¦‚ä½•å¤„ç† %06o %s '%s'" -#: merge-recursive.c:985 +#: merge-recursive.c:986 msgid "Failed to execute internal merge" msgstr "æ— æ³•æ‰§è¡Œå†…éƒ¨åˆå¹¶" -#: merge-recursive.c:989 +#: merge-recursive.c:990 #, c-format msgid "Unable to add %s to database" msgstr "ä¸èƒ½æ·»åŠ %s 至对象库" -#: merge-recursive.c:1092 +#: merge-recursive.c:1093 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2148,7 +2197,7 @@ msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除，在 %5$s ä¸è¢« %4$s。%7$s çš„ %6$s 版" "本被ä¿ç•™ã€‚" -#: merge-recursive.c:1097 +#: merge-recursive.c:1098 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2157,7 +2206,7 @@ msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除，在 %6$s ä¸çš„ %5$s 被 %4$s。%8$s çš„ " "%7$s 版本被ä¿ç•™ã€‚" -#: merge-recursive.c:1104 +#: merge-recursive.c:1105 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2166,7 +2215,7 @@ msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除，在 %5$s ä¸è¢« %4$s。%7$s çš„ %6$s 版" "本ä¿ç•™åœ¨ %8$s ä¸ã€‚" -#: merge-recursive.c:1109 +#: merge-recursive.c:1110 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2175,20 +2224,20 @@ msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除，在 %6$s ä¸çš„ %5$s 被 %4$s。%8$s çš„ " "%7$s 版本ä¿ç•™åœ¨ %9$s ä¸ã€‚" -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "rename" msgstr "é‡å‘½å" -#: merge-recursive.c:1143 +#: merge-recursive.c:1144 msgid "renamed" msgstr "é‡å‘½å" -#: merge-recursive.c:1200 +#: merge-recursive.c:1201 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s ä¸çš„一个目录而以 %s 为åè¢«æ·»åŠ " -#: merge-recursive.c:1225 +#: merge-recursive.c:1226 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2197,135 +2246,135 @@ msgstr "" "冲çªï¼ˆé‡å‘½å/é‡å‘½å）：在分支 \"%3$s\" ä¸é‡å‘½å \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" ä¸é‡å‘½å \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1231 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1292 +#: merge-recursive.c:1293 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲çªï¼ˆé‡å‘½å/é‡å‘½å）：在 %3$s ä¸é‡å‘½å %1$s->%2$s，在 %6$s ä¸é‡å‘½å %4$s->" "%5$s" -#: merge-recursive.c:1325 +#: merge-recursive.c:1326 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是é‡å‘½å %s 至 %sï¼Œä»¥åŠ %s 至 %s" -#: merge-recursive.c:1528 +#: merge-recursive.c:1529 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲çªï¼ˆé‡å‘½å/æ·»åŠ ï¼‰ï¼šåœ¨ %3$s ä¸é‡å‘½å %1$s->%2$s。在 %5$s ä¸æ·»åŠ %4$s" -#: merge-recursive.c:1543 +#: merge-recursive.c:1544 #, c-format msgid "Adding merged %s" msgstr "æ·»åŠ åˆå¹¶åŽçš„ %s" -#: merge-recursive.c:1550 merge-recursive.c:1780 +#: merge-recursive.c:1551 merge-recursive.c:1781 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为åæ·»åŠ " -#: merge-recursive.c:1607 +#: merge-recursive.c:1608 #, c-format msgid "cannot read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" -#: merge-recursive.c:1610 +#: merge-recursive.c:1611 #, c-format msgid "object %s is not a blob" msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modify" msgstr "修改" -#: merge-recursive.c:1679 +#: merge-recursive.c:1680 msgid "modified" msgstr "修改" -#: merge-recursive.c:1689 +#: merge-recursive.c:1690 msgid "content" msgstr "内容" -#: merge-recursive.c:1696 +#: merge-recursive.c:1697 msgid "add/add" msgstr "æ·»åŠ /æ·»åŠ " -#: merge-recursive.c:1732 +#: merge-recursive.c:1733 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已ç»åšè¿‡ç›¸åŒåˆå¹¶ï¼‰" -#: merge-recursive.c:1746 +#: merge-recursive.c:1747 #, c-format msgid "Auto-merging %s" msgstr "自动åˆå¹¶ %s" -#: merge-recursive.c:1750 git-submodule.sh:944 +#: merge-recursive.c:1751 git-submodule.sh:945 msgid "submodule" msgstr "å模组" -#: merge-recursive.c:1751 +#: merge-recursive.c:1752 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲çªï¼ˆ%s）：åˆå¹¶å†²çªäºŽ %s" -#: merge-recursive.c:1845 +#: merge-recursive.c:1846 #, c-format msgid "Removing %s" msgstr "åˆ é™¤ %s" -#: merge-recursive.c:1871 +#: merge-recursive.c:1872 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1877 +#: merge-recursive.c:1878 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1883 +#: merge-recursive.c:1884 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲çªï¼ˆ%1$s）：在 %3$s ä¸æœ‰ä¸€ä¸ªå为 %2$s 的目录。以 %5$s 为åæ·»åŠ %4$s" -#: merge-recursive.c:1892 +#: merge-recursive.c:1893 #, c-format msgid "Adding %s" msgstr "æ·»åŠ %s" -#: merge-recursive.c:1929 +#: merge-recursive.c:1930 msgid "Already up-to-date!" msgstr "å·²ç»æ˜¯æœ€æ–°çš„ï¼" -#: merge-recursive.c:1938 +#: merge-recursive.c:1939 #, c-format msgid "merging of trees %s and %s failed" msgstr "æ— æ³•åˆå¹¶æ ‘ %s å’Œ %s" -#: merge-recursive.c:2021 +#: merge-recursive.c:2022 msgid "Merging:" msgstr "åˆå¹¶ï¼š" -#: merge-recursive.c:2034 +#: merge-recursive.c:2035 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "å‘现 %u 个共åŒç¥–先：" msgstr[1] "å‘现 %u 个共åŒç¥–先：" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 msgid "merge returned no commit" msgstr "åˆå¹¶æœªè¿”回æ交" -#: merge-recursive.c:2136 +#: merge-recursive.c:2137 #, c-format msgid "Could not parse object '%s'" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'" -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793 msgid "Unable to write index." msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚" @@ -2345,23 +2394,25 @@ msgstr "" msgid "You have not concluded your notes merge (%s exists)." msgstr "您尚未结æŸæ³¨é‡Šåˆå¹¶ï¼ˆå˜åœ¨ %s）。" -#: notes-utils.c:41 +#: notes-utils.c:42 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "ä¸èƒ½æ交未åˆå§‹åŒ–/æœªå¼•ç”¨çš„æ³¨è§£æ ‘" -#: notes-utils.c:100 +#: notes-utils.c:101 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "åçš„ notes.rewriteMode 值：'%s'" -#: notes-utils.c:110 +#: notes-utils.c:111 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "æ‹’ç»å‘ %s（在 refs/notes/ 之外）写入注解" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c:141 #, c-format msgid "Bad %s value: '%s'" msgstr "åçš„ %s 值：'%s'" @@ -2371,29 +2422,30 @@ msgstr "åçš„ %s 值：'%s'" msgid "unable to parse object: %s" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ï¼š%s" -#: parse-options.c:572 +#: parse-options.c:573 msgid "..." msgstr "..." -#: parse-options.c:590 +#: parse-options.c:591 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#. +#: parse-options.c:597 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#: parse-options.c:597 +#: parse-options.c:600 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:631 +#: parse-options.c:634 msgid "-NUM" msgstr "-æ•°å—" @@ -2402,83 +2454,78 @@ msgstr "-æ•°å—" msgid "malformed object name '%s'" msgstr "éžæ³•çš„对象å '%s'" -#: path.c:810 +#: path.c:890 #, c-format msgid "Could not make %s writable by group" msgstr "ä¸èƒ½è®¾ç½® %s 为组å¯å†™" -#: pathspec.c:125 +#: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "转义å—符 '\\' ä¸èƒ½ä½œä¸ºå±žæ€§å€¼çš„最åŽä¸€ä¸ªå—符" -#: pathspec.c:143 +#: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." msgstr "åªå…许一个 'attr:' è§„æ ¼ã€‚" -#: pathspec.c:146 +#: pathspec.c:150 msgid "attr spec must not be empty" msgstr "å±žæ€§è§„æ ¼ä¸èƒ½ä¸ºç©º" -#: pathspec.c:189 +#: pathspec.c:193 #, c-format msgid "invalid attribute name %s" msgstr "æ— æ•ˆçš„å±žæ€§å %s" -#: pathspec.c:254 +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' å’Œ 'noglob' è·¯å¾„è§„æ ¼è®¾ç½®ä¸å…¼å®¹" -#: pathspec.c:261 +#: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' è·¯å¾„è§„æ ¼è®¾ç½®å’Œå…¶å®ƒçš„å…¨å±€è·¯å¾„è§„æ ¼è®¾ç½®ä¸å…¼å®¹" -#: pathspec.c:301 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "è·¯å¾„è§„æ ¼åŒ…å«æ— 效的神奇å‰ç¼€" -#: pathspec.c:322 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "åœ¨è·¯å¾„è§„æ ¼ '%3$s' ä¸æ— 效的神奇å‰ç¼€ '%2$.*1$s'" -#: pathspec.c:327 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "è·¯å¾„è§„æ ¼ '%s' 的神奇å‰ç¼€ç»“尾少了一个 ')'" -#: pathspec.c:365 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "è·¯å¾„è§„æ ¼ '%2$s' ä¸åŒ…å«æœªå®žçŽ°çš„神奇å‰ç¼€ '%1$c'" -#: pathspec.c:421 pathspec.c:443 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "è·¯å¾„è§„æ ¼ '%s' 在å模组 '%.*s' ä¸" - -#: pathspec.c:483 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' å’Œ 'glob' ä¸å…¼å®¹" -#: pathspec.c:496 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s：'%s' 在仓库之外" -#: pathspec.c:584 +#: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助记符：'%c'）" -#: pathspec.c:594 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%sï¼šè·¯å¾„è§„æ ¼ç¥žå¥‡å‰ç¼€ä¸è¢«æ¤å‘½ä»¤æ”¯æŒï¼š%s" -#: pathspec.c:644 +#: pathspec.c:575 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2486,16 +2533,16 @@ msgstr "" "在下一个版本ä¸ï¼Œä½¿ç”¨ç©ºå—ç¬¦ä¸²ä½œä¸ºè·¯å¾„è§„æ ¼å°†è¢«è§†ä½œéžæ³•ã€‚如果è¦åŒ¹é…所有路径，\n" "请代之以 ." -#: pathspec.c:668 +#: pathspec.c:599 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "è·¯å¾„è§„æ ¼ '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸" -#: pretty.c:982 +#: pretty.c:963 msgid "unable to parse --pretty format" msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼" -#: read-cache.c:1442 +#: read-cache.c:1443 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2504,7 +2551,7 @@ msgstr "" "设置了 index.version，但是å–å€¼æ— æ•ˆã€‚\n" "使用版本 %i" -#: read-cache.c:1452 +#: read-cache.c:1453 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2513,46 +2560,51 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是å–å€¼æ— æ•ˆã€‚\n" "使用版本 %i" -#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#: read-cache.c:2308 builtin/merge.c:1019 +#, c-format +msgid "could not close '%s'" +msgstr "ä¸èƒ½å…³é— '%s'" + +#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054 #, c-format msgid "could not stat '%s'" msgstr "ä¸èƒ½å¯¹ '%s' 调用 stat" -#: read-cache.c:2388 +#: read-cache.c:2396 #, c-format msgid "unable to open git dir: %s" msgstr "ä¸èƒ½æ‰“å¼€ git 目录：%s" -#: read-cache.c:2400 +#: read-cache.c:2408 #, c-format msgid "unable to unlink: %s" msgstr "æ— æ³•åˆ é™¤ï¼š%s" -#: refs.c:620 builtin/merge.c:844 +#: refs.c:622 #, c-format msgid "Could not open '%s' for writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入" -#: refs.c:1667 +#: refs.c:1769 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔离环境ä¸ç¦æ¢æ›´æ–°å¼•ç”¨" -#: refs/files-backend.c:1631 +#: refs/files-backend.c:1664 #, c-format msgid "could not delete reference %s: %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ %s：%s" -#: refs/files-backend.c:1634 +#: refs/files-backend.c:1667 #, c-format msgid "could not delete references: %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ï¼š%s" -#: refs/files-backend.c:1643 +#: refs/files-backend.c:1676 #, c-format msgid "could not remove reference %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ %s" -#: ref-filter.c:35 wt-status.c:1780 +#: ref-filter.c:35 wt-status.c:1811 msgid "gone" msgstr "丢失" @@ -2571,301 +2623,303 @@ msgstr "è½åŽ %d" msgid "ahead %d, behind %d" msgstr "领先 %d，è½åŽ %d" -#: ref-filter.c:104 +#: ref-filter.c:105 #, c-format msgid "expected format: %%(color:<color>)" msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(color:<color>)" -#: ref-filter.c:106 +#: ref-filter.c:107 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色：%%(color:%s)" -#: ref-filter.c:120 +#: ref-filter.c:121 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整数值 refname:lstrip=%s" -#: ref-filter.c:124 +#: ref-filter.c:125 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" -#: ref-filter.c:126 +#: ref-filter.c:127 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) å‚数：%s" -#: ref-filter.c:166 +#: ref-filter.c:167 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) ä¸å¸¦å‚æ•°" -#: ref-filter.c:173 +#: ref-filter.c:174 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) ä¸å¸¦å‚æ•°" -#: ref-filter.c:180 +#: ref-filter.c:181 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) ä¸å¸¦å‚æ•°" -#: ref-filter.c:199 +#: ref-filter.c:200 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一个æ£æ•° contents:lines=%s" -#: ref-filter.c:201 +#: ref-filter.c:202 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) å‚数：%s" -#: ref-filter.c:214 +#: ref-filter.c:215 #, c-format msgid "positive value expected objectname:short=%s" msgstr "期望一个æ£æ•° objectname:short=%s" -#: ref-filter.c:218 +#: ref-filter.c:219 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "未能识别的 %%(objectname) å‚数：%s" -#: ref-filter.c:245 +#: ref-filter.c:246 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(align:<width>,<position>)" -#: ref-filter.c:257 +#: ref-filter.c:258 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的ä½ç½®ï¼š%s" -#: ref-filter.c:261 +#: ref-filter.c:262 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" -#: ref-filter.c:267 +#: ref-filter.c:268 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) å‚数：%s" -#: ref-filter.c:271 +#: ref-filter.c:272 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "å…ƒç´ %%(align) 需è¦ä¸€ä¸ªæ£æ•°çš„宽度" -#: ref-filter.c:286 +#: ref-filter.c:287 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) å‚数：%s" -#: ref-filter.c:371 +#: ref-filter.c:378 #, c-format msgid "malformed field name: %.*s" msgstr "éžæ³•çš„å—段å：%.*s" -#: ref-filter.c:397 +#: ref-filter.c:404 #, c-format msgid "unknown field name: %.*s" msgstr "未知的å—段å：%.*s" -#: ref-filter.c:501 +#: ref-filter.c:508 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(if) å…ƒç´ è€Œæ²¡æœ‰ %%(then) å…ƒç´ " -#: ref-filter.c:561 +#: ref-filter.c:568 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(then) å…ƒç´ è€Œæ²¡æœ‰ %%(if) å…ƒç´ " -#: ref-filter.c:563 +#: ref-filter.c:570 #, c-format msgid "format: %%(then) atom used more than once" msgstr "æ ¼å¼ï¼š%%(then) å…ƒç´ ç”¨äº†å¤šæ¬¡" -#: ref-filter.c:565 +#: ref-filter.c:572 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "æ ¼å¼ï¼š%%(then) å…ƒç´ ç”¨åœ¨äº† %%(else) 之åŽ" -#: ref-filter.c:591 +#: ref-filter.c:598 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(else) å…ƒç´ è€Œæ²¡æœ‰ %%(if) å…ƒç´ " -#: ref-filter.c:593 +#: ref-filter.c:600 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(else) å…ƒç´ è€Œæ²¡æœ‰ %%(then) å…ƒç´ " -#: ref-filter.c:595 +#: ref-filter.c:602 #, c-format msgid "format: %%(else) atom used more than once" msgstr "æ ¼å¼ï¼š%%(else) å…ƒç´ ç”¨äº†å¤šæ¬¡" -#: ref-filter.c:608 +#: ref-filter.c:615 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(end) å…ƒç´ å´æ²¡æœ‰å®ƒçš„å¯¹åº”å…ƒç´ " -#: ref-filter.c:663 +#: ref-filter.c:670 #, c-format msgid "malformed format string %s" msgstr "éžæ³•çš„æ ¼å¼åŒ–å—符串 %s" -#: ref-filter.c:1247 +#: ref-filter.c:1254 #, c-format msgid "(no branch, rebasing %s)" msgstr "（éžåˆ†æ”¯ï¼Œæ£å˜åŸº %s）" -#: ref-filter.c:1250 +#: ref-filter.c:1257 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（éžåˆ†æ”¯ï¼ŒäºŒåˆ†æŸ¥æ‰¾å¼€å§‹äºŽ %s）" -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: ref-filter.c:1256 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1265 #, c-format msgid "(HEAD detached at %s)" msgstr "（头指针分离于 %s）" -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: ref-filter.c:1261 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1272 #, c-format msgid "(HEAD detached from %s)" msgstr "（头指针分离自 %s）" -#: ref-filter.c:1265 +#: ref-filter.c:1276 msgid "(no branch)" msgstr "（éžåˆ†æ”¯ï¼‰" -#: ref-filter.c:1420 ref-filter.c:1451 +#: ref-filter.c:1426 ref-filter.c:1457 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1423 ref-filter.c:1454 +#: ref-filter.c:1429 ref-filter.c:1460 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s çš„ %1$s" -#: ref-filter.c:1692 +#: ref-filter.c:1760 #, c-format msgid "malformed object at '%s'" msgstr "éžæ³•çš„对象于 '%s'" -#: ref-filter.c:1759 +#: ref-filter.c:1827 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误å称 %s 的引用" -#: ref-filter.c:1764 +#: ref-filter.c:1832 #, c-format msgid "ignoring broken ref %s" msgstr "忽略æŸå的引用 %s" -#: ref-filter.c:2028 +#: ref-filter.c:2095 #, c-format msgid "format: %%(end) atom missing" msgstr "æ ¼å¼ï¼šç¼ºå°‘ %%(end) å…ƒç´ " -#: ref-filter.c:2109 +#: ref-filter.c:2176 #, c-format msgid "malformed object name %s" msgstr "éžæ³•çš„对象å %s" -#: remote.c:754 +#: remote.c:747 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "ä¸èƒ½åŒæ—¶èŽ·å– %s å’Œ %s 至 %s" -#: remote.c:758 +#: remote.c:751 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %sï¼Œè€Œéž %s" -#: remote.c:762 +#: remote.c:755 #, c-format msgid "%s tracks both %s and %s" msgstr "%s åŒæ—¶è·Ÿè¸ª %s å’Œ %s" -#: remote.c:770 +#: remote.c:763 msgid "Internal error" msgstr "内部错误" -#: remote.c:1685 remote.c:1787 +#: remote.c:1680 remote.c:1782 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指å‘一个分支" -#: remote.c:1694 +#: remote.c:1689 #, c-format msgid "no such branch: '%s'" msgstr "没有æ¤åˆ†æ”¯ï¼š'%s'" -#: remote.c:1697 +#: remote.c:1692 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: remote.c:1703 +#: remote.c:1698 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有å˜å‚¨ä¸ºä¸€ä¸ªè¿œç¨‹è·Ÿè¸ªåˆ†æ”¯" -#: remote.c:1718 +#: remote.c:1713 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推é€ç›®æ ‡ '%s' 至远程 '%s' 没有本地跟踪分支" -#: remote.c:1730 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置è¦æŽ¨é€çš„远程æœåŠ¡å™¨" -#: remote.c:1741 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "å‘ '%s' 推é€å¼•ç”¨è§„æ ¼æœªåŒ…å« '%s'" -#: remote.c:1754 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "推é€æ— ç›®æ ‡ï¼ˆpush.default 是 'nothing'）" -#: remote.c:1776 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "æ— æ³•è§£æž 'simple' 推é€è‡³ä¸€ä¸ªå•ç‹¬çš„ç›®æ ‡" -#: remote.c:2081 +#: remote.c:2076 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但æ¤ä¸Šæ¸¸åˆ†æ”¯å·²ç»ä¸å˜åœ¨ã€‚\n" -#: remote.c:2085 +#: remote.c:2080 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" æ¥ä¿®å¤ï¼‰\n" -#: remote.c:2088 +#: remote.c:2083 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:2092 +#: remote.c:2087 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' å…± %d 个æ交。\n" msgstr[1] "您的分支领先 '%s' å…± %d 个æ交。\n" -#: remote.c:2098 +#: remote.c:2093 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" æ¥å‘布您的本地æ交）\n" -#: remote.c:2101 +#: remote.c:2096 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2874,11 +2928,11 @@ msgstr[0] "您的分支è½åŽ '%s' å…± %d 个æ交，并且å¯ä»¥å¿«è¿›ã€‚\n" msgstr[1] "您的分支è½åŽ '%s' å…± %d 个æ交，并且å¯ä»¥å¿«è¿›ã€‚\n" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: remote.c:2109 +#: remote.c:2104 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" æ¥æ›´æ–°æ‚¨çš„本地分支）\n" -#: remote.c:2112 +#: remote.c:2107 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2894,82 +2948,77 @@ msgstr[1] "" "并且分别有 %d å’Œ %d 处ä¸åŒçš„æ交。\n" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: remote.c:2122 +#: remote.c:2117 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" æ¥åˆå¹¶è¿œç¨‹åˆ†æ”¯ï¼‰\n" -#: revision.c:2158 +#: revision.c:2187 msgid "your current branch appears to be broken" msgstr "您的当å‰åˆ†æ”¯å¥½åƒè¢«æŸå" -#: revision.c:2161 +#: revision.c:2190 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当å‰åˆ†æ”¯ '%s' å°šæ— ä»»ä½•æ交" -#: revision.c:2355 +#: revision.c:2384 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect ä¸å…¼å®¹" -#: run-command.c:125 +#: run-command.c:644 msgid "open /dev/null failed" msgstr "ä¸èƒ½æ‰“å¼€ /dev/null" -#: run-command.c:127 -#, c-format -msgid "dup2(%d,%d) failed" -msgstr "ä¸èƒ½è°ƒç”¨ dup2(%d,%d)" - -#: send-pack.c:150 +#: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "ä¸èƒ½è§£æžè¿œç¨‹è§£åŒ…状æ€ï¼š%s" -#: send-pack.c:152 +#: send-pack.c:153 #, c-format msgid "remote unpack failed: %s" msgstr "远程解包失败：%s" -#: send-pack.c:315 +#: send-pack.c:316 msgid "failed to sign the push certificate" msgstr "æ— æ³•ä¸ºæŽ¨é€è¯ä¹¦ç¾å" -#: send-pack.c:428 +#: send-pack.c:429 msgid "the receiving end does not support --signed push" msgstr "接收端ä¸æ”¯æŒç¾å推é€" -#: send-pack.c:430 +#: send-pack.c:431 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未å‘é€æŽ¨é€è¯ä¹¦ï¼Œå› 为接收端ä¸æ”¯æŒç¾å推é€" -#: send-pack.c:442 +#: send-pack.c:443 msgid "the receiving end does not support --atomic push" msgstr "接收端ä¸æ”¯æŒåŽŸå推é€" -#: send-pack.c:447 +#: send-pack.c:448 msgid "the receiving end does not support push options" msgstr "接收端ä¸æ”¯æŒæŽ¨é€é€‰é¡¹" -#: sequencer.c:215 +#: sequencer.c:216 msgid "revert" msgstr "还原" -#: sequencer.c:217 +#: sequencer.c:218 msgid "cherry-pick" msgstr "拣选" -#: sequencer.c:219 +#: sequencer.c:220 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:221 +#: sequencer.c:222 #, c-format msgid "Unknown action: %d" msgstr "未知动作：%d" -#: sequencer.c:278 +#: sequencer.c:279 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2977,7 +3026,7 @@ msgstr "" "冲çªè§£å†³å®Œæ¯•åŽï¼Œç”¨ 'git add <路径>' 或 'git rm <路径>'\n" "å‘½ä»¤æ ‡è®°ä¿®æ£åŽçš„文件" -#: sequencer.c:281 +#: sequencer.c:282 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2986,63 +3035,63 @@ msgstr "" "冲çªè§£å†³å®Œæ¯•åŽï¼Œç”¨ 'git add <路径>' 或 'git rm <路径>'\n" "对修æ£åŽçš„文件åšæ ‡è®°ï¼Œç„¶åŽç”¨ 'git commit' æ交" -#: sequencer.c:294 sequencer.c:1682 +#: sequencer.c:295 sequencer.c:1685 #, c-format msgid "could not lock '%s'" msgstr "ä¸èƒ½é”定 '%s'" -#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704 #, c-format msgid "could not write to '%s'" msgstr "ä¸èƒ½å†™å…¥ '%s'" -#: sequencer.c:301 +#: sequencer.c:302 #, c-format msgid "could not write eol to '%s'" msgstr "ä¸èƒ½å°†æ¢è¡Œç¬¦å†™å…¥ '%s'" -#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692 #, c-format msgid "failed to finalize '%s'." msgstr "æ— æ³•å®Œæˆ '%s'。" -#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 -#: builtin/commit.c:749 builtin/merge.c:1018 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258 +#: builtin/commit.c:750 builtin/merge.c:1017 #, c-format msgid "could not read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" -#: sequencer.c:355 +#: sequencer.c:356 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" -#: sequencer.c:359 +#: sequencer.c:360 msgid "commit your changes or stash them to proceed." -msgstr "æ交您的修改或ä¿å˜è¿›åº¦åŽå†ç»§ç»ã€‚" +msgstr "æ交您的修改或贮è—åŽå†ç»§ç»ã€‚" -#: sequencer.c:388 +#: sequencer.c:389 #, c-format msgid "%s: fast-forward" msgstr "%s：快进" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. * "rebase -i". +#. "rebase -i". #. -#: sequencer.c:470 +#: sequencer.c:472 #, c-format msgid "%s: Unable to write new index file" msgstr "%sï¼šæ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" -#: sequencer.c:489 +#: sequencer.c:491 msgid "could not resolve HEAD commit\n" msgstr "ä¸èƒ½è§£æž HEAD æ交\n" -#: sequencer.c:509 +#: sequencer.c:511 msgid "unable to update cache tree\n" msgstr "ä¸èƒ½æ›´æ–°ç¼“å˜æ ‘\n" -#: sequencer.c:592 +#: sequencer.c:595 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3071,17 +3120,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:694 +#: sequencer.c:697 #, c-format msgid "could not parse commit %s\n" msgstr "ä¸èƒ½è§£æžæ交 %s\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse parent commit %s\n" msgstr "ä¸èƒ½è§£æžçˆ¶æ交 %s\n" -#: sequencer.c:821 +#: sequencer.c:824 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3092,7 +3141,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:827 +#: sequencer.c:830 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3103,230 +3152,230 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:833 sequencer.c:858 +#: sequencer.c:836 sequencer.c:861 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个æ交的组åˆã€‚" -#: sequencer.c:842 +#: sequencer.c:845 msgid "need a HEAD to fixup" msgstr "需è¦ä¸€ä¸ª HEAD æ¥ä¿®å¤" -#: sequencer.c:844 +#: sequencer.c:847 msgid "could not read HEAD" msgstr "ä¸èƒ½è¯»å– HEAD" -#: sequencer.c:846 +#: sequencer.c:849 msgid "could not read HEAD's commit message" msgstr "ä¸èƒ½è¯»å– HEAD çš„æ交说明" -#: sequencer.c:852 +#: sequencer.c:855 #, c-format msgid "cannot write '%s'" msgstr "ä¸èƒ½å†™ '%s'" -#: sequencer.c:861 git-rebase--interactive.sh:445 +#: sequencer.c:864 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "这是第一个æ交说明：" -#: sequencer.c:869 +#: sequencer.c:872 #, c-format msgid "could not read commit message of %s" msgstr "ä¸èƒ½è¯»å– %s çš„æ交说明" -#: sequencer.c:876 +#: sequencer.c:879 #, c-format msgid "This is the commit message #%d:" msgstr "这是æ交说明 #%d：" -#: sequencer.c:881 +#: sequencer.c:884 #, c-format msgid "The commit message #%d will be skipped:" msgstr "æ交说明 #%d 将被跳过：" -#: sequencer.c:886 +#: sequencer.c:889 #, c-format msgid "unknown command: %d" msgstr "未知命令：%d" -#: sequencer.c:952 +#: sequencer.c:955 msgid "your index file is unmerged." msgstr "您的索引文件未完æˆåˆå¹¶ã€‚" -#: sequencer.c:970 +#: sequencer.c:973 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "æ交 %s 是一个åˆå¹¶æ交但未æä¾› -m 选项。" -#: sequencer.c:978 +#: sequencer.c:981 #, c-format msgid "commit %s does not have parent %d" msgstr "æ交 %s 没有第 %d 个父æ交" -#: sequencer.c:982 +#: sequencer.c:985 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "指定了主线，但是æ交 %s ä¸æ˜¯ä¸€ä¸ªåˆå¹¶æ交。" -#: sequencer.c:988 +#: sequencer.c:991 #, 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. -#: sequencer.c:1009 +#: sequencer.c:1012 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：ä¸èƒ½è§£æžçˆ¶æ交 %s" -#: sequencer.c:1071 sequencer.c:1827 +#: sequencer.c:1075 sequencer.c:1830 #, c-format msgid "could not rename '%s' to '%s'" msgstr "ä¸èƒ½å°† '%s' é‡å‘½å为 '%s'" -#: sequencer.c:1122 +#: sequencer.c:1126 #, c-format msgid "could not revert %s... %s" msgstr "ä¸èƒ½è¿˜åŽŸ %s... %s" -#: sequencer.c:1123 +#: sequencer.c:1127 #, c-format msgid "could not apply %s... %s" msgstr "ä¸èƒ½åº”用 %s... %s" -#: sequencer.c:1165 +#: sequencer.c:1169 msgid "empty commit set passed" msgstr "æ供了空的æ交集" -#: sequencer.c:1175 +#: sequencer.c:1179 #, c-format msgid "git %s: failed to read the index" msgstr "git %sï¼šæ— æ³•è¯»å–索引" -#: sequencer.c:1182 +#: sequencer.c:1186 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %sï¼šæ— æ³•åˆ·æ–°ç´¢å¼•" -#: sequencer.c:1303 +#: sequencer.c:1306 #, c-format msgid "invalid line %d: %.*s" msgstr "æ— æ•ˆè¡Œ %d：%.*s" -#: sequencer.c:1311 +#: sequencer.c:1314 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父æ交的情况下ä¸èƒ½ '%s'" -#: sequencer.c:1344 +#: sequencer.c:1347 #, c-format msgid "could not read '%s'." msgstr "ä¸èƒ½è¯»å– '%s'。" -#: sequencer.c:1356 +#: sequencer.c:1359 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' æ¥ä¿®æ”¹ã€‚" -#: sequencer.c:1358 +#: sequencer.c:1361 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "ä¸å¯ç”¨çš„指令清å•ï¼š'%s'" -#: sequencer.c:1363 +#: sequencer.c:1366 msgid "no commits parsed." msgstr "没有解æžæ交。" -#: sequencer.c:1374 +#: sequencer.c:1377 msgid "cannot cherry-pick during a revert." msgstr "ä¸èƒ½åœ¨å›žé€€ä¸æ‰§è¡Œæ‹£é€‰ã€‚" -#: sequencer.c:1376 +#: sequencer.c:1379 msgid "cannot revert during a cherry-pick." msgstr "ä¸èƒ½åœ¨æ‹£é€‰ä¸æ‰§è¡Œå›žé€€ã€‚" -#: sequencer.c:1439 +#: sequencer.c:1442 #, c-format msgid "invalid key: %s" msgstr "æ— æ•ˆé”®å：%s" -#: sequencer.c:1442 +#: sequencer.c:1445 #, c-format msgid "invalid value for %s: %s" msgstr "%s çš„å€¼æ— æ•ˆï¼š%s" -#: sequencer.c:1499 +#: sequencer.c:1502 #, c-format msgid "malformed options sheet: '%s'" msgstr "éžæ³•çš„选项清å•ï¼š'%s'" -#: sequencer.c:1537 +#: sequencer.c:1540 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原æ“作已在进行" -#: sequencer.c:1538 +#: sequencer.c:1541 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "å°è¯• \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1541 +#: sequencer.c:1544 #, c-format msgid "could not create sequencer directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 '%s'" -#: sequencer.c:1555 +#: sequencer.c:1558 msgid "could not lock HEAD" msgstr "ä¸èƒ½é”定 HEAD" -#: sequencer.c:1611 sequencer.c:2181 +#: sequencer.c:1614 sequencer.c:2188 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原æ“作并未进行" -#: sequencer.c:1613 +#: sequencer.c:1616 msgid "cannot resolve HEAD" msgstr "ä¸èƒ½è§£æž HEAD" -#: sequencer.c:1615 sequencer.c:1649 +#: sequencer.c:1618 sequencer.c:1652 msgid "cannot abort from a branch yet to be born" msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终æ¢" -#: sequencer.c:1635 builtin/grep.c:910 +#: sequencer.c:1638 builtin/grep.c:929 #, c-format msgid "cannot open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" -#: sequencer.c:1637 +#: sequencer.c:1640 #, c-format msgid "cannot read '%s': %s" msgstr "ä¸èƒ½è¯»å– '%s'：%s" -#: sequencer.c:1638 +#: sequencer.c:1641 msgid "unexpected end of file" msgstr "æ„外的文件结æŸ" -#: sequencer.c:1644 +#: sequencer.c:1647 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ä¿å˜æ‹£é€‰æ交å‰çš„ HEAD 文件 '%s' æŸå" -#: sequencer.c:1655 +#: sequencer.c:1658 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好åƒç§»åŠ¨äº† HEAD。未能回退，检查您的 HEADï¼" -#: sequencer.c:1792 sequencer.c:2080 +#: sequencer.c:1795 sequencer.c:2086 msgid "cannot read HEAD" msgstr "ä¸èƒ½è¯»å– HEAD" -#: sequencer.c:1832 builtin/difftool.c:616 +#: sequencer.c:1835 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "ä¸èƒ½æ‹·è´ '%s' 至 '%s'" -#: sequencer.c:1848 +#: sequencer.c:1851 msgid "could not read index" msgstr "ä¸èƒ½è¯»å–索引" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: sequencer.c:1853 +#: sequencer.c:1856 #, c-format msgid "" "execution failed: %s\n" @@ -3341,11 +3390,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1859 +#: sequencer.c:1862 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:1865 +#: sequencer.c:1868 #, c-format msgid "" "execution succeeded: %s\n" @@ -3357,22 +3406,22 @@ msgid "" msgstr "" "执行æˆåŠŸï¼š%s\n" "但是在索引和/或工作区ä¸å˜åœ¨å˜æ›´\n" -"æ交或暂å˜ä¿®æ”¹ï¼Œç„¶åŽè¿è¡Œ\n" +"æ交或贮è—修改，然åŽè¿è¡Œ\n" "\n" " git rebase --continue\n" "\n" -#: sequencer.c:1920 git-rebase.sh:169 +#: sequencer.c:1925 #, c-format -msgid "Applied autostash." -msgstr "æˆåŠŸåº”用 autostash。" +msgid "Applied autostash.\n" +msgstr "已应用 autostash。\n" -#: sequencer.c:1932 +#: sequencer.c:1937 #, c-format msgid "cannot store %s" msgstr "ä¸èƒ½å˜å‚¨ %s" -#: sequencer.c:1934 git-rebase.sh:173 +#: sequencer.c:1940 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3380,60 +3429,60 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" "应用 autostash 导致冲çªã€‚\n" -"您的修改安全地ä¿å˜åœ¨ stash ä¸ã€‚\n" +"您的修改安全地ä¿å˜åœ¨è´®è—区ä¸ã€‚\n" "您å¯ä»¥åœ¨ä»»ä½•æ—¶å€™è¿è¡Œ \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:2016 +#: sequencer.c:2022 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "åœæ¢åœ¨ %s... %.*s\n" -#: sequencer.c:2058 +#: sequencer.c:2064 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:2088 +#: sequencer.c:2094 msgid "could not read orig-head" msgstr "ä¸èƒ½è¯»å– orig-head" -#: sequencer.c:2092 +#: sequencer.c:2099 msgid "could not read 'onto'" msgstr "ä¸èƒ½è¯»å– 'onto'" -#: sequencer.c:2099 +#: sequencer.c:2106 #, c-format msgid "could not update %s" msgstr "ä¸èƒ½æ›´æ–° %s" -#: sequencer.c:2106 +#: sequencer.c:2113 #, c-format msgid "could not update HEAD to %s" msgstr "ä¸èƒ½æ›´æ–° HEAD 为 %s" -#: sequencer.c:2190 +#: sequencer.c:2197 msgid "cannot rebase: You have unstaged changes." msgstr "ä¸èƒ½å˜åŸºï¼šæ‚¨æœ‰æœªæš‚å˜çš„å˜æ›´ã€‚" -#: sequencer.c:2195 +#: sequencer.c:2202 msgid "could not remove CHERRY_PICK_HEAD" msgstr "ä¸èƒ½åˆ 除 CHERRY_PICK_HEAD" -#: sequencer.c:2204 +#: sequencer.c:2211 msgid "cannot amend non-existing commit" msgstr "ä¸èƒ½ä¿®è¡¥ä¸å˜åœ¨çš„æ交" -#: sequencer.c:2206 +#: sequencer.c:2213 #, c-format msgid "invalid file: '%s'" msgstr "æ— æ•ˆæ–‡ä»¶ï¼š'%s'" -#: sequencer.c:2208 +#: sequencer.c:2215 #, c-format msgid "invalid contents: '%s'" msgstr "æ— æ•ˆå†…å®¹ï¼š'%s'" -#: sequencer.c:2211 +#: sequencer.c:2218 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3442,25 +3491,25 @@ msgstr "" "\n" "您的工作区ä¸æœ‰æœªæ交的å˜æ›´ã€‚请先æ交然åŽå†æ¬¡è¿è¡Œ 'git rebase --continue'。" -#: sequencer.c:2221 +#: sequencer.c:2228 msgid "could not commit staged changes." msgstr "ä¸èƒ½æ交暂å˜çš„修改。" -#: sequencer.c:2301 +#: sequencer.c:2308 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：ä¸èƒ½æ‹£é€‰ä¸€ä¸ª%s" -#: sequencer.c:2305 +#: sequencer.c:2312 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:2338 +#: sequencer.c:2345 msgid "can't revert as initial commit" msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交回退" -#: setup.c:165 +#: setup.c:171 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3469,7 +3518,7 @@ msgstr "" "%s：工作区ä¸æ— æ¤è·¯å¾„。\n" "使用命令 'git <command> -- <path>...' æ¥æŒ‡å®šæœ¬åœ°ä¸å˜åœ¨çš„路径。" -#: setup.c:178 +#: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3480,7 +3529,7 @@ msgstr "" "使用 '--' æ¥åˆ†éš”版本和路径，例如：\n" "'git <command> [<revision>...] -- [<file>...]'" -#: setup.c:228 +#: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3491,34 +3540,34 @@ msgstr "" "使用 '--' æ¥åˆ†éš”版本和路径，例如：\n" "'git <command> [<revision>...] -- [<file>...]'" -#: setup.c:475 +#: setup.c:504 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，å´å¾—到 %d" -#: setup.c:483 +#: setup.c:512 msgid "unknown repository extensions found:" msgstr "å‘现未知的仓库扩展：" -#: setup.c:776 +#: setup.c:810 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库（或者任何父目录）：%s" -#: setup.c:778 builtin/index-pack.c:1646 +#: setup.c:812 builtin/index-pack.c:1652 msgid "Cannot come back to cwd" msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" -#: setup.c:1010 +#: setup.c:1050 msgid "Unable to read current working directory" msgstr "ä¸èƒ½è¯»å–当å‰å·¥ä½œç›®å½•" -#: setup.c:1022 setup.c:1028 +#: setup.c:1062 setup.c:1068 #, c-format msgid "Cannot change to '%s'" msgstr "ä¸èƒ½åˆ‡æ¢åˆ° '%s'" -#: setup.c:1041 +#: setup.c:1081 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3527,7 +3576,7 @@ msgstr "" "ä¸æ˜¯ä¸€ä¸ª git 仓库（或者å‘上递归至挂载点 %s 的任何祖先目录）\n" "åœæ¢åœ¨æ–‡ä»¶ç³»ç»Ÿè¾¹ç•Œï¼ˆæœªè®¾ç½® GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1106 +#: setup.c:1173 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3536,27 +3585,27 @@ msgstr "" "å‚æ•° core.sharedRepository 的文件æƒé™å€¼æœ‰é”™ï¼ˆ0%.3o）。\n" "文件属主必须始终拥有读写æƒé™ã€‚" -#: sha1_file.c:559 +#: sha1_file.c:560 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' ä¸å˜åœ¨" -#: sha1_file.c:585 +#: sha1_file.c:586 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "å°šä¸æ”¯æŒå°†å‚考仓库 '%s' 作为一个链接检出。" -#: sha1_file.c:591 +#: sha1_file.c:592 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "å‚考仓库 '%s' ä¸æ˜¯ä¸€ä¸ªæœ¬åœ°ä»“库。" -#: sha1_file.c:597 +#: sha1_file.c:598 #, c-format msgid "reference repository '%s' is shallow" msgstr "å‚考仓库 '%s' 是一个浅克隆" -#: sha1_file.c:605 +#: sha1_file.c:606 #, c-format msgid "reference repository '%s' is grafted" msgstr "å‚考仓库 '%s' 已被å«æŽ¥" @@ -3565,26 +3614,26 @@ msgstr "å‚考仓库 '%s' 已被å«æŽ¥" msgid "offset before end of packfile (broken .idx?)" msgstr "å移é‡åœ¨åŒ…文件结æŸä¹‹å‰ï¼ˆæŸåçš„ .idx？）" -#: sha1_file.c:2721 +#: sha1_file.c:2729 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "å移é‡åœ¨ %s 的包索引开始之å‰ï¼ˆæŸå的索引？）" -#: sha1_file.c:2725 +#: sha1_file.c:2733 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "å移é‡è¶Šè¿‡äº† %s 的包索引的结尾（被截æ–的索引？）" -#: sha1_name.c:409 +#: sha1_name.c:419 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "çŸ SHA1 %s å˜åœ¨æ§ä¹‰" -#: sha1_name.c:420 +#: sha1_name.c:430 msgid "The candidates are:" msgstr "候选者有：" -#: sha1_name.c:580 +#: sha1_name.c:589 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" @@ -3605,71 +3654,81 @@ msgstr "" "å¯èƒ½éœ€è¦åˆ 除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关é—本消æ¯é€šçŸ¥ã€‚" -#: submodule.c:67 submodule.c:101 +#: submodule.c:70 submodule.c:104 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "æ— æ³•ä¿®æ”¹æœªåˆå¹¶çš„ .gitmodules，先解决åˆå¹¶å†²çª" -#: submodule.c:71 submodule.c:105 +#: submodule.c:74 submodule.c:108 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "æ— æ³•åœ¨ .gitmodules ä¸æ‰¾åˆ° path=%s çš„å°èŠ‚" -#: submodule.c:79 +#: submodule.c:82 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "ä¸èƒ½æ›´æ–° .gitmodules æ¡ç›® %s" -#: submodule.c:112 +#: submodule.c:115 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "æ— æ³•ç§»é™¤ %s çš„ .gitmodules æ¡ç›®" -#: submodule.c:123 +#: submodule.c:126 msgid "staging updated .gitmodules failed" msgstr "å°†æ›´æ–°åŽ .gitmodules æ·»åŠ æš‚å˜åŒºå¤±è´¥" -#: submodule.c:161 +#: submodule.c:165 msgid "negative values not allowed for submodule.fetchJobs" msgstr "submodule.fetchJobs ä¸å…许为负值" -#: submodule.c:1194 +#: submodule.c:376 +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "ä½äºŽæœªæ£€å‡ºçš„å模组 '%s'" + +#: submodule.c:407 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "è·¯å¾„è§„æ ¼ '%s' 在å模组 '%.*s' ä¸" + +#: submodule.c:1337 #, c-format msgid "'%s' not recognized as a git repository" msgstr "æ— æ³•å°† '%s' 识别为一个 git 仓库" -#: submodule.c:1332 +#: submodule.c:1475 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "æ— æ³•åœ¨å模组 '%s' ä¸å¯åŠ¨ 'git status'" -#: submodule.c:1345 +#: submodule.c:1488 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "æ— æ³•åœ¨å模组 '%s' ä¸æ‰§è¡Œ 'git status'" -#: submodule.c:1421 +#: submodule.c:1581 #, c-format msgid "submodule '%s' has dirty index" msgstr "å模组 '%s' ä¸æœ‰è„索引" -#: submodule.c:1678 +#: submodule.c:1845 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "ä¸æ”¯æŒå¯¹æœ‰å¤šä¸ªå·¥ä½œåŒºçš„å模组 '%s' 执行 relocate_gitdir" -#: submodule.c:1690 submodule.c:1746 +#: submodule.c:1857 submodule.c:1913 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "ä¸èƒ½æŸ¥è¯¢å模组 '%s' çš„å称" -#: submodule.c:1694 builtin/submodule--helper.c:678 +#: submodule.c:1861 builtin/submodule--helper.c:678 #: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" -#: submodule.c:1697 +#: submodule.c:1864 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3680,101 +3739,101 @@ msgstr "" "'%s' è¿ç§»è‡³\n" "'%s'\n" -#: submodule.c:1781 +#: submodule.c:1948 #, c-format msgid "could not recurse into submodule '%s'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '%s'" -#: submodule.c:1825 +#: submodule.c:1992 msgid "could not start ls-files in .." msgstr "æ— æ³•åœ¨ .. ä¸å¯åŠ¨ ls-files" -#: submodule.c:1845 +#: submodule.c:2012 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG：返回的路径和当å‰è·¯å¾„ä¸åŒ¹é…？" -#: submodule.c:1864 +#: submodule.c:2031 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" -#: submodule-config.c:380 +#: submodule-config.c:420 #, c-format msgid "invalid value for %s" msgstr "%s çš„å€¼æ— æ•ˆ" -#: trailer.c:240 +#: trailer.c:241 #, c-format msgid "running trailer command '%s' failed" msgstr "执行 trailer 命令 '%s' 失败" -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 -#: trailer.c:543 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540 +#: trailer.c:544 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "é”® '%2$s' 的未知å–值 '%1$s'" -#: trailer.c:525 trailer.c:530 builtin/remote.c:289 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "多于一个 %s" -#: trailer.c:702 +#: trailer.c:703 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "ç¾å '%.*s' 的键为空" -#: trailer.c:722 +#: trailer.c:723 #, c-format msgid "could not read input file '%s'" msgstr "ä¸èƒ½è¯»å–输入文件 '%s'" -#: trailer.c:725 +#: trailer.c:726 msgid "could not read from stdin" msgstr "ä¸èƒ½è‡ªæ ‡å‡†è¾“入读å–" -#: trailer.c:949 builtin/am.c:44 +#: trailer.c:950 builtin/am.c:45 #, c-format msgid "could not stat %s" msgstr "ä¸èƒ½å¯¹ %s 调用 stat" -#: trailer.c:951 +#: trailer.c:952 #, c-format msgid "file %s is not a regular file" msgstr "文件 %s ä¸æ˜¯ä¸€ä¸ªæ£è§„文件" -#: trailer.c:953 +#: trailer.c:954 #, c-format msgid "file %s is not writable by user" msgstr "文件 %s 用户ä¸å¯å†™" -#: trailer.c:965 +#: trailer.c:966 msgid "could not open temporary file" msgstr "ä¸èƒ½æ‰“开临时文件" -#: trailer.c:1001 +#: trailer.c:1002 #, c-format msgid "could not rename temporary file to %s" msgstr "ä¸èƒ½é‡å‘½å临时文件为 %s" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "å°†è¦è®¾ç½® '%1$s' 的上游为 '%3$s' çš„ '%2$s'\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "ä¼ è¾“ï¼šæ— æ•ˆçš„æ·±åº¦é€‰é¡¹ '%s'" -#: transport.c:889 +#: transport.c:890 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列å模组路径所包å«çš„修改在任何远程æºä¸éƒ½æ‰¾ä¸åˆ°ï¼š\n" -#: transport.c:893 +#: transport.c:894 #, c-format msgid "" "\n" @@ -3801,11 +3860,11 @@ msgstr "" "以推é€è‡³è¿œç¨‹ã€‚\n" "\n" -#: transport.c:901 +#: transport.c:902 msgid "Aborting." msgstr "æ£åœ¨ç»ˆæ¢ã€‚" -#: transport-helper.c:1080 +#: transport-helper.c:1071 #, c-format msgid "Could not read ref %s" msgstr "ä¸èƒ½è¯»å–引用 %s" @@ -3826,16 +3885,16 @@ msgstr "æ ‘å¯¹è±¡æ¡ç›®ä¸ç©ºçš„文件å" msgid "too-short tree file" msgstr "太çŸçš„æ ‘æ–‡ä»¶" -#: unpack-trees.c:104 +#: unpack-trees.c:105 #, 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请在切æ¢åˆ†æ”¯å‰æ交您的修改或者ä¿å˜è¿›åº¦ã€‚" +"%%s请在切æ¢åˆ†æ”¯å‰æ交或贮è—您的修改。" -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3844,16 +3903,16 @@ msgstr "" "您对下列文件的本地修改将被检出æ“作覆盖：\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:110 #, 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请在åˆå¹¶å‰æ交您的修改或者ä¿å˜è¿›åº¦ã€‚" +"%%s请在åˆå¹¶å‰æ交或贮è—您的修改。" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3862,16 +3921,16 @@ msgstr "" "您对下列文件的本地修改将被åˆå¹¶æ“作覆盖：\n" "%%s" -#: unpack-trees.c:114 +#: unpack-trees.c:115 #, 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 之å‰æ交您的修改或者ä¿å˜è¿›åº¦ã€‚" +"%%s请在 %s 之å‰æ交或贮è—您的修改。" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3880,7 +3939,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:122 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3889,7 +3948,7 @@ msgstr "" "更新如下目录将会丢失其ä¸æœªè·Ÿè¸ªçš„文件：\n" "%s" -#: unpack-trees.c:125 +#: unpack-trees.c:126 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3898,7 +3957,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºæ£€å‡ºæ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s请在切æ¢åˆ†æ”¯ä¹‹å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3907,7 +3966,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºæ£€å‡ºæ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3916,7 +3975,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºåˆå¹¶æ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s请在åˆå¹¶å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3925,7 +3984,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºåˆå¹¶æ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s" -#: unpack-trees.c:135 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3934,7 +3993,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸º %s æ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s请在 %s å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3943,7 +4002,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸º %s æ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3953,7 +4012,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºæ£€å‡ºæ“作而被覆盖：\n" "%%s请在切æ¢åˆ†æ”¯å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3963,7 +4022,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºæ£€å‡ºæ“作而被覆盖：\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3972,7 +4031,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºåˆå¹¶æ“作而被覆盖：\n" "%%s请在åˆå¹¶å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3981,7 +4040,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºåˆå¹¶æ“作而被覆盖：\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3990,7 +4049,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸º %s æ“作而被覆盖：\n" "%%s请在 %s å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3999,12 +4058,12 @@ msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸º %s æ“作而被覆盖：\n" "%%s" -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "æ¡ç›® '%s' å’Œ '%s' é‡å ã€‚æ— æ³•åˆå¹¶ã€‚" -#: unpack-trees.c:164 +#: unpack-trees.c:165 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -4013,7 +4072,7 @@ msgstr "" "æ— æ³•æ›´æ–°ç¨€ç–检出：如下æ¡ç›®ä¸æ˜¯æœ€æ–°ï¼š\n" "%s" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4023,7 +4082,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—文件将被稀ç–检出更新所覆盖：\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4033,7 +4092,7 @@ msgstr "" "工作区ä¸ä¸‹åˆ—文件将被稀ç–æ£€å‡ºæ›´æ–°æ‰€åˆ é™¤ï¼š\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "Cannot update submodule:\n" @@ -4042,17 +4101,17 @@ msgstr "" "æ— æ³•æ›´æ–°å模组：\n" "%s" -#: unpack-trees.c:247 +#: unpack-trees.c:248 #, c-format msgid "Aborting\n" msgstr "终æ¢ä¸\n" -#: unpack-trees.c:272 +#: unpack-trees.c:277 #, c-format msgid "submodule update strategy not supported for submodule '%s'" msgstr "å模组 %s ä¸æ”¯æŒå模组更新ç–ç•¥" -#: unpack-trees.c:340 +#: unpack-trees.c:346 msgid "Checking out files" msgstr "æ£åœ¨æ£€å‡ºæ–‡ä»¶" @@ -4085,196 +4144,202 @@ msgstr "æ— æ•ˆçš„ç«¯å£å·" msgid "invalid '..' path segment" msgstr "æ— æ•ˆçš„ '..' 路径片段" -#: worktree.c:285 +#: worktree.c:245 #, c-format msgid "failed to read '%s'" msgstr "æ— æ³•è¯»å– '%s'" -#: wrapper.c:222 wrapper.c:392 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行读写" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766 #, c-format msgid "could not open '%s' for writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 -#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 -#: builtin/pull.c:341 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757 +#: builtin/am.c:849 builtin/merge.c:1014 #, c-format msgid "could not open '%s' for reading" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行读å–" -#: wrapper.c:581 wrapper.c:602 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "ä¸èƒ½è®¿é—® '%s'" -#: wrapper.c:610 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "ä¸èƒ½èŽ·å–当å‰å·¥ä½œç›®å½•" -#: wrapper.c:634 +#: wrapper.c:656 #, c-format msgid "could not write to %s" msgstr "ä¸èƒ½å†™å…¥ %s" -#: wrapper.c:636 +#: wrapper.c:658 #, c-format msgid "could not close %s" msgstr "ä¸èƒ½å…³é— %s" -#: wt-status.c:151 +#: wt-status.c:152 msgid "Unmerged paths:" msgstr "未åˆå¹¶çš„路径：" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <文件>...\" 以å–消暂å˜ï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:181 wt-status.c:208 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <文件>...\" 以å–消暂å˜ï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:184 +#: wt-status.c:185 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " （使用 \"git add <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:187 wt-status.c:191 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" -#: wt-status.c:199 wt-status.c:958 +#: wt-status.c:200 wt-status.c:981 msgid "Changes to be committed:" msgstr "è¦æ交的å˜æ›´ï¼š" -#: wt-status.c:217 wt-status.c:967 +#: wt-status.c:218 wt-status.c:990 msgid "Changes not staged for commit:" msgstr "尚未暂å˜ä»¥å¤‡æ交的å˜æ›´ï¼š" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <文件>...\" æ›´æ–°è¦æ交的内容）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:223 +#: wt-status.c:224 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <文件>...\" æ›´æ–°è¦æ交的内容）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:224 +#: wt-status.c:225 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:226 +#: wt-status.c:227 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （æ交或丢弃å模组ä¸æœªè·Ÿè¸ªæˆ–修改的内容）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:238 +#: wt-status.c:239 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <文件>...\" 以包å«è¦æ交的内容）" -#: wt-status.c:253 +#: wt-status.c:254 msgid "both deleted:" msgstr "åŒæ–¹åˆ 除：" -#: wt-status.c:255 +#: wt-status.c:256 msgid "added by us:" msgstr "ç”±æˆ‘ä»¬æ·»åŠ ï¼š" -#: wt-status.c:257 +#: wt-status.c:258 msgid "deleted by them:" msgstr "ç”±ä»–ä»¬åˆ é™¤ï¼š" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by them:" msgstr "ç”±ä»–ä»¬æ·»åŠ ï¼š" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by us:" msgstr "ç”±æˆ‘ä»¬åˆ é™¤ï¼š" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both added:" msgstr "åŒæ–¹æ·»åŠ ：" -#: wt-status.c:265 +#: wt-status.c:266 msgid "both modified:" msgstr "åŒæ–¹ä¿®æ”¹ï¼š" -#: wt-status.c:275 +#: wt-status.c:276 msgid "new file:" msgstr "新文件：" -#: wt-status.c:277 +#: wt-status.c:278 msgid "copied:" msgstr "æ‹·è´ï¼š" -#: wt-status.c:279 +#: wt-status.c:280 msgid "deleted:" msgstr "åˆ é™¤ï¼š" -#: wt-status.c:281 +#: wt-status.c:282 msgid "modified:" msgstr "修改：" -#: wt-status.c:283 +#: wt-status.c:284 msgid "renamed:" msgstr "é‡å‘½å：" -#: wt-status.c:285 +#: wt-status.c:286 msgid "typechange:" msgstr "类型å˜æ›´ï¼š" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unknown:" msgstr "未知：" -#: wt-status.c:289 +#: wt-status.c:290 msgid "unmerged:" msgstr "未åˆå¹¶ï¼š" # 译者：末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— -#: wt-status.c:371 +#: wt-status.c:372 msgid "new commits, " msgstr "æ–°æ交, " # 译者：末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— -#: wt-status.c:373 +#: wt-status.c:374 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— -#: wt-status.c:375 +#: wt-status.c:376 msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:831 +#: wt-status.c:821 +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "您的贮è—区当å‰æœ‰ %d æ¡è®°å½•" +msgstr[1] "您的贮è—区当å‰æœ‰ %d æ¡è®°å½•" + +#: wt-status.c:853 msgid "Submodules changed but not updated:" msgstr "å模组已修改但尚未更新：" -#: wt-status.c:833 +#: wt-status.c:855 msgid "Submodule changes to be committed:" msgstr "è¦æ交的å模组å˜æ›´ï¼š" -#: wt-status.c:914 +#: wt-status.c:937 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -4282,77 +4347,77 @@ msgstr "" "ä¸è¦æ”¹åŠ¨ä¸Šé¢çš„一行。\n" "下é¢çš„所有内容å‡å°†è¢«åˆ 除。" -#: wt-status.c:1026 +#: wt-status.c:1049 msgid "You have unmerged paths." msgstr "您有尚未åˆå¹¶çš„路径。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1029 +#: wt-status.c:1052 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲çªå¹¶è¿è¡Œ \"git commit\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1031 +#: wt-status.c:1054 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 终æ¢åˆå¹¶ï¼‰" -#: wt-status.c:1036 +#: wt-status.c:1059 msgid "All conflicts fixed but you are still merging." msgstr "所有冲çªå·²è§£å†³ä½†æ‚¨ä»å¤„于åˆå¹¶ä¸ã€‚" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1039 +#: wt-status.c:1062 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结æŸåˆå¹¶ï¼‰" -#: wt-status.c:1049 +#: wt-status.c:1072 msgid "You are in the middle of an am session." msgstr "您æ£å¤„于 am æ“作过程ä¸ã€‚" -#: wt-status.c:1052 +#: wt-status.c:1075 msgid "The current patch is empty." msgstr "当å‰çš„è¡¥ä¸ä¸ºç©ºã€‚" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1056 +#: wt-status.c:1079 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1058 +#: wt-status.c:1081 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1060 +#: wt-status.c:1083 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" æ¢å¤åŽŸæœ‰åˆ†æ”¯ï¼‰" -#: wt-status.c:1189 +#: wt-status.c:1214 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1191 +#: wt-status.c:1216 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1194 +#: wt-status.c:1219 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最åŽä¸€æ¡å‘½ä»¤å·²å®Œæˆï¼ˆ%d æ¡å‘½ä»¤è¢«æ‰§è¡Œï¼‰ï¼š" msgstr[1] "最åŽçš„命令已完æˆï¼ˆ%d æ¡å‘½ä»¤è¢«æ‰§è¡Œï¼‰ï¼š" -#: wt-status.c:1205 +#: wt-status.c:1230 #, c-format msgid " (see more in file %s)" msgstr " （更多å‚è§æ–‡ä»¶ %s）" -#: wt-status.c:1210 +#: wt-status.c:1235 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1213 +#: wt-status.c:1238 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -4360,165 +4425,169 @@ msgstr[0] "接下æ¥è¦æ‰§è¡Œçš„命令（剩余 %d æ¡å‘½ä»¤ï¼‰ï¼š" msgstr[1] "接下æ¥è¦æ‰§è¡Œçš„命令（剩余 %d æ¡å‘½ä»¤ï¼‰ï¼š" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1221 +#: wt-status.c:1246 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" æ¥æŸ¥çœ‹å’Œç¼–辑）" -#: wt-status.c:1234 +#: wt-status.c:1259 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作。" -#: wt-status.c:1239 +#: wt-status.c:1264 msgid "You are currently rebasing." msgstr "您在执行å˜åŸºæ“作。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1253 +#: wt-status.c:1278 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git rebase --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1255 +#: wt-status.c:1280 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1257 +#: wt-status.c:1282 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1263 +#: wt-status.c:1288 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git rebase --continue\"）" -#: wt-status.c:1267 +#: wt-status.c:1292 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时拆分æ交。" -#: wt-status.c:1272 +#: wt-status.c:1297 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行å˜åŸºæ“作时拆分æ交。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1275 +#: wt-status.c:1300 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录æ交干净åŽï¼Œè¿è¡Œ \"git rebase --continue\"）" -#: wt-status.c:1279 +#: wt-status.c:1304 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时编辑æ交。" -#: wt-status.c:1284 +#: wt-status.c:1309 msgid "You are currently editing a commit during a rebase." msgstr "您在执行å˜åŸºæ“作时编辑æ交。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1287 +#: wt-status.c:1312 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当å‰æ交）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1289 +#: wt-status.c:1314 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满æ„åŽæ‰§è¡Œ \"git rebase --continue\"）" -#: wt-status.c:1299 +#: wt-status.c:1324 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选æ交 %s çš„æ“作。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1304 +#: wt-status.c:1329 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解决冲çªå¹¶è¿è¡Œ \"git cherry-pick --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1307 +#: wt-status.c:1332 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git cherry-pick --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1309 +#: wt-status.c:1334 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以å–消拣选æ“作）" -#: wt-status.c:1318 +#: wt-status.c:1343 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行å转æ交 %s çš„æ“作。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1323 +#: wt-status.c:1348 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲çªå¹¶è¿è¡Œ \"git revert --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1326 +#: wt-status.c:1351 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git revert --continue\"）" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1328 +#: wt-status.c:1353 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以å–消å转æ交æ“作）" -#: wt-status.c:1339 +#: wt-status.c:1364 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找æ“作。" -#: wt-status.c:1343 +#: wt-status.c:1368 msgid "You are currently bisecting." msgstr "您在执行二分查找æ“作。" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: wt-status.c:1346 +#: wt-status.c:1371 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1543 +#: wt-status.c:1568 msgid "On branch " msgstr "ä½äºŽåˆ†æ”¯ " -#: wt-status.c:1549 +#: wt-status.c:1574 msgid "interactive rebase in progress; onto " msgstr "交互å¼å˜åŸºæ“作æ£åœ¨è¿›è¡Œä¸ï¼›è‡³ " -#: wt-status.c:1551 +#: wt-status.c:1576 msgid "rebase in progress; onto " msgstr "å˜åŸºæ“作æ£åœ¨è¿›è¡Œä¸ï¼›è‡³ " -#: wt-status.c:1556 +#: wt-status.c:1581 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1558 +#: wt-status.c:1583 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1561 +#: wt-status.c:1586 msgid "Not currently on any branch." msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚" -#: wt-status.c:1579 +#: wt-status.c:1606 msgid "Initial commit" msgstr "åˆå§‹æ交" -#: wt-status.c:1593 +#: wt-status.c:1607 +msgid "No commits yet" +msgstr "å°šæ— æ交" + +#: wt-status.c:1621 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1595 +#: wt-status.c:1623 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1599 +#: wt-status.c:1627 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4528,258 +4597,294 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能æ高速度，\n" "但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ·»åŠ 新文件（å‚è§ 'git help status'）。" -#: wt-status.c:1605 +#: wt-status.c:1633 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: wt-status.c:1607 +#: wt-status.c:1635 msgid " (use -u option to show untracked files)" msgstr "（使用 -u å‚数显示未跟踪的文件）" -#: wt-status.c:1613 +#: wt-status.c:1641 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1618 +#: wt-status.c:1646 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "ä¿®æ”¹å°šæœªåŠ å…¥æ交（使用 \"git add\" å’Œ/或 \"git commit -a\"）\n" -#: wt-status.c:1621 +#: wt-status.c:1649 #, c-format msgid "no changes added to commit\n" msgstr "ä¿®æ”¹å°šæœªåŠ å…¥æ交\n" -#: wt-status.c:1624 +#: wt-status.c:1652 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "æ交为空，但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1627 +#: wt-status.c:1655 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "æ交为空，但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件\n" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: wt-status.c:1630 +#: wt-status.c:1658 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "æ— æ–‡ä»¶è¦æ交（创建/æ‹·è´æ–‡ä»¶å¹¶ä½¿ç”¨ \"git add\" 建立跟踪）\n" -#: wt-status.c:1633 wt-status.c:1638 +#: wt-status.c:1661 wt-status.c:1666 #, c-format msgid "nothing to commit\n" msgstr "æ— æ–‡ä»¶è¦æ交\n" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: wt-status.c:1636 +#: wt-status.c:1664 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "æ— æ–‡ä»¶è¦æ交（使用 -u 显示未跟踪的文件）\n" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: wt-status.c:1640 +#: wt-status.c:1668 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "æ— æ–‡ä»¶è¦æ交，干净的工作区\n" -# 译者：注æ„ä¿æŒå¥å°¾ç©ºæ ¼ -#: wt-status.c:1749 -msgid "Initial commit on " -msgstr "åˆå§‹æ交于 " +#: wt-status.c:1780 +msgid "No commits yet on " +msgstr "å°šæ— æ交在 " -#: wt-status.c:1753 +#: wt-status.c:1784 msgid "HEAD (no branch)" msgstr "HEAD（éžåˆ†æ”¯ï¼‰" # 译者：注æ„ä¿æŒå¥å°¾ç©ºæ ¼ -#: wt-status.c:1782 wt-status.c:1790 +#: wt-status.c:1813 wt-status.c:1821 msgid "behind " msgstr "è½åŽ " -#: wt-status.c:1785 wt-status.c:1788 +#: wt-status.c:1816 wt-status.c:1819 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2280 +#: wt-status.c:2311 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "ä¸èƒ½%s：您有未暂å˜çš„å˜æ›´ã€‚" -#: wt-status.c:2286 +#: wt-status.c:2317 msgid "additionally, your index contains uncommitted changes." msgstr "å¦å¤–，您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" -#: wt-status.c:2288 +#: wt-status.c:2319 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "ä¸èƒ½%s：您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" -#: compat/precompose_utf8.c:57 builtin/clone.c:432 +#: compat/precompose_utf8.c:58 builtin/clone.c:436 #, c-format msgid "failed to unlink '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" -#: builtin/add.c:22 +#: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<选项>] [--] <è·¯å¾„è§„æ ¼>..." -#: builtin/add.c:80 +#: builtin/add.c:82 #, c-format msgid "unexpected diff status %c" msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c" -#: builtin/add.c:85 builtin/commit.c:291 +#: builtin/add.c:87 builtin/commit.c:292 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:95 +#: builtin/add.c:97 #, c-format msgid "remove '%s'\n" msgstr "åˆ é™¤ '%s'\n" -#: builtin/add.c:149 +#: builtin/add.c:151 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之åŽå°šæœªè¢«æš‚å˜çš„å˜æ›´ï¼š" -#: builtin/add.c:209 builtin/rev-parse.c:872 +#: builtin/add.c:211 builtin/rev-parse.c:873 msgid "Could not read the index" msgstr "ä¸èƒ½è¯»å–索引" -#: builtin/add.c:220 +#: builtin/add.c:222 #, c-format msgid "Could not open '%s' for writing." msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入。" -#: builtin/add.c:224 +#: builtin/add.c:226 msgid "Could not write patch" msgstr "ä¸èƒ½ç”Ÿæˆè¡¥ä¸" -#: builtin/add.c:227 +#: builtin/add.c:229 msgid "editing patch failed" msgstr "编辑补ä¸å¤±è´¥" -#: builtin/add.c:230 +#: builtin/add.c:232 #, c-format msgid "Could not stat '%s'" msgstr "ä¸èƒ½å¯¹ '%s' 调用 stat" -#: builtin/add.c:232 +#: builtin/add.c:234 msgid "Empty patch. Aborted." msgstr "空补ä¸ã€‚异常终æ¢ã€‚" -#: builtin/add.c:237 +#: builtin/add.c:239 #, c-format msgid "Could not apply '%s'" msgstr "ä¸èƒ½åº”用 '%s'" -#: builtin/add.c:247 +#: builtin/add.c:249 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "ä¸‹åˆ—è·¯å¾„æ ¹æ®æ‚¨çš„一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 +#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "æ¼”ä¹ " -#: builtin/add.c:269 +#: builtin/add.c:272 msgid "interactive picking" msgstr "交互å¼æ‹£é€‰" -#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 +#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299 msgid "select hunks interactively" msgstr "交互å¼æŒ‘选数æ®å—" -#: builtin/add.c:271 +#: builtin/add.c:274 msgid "edit current diff and apply" msgstr "编辑当å‰å·®å¼‚并应用" -#: builtin/add.c:272 +#: builtin/add.c:275 msgid "allow adding otherwise ignored files" msgstr "å…è®¸æ·»åŠ å¿½ç•¥çš„æ–‡ä»¶" -#: builtin/add.c:273 +#: builtin/add.c:276 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:274 +#: builtin/add.c:277 msgid "record only the fact that the path will be added later" msgstr "åªè®°å½•ï¼Œè¯¥è·¯å¾„ç¨åŽå†æ·»åŠ " -#: builtin/add.c:275 +#: builtin/add.c:278 msgid "add changes from all tracked and untracked files" msgstr "æ·»åŠ æ‰€æœ‰æ”¹å˜çš„已跟踪文件和未跟踪文件" -#: builtin/add.c:278 +#: builtin/add.c:281 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区ä¸ç§»é™¤çš„路径（和 --no-all 相åŒï¼‰" -#: builtin/add.c:280 +#: builtin/add.c:283 msgid "don't add, only refresh the index" msgstr "ä¸æ·»åŠ ，åªåˆ·æ–°ç´¢å¼•" -#: builtin/add.c:281 +#: builtin/add.c:284 msgid "just skip files which cannot be added because of errors" msgstr "è·³è¿‡å› å‡ºé”™ä¸èƒ½æ·»åŠ 的文件" -#: builtin/add.c:282 +#: builtin/add.c:285 msgid "check if - even missing - files are ignored in dry run" msgstr "æ£€æŸ¥åœ¨æ¼”ä¹ æ¨¡å¼ä¸‹æ–‡ä»¶ï¼ˆå³ä½¿ä¸å˜åœ¨ï¼‰æ˜¯å¦è¢«å¿½ç•¥" -#: builtin/add.c:283 builtin/update-index.c:951 +#: builtin/add.c:286 builtin/update-index.c:952 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:952 +#: builtin/add.c:286 builtin/update-index.c:953 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的å¯æ‰§è¡Œä½" -#: builtin/add.c:305 +#: builtin/add.c:288 +msgid "warn when adding an embedded repository" +msgstr "创建一个嵌入å¼ä»“库时给予è¦å‘Š" + +#: builtin/add.c:303 +#, 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" +"\tgit submodule add <url> %s\n" +"\n" +"如果您ä¸å°å¿ƒæ·»åŠ 了这个路径，å¯ä»¥ç”¨ä¸‹é¢çš„命令将其从索引ä¸åˆ 除：\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"å‚è§ \"git help submodule\" 获å–更多信æ¯ã€‚" + +#: builtin/add.c:331 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "æ£åœ¨æ·»åŠ åµŒå…¥å¼ git 仓库：%s" + +#: builtin/add.c:349 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f å‚数如果您确实è¦æ·»åŠ 它们。\n" -#: builtin/add.c:312 +#: builtin/add.c:357 msgid "adding files failed" msgstr "æ·»åŠ æ–‡ä»¶å¤±è´¥" -#: builtin/add.c:348 +#: builtin/add.c:394 msgid "-A and -u are mutually incompatible" msgstr "-A å’Œ -u 选项互斥" -#: builtin/add.c:355 +#: builtin/add.c:401 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing åªèƒ½å’Œ --dry-run åŒæ—¶ä½¿ç”¨" -#: builtin/add.c:359 +#: builtin/add.c:405 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "å‚æ•° --chmod å–值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:374 +#: builtin/add.c:420 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "æ²¡æœ‰æŒ‡å®šæ–‡ä»¶ï¼Œä¹Ÿæ²¡æœ‰æ–‡ä»¶è¢«æ·»åŠ ã€‚\n" -#: builtin/add.c:375 +#: builtin/add.c:421 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想è¦æ‰§è¡Œ 'git add .'？\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 -#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 +#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282 +#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351 +#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "索引文件æŸå" -#: builtin/am.c:412 +#: builtin/am.c:413 msgid "could not parse author script" msgstr "ä¸èƒ½è§£æžä½œè€…脚本" @@ -4827,7 +4932,7 @@ msgstr "æ— æ•ˆçš„æ—¶åŒºå移值" msgid "Patch format detection failed." msgstr "è¡¥ä¸æ ¼å¼æŽ¢æµ‹å¤±è´¥ã€‚" -#: builtin/am.c:991 builtin/clone.c:397 +#: builtin/am.c:991 builtin/clone.c:401 #, c-format msgid "failed to create directory '%s'" msgstr "æ— æ³•åˆ›å»ºç›®å½• '%s'" @@ -4836,48 +4941,48 @@ msgstr "æ— æ³•åˆ›å»ºç›®å½• '%s'" msgid "Failed to split patches." msgstr "æ— æ³•æ‹†åˆ†è¡¥ä¸ã€‚" -#: builtin/am.c:1127 builtin/commit.c:376 +#: builtin/am.c:1120 builtin/commit.c:377 msgid "unable to write index file" msgstr "æ— æ³•å†™å…¥ç´¢å¼•æ–‡ä»¶" -#: builtin/am.c:1178 +#: builtin/am.c:1171 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1179 +#: builtin/am.c:1172 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想è¦è·³è¿‡è¿™ä¸€è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"%s --skip\"。" -#: builtin/am.c:1180 +#: builtin/am.c:1173 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "è‹¥è¦å¤åŽŸè‡³åŽŸå§‹åˆ†æ”¯å¹¶åœæ¢è¡¥ä¸æ“作，执行 \"%s --abort\"。" -#: builtin/am.c:1315 -msgid "Patch is empty. Was it split wrong?" -msgstr "è¡¥ä¸ä¸ºç©ºã€‚是ä¸æ˜¯åˆ‡åˆ†é”™è¯¯ï¼Ÿ" +#: builtin/am.c:1304 +msgid "Patch is empty." +msgstr "è¡¥ä¸ä¸ºç©ºã€‚" -#: builtin/am.c:1386 builtin/log.c:1557 +#: builtin/am.c:1370 #, c-format -msgid "invalid ident line: %s" -msgstr "包å«æ— æ•ˆçš„èº«ä»½æ ‡è¯†ï¼š%s" +msgid "invalid ident line: %.*s" +msgstr "æ— æ•ˆçš„èº«ä»½æ ‡è¯†ï¼š%.*s" -#: builtin/am.c:1413 +#: builtin/am.c:1392 #, c-format msgid "unable to parse commit %s" msgstr "ä¸èƒ½è§£æžæ交 %s" -#: builtin/am.c:1606 +#: builtin/am.c:1586 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺ä¹å¿…è¦çš„æ•°æ®å¯¹è±¡ä»¥è¿›è¡Œä¸‰æ–¹åˆå¹¶ã€‚" -#: builtin/am.c:1608 +#: builtin/am.c:1588 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引æ¥é‡å»ºä¸€ä¸ªï¼ˆä¸‰æ–¹åˆå¹¶çš„ï¼‰åŸºç¡€ç›®å½•æ ‘..." -#: builtin/am.c:1627 +#: builtin/am.c:1607 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4885,37 +4990,37 @@ msgstr "" "您是å¦æ›¾æ‰‹åŠ¨ç¼–辑过您的补ä¸ï¼Ÿ\n" "æ— æ³•åº”ç”¨è¡¥ä¸åˆ°ç´¢å¼•ä¸çš„æ•°æ®å¯¹è±¡ä¸Šã€‚" -#: builtin/am.c:1633 +#: builtin/am.c:1613 msgid "Falling back to patching base and 3-way merge..." msgstr "回è½åˆ°åŸºç¡€ç‰ˆæœ¬ä¸Šæ‰“è¡¥ä¸åŠè¿›è¡Œä¸‰æ–¹åˆå¹¶..." -#: builtin/am.c:1658 +#: builtin/am.c:1638 msgid "Failed to merge in the changes." msgstr "æ— æ³•åˆå¹¶å˜æ›´ã€‚" -#: builtin/am.c:1682 builtin/merge.c:631 +#: builtin/am.c:1662 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree æ— æ³•å†™å…¥ä¸€æ ‘å¯¹è±¡" -#: builtin/am.c:1689 +#: builtin/am.c:1669 msgid "applying to an empty history" msgstr "æ£åº”用到一个空历å²ä¸Š" -#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 -#: builtin/merge.c:827 +#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803 +#: builtin/merge.c:828 msgid "failed to write commit object" msgstr "æ— æ³•å†™æ交对象" -#: builtin/am.c:1735 builtin/am.c:1739 +#: builtin/am.c:1715 builtin/am.c:1719 #, c-format msgid "cannot resume: %s does not exist." msgstr "æ— æ³•ç»§ç»ï¼š%s ä¸å˜åœ¨ã€‚" -#: builtin/am.c:1755 +#: builtin/am.c:1735 msgid "cannot be interactive without stdin connected to a terminal." msgstr "æ ‡å‡†è¾“å…¥æ²¡æœ‰å’Œç»ˆç«¯å…³è”，ä¸èƒ½è¿›è¡Œäº¤äº’å¼æ“作。" -#: builtin/am.c:1760 +#: builtin/am.c:1740 msgid "Commit Body is:" msgstr "æ交内容为：" @@ -4924,35 +5029,35 @@ msgstr "æ交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1770 +#: builtin/am.c:1750 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/å¦[n]/编辑[e]/查看补ä¸[v]/应用所有[a]：" -#: builtin/am.c:1820 +#: builtin/am.c:1800 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "è„索引：ä¸èƒ½åº”用补ä¸ï¼ˆè„文件：%s）" -#: builtin/am.c:1860 builtin/am.c:1932 +#: builtin/am.c:1840 builtin/am.c:1912 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1876 +#: builtin/am.c:1856 msgid "No changes -- Patch already applied." msgstr "没有å˜æ›´ —— è¡¥ä¸å·²ç»åº”用过。" -#: builtin/am.c:1884 +#: builtin/am.c:1864 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补ä¸å¤±è´¥äºŽ %s %.*s" -#: builtin/am.c:1890 +#: builtin/am.c:1870 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "失败的补ä¸æ–‡ä»¶å‰¯æœ¬ä½äºŽï¼š%s" -#: builtin/am.c:1935 +#: builtin/am.c:1915 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4962,157 +5067,161 @@ msgstr "" "如果没有什么è¦æ·»åŠ 到暂å˜åŒºçš„，则很å¯èƒ½æ˜¯å…¶å®ƒæ交已ç»å¼•å…¥äº†ç›¸åŒçš„å˜æ›´ã€‚\n" "您也许想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ã€‚" -#: builtin/am.c:1942 +#: builtin/am.c:1922 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +"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 add' æ¥æ ‡è®°å·²ç»å®Œæˆã€‚ \n" +"ä½ å¯ä»¥å¯¹ \"ç”±ä»–ä»¬åˆ é™¤\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 -#: builtin/reset.c:316 +#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323 +#: builtin/reset.c:331 #, c-format msgid "Could not parse object '%s'." msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'。" -#: builtin/am.c:2102 +#: builtin/am.c:2083 msgid "failed to clean index" msgstr "æ— æ³•æ¸…ç©ºç´¢å¼•" -#: builtin/am.c:2136 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好åƒåœ¨ä¸Šä¸€æ¬¡ 'am' 失败åŽç§»åŠ¨äº† HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c:2199 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "æ— æ•ˆçš„ --patch-format 值：%s" -#: builtin/am.c:2232 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2233 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2239 +#: builtin/am.c:2220 msgid "run interactively" msgstr "以交互å¼æ–¹å¼è¿è¡Œ" -#: builtin/am.c:2241 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "è€çš„å‚æ•° —— æ— ä½œç”¨" -#: builtin/am.c:2243 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "如果必è¦ï¼Œå…许使用三方åˆå¹¶ã€‚" -#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:178 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:180 msgid "be quiet" msgstr "é™é»˜æ¨¡å¼" -#: builtin/am.c:2246 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "在æ交说明ä¸æ·»åŠ 一个 Signed-off-by ç¾å" -#: builtin/am.c:2249 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "使用 utf8 å—符集（默认）" -#: builtin/am.c:2251 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -k å‚æ•°" -#: builtin/am.c:2253 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -b å‚æ•°" -#: builtin/am.c:2255 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -m å‚æ•°" -#: builtin/am.c:2257 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox æ ¼å¼ï¼Œå‘ git-mailsplit ä¼ é€’ --keep-cr å‚æ•°" -#: builtin/am.c:2260 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "ä¸å‘ git-mailsplit ä¼ é€’ --keep-cr å‚数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2263 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "丢弃è£åˆ‡çº¿å‰çš„所有内容" -#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 -#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 -#: builtin/am.c:2292 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "ä¼ é€’ç»™ git-apply" -#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 +#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142 +#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 +#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134 +#: parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 -#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38 +#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39 msgid "format" msgstr "æ ¼å¼" -#: builtin/am.c:2289 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "è¡¥ä¸çš„æ ¼å¼" -#: builtin/am.c:2295 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "打补ä¸å¤±è´¥æ—¶æ˜¾ç¤ºçš„错误信æ¯" -#: builtin/am.c:2297 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "冲çªè§£å†³åŽç»§ç»åº”用补ä¸" -#: builtin/am.c:2300 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "å’Œ --continue åŒä¹‰" -#: builtin/am.c:2303 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "跳过当å‰è¡¥ä¸" -#: builtin/am.c:2306 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "æ¢å¤åŽŸå§‹åˆ†æ”¯å¹¶ç»ˆæ¢æ‰“è¡¥ä¸æ“作。" -#: builtin/am.c:2310 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "将作者日期作为æ交日期" -#: builtin/am.c:2312 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "用当å‰æ—¶é—´ä½œä¸ºä½œè€…日期" -#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 -#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 +#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2315 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "使用 GPG ç¾åæ交" -#: builtin/am.c:2318 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2333 +#: builtin/am.c:2317 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." @@ -5120,16 +5229,16 @@ msgstr "" "å‚æ•° -b/--binary å·²ç»å¾ˆé•¿æ—¶é—´ä¸åšä»»ä½•å®žè´¨æ“作了，并且将被移除。\n" "请ä¸è¦å†ä½¿ç”¨å®ƒäº†ã€‚" -#: builtin/am.c:2340 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "æ— æ³•è¯»å–索引" -#: builtin/am.c:2355 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之å‰çš„å˜åŸºç›®å½• %s ä»ç„¶å˜åœ¨ï¼Œä½†å´æ供了 mbox。" -#: builtin/am.c:2379 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -5138,7 +5247,7 @@ msgstr "" "å‘现了错误的 %s 目录。\n" "使用 \"git am --abort\" åˆ é™¤å®ƒã€‚" -#: builtin/am.c:2385 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决æ“作未进行，我们ä¸ä¼šç»§ç»ã€‚" @@ -5188,192 +5297,167 @@ msgstr "执行 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "æ›´æ–° BISECT_HEAD 而éžæ£€å‡ºå½“å‰æ交" -#: builtin/blame.c:33 +#: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: builtin/blame.c:38 +#: builtin/blame.c:32 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) ä¸" -#: builtin/blame.c:1777 -msgid "Blaming lines" -msgstr "追踪代ç è¡Œ" - -#: builtin/blame.c:2573 +#: builtin/blame.c:668 msgid "Show blame entries as we find them, incrementally" msgstr "增é‡å¼åœ°æ˜¾ç¤ºå‘现的 blame æ¡ç›®" -#: builtin/blame.c:2574 +#: builtin/blame.c:669 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界æ交显示空的 SHA-1（默认：关é—）" -#: builtin/blame.c:2575 +#: builtin/blame.c:670 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "ä¸æŠŠæ ¹æ交作为边界（默认：关é—）" -#: builtin/blame.c:2576 +#: builtin/blame.c:671 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:2577 +#: builtin/blame.c:672 msgid "Force progress reporting" msgstr "强制进度显示" -#: builtin/blame.c:2578 +#: builtin/blame.c:673 msgid "Show output score for blame entries" msgstr "æ˜¾ç¤ºåˆ¤æ– blame æ¡ç›®ä½ç§»çš„得分诊æ–ä¿¡æ¯" -#: builtin/blame.c:2579 +#: builtin/blame.c:674 msgid "Show original filename (Default: auto)" msgstr "显示原始文件å（默认：自动）" -#: builtin/blame.c:2580 +#: builtin/blame.c:675 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行å·ï¼ˆé»˜è®¤ï¼šå…³é—）" -#: builtin/blame.c:2581 +#: builtin/blame.c:676 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适åˆæœºå™¨è¯»å–çš„æ ¼å¼" -#: builtin/blame.c:2582 +#: builtin/blame.c:677 msgid "Show porcelain format with per-line commit information" msgstr "为æ¯ä¸€è¡Œæ˜¾ç¤ºæœºå™¨é€‚用的æ交信æ¯" -#: builtin/blame.c:2583 +#: builtin/blame.c:678 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相åŒçš„输出模å¼ï¼ˆé»˜è®¤ï¼šå…³é—）" -#: builtin/blame.c:2584 +#: builtin/blame.c:679 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关é—）" -#: builtin/blame.c:2585 +#: builtin/blame.c:680 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 æ交å·ï¼ˆé»˜è®¤ï¼šå…³é—）" -#: builtin/blame.c:2586 +#: builtin/blame.c:681 msgid "Suppress author name and timestamp (Default: off)" msgstr "éšè—作者åå—和时间戳（默认：关é—）" -#: builtin/blame.c:2587 +#: builtin/blame.c:682 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而ä¸æ˜¯åå—（默认：关é—）" -#: builtin/blame.c:2588 +#: builtin/blame.c:683 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:2595 +#: builtin/blame.c:690 msgid "Use an experimental heuristic to improve diffs" msgstr "使用一个试验性的å¯å‘å¼ç®—法改进差异显示" -#: builtin/blame.c:2597 +#: builtin/blame.c:692 msgid "Spend extra cycles to find better match" msgstr "花费é¢å¤–的循环æ¥æ‰¾åˆ°æ›´å¥½çš„匹é…" -#: builtin/blame.c:2598 +#: builtin/blame.c:693 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用æ¥è‡ª <文件> 的修订集而ä¸æ˜¯è°ƒç”¨ git-rev-list" -#: builtin/blame.c:2599 +#: builtin/blame.c:694 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:2600 builtin/blame.c:2601 +#: builtin/blame.c:695 builtin/blame.c:696 msgid "score" msgstr "得分" -#: builtin/blame.c:2600 +#: builtin/blame.c:695 msgid "Find line copies within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行拷è´" -#: builtin/blame.c:2601 +#: builtin/blame.c:696 msgid "Find line movements within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行移动" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2602 +#: builtin/blame.c:697 msgid "Process only line range n,m, counting from 1" msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的，从 1 开始" -#: builtin/blame.c:2649 +#: builtin/blame.c:744 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. -#: builtin/blame.c:2697 +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c:795 msgid "4 years, 11 months ago" msgstr "4 å¹´ 11 个月å‰" -#: builtin/blame.c:2777 -msgid "--contents and --reverse do not blend well." -msgstr "--contents å’Œ --reverse ä¸èƒ½æ··ç”¨ã€‚" - -#: builtin/blame.c:2797 -msgid "cannot use --contents with final commit object name" -msgstr "ä¸èƒ½å°† --contents 和最终的æ交对象å共用" - -#: builtin/blame.c:2802 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "--reverse å’Œ --first-parent 共用，需è¦æŒ‡å®šæœ€æ–°çš„æ交" - -#: builtin/blame.c:2829 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse å’Œ --first-parent 共用，需è¦ç¬¬ä¸€ç¥–先链上的æ交范围" - -#: builtin/blame.c:2840 -#, c-format -msgid "no such path %s in %s" -msgstr "在 %2$s ä¸æ— æ¤è·¯å¾„ %1$s" - -#: builtin/blame.c:2851 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "ä¸èƒ½ä¸ºè·¯å¾„ %2$s 读å–æ•°æ®å¯¹è±¡ %1$s" - -#: builtin/blame.c:2870 +#: builtin/blame.c:882 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s åªæœ‰ %lu è¡Œ" msgstr[1] "文件 %s åªæœ‰ %lu è¡Œ" -#: builtin/branch.c:26 +#: builtin/blame.c:928 +msgid "Blaming lines" +msgstr "追踪代ç è¡Œ" + +#: builtin/branch.c:27 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<选项>] [-l] [-f] <分支å> [<起始点>]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<选项>] [-r] (-d | -D) <分支å>..." -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<选项>] [-r | -a] [--points-at]" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<选项>] [-r | -a] [--format]" # 译者：ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ -#: builtin/branch.c:144 +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5383,7 +5467,7 @@ msgstr "" " '%s'，但未åˆå¹¶åˆ° HEAD。" # 译者：ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5392,12 +5476,12 @@ msgstr "" "å¹¶æœªåˆ é™¤åˆ†æ”¯ '%s'， 虽然它已ç»åˆå¹¶åˆ° HEAD，\n" " 然而å´å°šæœªè¢«åˆå¹¶åˆ°åˆ†æ”¯ '%s' 。" -#: builtin/branch.c:162 +#: builtin/branch.c:163 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "æ— æ³•æŸ¥è¯¢ '%s' 指å‘çš„æ交对象" -#: builtin/branch.c:166 +#: builtin/branch.c:167 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5406,91 +5490,91 @@ msgstr "" "分支 '%s' 没有完全åˆå¹¶ã€‚\n" "如果您确认è¦åˆ 除它，执行 'git branch -D %s'。" -#: builtin/branch.c:179 +#: builtin/branch.c:180 msgid "Update of config-file failed" msgstr "æ— æ³•æ›´æ–° config 文件" -#: builtin/branch.c:210 +#: builtin/branch.c:211 msgid "cannot use -a with -d" msgstr "ä¸èƒ½å°† -a å’Œ -d åŒæ—¶ä½¿ç”¨" -#: builtin/branch.c:216 +#: builtin/branch.c:217 msgid "Couldn't look up commit object for HEAD" msgstr "æ— æ³•æŸ¥è¯¢ HEAD 指å‘çš„æ交对象" -#: builtin/branch.c:230 +#: builtin/branch.c:231 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "æ— æ³•åˆ é™¤æ£€å‡ºäºŽ '%2$s' 的分支 '%1$s'。" -#: builtin/branch.c:245 +#: builtin/branch.c:246 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" -#: builtin/branch.c:246 +#: builtin/branch.c:247 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未å‘现。" -#: builtin/branch.c:261 +#: builtin/branch.c:262 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "æ— æ³•åˆ é™¤è¿œç¨‹è·Ÿè¸ªåˆ†æ”¯ '%s'" -#: builtin/branch.c:262 +#: builtin/branch.c:263 #, c-format msgid "Error deleting branch '%s'" msgstr "æ— æ³•åˆ é™¤åˆ†æ”¯ '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:270 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "å·²åˆ é™¤è¿œç¨‹è·Ÿè¸ªåˆ†æ”¯ %s（曾为 %s）。\n" -#: builtin/branch.c:270 +#: builtin/branch.c:271 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "å·²åˆ é™¤åˆ†æ”¯ %s（曾为 %s）。\n" -#: builtin/branch.c:441 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s æ£è¢«å˜åŸºåˆ° %s" -#: builtin/branch.c:445 +#: builtin/branch.c:449 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s æ£è¢«äºŒåˆ†æŸ¥æ‰¾äºŽ %s" -#: builtin/branch.c:460 +#: builtin/branch.c:464 msgid "cannot rename the current branch while not on any." msgstr "æ— æ³•é‡å‘½å当å‰åˆ†æ”¯å› 为ä¸å¤„于任何分支上。" -#: builtin/branch.c:470 +#: builtin/branch.c:474 #, c-format msgid "Invalid branch name: '%s'" msgstr "æ— æ•ˆçš„åˆ†æ”¯å：'%s'" -#: builtin/branch.c:487 +#: builtin/branch.c:491 msgid "Branch rename failed" msgstr "分支é‡å‘½å失败" -#: builtin/branch.c:490 +#: builtin/branch.c:494 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "é‡å‘½å掉一个错误命å的旧分支 '%s'" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支é‡å‘½å为 %s，但 HEAD 没有更新ï¼" -#: builtin/branch.c:502 +#: builtin/branch.c:506 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被é‡å‘½å，但更新 config 文件失败" -#: builtin/branch.c:518 +#: builtin/branch.c:522 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5501,213 +5585,213 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被过滤。\n" -#: builtin/branch.c:551 +#: builtin/branch.c:555 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:553 +#: builtin/branch.c:557 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若å‚数出现两次则显示上游分支" -#: builtin/branch.c:554 +#: builtin/branch.c:558 msgid "suppress informational messages" msgstr "ä¸æ˜¾ç¤ºä¿¡æ¯" -#: builtin/branch.c:555 +#: builtin/branch.c:559 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模å¼ï¼ˆå‚è§ git-pull(1)）" -#: builtin/branch.c:557 +#: builtin/branch.c:561 msgid "change upstream info" msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "upstream" msgstr "上游" -#: builtin/branch.c:559 +#: builtin/branch.c:563 msgid "change the upstream info" msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯" -#: builtin/branch.c:560 +#: builtin/branch.c:564 msgid "Unset the upstream info" msgstr "å–消上游信æ¯çš„设置" -#: builtin/branch.c:561 +#: builtin/branch.c:565 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:562 +#: builtin/branch.c:566 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:564 builtin/branch.c:566 +#: builtin/branch.c:568 builtin/branch.c:570 msgid "print only branches that contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的分支" -#: builtin/branch.c:565 builtin/branch.c:567 +#: builtin/branch.c:569 builtin/branch.c:571 msgid "print only branches that don't contain the commit" msgstr "åªæ‰“å°ä¸åŒ…å«è¯¥æ交的分支" -#: builtin/branch.c:570 +#: builtin/branch.c:574 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:571 +#: builtin/branch.c:575 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪åŠæœ¬åœ°åˆ†æ”¯" -#: builtin/branch.c:573 +#: builtin/branch.c:577 msgid "delete fully merged branch" msgstr "åˆ é™¤å®Œå…¨åˆå¹¶çš„分支" -#: builtin/branch.c:574 +#: builtin/branch.c:578 msgid "delete branch (even if not merged)" msgstr "åˆ é™¤åˆ†æ”¯ï¼ˆå³ä½¿æ²¡æœ‰åˆå¹¶ï¼‰" -#: builtin/branch.c:575 +#: builtin/branch.c:579 msgid "move/rename a branch and its reflog" msgstr "移动/é‡å‘½å一个分支，以åŠå®ƒçš„引用日志" -#: builtin/branch.c:576 +#: builtin/branch.c:580 msgid "move/rename a branch, even if target exists" msgstr "移动/é‡å‘½å一个分支，å³ä½¿ç›®æ ‡å·²å˜åœ¨" -#: builtin/branch.c:577 +#: builtin/branch.c:581 msgid "list branch names" msgstr "列出分支å" -#: builtin/branch.c:578 +#: builtin/branch.c:582 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "edit the description for the branch" msgstr "æ ‡è®°åˆ†æ”¯çš„æè¿°" -#: builtin/branch.c:581 +#: builtin/branch.c:585 msgid "force creation, move/rename, deletion" msgstr "强制创建ã€ç§»åŠ¨/é‡å‘½åã€åˆ 除" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "print only branches that are merged" msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„分支" -#: builtin/branch.c:583 +#: builtin/branch.c:587 msgid "print only branches that are not merged" msgstr "åªæ‰“å°å°šæœªåˆå¹¶çš„分支" -#: builtin/branch.c:584 +#: builtin/branch.c:588 msgid "list branches in columns" msgstr "以列的方å¼æ˜¾ç¤ºåˆ†æ”¯" -#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 +#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "key" msgstr "key" -#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 +#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428 msgid "field name to sort on" msgstr "排åºçš„å—段å" -#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 -#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:429 +#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407 +#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573 +#: builtin/tag.c:430 msgid "object" msgstr "对象" -#: builtin/branch.c:589 +#: builtin/branch.c:593 msgid "print only branches of the object" msgstr "åªæ‰“å°æŒ‡å‘该对象的分支" -#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 +#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435 msgid "sorting and filtering are case insensitive" msgstr "排åºå’Œè¿‡æ»¤å±žäºŽå¤§å°å†™ä¸æ•æ„Ÿ" -#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 -#: builtin/verify-tag.c:38 +#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "è¾“å‡ºæ ¼å¼" -#: builtin/branch.c:611 +#: builtin/branch.c:615 msgid "Failed to resolve HEAD as a valid ref." msgstr "æ— æ³•å°† HEAD 解æžä¸ºæœ‰æ•ˆå¼•ç”¨ã€‚" -#: builtin/branch.c:615 builtin/clone.c:724 +#: builtin/branch.c:619 builtin/clone.c:728 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼" -#: builtin/branch.c:638 +#: builtin/branch.c:642 msgid "--column and --verbose are incompatible" msgstr "--column å’Œ --verbose ä¸å…¼å®¹" -#: builtin/branch.c:649 builtin/branch.c:701 +#: builtin/branch.c:653 builtin/branch.c:705 msgid "branch name required" msgstr "å¿…é¡»æ供分支å" -#: builtin/branch.c:677 +#: builtin/branch.c:681 msgid "Cannot give description to detached HEAD" msgstr "ä¸èƒ½å‘分离头指针æä¾›æè¿°" -#: builtin/branch.c:682 +#: builtin/branch.c:686 msgid "cannot edit description of more than one branch" msgstr "ä¸èƒ½ä¸ºä¸€ä¸ªä»¥ä¸Šçš„分支编辑æè¿°" -#: builtin/branch.c:689 +#: builtin/branch.c:693 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' å°šæ— æ交。" -#: builtin/branch.c:692 +#: builtin/branch.c:696 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:707 +#: builtin/branch.c:711 msgid "too many branches for a rename operation" msgstr "为é‡å‘½åæ“作æ供了太多的分支å" -#: builtin/branch.c:712 +#: builtin/branch.c:716 msgid "too many branches to set new upstream" msgstr "为设置新上游æ供了太多的分支å" -#: builtin/branch.c:716 +#: builtin/branch.c:720 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "æ— æ³•è®¾ç½® HEAD 的上游为 %sï¼Œå› ä¸º HEAD 没有指å‘任何分支。" -#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 +#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766 #, c-format msgid "no such branch '%s'" msgstr "没有æ¤åˆ†æ”¯ '%s'" -#: builtin/branch.c:723 +#: builtin/branch.c:727 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' ä¸å˜åœ¨" -#: builtin/branch.c:735 +#: builtin/branch.c:739 msgid "too many branches to unset upstream" msgstr "为å–消上游设置æ“作æ供了太多的分支å" -#: builtin/branch.c:739 +#: builtin/branch.c:743 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "æ— æ³•å–消 HEAD çš„ä¸Šæ¸¸è®¾ç½®å› ä¸ºå®ƒæ²¡æœ‰æŒ‡å‘一个分支" -#: builtin/branch.c:745 +#: builtin/branch.c:749 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信æ¯" -#: builtin/branch.c:759 +#: builtin/branch.c:763 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有æ„义" -#: builtin/branch.c:765 +#: builtin/branch.c:769 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' çš„ -a å’Œ -r 选项带一个分支åå‚数没有æ„义" -#: builtin/branch.c:768 +#: builtin/branch.c:772 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5715,7 +5799,7 @@ msgid "" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:785 +#: builtin/branch.c:789 #, c-format msgid "" "\n" @@ -5739,7 +5823,7 @@ msgstr "需è¦ä¸€ä¸ªä»“库æ¥åˆ›å»ºåŒ…。" msgid "Need a repository to unbundle." msgstr "需è¦ä¸€ä¸ªä»“库æ¥è§£åŒ…。" -#: builtin/cat-file.c:513 +#: builtin/cat-file.c:519 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -5747,7 +5831,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" -#: builtin/cat-file.c:514 +#: builtin/cat-file.c:520 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -5755,302 +5839,302 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:551 +#: builtin/cat-file.c:557 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> å¯ä»¥æ˜¯å…¶ä¸ä¹‹ä¸€ï¼šblobã€treeã€commitã€tag" -#: builtin/cat-file.c:552 +#: builtin/cat-file.c:558 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:553 +#: builtin/cat-file.c:559 msgid "show object size" msgstr "显示对象大å°" -#: builtin/cat-file.c:555 +#: builtin/cat-file.c:561 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:556 +#: builtin/cat-file.c:562 msgid "pretty-print object's content" msgstr "美观地打å°å¯¹è±¡çš„内容" -#: builtin/cat-file.c:558 +#: builtin/cat-file.c:564 msgid "for blob objects, run textconv on object's content" msgstr "对于数æ®å¯¹è±¡ï¼Œå¯¹å…¶å†…容åšæ–‡æœ¬è½¬æ¢" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:566 msgid "for blob objects, run filters on object's content" msgstr "对于数æ®å¯¹è±¡ï¼Œå¯¹å…¶å†…容åšè¿‡æ»¤" -#: builtin/cat-file.c:561 git-submodule.sh:943 +#: builtin/cat-file.c:567 git-submodule.sh:944 msgid "blob" msgstr "æ•°æ®å¯¹è±¡" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:568 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:570 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "å…许 -s å’Œ -t 对æŸå的对象生效" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:571 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:573 msgid "show info and content of objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯å’Œå†…容" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:576 msgid "show info about objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:579 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "è·Ÿéšæ ‘内符å·é“¾æŽ¥ï¼ˆå’Œ --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:581 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check å‚数显示所有对象" -#: builtin/check-attr.c:11 +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <属性>...] [--] <路径å>..." -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "åªä½¿ç”¨ç´¢å¼•ä¸çš„ .gitattributes" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 msgid "read file names from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å‡ºæ–‡ä»¶å" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL å—符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 +#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357 msgid "suppress progress reporting" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦æŠ¥å‘Š" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "显示未匹é…的输入路径" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "检查时忽略索引" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:158 msgid "cannot specify pathnames with --stdin" msgstr "ä¸èƒ½åŒæ—¶æŒ‡å®šè·¯å¾„åŠ --stdin å‚æ•°" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:161 msgid "-z only makes sense with --stdin" msgstr "-z 需è¦å’Œ --stdin å‚数共用æ‰æœ‰æ„义" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:163 msgid "no path specified" msgstr "未指定路径" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:167 msgid "--quiet is only valid with a single pathname" msgstr "å‚æ•° --quiet åªåœ¨æ供一个路径å时有效" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:169 msgid "cannot have both --quiet and --verbose" msgstr "ä¸èƒ½åŒæ—¶æä¾› --quiet å’Œ --verbose å‚æ•°" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:172 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项åªåœ¨ä½¿ç”¨ --verbose 时有效" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<选项>] <è”系地å€>..." -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "è¿˜ä»Žæ ‡å‡†è¾“å…¥è¯»å–è”系地å€" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "ä¸èƒ½è§£æžè”系地å€ï¼š%s" -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "未指定è”系地å€" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<选项>] [--] [<文件>...]" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:145 msgid "stage should be between 1 and 3 or all" msgstr "索引值应该å–值 1 到 3 或者 all" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:161 msgid "check out all files in the index" msgstr "检出索引区的所有文件" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:162 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:164 msgid "no warning for existing files and files not in index" msgstr "å˜åœ¨æˆ–ä¸åœ¨ç´¢å¼•ä¸çš„文件都没有è¦å‘Š" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:166 msgid "don't checkout new files" msgstr "ä¸æ£€å‡ºæ–°æ–‡ä»¶" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:168 msgid "update stat information in the index file" msgstr "更新索引ä¸æ–‡ä»¶çš„状æ€ä¿¡æ¯" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:172 msgid "read list of paths from the standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–路径列表" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:174 msgid "write the content to temporary files" msgstr "将内容写入临时文件" -#: builtin/checkout-index.c:174 builtin/column.c:30 +#: builtin/checkout-index.c:175 builtin/column.c:31 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:477 +#: builtin/worktree.c:478 msgid "string" msgstr "å—符串" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:176 msgid "when creating files, prepend <string>" msgstr "在创建文件时，在å‰é¢åŠ 上 <å—符串>" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:178 msgid "copy out the files from named stage" msgstr "从指定暂å˜åŒºä¸æ‹·å‡ºæ–‡ä»¶" -#: builtin/checkout.c:27 +#: builtin/checkout.c:26 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<选项>] <分支>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:27 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." -#: builtin/checkout.c:153 builtin/checkout.c:186 +#: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:155 builtin/checkout.c:188 +#: builtin/checkout.c:137 builtin/checkout.c:170 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:171 +#: builtin/checkout.c:153 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" -#: builtin/checkout.c:215 +#: builtin/checkout.c:197 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" -#: builtin/checkout.c:232 +#: builtin/checkout.c:214 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'ï¼šæ— æ³•åˆå¹¶" -#: builtin/checkout.c:249 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "æ— æ³•ä¸º '%s' æ·»åŠ åˆå¹¶ç»“æžœ" -#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 -#: builtin/checkout.c:278 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ä¸èƒ½åœ¨æ›´æ–°è·¯å¾„时使用" -#: builtin/checkout.c:281 builtin/checkout.c:284 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨" -#: builtin/checkout.c:287 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。" -#: builtin/checkout.c:358 builtin/checkout.c:365 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未åˆå¹¶" -#: builtin/checkout.c:513 +#: builtin/checkout.c:497 msgid "you need to resolve your current index first" msgstr "您需è¦å…ˆè§£å†³å½“å‰ç´¢å¼•çš„冲çª" -#: builtin/checkout.c:644 +#: builtin/checkout.c:628 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "ä¸èƒ½å¯¹ '%s' 执行 reflog æ“作：%s\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:669 msgid "HEAD is now at" msgstr "HEAD ç›®å‰ä½äºŽ" -#: builtin/checkout.c:689 builtin/clone.c:678 +#: builtin/checkout.c:673 builtin/clone.c:682 msgid "unable to update HEAD" msgstr "ä¸èƒ½æ›´æ–° HEAD" -#: builtin/checkout.c:693 +#: builtin/checkout.c:677 #, c-format msgid "Reset branch '%s'\n" msgstr "é‡ç½®åˆ†æ”¯ '%s'\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:680 #, c-format msgid "Already on '%s'\n" msgstr "å·²ç»ä½äºŽ '%s'\n" -#: builtin/checkout.c:700 +#: builtin/checkout.c:684 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n" -#: builtin/checkout.c:702 builtin/checkout.c:1090 +#: builtin/checkout.c:686 builtin/checkout.c:1075 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n" -#: builtin/checkout.c:704 +#: builtin/checkout.c:688 #, c-format msgid "Switched to branch '%s'\n" msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: builtin/checkout.c:755 +#: builtin/checkout.c:739 #, c-format msgid " ... and %d more.\n" msgstr " ... åŠå…¶å®ƒ %d 个。\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:745 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6071,7 +6155,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:780 +#: builtin/checkout.c:764 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6098,202 +6182,198 @@ msgstr[1] "" " git branch <新分支å> %s\n" "\n" -#: builtin/checkout.c:816 +#: builtin/checkout.c:800 msgid "internal error in revision walk" msgstr "在版本é历时é‡åˆ°å†…部错误" -#: builtin/checkout.c:820 +#: builtin/checkout.c:804 msgid "Previous HEAD position was" msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯" -#: builtin/checkout.c:847 builtin/checkout.c:1085 +#: builtin/checkout.c:832 builtin/checkout.c:1070 msgid "You are on a branch yet to be born" msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支" -#: builtin/checkout.c:991 +#: builtin/checkout.c:976 #, c-format msgid "only one reference expected, %d given." msgstr "应åªæœ‰ä¸€ä¸ªå¼•ç”¨ï¼Œå´ç»™å‡ºäº† %d 个" -#: builtin/checkout.c:1031 builtin/worktree.c:214 +#: builtin/checkout.c:1016 builtin/worktree.c:215 #, c-format msgid "invalid reference: %s" msgstr "æ— æ•ˆå¼•ç”¨ï¼š%s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1045 #, c-format msgid "reference is not a tree: %s" msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘：%s" -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1084 msgid "paths cannot be used with switching branches" msgstr "路径ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨" -#: builtin/checkout.c:1102 builtin/checkout.c:1106 +#: builtin/checkout.c:1087 builtin/checkout.c:1091 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨" -#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 -#: builtin/checkout.c:1121 +#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103 +#: builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ä¸èƒ½å’Œ '%s' åŒæ—¶ä½¿ç”¨" -#: builtin/checkout.c:1126 +#: builtin/checkout.c:1111 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "ä¸èƒ½åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交 '%s'" -#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 -#: builtin/worktree.c:331 +#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328 +#: builtin/worktree.c:330 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1145 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1147 msgid "create/reset and checkout a branch" msgstr "创建/é‡ç½®å¹¶æ£€å‡ºä¸€ä¸ªåˆ†æ”¯" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1148 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1164 builtin/worktree.c:333 +#: builtin/checkout.c:1149 builtin/worktree.c:332 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的æ交分离" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1150 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信æ¯" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1152 msgid "new unparented branch" msgstr "新的没有父æ交的分支" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1153 msgid "checkout our version for unmerged files" msgstr "对尚未åˆå¹¶çš„文件检出我们的版本" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1155 msgid "checkout their version for unmerged files" msgstr "对尚未åˆå¹¶çš„文件检出他们的版本" -#: builtin/checkout.c:1172 +#: builtin/checkout.c:1157 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1173 +#: builtin/checkout.c:1158 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方åˆå¹¶" -#: builtin/checkout.c:1174 builtin/merge.c:234 +#: builtin/checkout.c:1159 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 +#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251 msgid "style" msgstr "é£Žæ ¼" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1161 msgid "conflict style (merge or diff3)" msgstr "冲çªè¾“å‡ºé£Žæ ¼ï¼ˆmerge 或 diff3）" -#: builtin/checkout.c:1179 +#: builtin/checkout.c:1164 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径ä¸åšç¨€ç–检出的é™åˆ¶" -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1166 msgid "second guess 'git checkout <no-such-branch>'" msgstr "二次猜测'git checkout <æ— æ¤åˆ†æ”¯>'" -#: builtin/checkout.c:1183 +#: builtin/checkout.c:1168 msgid "do not check if another worktree is holding the given ref" msgstr "ä¸æ£€æŸ¥æŒ‡å®šçš„引用是å¦è¢«å…¶ä»–工作区所å 用" -#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 -#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:172 +#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114 +#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/checkout.c:1224 +#: builtin/checkout.c:1203 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-bã€-B å’Œ --orphan 是互斥的" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1220 msgid "--track needs a branch name" msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1225 msgid "Missing branch name; try -b" msgstr "缺少分支åï¼›å°è¯• -b" -#: builtin/checkout.c:1282 +#: builtin/checkout.c:1261 msgid "invalid path specification" msgstr "æ— æ•ˆçš„è·¯å¾„è§„æ ¼" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1268 #, c-format -msgid "" -"Cannot update paths and switch to branch '%s' at the same time.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" -msgstr "" -"ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。\n" -"您是想è¦æ£€å‡º '%s' 但其未能解æžä¸ºæ交么？" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交，ä¸èƒ½åŸºäºŽå®ƒåˆ›å»ºåˆ†æ”¯ '%s'" -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1272 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach ä¸èƒ½æŽ¥æ”¶è·¯å¾„å‚æ•° '%s'" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1276 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirsã€--force å’Œ --merge ä¸å…¼å®¹ã€‚" -#: builtin/clean.c:25 +#: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模å¼>] [-x | -X] [--] <路径>..." -#: builtin/clean.c:29 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "æ£åˆ 除 %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "å°†åˆ é™¤ %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "æ— æ³•åˆ é™¤ %s" -#: builtin/clean.c:297 git-add--interactive.perl:614 +#: builtin/clean.c:298 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6306,7 +6386,7 @@ msgstr "" "foo - 通过唯一å‰ç¼€é€‰æ‹©ä¸€ä¸ªé€‰é¡¹\n" " - （空）什么也ä¸é€‰æ‹©\n" -#: builtin/clean.c:301 git-add--interactive.perl:623 +#: builtin/clean.c:302 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6327,38 +6407,38 @@ msgstr "" "* - 选择所有选项\n" " - （空）结æŸé€‰æ‹©\n" -#: builtin/clean.c:517 git-add--interactive.perl:589 -#: git-add--interactive.perl:594 +#: builtin/clean.c:518 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:659 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除æ¡ç›®>> " -#: builtin/clean.c:696 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "è¦å‘Šï¼šæ— 法找到和 %s 匹é…çš„æ¡ç›®" -#: builtin/clean.c:717 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "选择è¦åˆ 除的æ¡ç›®" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:759 #, c-format msgid "Remove %s [y/N]? " msgstr "åˆ é™¤ %s [y/N]？" -#: builtin/clean.c:783 git-add--interactive.perl:1660 +#: builtin/clean.c:784 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "å†è§ã€‚\n" -#: builtin/clean.c:791 +#: builtin/clean.c:792 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6376,15 +6456,15 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在æ示符下选择的帮助" -#: builtin/clean.c:818 git-add--interactive.perl:1736 +#: builtin/clean.c:819 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: builtin/clean.c:819 git-add--interactive.perl:1733 +#: builtin/clean.c:820 git-add--interactive.perl:1689 msgid "What now" msgstr "请选择" -#: builtin/clean.c:827 +#: builtin/clean.c:828 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "å°†åˆ é™¤å¦‚ä¸‹æ¡ç›®ï¼š" @@ -6394,190 +6474,194 @@ msgstr[1] "å°†åˆ é™¤å¦‚ä¸‹æ¡ç›®ï¼š" msgid "No more files to clean, exiting." msgstr "没有è¦æ¸…ç†çš„文件，退出。" -#: builtin/clean.c:875 +#: builtin/clean.c:906 msgid "do not print names of files removed" msgstr "ä¸æ‰“å°åˆ 除文件的å称" -#: builtin/clean.c:877 +#: builtin/clean.c:908 msgid "force" msgstr "强制" -#: builtin/clean.c:878 +#: builtin/clean.c:909 msgid "interactive cleaning" msgstr "交互å¼æ¸…除" -#: builtin/clean.c:880 +#: builtin/clean.c:911 msgid "remove whole directories" msgstr "åˆ é™¤æ•´ä¸ªç›®å½•" -#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 -#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 -#: builtin/name-rev.c:350 builtin/show-ref.c:176 +#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454 +#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397 +#: builtin/name-rev.c:399 builtin/show-ref.c:176 msgid "pattern" msgstr "模å¼" -#: builtin/clean.c:882 +#: builtin/clean.c:913 msgid "add <pattern> to ignore rules" msgstr "æ·»åŠ <模å¼> 到忽略规则" -#: builtin/clean.c:883 +#: builtin/clean.c:914 msgid "remove ignored files, too" msgstr "ä¹Ÿåˆ é™¤å¿½ç•¥çš„æ–‡ä»¶" -#: builtin/clean.c:885 +#: builtin/clean.c:916 msgid "remove only ignored files" msgstr "åªåˆ 除忽略的文件" -#: builtin/clean.c:903 +#: builtin/clean.c:934 msgid "-x and -X cannot be used together" msgstr "-x å’Œ -X ä¸èƒ½åŒæ—¶ä½¿ç”¨" -#: builtin/clean.c:907 +#: builtin/clean.c:938 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未æä¾› -iã€-n 或 -f 选项，拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ" -#: builtin/clean.c:910 +#: builtin/clean.c:941 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未æä¾› -iã€-n 或 -f 选项，拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ" -#: builtin/clone.c:37 +#: builtin/clone.c:38 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: builtin/clone.c:80 +#: builtin/clone.c:82 msgid "don't create a checkout" msgstr "ä¸åˆ›å»ºä¸€ä¸ªæ£€å‡º" -#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 +#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479 msgid "create a bare repository" msgstr "创建一个纯仓库" -#: builtin/clone.c:85 +#: builtin/clone.c:87 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜åƒä»“库（也是纯仓库）" -#: builtin/clone.c:87 +#: builtin/clone.c:89 msgid "to clone from a local repository" msgstr "从本地仓库克隆" -#: builtin/clone.c:89 +#: builtin/clone.c:91 msgid "don't use local hardlinks, always copy" msgstr "ä¸ä½¿ç”¨æœ¬åœ°ç¡¬é“¾æŽ¥ï¼Œå§‹ç»ˆå¤åˆ¶" -#: builtin/clone.c:91 +#: builtin/clone.c:93 msgid "setup as shared repository" msgstr "设置为共享仓库" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "pathspec" msgstr "è·¯å¾„è§„æ ¼" -#: builtin/clone.c:93 builtin/clone.c:97 +#: builtin/clone.c:95 builtin/clone.c:99 msgid "initialize submodules in the clone" msgstr "在克隆时åˆå§‹åŒ–å模组" -#: builtin/clone.c:100 +#: builtin/clone.c:102 msgid "number of submodules cloned in parallel" msgstr "并å‘克隆的å模组的数é‡" -#: builtin/clone.c:101 builtin/init-db.c:475 +#: builtin/clone.c:103 builtin/init-db.c:476 msgid "template-directory" msgstr "模æ¿ç›®å½•" -#: builtin/clone.c:102 builtin/init-db.c:476 +#: builtin/clone.c:104 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "模æ¿ç›®å½•å°†è¢«ä½¿ç”¨" -#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642 #: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "å‚考仓库" -#: builtin/clone.c:108 +#: builtin/clone.c:110 msgid "use --reference only while cloning" msgstr "仅在克隆时å‚考 --reference 指å‘的本地仓库" -#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 +#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "å称" -#: builtin/clone.c:110 +#: builtin/clone.c:112 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <å称> 而ä¸æ˜¯ 'origin' 去跟踪上游" -#: builtin/clone.c:112 +#: builtin/clone.c:114 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出 <分支> 而ä¸æ˜¯è¿œç¨‹ HEAD" -#: builtin/clone.c:114 +#: builtin/clone.c:116 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 -#: builtin/pull.c:202 +#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025 +#: builtin/pull.c:205 msgid "depth" msgstr "深度" -#: builtin/clone.c:116 +#: builtin/clone.c:118 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 +#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932 #: parse-options.h:142 msgid "time" msgstr "时间" -#: builtin/clone.c:118 +#: builtin/clone.c:120 msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c:119 builtin/fetch.c:124 +#: builtin/clone.c:121 builtin/fetch.c:119 msgid "revision" msgstr "版本" -#: builtin/clone.c:120 builtin/fetch.c:125 +#: builtin/clone.c:122 builtin/fetch.c:120 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历å²ï¼Œé™¤äº†ç‰¹å®šç‰ˆæœ¬" -#: builtin/clone.c:122 +#: builtin/clone.c:124 msgid "clone only one branch, HEAD or --branch" msgstr "åªå…‹éš†ä¸€ä¸ªåˆ†æ”¯ã€HEAD 或 --branch" -#: builtin/clone.c:124 +#: builtin/clone.c:126 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "ä¸è¦å…‹éš†ä»»ä½•æ ‡ç¾ï¼Œå¹¶ä¸”åŽç»èŽ·å–æ“作也ä¸ä¸‹è½½å®ƒä»¬" + +#: builtin/clone.c:128 msgid "any cloned submodules will be shallow" msgstr "å模组将以浅下载模å¼å…‹éš†" -#: builtin/clone.c:125 builtin/init-db.c:484 +#: builtin/clone.c:129 builtin/init-db.c:485 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:126 builtin/init-db.c:485 +#: builtin/clone.c:130 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:128 +#: builtin/clone.c:132 msgid "set config inside the new repository" msgstr "在新仓库ä¸è®¾ç½®é…置信æ¯" -#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555 msgid "use IPv4 addresses only" msgstr "åªä½¿ç”¨ IPv4 地å€" -#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557 msgid "use IPv6 addresses only" msgstr "åªä½¿ç”¨ IPv6 地å€" -#: builtin/clone.c:268 +#: builtin/clone.c:272 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6585,42 +6669,42 @@ msgstr "" "æ— æ³•çŒœåˆ°ç›®å½•å。\n" "请在命令行指定一个目录" -#: builtin/clone.c:321 +#: builtin/clone.c:325 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: ä¸èƒ½ä¸º '%s' æ·»åŠ ä¸€ä¸ªå¤‡ç”¨ï¼š%s\n" -#: builtin/clone.c:393 +#: builtin/clone.c:397 #, c-format msgid "failed to open '%s'" msgstr "æ— æ³•æ‰“å¼€ '%s'" -#: builtin/clone.c:401 +#: builtin/clone.c:405 #, c-format msgid "%s exists and is not a directory" msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªç›®å½•" -#: builtin/clone.c:415 +#: builtin/clone.c:419 #, c-format msgid "failed to stat %s\n" msgstr "对 %s 调用 stat 失败\n" -#: builtin/clone.c:437 +#: builtin/clone.c:441 #, c-format msgid "failed to create link '%s'" msgstr "æ— æ³•åˆ›å»ºé“¾æŽ¥ '%s'" -#: builtin/clone.c:441 +#: builtin/clone.c:445 #, c-format msgid "failed to copy file to '%s'" msgstr "æ— æ³•æ‹·è´æ–‡ä»¶è‡³ '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:470 #, c-format msgid "done.\n" msgstr "完æˆã€‚\n" -#: builtin/clone.c:478 +#: builtin/clone.c:482 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6630,179 +6714,179 @@ msgstr "" "您å¯ä»¥é€šè¿‡ 'git status' 检查哪些已被检出，然åŽä½¿ç”¨å‘½ä»¤\n" "'git checkout -f HEAD' é‡è¯•\n" -#: builtin/clone.c:555 +#: builtin/clone.c:559 #, c-format msgid "Could not find remote branch %s to clone." msgstr "ä¸èƒ½å‘现è¦å…‹éš†çš„远程分支 %s。" -#: builtin/clone.c:650 +#: builtin/clone.c:654 msgid "remote did not send all necessary objects" msgstr "远程没有å‘é€æ‰€æœ‰å¿…须的对象" -#: builtin/clone.c:666 +#: builtin/clone.c:670 #, c-format msgid "unable to update %s" msgstr "ä¸èƒ½æ›´æ–° %s" -#: builtin/clone.c:715 +#: builtin/clone.c:719 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指å‘一个ä¸å˜åœ¨çš„å¼•ç”¨ï¼Œæ— æ³•æ£€å‡ºã€‚\n" -#: builtin/clone.c:746 +#: builtin/clone.c:750 msgid "unable to checkout working tree" msgstr "ä¸èƒ½æ£€å‡ºå·¥ä½œåŒº" -#: builtin/clone.c:786 +#: builtin/clone.c:792 msgid "unable to write parameters to config file" msgstr "æ— æ³•å°†å‚数写入é…置文件" -#: builtin/clone.c:849 +#: builtin/clone.c:855 msgid "cannot repack to clean up" msgstr "æ— æ³•æ‰§è¡Œ repack æ¥æ¸…ç†" -#: builtin/clone.c:851 +#: builtin/clone.c:857 msgid "cannot unlink temporary alternates file" msgstr "æ— æ³•åˆ é™¤ä¸´æ—¶çš„ alternates 文件" -#: builtin/clone.c:884 builtin/receive-pack.c:1900 +#: builtin/clone.c:890 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "太多å‚数。" -#: builtin/clone.c:888 +#: builtin/clone.c:894 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库æ¥å…‹éš†ã€‚" -#: builtin/clone.c:901 +#: builtin/clone.c:907 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare å’Œ --origin %s 选项ä¸å…¼å®¹ã€‚" -#: builtin/clone.c:904 +#: builtin/clone.c:910 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare å’Œ --separate-git-dir 选项ä¸å…¼å®¹ã€‚" -#: builtin/clone.c:917 +#: builtin/clone.c:923 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' ä¸å˜åœ¨" -#: builtin/clone.c:923 builtin/fetch.c:1337 +#: builtin/clone.c:929 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s ä¸æ˜¯ä¸€ä¸ªæ£æ•°" -#: builtin/clone.c:933 +#: builtin/clone.c:939 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ç›®æ ‡è·¯å¾„ '%s' å·²ç»å˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚" -#: builtin/clone.c:943 +#: builtin/clone.c:949 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' å·²ç»å˜åœ¨ã€‚" -#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 -#: builtin/worktree.c:221 builtin/worktree.c:251 +#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260 +#: builtin/worktree.c:222 builtin/worktree.c:252 #, c-format msgid "could not create leading directories of '%s'" msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录" -#: builtin/clone.c:961 +#: builtin/clone.c:967 #, c-format msgid "could not create work tree dir '%s'" msgstr "ä¸èƒ½åˆ›å»ºå·¥ä½œåŒºç›®å½• '%s'" -#: builtin/clone.c:973 +#: builtin/clone.c:979 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:975 +#: builtin/clone.c:981 #, c-format msgid "Cloning into '%s'...\n" msgstr "æ£å…‹éš†åˆ° '%s'...\n" -#: builtin/clone.c:999 +#: builtin/clone.c:1005 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive å’Œ --reference ä»¥åŠ --reference-if-able ä¸å…¼å®¹" -#: builtin/clone.c:1055 +#: builtin/clone.c:1067 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// å议。" -#: builtin/clone.c:1057 +#: builtin/clone.c:1069 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// å议。" -#: builtin/clone.c:1059 +#: builtin/clone.c:1071 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// å议。" -#: builtin/clone.c:1062 +#: builtin/clone.c:1074 msgid "source repository is shallow, ignoring --local" msgstr "æºä»“库是浅克隆，忽略 --local" -#: builtin/clone.c:1067 +#: builtin/clone.c:1079 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1071 +#: builtin/clone.c:1083 #, c-format msgid "Don't know how to clone %s" msgstr "ä¸çŸ¥é“如何克隆 %s" -#: builtin/clone.c:1126 builtin/clone.c:1134 +#: builtin/clone.c:1138 builtin/clone.c:1146 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未å‘现" -#: builtin/clone.c:1137 +#: builtin/clone.c:1149 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<选项>]" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "查找é…ç½®å˜é‡" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "è¦ä½¿ç”¨çš„布局" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "最大宽度" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "左边框的填充空间" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "å³è¾¹æ¡†çš„填充空间" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "两列之间的填充空间" -#: builtin/column.c:51 +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "--command 必须是第一个å‚æ•°" -#: builtin/commit.c:38 +#: builtin/commit.c:39 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<选项>] [--] <è·¯å¾„è§„æ ¼>..." -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<选项>] [--] <è·¯å¾„è§„æ ¼>..." -#: builtin/commit.c:48 +#: builtin/commit.c:49 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6826,7 +6910,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:61 +#: builtin/commit.c:62 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6849,7 +6933,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:73 +#: builtin/commit.c:74 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" @@ -6858,7 +6942,7 @@ msgstr "" "您è¦ä¿®è¡¥æœ€è¿‘çš„æ交，但这么åšä¼šè®©å®ƒæˆä¸ºç©ºæ交。您å¯ä»¥é‡å¤æ‚¨çš„命令并带上\n" "--allow-empty 选项，或者您å¯ç”¨å‘½ä»¤ \"git reset HEAD^\" æ•´ä¸ªåˆ é™¤è¯¥æ交。\n" -#: builtin/commit.c:78 +#: builtin/commit.c:79 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -6872,11 +6956,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:85 +#: builtin/commit.c:86 msgid "Otherwise, please use 'git reset'\n" msgstr "å¦åˆ™ï¼Œè¯·ä½¿ç”¨å‘½ä»¤ 'git reset'\n" -#: builtin/commit.c:88 +#: builtin/commit.c:89 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6892,98 +6976,98 @@ msgstr "" "然åŽæ‰§è¡Œ \"git cherry-pick --continue\" 继ç»å¯¹å…¶ä½™æ交执行拣选\n" "æ“作。\n" -#: builtin/commit.c:318 +#: builtin/commit.c:319 msgid "failed to unpack HEAD tree object" msgstr "æ— æ³•è§£åŒ… HEAD æ ‘å¯¹è±¡" -#: builtin/commit.c:359 +#: builtin/commit.c:360 msgid "unable to create temporary index" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•" -#: builtin/commit.c:365 +#: builtin/commit.c:366 msgid "interactive add failed" msgstr "交互å¼æ·»åŠ 失败" -#: builtin/commit.c:378 +#: builtin/commit.c:379 msgid "unable to update temporary index" msgstr "æ— æ³•æ›´æ–°ä¸´æ—¶ç´¢å¼•" -#: builtin/commit.c:380 +#: builtin/commit.c:381 msgid "Failed to update main cache tree" msgstr "ä¸èƒ½æ›´æ–°æ ‘的主缓å˜" -#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 +#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477 msgid "unable to write new_index file" msgstr "æ— æ³•å†™ new_index 文件" -#: builtin/commit.c:458 +#: builtin/commit.c:459 msgid "cannot do a partial commit during a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" -#: builtin/commit.c:460 +#: builtin/commit.c:461 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" -#: builtin/commit.c:469 +#: builtin/commit.c:470 msgid "cannot read the index" msgstr "æ— æ³•è¯»å–索引" -#: builtin/commit.c:488 +#: builtin/commit.c:489 msgid "unable to write temporary index file" msgstr "æ— æ³•å†™ä¸´æ—¶ç´¢å¼•æ–‡ä»¶" -#: builtin/commit.c:582 +#: builtin/commit.c:583 #, c-format msgid "commit '%s' lacks author header" msgstr "æ交 '%s' 缺少作者信æ¯" -#: builtin/commit.c:584 +#: builtin/commit.c:585 #, c-format msgid "commit '%s' has malformed author line" msgstr "æ交 '%s' 有éžæ³•çš„作者信æ¯" -#: builtin/commit.c:603 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "éžæ³•çš„ --author å‚æ•°" -#: builtin/commit.c:655 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "æ— æ³•é€‰æ‹©ä¸€ä¸ªæœªè¢«å½“å‰æ交说明使用的注释å—符" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093 #, c-format msgid "could not lookup commit %s" msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s" -#: builtin/commit.c:704 builtin/shortlog.c:294 +#: builtin/commit.c:705 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "（æ£ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯ï¼‰\n" -#: builtin/commit.c:706 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯" -#: builtin/commit.c:710 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "ä¸èƒ½è¯»å–日志文件 '%s'" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "ä¸èƒ½è¯»å– SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:743 msgid "could not read MERGE_MSG" msgstr "ä¸èƒ½è¯»å– MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "ä¸èƒ½å†™æ交模版" -#: builtin/commit.c:814 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -6997,7 +7081,7 @@ msgstr "" "\t%s\n" "然åŽé‡è¯•ã€‚\n" -#: builtin/commit.c:819 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -7011,7 +7095,7 @@ msgstr "" "\t%s\n" "然åŽé‡è¯•ã€‚\n" -#: builtin/commit.c:832 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7020,7 +7104,7 @@ msgstr "" "请为您的å˜æ›´è¾“å…¥æ交说明。以 '%c' 开始的行将被忽略，而一个空的æ交\n" "说明将会终æ¢æ交。\n" -#: builtin/commit.c:839 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7031,346 +7115,346 @@ msgstr "" "也å¯ä»¥åˆ 除它们。一个空的æ交说明将会终æ¢æ交。\n" # 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#: builtin/commit.c:859 +#: builtin/commit.c:857 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#: builtin/commit.c:867 +#: builtin/commit.c:865 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ -#: builtin/commit.c:874 +#: builtin/commit.c:872 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sæ交者：%.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:889 msgid "Cannot read index" msgstr "æ— æ³•è¯»å–索引" -#: builtin/commit.c:954 +#: builtin/commit.c:951 msgid "Error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘å¯¹è±¡" -#: builtin/commit.c:968 builtin/tag.c:273 +#: builtin/commit.c:965 builtin/tag.c:274 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项æä¾›æ交说明。\n" -#: builtin/commit.c:1071 +#: builtin/commit.c:1068 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' ä¸æ˜¯ 'Name <email>' æ ¼å¼ï¼Œä¸”未能在现有作者ä¸æ‰¾åˆ°åŒ¹é…" -#: builtin/commit.c:1086 builtin/commit.c:1325 +#: builtin/commit.c:1083 builtin/commit.c:1328 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "æ— æ•ˆçš„æœªè¿½è¸ªæ–‡ä»¶å‚æ•° '%s'" -#: builtin/commit.c:1124 +#: builtin/commit.c:1121 msgid "--long and -z are incompatible" msgstr "--long å’Œ -z 选项ä¸å…¼å®¹" -#: builtin/commit.c:1154 +#: builtin/commit.c:1151 msgid "Using both --reset-author and --author does not make sense" msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义" -#: builtin/commit.c:1163 +#: builtin/commit.c:1160 msgid "You have nothing to amend." msgstr "您没有å¯ä¿®è¡¥çš„æ交。" -#: builtin/commit.c:1166 +#: builtin/commit.c:1163 msgid "You are in the middle of a merge -- cannot amend." msgstr "您æ£å¤„于一个åˆå¹¶è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" -#: builtin/commit.c:1168 +#: builtin/commit.c:1165 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您æ£å¤„äºŽä¸€ä¸ªæ‹£é€‰è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" -#: builtin/commit.c:1171 +#: builtin/commit.c:1168 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash å’Œ --fixup ä¸èƒ½åŒæ—¶ä½¿ç”¨" -#: builtin/commit.c:1181 +#: builtin/commit.c:1178 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1183 +#: builtin/commit.c:1180 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F/--fixup åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/commit.c:1191 +#: builtin/commit.c:1188 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/commit.c:1208 +#: builtin/commit.c:1205 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1210 +#: builtin/commit.c:1207 msgid "No paths with --include/--only does not make sense." msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。" -#: builtin/commit.c:1212 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..." - -#: builtin/commit.c:1224 builtin/tag.c:551 +#: builtin/commit.c:1219 builtin/tag.c:552 #, c-format msgid "Invalid cleanup mode %s" msgstr "æ— æ•ˆçš„æ¸…ç†æ¨¡å¼ %s" -#: builtin/commit.c:1229 +#: builtin/commit.c:1224 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义。" -#: builtin/commit.c:1339 builtin/commit.c:1612 +#: builtin/commit.c:1342 builtin/commit.c:1617 msgid "show status concisely" msgstr "以简æ´çš„æ ¼å¼æ˜¾ç¤ºçŠ¶æ€" -#: builtin/commit.c:1341 builtin/commit.c:1614 +#: builtin/commit.c:1344 builtin/commit.c:1619 msgid "show branch information" msgstr "显示分支信æ¯" -#: builtin/commit.c:1343 +#: builtin/commit.c:1346 +msgid "show stash information" +msgstr "显示贮è—区信æ¯" + +#: builtin/commit.c:1348 msgid "version" msgstr "版本" -#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:448 +#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530 +#: builtin/worktree.c:449 msgid "machine-readable output" msgstr "机器å¯è¯»çš„输出" -#: builtin/commit.c:1346 builtin/commit.c:1618 +#: builtin/commit.c:1351 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "ä»¥é•¿æ ¼å¼æ˜¾ç¤ºçŠ¶æ€ï¼ˆé»˜è®¤ï¼‰" -#: builtin/commit.c:1349 builtin/commit.c:1621 +#: builtin/commit.c:1354 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "æ¡ç›®ä»¥ NUL å—符结尾" -#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:411 +#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983 +#: builtin/fast-export.c:986 builtin/tag.c:412 msgid "mode" msgstr "模å¼" -#: builtin/commit.c:1352 builtin/commit.c:1624 +#: builtin/commit.c:1357 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模å¼â€çš„å¯é€‰å‚数：allã€normalã€no。（默认：all）" -#: builtin/commit.c:1355 +#: builtin/commit.c:1360 msgid "show ignored files" msgstr "显示忽略的文件" -#: builtin/commit.c:1356 parse-options.h:155 +#: builtin/commit.c:1361 parse-options.h:155 msgid "when" msgstr "何时" -#: builtin/commit.c:1357 +#: builtin/commit.c:1362 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略å模组的更改，“何时â€çš„å¯é€‰å‚数：allã€dirtyã€untracked。（默认：all）" -#: builtin/commit.c:1359 +#: builtin/commit.c:1364 msgid "list untracked files in columns" msgstr "以列的方å¼æ˜¾ç¤ºæœªè·Ÿè¸ªçš„文件" -#: builtin/commit.c:1435 +#: builtin/commit.c:1440 msgid "couldn't look up newly created commit" msgstr "æ— æ³•æ‰¾åˆ°æ–°åˆ›å»ºçš„æ交" -#: builtin/commit.c:1437 +#: builtin/commit.c:1442 msgid "could not parse newly created commit" msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交" -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "detached HEAD" msgstr "分离头指针" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid " (root-commit)" msgstr "ï¼ˆæ ¹æ交）" -#: builtin/commit.c:1582 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "æ交æˆåŠŸåŽä¸æ˜¾ç¤ºæ¦‚è¿°ä¿¡æ¯" -#: builtin/commit.c:1583 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "在æ交说明模æ¿é‡Œæ˜¾ç¤ºå·®å¼‚" -#: builtin/commit.c:1585 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "æ交说明选项" -#: builtin/commit.c:1586 builtin/tag.c:409 +#: builtin/commit.c:1591 builtin/tag.c:410 msgid "read message from file" msgstr "从文件ä¸è¯»å–æ交说明" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "author" msgstr "作者" -#: builtin/commit.c:1587 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "æ交时覆盖作者" -#: builtin/commit.c:1588 builtin/gc.c:357 +#: builtin/commit.c:1593 builtin/gc.c:358 msgid "date" msgstr "日期" -#: builtin/commit.c:1588 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "æ交时覆盖日期" -#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:407 +#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401 +#: builtin/notes.c:564 builtin/tag.c:408 msgid "message" msgstr "说明" -#: builtin/commit.c:1589 +#: builtin/commit.c:1594 msgid "commit message" msgstr "æ交说明" -#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "æ交" -#: builtin/commit.c:1590 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "é‡ç”¨å¹¶ç¼–辑指定æ交的æ交说明" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "é‡ç”¨æŒ‡å®šæ交的æ交说明" -#: builtin/commit.c:1592 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以修æ£æŒ‡å®šçš„æ交" -#: builtin/commit.c:1593 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以压缩至指定的æ交" -#: builtin/commit.c:1594 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该æ交的作者改为我（和 -C/-c/--amend å‚数共用）" -#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 +#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "æ·»åŠ Signed-off-by: ç¾å" -#: builtin/commit.c:1596 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "使用指定的模æ¿æ–‡ä»¶" -#: builtin/commit.c:1597 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "强制编辑æ交" # 译者：å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘（或是原文ä¸ç¬”误，应为 mode） -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "default" msgstr "default" -#: builtin/commit.c:1598 builtin/tag.c:412 +#: builtin/commit.c:1603 builtin/tag.c:413 msgid "how to strip spaces and #comments from message" msgstr "è®¾ç½®å¦‚ä½•åˆ é™¤æäº¤è¯´æ˜Žé‡Œçš„ç©ºæ ¼å’Œ#注释" -#: builtin/commit.c:1599 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "在æ交说明模æ¿é‡ŒåŒ…å«çŠ¶æ€ä¿¡æ¯" -#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 -#: builtin/revert.c:112 +#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG æ交ç¾å" -#: builtin/commit.c:1604 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "æ交内容选项" -#: builtin/commit.c:1605 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "æ交所有改动的文件" -#: builtin/commit.c:1606 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "æ·»åŠ æŒ‡å®šçš„æ–‡ä»¶åˆ°ç´¢å¼•åŒºç‰å¾…æ交" -#: builtin/commit.c:1607 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "交互å¼æ·»åŠ 文件" -#: builtin/commit.c:1608 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "交互å¼æ·»åŠ å˜æ›´" -#: builtin/commit.c:1609 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "åªæ交指定的文件" -#: builtin/commit.c:1610 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit å’Œ commit-msg é’©å" -#: builtin/commit.c:1611 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "显示将è¦æ交的内容" -#: builtin/commit.c:1622 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "修改先å‰çš„æ交" -#: builtin/commit.c:1623 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite é’©å" -#: builtin/commit.c:1628 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "å…许一个空æ交" -#: builtin/commit.c:1630 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "å…许空的æ交说明" -#: builtin/commit.c:1659 +#: builtin/commit.c:1665 msgid "could not parse HEAD commit" msgstr "ä¸èƒ½è§£æž HEAD æ交" -#: builtin/commit.c:1707 +#: builtin/commit.c:1710 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "æŸåçš„ MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1714 +#: builtin/commit.c:1717 msgid "could not read MERGE_MODE" msgstr "ä¸èƒ½è¯»å– MERGE_MODE" -#: builtin/commit.c:1733 +#: builtin/commit.c:1736 #, c-format msgid "could not read commit message: %s" msgstr "ä¸èƒ½è¯»å–æ交说明：%s" -#: builtin/commit.c:1744 +#: builtin/commit.c:1747 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终æ¢æ交；您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n" -#: builtin/commit.c:1749 +#: builtin/commit.c:1752 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终æ¢æäº¤å› ä¸ºæ交说明为空。\n" -#: builtin/commit.c:1797 +#: builtin/commit.c:1800 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7379,143 +7463,143 @@ msgstr "" "ä»“åº“å·²æ›´æ–°ï¼Œä½†æ— æ³•å†™ new_index 文件。检查是å¦ç£ç›˜å·²æ»¡\n" "或ç£ç›˜é…é¢å·²è€—尽，然åŽæ‰§è¡Œ \"git reset HEAD\" æ¢å¤ã€‚" -#: builtin/config.c:9 +#: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<选项>]" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "Config file location" msgstr "é…置文件ä½ç½®" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use global config file" msgstr "使用全局é…置文件" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use system config file" msgstr "使用系统级é…置文件" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use repository config file" msgstr "使用仓库级é…置文件" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use given config file" msgstr "使用指定的é…置文件" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "blob-id" msgstr "æ•°æ®å¯¹è±¡ ID" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "read config from given blob object" msgstr "从给定的数æ®å¯¹è±¡è¯»å–é…ç½®" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "Action" msgstr "æ“作" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get value: name [value-regex]" msgstr "获å–值：name [value-regex]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get values for regexp: name-regex [value-regex]" msgstr "æ ¹æ®æ£åˆ™è¡¨è¾¾å¼èŽ·å¾—值：name-regex [value-regex]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL å–值：section[.var] URL" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "replace all matching variables: name value [value_regex]" msgstr "替æ¢æ‰€æœ‰åŒ¹é…çš„å˜é‡ï¼šname value [value_regex]" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "add a new variable: name value" msgstr "æ·»åŠ ä¸€ä¸ªæ–°çš„å˜é‡ï¼šname value" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove a variable: name [value-regex]" msgstr "åˆ é™¤ä¸€ä¸ªå˜é‡ï¼šname [value-regex]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove all matches: name [value-regex]" msgstr "åˆ é™¤æ‰€æœ‰åŒ¹é…项：name [value-regex]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "rename section: old-name new-name" msgstr "é‡å‘½åå°èŠ‚：old-name new-name" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "remove a section: name" msgstr "åˆ é™¤ä¸€ä¸ªå°èŠ‚：name" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "list all" msgstr "列出所有" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "open an editor" msgstr "打开一个编辑器" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color configured: slot [default]" msgstr "获得é…置的颜色：é…ç½® [默认]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置：é…ç½® [stdout-is-tty]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "Type" msgstr "类型" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is decimal number" msgstr "值是å进制数" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录å）" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "Other" msgstr "其它" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "terminate values with NUL byte" msgstr "终æ¢å€¼æ˜¯ NUL å—节" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "show variable names only" msgstr "åªæ˜¾ç¤ºå˜é‡å" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "respect include directives on lookup" msgstr "查询时å‚ç…§ include 指令递归查找" -#: builtin/config.c:86 +#: builtin/config.c:87 msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示é…置的æ¥æºï¼ˆæ–‡ä»¶ã€æ ‡å‡†è¾“å…¥ã€æ•°æ®å¯¹è±¡ï¼Œæˆ–命令行）" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "ä¸èƒ½è§£æžé»˜è®¤é¢œè‰²å€¼" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7530,12 +7614,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:615 +#: builtin/config.c:499 +msgid "--local can only be used inside a git repository" +msgstr "--local åªèƒ½åœ¨ä¸€ä¸ªä»“库内使用" + +#: builtin/config.c:621 #, c-format msgid "cannot create configuration file %s" msgstr "ä¸èƒ½åˆ›å»ºé…置文件 %s" -#: builtin/config.c:627 +#: builtin/config.c:633 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7544,75 +7632,75 @@ msgstr "" "æ— æ³•ç”¨ä¸€ä¸ªå€¼è¦†ç›–å¤šä¸ªå€¼\n" " 使用一个æ£åˆ™è¡¨è¾¾å¼ã€--add 或 --replace-all æ¥ä¿®æ”¹ %s。" -#: builtin/count-objects.c:86 +#: builtin/count-objects.c:87 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:96 +#: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "以用户å¯è¯»çš„æ ¼å¼æ˜¾ç¤ºå¤§å°" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<选项>] [<æ交å·>...]" -#: builtin/describe.c:19 +#: builtin/describe.c:20 msgid "git describe [<options>] --dirty" msgstr "git describe [<选项>] --dirty" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "head" msgstr "头" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "lightweight" msgstr "è½»é‡çº§çš„" -#: builtin/describe.c:53 +#: builtin/describe.c:54 msgid "annotated" msgstr "附注的" -#: builtin/describe.c:250 +#: builtin/describe.c:253 #, c-format msgid "annotated tag %s not available" msgstr "é™„æ³¨æ ‡ç¾ %s æ— æ•ˆ" -#: builtin/describe.c:254 +#: builtin/describe.c:257 #, c-format msgid "annotated tag %s has no embedded name" msgstr "é™„æ³¨æ ‡ç¾ %s 没有嵌入å称" -#: builtin/describe.c:256 +#: builtin/describe.c:259 #, c-format msgid "tag '%s' is really '%s' here" msgstr "æ ‡ç¾ '%s' 的确是在 '%s'" -#: builtin/describe.c:283 builtin/log.c:487 +#: builtin/describe.c:286 builtin/log.c:489 #, c-format msgid "Not a valid object name %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å %s" -#: builtin/describe.c:286 +#: builtin/describe.c:289 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ '%s' 对象" -#: builtin/describe.c:303 +#: builtin/describe.c:306 #, c-format msgid "no tag exactly matches '%s'" msgstr "æ²¡æœ‰æ ‡ç¾å‡†ç¡®åŒ¹é… '%s'" -#: builtin/describe.c:305 +#: builtin/describe.c:308 #, c-format msgid "searching to describe %s\n" msgstr "æœç´¢æè¿° %s\n" -#: builtin/describe.c:352 +#: builtin/describe.c:355 #, c-format msgid "finished search at %s\n" msgstr "完æˆæœç´¢ %s\n" -#: builtin/describe.c:379 +#: builtin/describe.c:382 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7621,7 +7709,7 @@ msgstr "" "æ²¡æœ‰é™„æ³¨æ ‡ç¾èƒ½æè¿° '%s'。\n" "然而，å˜åœ¨æœªé™„æ³¨æ ‡ç¾ï¼šå°è¯• --tags。" -#: builtin/describe.c:383 +#: builtin/describe.c:386 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7630,12 +7718,12 @@ msgstr "" "æ²¡æœ‰æ ‡ç¾èƒ½æè¿° '%s'。\n" "å°è¯• --alwaysï¼Œæˆ–è€…åˆ›å»ºä¸€äº›æ ‡ç¾ã€‚" -#: builtin/describe.c:413 +#: builtin/describe.c:416 #, c-format msgid "traversed %lu commits\n" msgstr "å·²é历 %lu 个æ交\n" -#: builtin/describe.c:416 +#: builtin/describe.c:419 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7644,75 +7732,75 @@ msgstr "" "å‘现多于 %i ä¸ªæ ‡ç¾ï¼Œåˆ—出最近的 %i 个\n" "在 %s 放弃æœç´¢\n" -#: builtin/describe.c:438 +#: builtin/describe.c:441 msgid "find the tag that comes after the commit" msgstr "寻找该æ交之åŽçš„æ ‡ç¾" -#: builtin/describe.c:439 +#: builtin/describe.c:442 msgid "debug search strategy on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸Šè°ƒè¯•æœç´¢ç–ç•¥" -#: builtin/describe.c:440 +#: builtin/describe.c:443 msgid "use any ref" msgstr "使用任æ„引用" -#: builtin/describe.c:441 +#: builtin/describe.c:444 msgid "use any tag, even unannotated" msgstr "使用任æ„æ ‡ç¾ï¼Œå³ä½¿æœªé™„带注释" -#: builtin/describe.c:442 +#: builtin/describe.c:445 msgid "always use long format" msgstr "始终使用长æ交å·æ ¼å¼" -#: builtin/describe.c:443 +#: builtin/describe.c:446 msgid "only follow first parent" msgstr "åªè·Ÿéšç¬¬ä¸€ä¸ªçˆ¶æ交" -#: builtin/describe.c:446 +#: builtin/describe.c:449 msgid "only output exact matches" msgstr "åªè¾“出精确匹é…" -#: builtin/describe.c:448 +#: builtin/describe.c:451 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> ä¸ªæ ‡ç¾ï¼ˆé»˜è®¤ï¼š10）" -#: builtin/describe.c:450 +#: builtin/describe.c:453 msgid "only consider tags matching <pattern>" msgstr "åªè€ƒè™‘åŒ¹é… <模å¼> çš„æ ‡ç¾" -#: builtin/describe.c:452 +#: builtin/describe.c:455 msgid "do not consider tags matching <pattern>" msgstr "ä¸è€ƒè™‘åŒ¹é… <模å¼> çš„æ ‡ç¾" -#: builtin/describe.c:454 builtin/name-rev.c:357 +#: builtin/describe.c:457 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "显示简写的æ交å·ä½œä¸ºåŽå¤‡" -#: builtin/describe.c:455 builtin/describe.c:458 +#: builtin/describe.c:458 builtin/describe.c:461 msgid "mark" msgstr "æ ‡è®°" -#: builtin/describe.c:456 +#: builtin/describe.c:459 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "对于è„å·¥ä½œåŒºï¼Œè¿½åŠ <æ ‡è®°>（默认：\"-dirty\"）" -#: builtin/describe.c:459 +#: builtin/describe.c:462 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "对于æŸåçš„å·¥ä½œåŒºï¼Œè¿½åŠ <æ ‡è®°>（默认：\"-broken\"）" -#: builtin/describe.c:477 +#: builtin/describe.c:480 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 ä¸å…¼å®¹" -#: builtin/describe.c:506 +#: builtin/describe.c:509 msgid "No names found, cannot describe anything." msgstr "没有å‘现åç§°ï¼Œæ— æ³•æ述任何东西。" -#: builtin/describe.c:549 +#: builtin/describe.c:552 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 与æ交å·ä¸å…¼å®¹" -#: builtin/describe.c:551 +#: builtin/describe.c:554 msgid "--broken is incompatible with commit-ishes" msgstr "--broken 与æ交å·ä¸å…¼å®¹" @@ -7721,55 +7809,55 @@ msgstr "--broken 与æ交å·ä¸å…¼å®¹" msgid "'%s': not a regular file or symlink" msgstr "'%s'：ä¸æ˜¯ä¸€ä¸ªæ£è§„文件或符å·é“¾æŽ¥" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "æ— æ•ˆé€‰é¡¹ï¼š%s" -#: builtin/diff.c:358 +#: builtin/diff.c:359 msgid "Not a git repository" msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库" -#: builtin/diff.c:401 +#: builtin/diff.c:402 #, c-format msgid "invalid object '%s' given." msgstr "æä¾›äº†æ— æ•ˆå¯¹è±¡ '%s'。" -#: builtin/diff.c:410 +#: builtin/diff.c:411 #, c-format msgid "more than two blobs given: '%s'" msgstr "æ供了超过两个数æ®å¯¹è±¡ï¼š'%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "æ— æ³•å¤„ç†çš„对象 '%s'。" -#: builtin/difftool.c:28 +#: builtin/difftool.c:29 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<选项>] [<æ交> [<æ交>]] [--] [<路径>...]" -#: builtin/difftool.c:241 +#: builtin/difftool.c:249 #, c-format msgid "failed: %d" msgstr "失败：%d" -#: builtin/difftool.c:283 +#: builtin/difftool.c:291 #, c-format msgid "could not read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" -#: builtin/difftool.c:285 +#: builtin/difftool.c:293 #, c-format msgid "could not read symlink file %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥æ–‡ä»¶ %s" -#: builtin/difftool.c:293 +#: builtin/difftool.c:301 #, c-format msgid "could not read object %s for symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %2$s 指å‘的对象 %1$s" -#: builtin/difftool.c:395 +#: builtin/difftool.c:403 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7777,292 +7865,294 @@ msgstr "" "ä¸æ”¯æŒåœ¨ç›®å½•æ¯”较模å¼ï¼ˆ'-d' å’Œ '--dir-diff'）ä¸é‡‡ç”¨ç»„åˆå·®å¼‚æ ¼å¼ï¼ˆ'-c' å’Œ '--" "cc'）。" -#: builtin/difftool.c:609 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改：'%s' å’Œ '%s'。" -#: builtin/difftool.c:611 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "工作区文件被留了下æ¥ã€‚" -#: builtin/difftool.c:622 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件å˜åœ¨äºŽ '%s'。" -#: builtin/difftool.c:623 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "您å¯èƒ½æƒ³è¦æ¸…ç†æˆ–者æ¢å¤å®ƒä»¬ã€‚" -#: builtin/difftool.c:669 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:671 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c:673 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "å¯åŠ¨å·®å¼‚比较工具之å‰ä¸æ示" -#: builtin/difftool.c:679 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模å¼ä¸ä½¿ç”¨ç¬¦å·é“¾æŽ¥" -#: builtin/difftool.c:680 +#: builtin/difftool.c:700 msgid "<tool>" msgstr "<工具>" -#: builtin/difftool.c:681 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c:683 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示å¯ä»¥ç”¨åœ¨ `--tool` å‚æ•°åŽçš„差异工具列表" -#: builtin/difftool.c:686 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回éžé›¶é€€å‡ºç 时，使 'git-difftool' 退出" -#: builtin/difftool.c:688 +#: builtin/difftool.c:708 msgid "<command>" msgstr "<命令>" -#: builtin/difftool.c:689 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" -#: builtin/difftool.c:713 +#: builtin/difftool.c:733 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> å‚æ•°æä¾› <工具>" -#: builtin/difftool.c:720 +#: builtin/difftool.c:740 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> å‚æ•°æä¾› <命令>" -#: builtin/fast-export.c:25 +#: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:982 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之åŽæ˜¾ç¤ºè¿›åº¦" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:984 msgid "select handling of signed tags" msgstr "选择如何处ç†ç¾åæ ‡ç¾" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:987 msgid "select handling of tags that tag filtered objects" msgstr "é€‰æ‹©å½“æ ‡ç¾æŒ‡å‘è¢«è¿‡æ»¤å¯¹è±¡æ—¶è¯¥æ ‡ç¾çš„处ç†æ–¹å¼" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:990 msgid "Dump marks to this file" msgstr "æŠŠæ ‡è®°å˜å‚¨åˆ°è¿™ä¸ªæ–‡ä»¶" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:992 msgid "Import marks from this file" msgstr "ä»Žè¿™ä¸ªæ–‡ä»¶å¯¼å…¥æ ‡è®°" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:994 msgid "Fake a tagger when tags lack one" msgstr "å½“æ ‡ç¾ç¼ºå°‘æ ‡è®°è€…å—段时，å‡è£…æ供一个" -#: builtin/fast-export.c:994 +#: builtin/fast-export.c:996 msgid "Output full tree for each commit" msgstr "æ¯æ¬¡æäº¤éƒ½è¾“å‡ºæ•´ä¸ªæ ‘" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:998 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能æ¥ç»ˆæ¢æµ" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:999 msgid "Skip output of blob data" msgstr "跳过数æ®å¯¹è±¡çš„输出" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "refspec" msgstr "å¼•ç”¨è§„æ ¼" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1001 msgid "Apply refspec to exported refs" msgstr "å¯¹å¯¼å‡ºçš„å¼•ç”¨åº”ç”¨å¼•ç”¨è§„æ ¼" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "anonymize output" msgstr "匿å输出" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:95 builtin/pull.c:175 +#: builtin/fetch.c:90 builtin/pull.c:182 msgid "fetch from all remotes" msgstr "从所有的远程抓å–" -#: builtin/fetch.c:97 builtin/pull.c:178 +#: builtin/fetch.c:92 builtin/pull.c:185 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它" -#: builtin/fetch.c:99 builtin/pull.c:181 +#: builtin/fetch.c:94 builtin/pull.c:188 msgid "path to upload pack on remote end" msgstr "ä¸Šä¼ åŒ…åˆ°è¿œç¨‹çš„è·¯å¾„" -#: builtin/fetch.c:100 builtin/pull.c:183 +#: builtin/fetch.c:95 builtin/pull.c:190 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/fetch.c:102 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "从多个远程抓å–" -#: builtin/fetch.c:104 builtin/pull.c:185 +#: builtin/fetch.c:99 builtin/pull.c:192 msgid "fetch all tags and associated objects" msgstr "抓å–æ‰€æœ‰çš„æ ‡ç¾å’Œå…³è”对象" -#: builtin/fetch.c:106 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "ä¸æŠ“å–ä»»ä½•æ ‡ç¾(--no-tags)" -#: builtin/fetch.c:108 +#: builtin/fetch.c:103 msgid "number of submodules fetched in parallel" msgstr "å模组获å–的并å‘æ•°" -#: builtin/fetch.c:110 builtin/pull.c:188 +#: builtin/fetch.c:105 builtin/pull.c:195 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已ç»ä¸å˜åœ¨çš„分支的跟踪分支" # 译者：å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘ -#: builtin/fetch.c:111 builtin/pull.c:191 +#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:112 builtin/pull.c:192 +#: builtin/fetch.c:107 msgid "control recursive fetching of submodules" msgstr "控制å模组的递归抓å–" -#: builtin/fetch.c:116 builtin/pull.c:200 +#: builtin/fetch.c:111 builtin/pull.c:203 msgid "keep downloaded pack" msgstr "ä¿æŒä¸‹è½½åŒ…" -#: builtin/fetch.c:118 +#: builtin/fetch.c:113 msgid "allow updating of HEAD ref" msgstr "å…许更新 HEAD 引用" -#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 +#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历å²" -#: builtin/fetch.c:123 +#: builtin/fetch.c:118 msgid "deepen history of shallow repository based on time" msgstr "基于时间æ¥æ·±åŒ–浅克隆的历å²" -#: builtin/fetch.c:129 builtin/pull.c:206 +#: builtin/fetch.c:124 builtin/pull.c:209 msgid "convert to a complete repository" msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„仓库" -#: builtin/fetch.c:131 builtin/log.c:1440 +#: builtin/fetch.c:126 builtin/log.c:1450 msgid "dir" msgstr "目录" -#: builtin/fetch.c:132 +#: builtin/fetch.c:127 msgid "prepend this to submodule path output" msgstr "在å模组路径输出的å‰é¢åŠ 上æ¤ç›®å½•" -#: builtin/fetch.c:135 -msgid "default mode for recursion" -msgstr "递归的默认模å¼" +#: builtin/fetch.c:130 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "递归获å–å模组的缺çœå€¼ï¼ˆæ¯”é…置文件优先级低）" -#: builtin/fetch.c:137 builtin/pull.c:209 +#: builtin/fetch.c:134 builtin/pull.c:212 msgid "accept refs that update .git/shallow" msgstr "接å—æ›´æ–° .git/shallow 的引用" -#: builtin/fetch.c:138 builtin/pull.c:211 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "refmap" msgstr "å¼•ç”¨æ˜ å°„" -#: builtin/fetch.c:139 builtin/pull.c:212 +#: builtin/fetch.c:136 builtin/pull.c:215 msgid "specify fetch refmap" msgstr "指定获å–æ“ä½œçš„å¼•ç”¨æ˜ å°„" -#: builtin/fetch.c:395 +#: builtin/fetch.c:394 msgid "Couldn't find remote ref HEAD" msgstr "æ— æ³•å‘现远程 HEAD 引用" -#: builtin/fetch.c:513 +#: builtin/fetch.c:512 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "é…ç½®å˜é‡ fetch.output 包å«æ— 效值 %s" -#: builtin/fetch.c:606 +#: builtin/fetch.c:605 #, c-format msgid "object %s not found" msgstr "对象 %s 未å‘现" -#: builtin/fetch.c:610 +#: builtin/fetch.c:609 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:623 builtin/fetch.c:703 +#: builtin/fetch.c:622 builtin/fetch.c:702 msgid "[rejected]" msgstr "[已拒ç»]" -#: builtin/fetch.c:624 +#: builtin/fetch.c:623 msgid "can't fetch in current branch" msgstr "当å‰åˆ†æ”¯ä¸‹ä¸èƒ½æ‰§è¡ŒèŽ·å–æ“作" -#: builtin/fetch.c:633 +#: builtin/fetch.c:632 msgid "[tag update]" msgstr "[æ ‡ç¾æ›´æ–°]" -#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 -#: builtin/fetch.c:698 +#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682 +#: builtin/fetch.c:697 msgid "unable to update local ref" msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨" -#: builtin/fetch.c:653 +#: builtin/fetch.c:652 msgid "[new tag]" msgstr "[æ–°æ ‡ç¾]" -#: builtin/fetch.c:656 +#: builtin/fetch.c:655 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:659 +#: builtin/fetch.c:658 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:698 +#: builtin/fetch.c:697 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:703 +#: builtin/fetch.c:702 msgid "non-fast-forward" msgstr "éžå¿«è¿›" -#: builtin/fetch.c:748 +#: builtin/fetch.c:747 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未å‘é€æ‰€æœ‰å¿…须的对象\n" -#: builtin/fetch.c:768 +#: builtin/fetch.c:767 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "æ‹’ç» %s å› ä¸ºæµ…å…‹éš†ä¸å…许被更新" @@ -8097,7 +8187,7 @@ msgstr " （%s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" msgid "[deleted]" msgstr "[å·²åˆ é™¤]" -#: builtin/fetch.c:955 builtin/remote.c:1022 +#: builtin/fetch.c:955 builtin/remote.c:1023 msgid "(none)" msgstr "ï¼ˆæ— ï¼‰" @@ -8126,7 +8216,7 @@ msgstr "ä¸çŸ¥é“如何从 %s 获å–" msgid "Fetching %s\n" msgstr "æ£åœ¨èŽ·å– %s\n" -#: builtin/fetch.c:1238 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "ä¸èƒ½èŽ·å– %s" @@ -8157,101 +8247,101 @@ msgstr "--depth å’Œ --unshallow ä¸èƒ½åŒæ—¶ä½¿ç”¨" msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，å‚æ•° --unshallow 没有æ„义" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1349 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªä»“库å‚æ•°" -#: builtin/fetch.c:1354 +#: builtin/fetch.c:1351 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all å¸¦å¼•ç”¨è§„æ ¼æ²¡æœ‰ä»»ä½•æ„义" -#: builtin/fetch.c:1365 +#: builtin/fetch.c:1362 #, c-format msgid "No such remote or remote group: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹æˆ–è¿œç¨‹ç»„ï¼š%s" -#: builtin/fetch.c:1373 +#: builtin/fetch.c:1370 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获å–ç»„å¹¶æŒ‡å®šå¼•ç”¨è§„æ ¼æ²¡æœ‰æ„义" -#: builtin/fmt-merge-msg.c:14 +#: builtin/fmt-merge-msg.c:15 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "å‘æ交说明ä¸æœ€å¤šå¤åˆ¶æŒ‡å®šæ¡ç›®ï¼ˆåˆå¹¶è€Œæ¥çš„æ交）的简çŸè¯´æ˜Ž" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "å‚æ•° --log 的别å（已弃用）" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "使用 <文本> 作为æ交说明的开始" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "从文件ä¸è¯»å–" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<选项>] [<模å¼>]" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <对象>]" -#: builtin/for-each-ref.c:11 +#: builtin/for-each-ref.c:12 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" msgstr "git for-each-ref [(--merged | --no-merged) [<æ交>]]" -#: builtin/for-each-ref.c:12 +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<æ交>]] [--no-contains [<æ交>]]" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "引用å ä½ç¬¦é€‚用于 shells" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "引用å ä½ç¬¦é€‚用于 perl" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "引用å ä½ç¬¦é€‚用于 python" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "引用å ä½ç¬¦é€‚用于 Tcl" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "åªæ˜¾ç¤º <n> 个匹é…的引用" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "åªæ‰“å°æŒ‡å‘给定对象的引用" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„引用" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "åªæ‰“å°æ²¡æœ‰åˆå¹¶çš„引用" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的引用" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "åªæ‰“å°ä¸åŒ…å«è¯¥æ交的引用" @@ -8315,21 +8405,21 @@ msgstr "显示å¯è¾¾å¯¹è±¡çš„详细å称" msgid "Checking objects" msgstr "检查对象ä¸" -#: builtin/gc.c:25 +#: builtin/gc.c:26 msgid "git gc [<options>]" msgstr "git gc [<选项>]" -#: builtin/gc.c:78 +#: builtin/gc.c:79 #, c-format msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败：%s" -#: builtin/gc.c:310 +#: builtin/gc.c:311 #, c-format msgid "Can't stat %s" msgstr "ä¸èƒ½å¯¹ %s 调用 stat" -#: builtin/gc.c:319 +#: builtin/gc.c:320 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8343,307 +8433,320 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:358 +#: builtin/gc.c:359 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:360 +#: builtin/gc.c:361 msgid "be more thorough (increased runtime)" msgstr "æ›´å½»åº•ï¼ˆå¢žåŠ è¿è¡Œæ—¶é—´ï¼‰" -#: builtin/gc.c:361 +#: builtin/gc.c:362 msgid "enable auto-gc mode" msgstr "å¯ç”¨è‡ªåŠ¨åžƒåœ¾å›žæ”¶æ¨¡å¼" -#: builtin/gc.c:362 +#: builtin/gc.c:363 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc å³ä½¿å¦å¤–一个 gc æ£åœ¨æ‰§è¡Œ" -#: builtin/gc.c:379 +#: builtin/gc.c:380 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "æ— æ³•è§£æž gc.logexpiry 的值 %s" -#: builtin/gc.c:407 +#: builtin/gc.c:408 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在åŽå°æ‰§è¡Œä»“库打包以求最佳性能。\n" -#: builtin/gc.c:409 +#: builtin/gc.c:410 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:410 +#: builtin/gc.c:411 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护å‚è§ \"git help gc\"。\n" -#: builtin/gc.c:431 +#: builtin/gc.c:436 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "å·²ç»æœ‰ä¸€ä¸ª gc æ£è¿è¡Œåœ¨æœºå™¨ '%s' pid %<PRIuMAX>（如果ä¸æ˜¯ï¼Œä½¿ç”¨ --force）" -#: builtin/gc.c:475 +#: builtin/gc.c:480 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多ä¸å¯è¾¾çš„æ¾æ•£å¯¹è±¡ï¼Œè¿è¡Œ 'git prune' åˆ é™¤å®ƒä»¬ã€‚" -#: builtin/grep.c:25 +#: builtin/grep.c:27 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<选项>] [-e] <模å¼> [<版本>...] [[--] <路径>...]" -#: builtin/grep.c:232 +#: builtin/grep.c:235 #, c-format msgid "grep: failed to create thread: %s" msgstr "grepï¼šæ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s" -#: builtin/grep.c:290 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "为 %2$s 设定的线程数 (%1$d) æ— æ•ˆ" -#: builtin/grep.c:769 builtin/grep.c:810 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "没有线程支æŒï¼Œå¿½ç•¥ %s" + +#: builtin/grep.c:788 builtin/grep.c:829 #, c-format msgid "unable to read tree (%s)" msgstr "æ— æ³•è¯»å–æ ‘ï¼ˆ%s）" -#: builtin/grep.c:829 +#: builtin/grep.c:848 #, c-format msgid "unable to grep from object of type %s" msgstr "æ— æ³•æŠ“å–æ¥è‡ªäºŽ %s 类型的对象" -#: builtin/grep.c:893 +#: builtin/grep.c:912 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数å—值" -#: builtin/grep.c:980 +#: builtin/grep.c:999 msgid "search in index instead of in the work tree" msgstr "在索引区æœç´¢è€Œä¸æ˜¯åœ¨å·¥ä½œåŒº" -#: builtin/grep.c:982 +#: builtin/grep.c:1001 msgid "find in contents not managed by git" msgstr "在未被 git 管ç†çš„内容ä¸æŸ¥æ‰¾" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: builtin/grep.c:984 +#: builtin/grep.c:1003 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件ä¸æœç´¢" -#: builtin/grep.c:986 +#: builtin/grep.c:1005 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包å«çš„文件" -#: builtin/grep.c:988 +#: builtin/grep.c:1007 msgid "recursively search in each submodule" msgstr "在æ¯ä¸€ä¸ªå模组ä¸é€’å½’æœç´¢" -#: builtin/grep.c:990 +#: builtin/grep.c:1009 msgid "basename" msgstr "基本å" -#: builtin/grep.c:991 +#: builtin/grep.c:1010 msgid "prepend parent project's basename to output" msgstr "在输出ä¸ä»¥çˆ¶é¡¹ç›®çš„基本å为å‰ç¼€" -#: builtin/grep.c:994 +#: builtin/grep.c:1013 msgid "show non-matching lines" msgstr "显示未匹é…çš„è¡Œ" -#: builtin/grep.c:996 +#: builtin/grep.c:1015 msgid "case insensitive matching" msgstr "ä¸åŒºåˆ†å¤§å°å†™åŒ¹é…" -#: builtin/grep.c:998 +#: builtin/grep.c:1017 msgid "match patterns only at word boundaries" msgstr "åªåœ¨å•è¯è¾¹ç•ŒåŒ¹é…模å¼" -#: builtin/grep.c:1000 +#: builtin/grep.c:1019 msgid "process binary files as text" msgstr "把二进制文件当åšæ–‡æœ¬å¤„ç†" -#: builtin/grep.c:1002 +#: builtin/grep.c:1021 msgid "don't match patterns in binary files" msgstr "ä¸åœ¨äºŒè¿›åˆ¶æ–‡ä»¶ä¸åŒ¹é…模å¼" -#: builtin/grep.c:1005 +#: builtin/grep.c:1024 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处ç†äºŒè¿›åˆ¶æ–‡ä»¶" -#: builtin/grep.c:1007 +#: builtin/grep.c:1026 msgid "descend at most <depth> levels" msgstr "最多以指定的深度å‘下寻找" -#: builtin/grep.c:1011 +#: builtin/grep.c:1030 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX æ£åˆ™è¡¨è¾¾å¼" -#: builtin/grep.c:1014 +#: builtin/grep.c:1033 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX æ£åˆ™è¡¨è¾¾å¼ï¼ˆé»˜è®¤ï¼‰" -#: builtin/grep.c:1017 +#: builtin/grep.c:1036 msgid "interpret patterns as fixed strings" msgstr "把模å¼è§£æžä¸ºå›ºå®šçš„å—符串" -#: builtin/grep.c:1020 +#: builtin/grep.c:1039 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的æ£åˆ™è¡¨è¾¾å¼" -#: builtin/grep.c:1023 +#: builtin/grep.c:1042 msgid "show line numbers" msgstr "显示行å·" -#: builtin/grep.c:1024 +#: builtin/grep.c:1043 msgid "don't show filenames" msgstr "ä¸æ˜¾ç¤ºæ–‡ä»¶å" -#: builtin/grep.c:1025 +#: builtin/grep.c:1044 msgid "show filenames" msgstr "显示文件å" -#: builtin/grep.c:1027 +#: builtin/grep.c:1046 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件å" -#: builtin/grep.c:1029 +#: builtin/grep.c:1048 msgid "show only filenames instead of matching lines" msgstr "åªæ˜¾ç¤ºæ–‡ä»¶å而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ" -#: builtin/grep.c:1031 +#: builtin/grep.c:1050 msgid "synonym for --files-with-matches" msgstr "å’Œ --files-with-matches åŒä¹‰" -#: builtin/grep.c:1034 +#: builtin/grep.c:1053 msgid "show only the names of files without match" msgstr "åªæ˜¾ç¤ºæœªåŒ¹é…的文件å" -#: builtin/grep.c:1036 +#: builtin/grep.c:1055 msgid "print NUL after filenames" msgstr "在文件ååŽè¾“出 NUL å—符" -#: builtin/grep.c:1038 +#: builtin/grep.c:1057 msgid "show the number of matches instead of matching lines" msgstr "显示总匹é…行数，而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ" -#: builtin/grep.c:1039 +#: builtin/grep.c:1058 msgid "highlight matches" msgstr "高亮显示匹é…项" -#: builtin/grep.c:1041 +#: builtin/grep.c:1060 msgid "print empty line between matches from different files" msgstr "在ä¸åŒæ–‡ä»¶çš„匹é…项之间打å°ç©ºè¡Œ" -#: builtin/grep.c:1043 +#: builtin/grep.c:1062 msgid "show filename only once above matches from same file" msgstr "åªåœ¨åŒä¸€æ–‡ä»¶çš„匹é…项的上é¢æ˜¾ç¤ºä¸€æ¬¡æ–‡ä»¶å" -#: builtin/grep.c:1046 +#: builtin/grep.c:1065 msgid "show <n> context lines before and after matches" msgstr "显示匹é…项å‰åŽçš„ <n> 行上下文" -#: builtin/grep.c:1049 +#: builtin/grep.c:1068 msgid "show <n> context lines before matches" msgstr "显示匹é…é¡¹å‰ <n> 行上下文" -#: builtin/grep.c:1051 +#: builtin/grep.c:1070 msgid "show <n> context lines after matches" msgstr "显示匹é…é¡¹åŽ <n> 行上下文" -#: builtin/grep.c:1053 +#: builtin/grep.c:1072 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:1054 +#: builtin/grep.c:1073 msgid "shortcut for -C NUM" msgstr "å¿«æ·é”® -C æ•°å—" -#: builtin/grep.c:1057 +#: builtin/grep.c:1076 msgid "show a line with the function name before matches" msgstr "在匹é…çš„å‰é¢æ˜¾ç¤ºä¸€è¡Œå‡½æ•°å" -#: builtin/grep.c:1059 +#: builtin/grep.c:1078 msgid "show the surrounding function" msgstr "显示所在函数的å‰åŽå†…容" -#: builtin/grep.c:1062 +#: builtin/grep.c:1081 msgid "read patterns from file" msgstr "从文件读å–模å¼" -#: builtin/grep.c:1064 +#: builtin/grep.c:1083 msgid "match <pattern>" msgstr "åŒ¹é… <模å¼>" -#: builtin/grep.c:1066 +#: builtin/grep.c:1085 msgid "combine patterns specified with -e" msgstr "组åˆç”¨ -e å‚数设定的模å¼" -#: builtin/grep.c:1078 +#: builtin/grep.c:1097 msgid "indicate hit with exit status without output" msgstr "ä¸è¾“出，而用退出ç æ ‡è¯†å‘½ä¸çŠ¶æ€" -#: builtin/grep.c:1080 +#: builtin/grep.c:1099 msgid "show only matches from files that match all patterns" msgstr "åªæ˜¾ç¤ºåŒ¹é…所有模å¼çš„文件ä¸çš„匹é…" -#: builtin/grep.c:1082 +#: builtin/grep.c:1101 msgid "show parse tree for grep expression" msgstr "显示 grep 表达å¼çš„解æžæ ‘" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "pager" msgstr "分页" -#: builtin/grep.c:1086 +#: builtin/grep.c:1105 msgid "show matching files in the pager" msgstr "分页显示匹é…的文件" -#: builtin/grep.c:1089 +#: builtin/grep.c:1108 msgid "allow calling of grep(1) (ignored by this build)" msgstr "å…许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:1153 +#: builtin/grep.c:1172 msgid "no pattern given." msgstr "未æ供模å¼åŒ¹é…。" -#: builtin/grep.c:1189 +#: builtin/grep.c:1204 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked ä¸èƒ½å’Œç‰ˆæœ¬åŒæ—¶ä½¿ç”¨" -#: builtin/grep.c:1195 +#: builtin/grep.c:1211 #, c-format msgid "unable to resolve revision: %s" msgstr "ä¸èƒ½è§£æžç‰ˆæœ¬ï¼š%s" -#: builtin/grep.c:1228 builtin/index-pack.c:1485 +#: builtin/grep.c:1245 builtin/index-pack.c:1490 #, c-format msgid "invalid number of threads specified (%d)" msgstr "æŒ‡å®šçš„çº¿ç¨‹æ•°æ— æ•ˆï¼ˆ%d）" -#: builtin/grep.c:1251 +#: builtin/grep.c:1250 +msgid "no threads support, ignoring --threads" +msgstr "没有线程支æŒï¼Œå¿½ç•¥ --threads" + +#: builtin/grep.c:1281 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:1274 +#: builtin/grep.c:1304 msgid "option not supported with --recurse-submodules." msgstr "选项ä¸æ”¯æŒå’Œ --recurse-submodules 共用。" -#: builtin/grep.c:1280 +#: builtin/grep.c:1310 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked ä¸èƒ½ä¸Ž --no-index åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/grep.c:1286 +#: builtin/grep.c:1316 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard ä¸èƒ½ç”¨äºŽå·²è·Ÿè¸ªå†…容。" -#: builtin/grep.c:1294 +#: builtin/grep.c:1324 msgid "both --cached and trees are given." msgstr "åŒæ—¶ç»™å‡ºäº† --cached å’Œæ ‘å¯¹è±¡ã€‚" -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -8651,91 +8754,91 @@ msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " "[--] <文件>..." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "type" msgstr "类型" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "object type" msgstr "对象类型" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "write the object into the object database" msgstr "将对象写入对象数æ®åº“" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "read the object from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "store file as is without filters" msgstr "åŽŸæ ·å˜å‚¨æ–‡ä»¶ä¸ä½¿ç”¨è¿‡æ»¤å™¨" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "å…许对任æ„éšæœºåžƒåœ¾æ•°æ®åšæ•£åˆ—æ¥åˆ›å»ºæŸå的对象以便调试 Git" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "process file as it were from this path" msgstr "处ç†æ–‡ä»¶å¹¶å‡è®¾å…¶æ¥è‡ªäºŽæ¤è·¯å¾„" -#: builtin/help.c:42 +#: builtin/help.c:43 msgid "print all available commands" msgstr "打å°æ‰€æœ‰å¯ç”¨çš„命令" -#: builtin/help.c:43 +#: builtin/help.c:44 msgid "exclude guides" msgstr "排除å‘导" -#: builtin/help.c:44 +#: builtin/help.c:45 msgid "print list of useful guides" msgstr "显示有用的指å—列表" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "show man page" msgstr "显示 man 手册" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "show manual in web browser" msgstr "在 web æµè§ˆå™¨ä¸æ˜¾ç¤ºæ‰‹å†Œ" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "show info page" msgstr "显示 info 手册" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" -#: builtin/help.c:66 +#: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "æœªèƒ½è¯†åˆ«çš„å¸®åŠ©æ ¼å¼ '%s'" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "æ— æ³•å¯åŠ¨ emacsclient。" -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "æ— æ³•è§£æž emacsclient 版本。" -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太è€ï¼ˆ< 22）。" -#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 +#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 #, c-format msgid "failed to exec '%s'" msgstr "æ— æ³•æ‰§è¡Œ '%s'" -#: builtin/help.c:207 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8744,7 +8847,7 @@ msgstr "" "'%s'：ä¸æ”¯æŒçš„ man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" -#: builtin/help.c:219 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8753,132 +8856,132 @@ msgstr "" "'%s': 支æŒçš„ man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" -#: builtin/help.c:336 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:353 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "没有 man 查看器处ç†æ¤è¯·æ±‚" -#: builtin/help.c:361 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "没有 info 查看器处ç†æ¤è¯·æ±‚" -#: builtin/help.c:403 +#: builtin/help.c:404 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: builtin/help.c:404 +#: builtin/help.c:405 msgid "Everyday Git With 20 Commands Or So" msgstr "æ¯ä¸€å¤© Git 常用的约 20 æ¡å‘½ä»¤" -#: builtin/help.c:405 +#: builtin/help.c:406 msgid "A Git glossary" msgstr "Git è¯æ±‡è¡¨" -#: builtin/help.c:406 +#: builtin/help.c:407 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: builtin/help.c:407 +#: builtin/help.c:408 msgid "Defining submodule properties" msgstr "定义å模组属性" -#: builtin/help.c:408 +#: builtin/help.c:409 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: builtin/help.c:409 +#: builtin/help.c:410 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程（针对 1.5.1 或更新版本）" -#: builtin/help.c:410 +#: builtin/help.c:411 msgid "An overview of recommended workflows with Git" msgstr "Git 推è的工作æµæ¦‚览" -#: builtin/help.c:422 +#: builtin/help.c:423 msgid "The common Git guides are:\n" msgstr "最常用的 Git å‘导有：\n" -#: builtin/help.c:440 +#: builtin/help.c:441 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别å" -#: builtin/help.c:462 builtin/help.c:479 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/index-pack.c:154 +#: builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型ä¸åŒ¹é…" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, c-format msgid "did not receive expected object %s" msgstr "未能获å–预期的对象 %s" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：应为类型 %s，å´æ˜¯ %s" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:270 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "æ— æ³•å¡«å…… %d å—节" msgstr[1] "æ— æ³•å¡«å…… %d å—节" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "early EOF" msgstr "过早的文件结æŸç¬¦ï¼ˆEOF）" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:293 msgid "used more bytes than were available" msgstr "用掉了超过å¯ç”¨çš„å—节" -#: builtin/index-pack.c:299 +#: builtin/index-pack.c:300 msgid "pack too large for current definition of off_t" msgstr "åŒ…å¤ªå¤§è¶…è¿‡äº†å½“å‰ off_t 的定义" -#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +#: builtin/index-pack.c:303 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "包超过了最大å…许值" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "unable to create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:324 #, c-format msgid "cannot open packfile '%s'" msgstr "æ— æ³•æ‰“å¼€åŒ…æ–‡ä»¶ '%s'" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:338 msgid "pack signature mismatch" msgstr "包ç¾åä¸åŒ¹é…" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:340 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "ä¸æ”¯æŒåŒ…版本 %<PRIu32>" -#: builtin/index-pack.c:357 +#: builtin/index-pack.c:358 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包ä¸æœ‰é”™è¯¯çš„对象ä½äºŽåç§»é‡ %<PRIuMAX>：%s" @@ -8916,14 +9019,14 @@ msgstr[1] "包文件过早结æŸï¼Œç¼ºå°‘ %<PRIuMAX> å—节" msgid "serious inflate inconsistency" msgstr "解压缩严é‡çš„ä¸ä¸€è‡´" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 #: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "å‘现 %s 出现 SHA1 冲çªï¼" -#: builtin/index-pack.c:752 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:257 +#: builtin/index-pack.c:751 builtin/pack-objects.c:167 +#: builtin/pack-objects.c:261 #, c-format msgid "unable to read %s" msgstr "ä¸èƒ½è¯» %s" @@ -8943,250 +9046,245 @@ msgstr "ä¸èƒ½è¯»å–现å˜å¯¹è±¡ %s" msgid "invalid blob object %s" msgstr "æ— æ•ˆçš„æ•°æ®å¯¹è±¡ %s" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:851 #, c-format msgid "invalid %s" msgstr "æ— æ•ˆçš„ %s" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:854 msgid "Error in object" msgstr "对象ä¸å‡ºé”™" -#: builtin/index-pack.c:855 +#: builtin/index-pack.c:856 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有å对象并éžéƒ½å¯è¾¾" -#: builtin/index-pack.c:927 builtin/index-pack.c:958 +#: builtin/index-pack.c:928 builtin/index-pack.c:959 msgid "failed to apply delta" msgstr "æ— æ³•åº”ç”¨ delta" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Receiving objects" msgstr "接收对象ä¸" -#: builtin/index-pack.c:1128 +#: builtin/index-pack.c:1130 msgid "Indexing objects" msgstr "索引对象ä¸" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1164 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲çªï¼ˆSHA1 ä¸åŒ¹é…）" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1169 msgid "cannot fstat packfile" msgstr "ä¸èƒ½å¯¹åŒ…文件调用 fstat" -#: builtin/index-pack.c:1168 +#: builtin/index-pack.c:1172 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数æ®" -#: builtin/index-pack.c:1179 +#: builtin/index-pack.c:1184 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() ä¸é‡åˆ°ä¸å¯ç†å–»çš„问题" -#: builtin/index-pack.c:1202 +#: builtin/index-pack.c:1207 msgid "Resolving deltas" msgstr "å¤„ç† delta ä¸" -#: builtin/index-pack.c:1213 +#: builtin/index-pack.c:1218 #, c-format msgid "unable to create thread: %s" msgstr "ä¸èƒ½åˆ›å»ºçº¿ç¨‹ï¼š%s" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1260 msgid "confusion beyond insanity" msgstr "ä¸å¯ç†å–»" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "å®Œæˆ %d 个本地对象" msgstr[1] "å®Œæˆ %d 个本地对象" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1278 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s çš„å°¾éƒ¨æ ¡éªŒå‡ºçŽ°æ„外（ç£ç›˜æŸå？）" -#: builtin/index-pack.c:1277 +#: builtin/index-pack.c:1282 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1306 #, c-format msgid "unable to deflate appended object (%d)" msgstr "ä¸èƒ½åŽ‹ç¼©é™„åŠ å¯¹è±¡ï¼ˆ%d）" -#: builtin/index-pack.c:1377 +#: builtin/index-pack.c:1382 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s å·²æŸå" -#: builtin/index-pack.c:1403 +#: builtin/index-pack.c:1408 msgid "error while closing pack file" msgstr "å…³é—包文件时出错" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1420 #, c-format msgid "cannot write keep file '%s'" msgstr "æ— æ³•å†™ä¿ç•™æ–‡ä»¶ '%s'" -#: builtin/index-pack.c:1423 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot close written keep file '%s'" msgstr "æ— æ³•å…³é—ä¿ç•™æ–‡ä»¶ '%s'" -#: builtin/index-pack.c:1433 +#: builtin/index-pack.c:1438 msgid "cannot store pack file" msgstr "æ— æ³•å˜å‚¨åŒ…文件" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1446 msgid "cannot store index file" msgstr "æ— æ³•å˜å‚¨ç´¢å¼•æ–‡ä»¶" -#: builtin/index-pack.c:1479 +#: builtin/index-pack.c:1484 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "åçš„ pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "没有线程支æŒï¼Œå¿½ç•¥ %s" - -#: builtin/index-pack.c:1547 +#: builtin/index-pack.c:1552 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "æ— æ³•æ‰“å¼€çŽ°å˜åŒ…文件 '%s'" -#: builtin/index-pack.c:1549 +#: builtin/index-pack.c:1554 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "æ— æ³•ä¸º %s 打开包索引文件" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1602 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "éž delta：%d 个对象" msgstr[1] "éž delta：%d 个对象" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1609 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1616 +#: builtin/index-pack.c:1622 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件å '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 -#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 +#: builtin/index-pack.c:1704 builtin/index-pack.c:1707 +#: builtin/index-pack.c:1723 builtin/index-pack.c:1727 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1737 +#: builtin/index-pack.c:1743 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ä¸èƒ½å’Œ --stdin åŒæ—¶ä½¿ç”¨" -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1745 msgid "--stdin requires a git repository" msgstr "--stdin 需è¦ä¸€ä¸ª git 仓库" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1753 msgid "--verify with no packfile name given" msgstr "--verify 没有æ供包文件åå‚æ•°" -#: builtin/init-db.c:54 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "ä¸èƒ½å¯¹ '%s' 调用 stat" -#: builtin/init-db.c:60 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "ä¸èƒ½å¯¹æ¨¡ç‰ˆ '%s' 调用 stat" -#: builtin/init-db.c:65 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "ä¸èƒ½æ‰“开目录 '%s'" -#: builtin/init-db.c:76 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "ä¸èƒ½è¯»å–链接 '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "ä¸èƒ½è‡ª '%s' 到 '%s' 创建符å·é“¾æŽ¥" -#: builtin/init-db.c:84 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "ä¸èƒ½æ‹·è´ '%s' 至 '%s'" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" -#: builtin/init-db.c:119 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "模版未找到 %s" -#: builtin/init-db.c:134 +#: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' å¤åˆ¶æ¨¡ç‰ˆï¼š%s" -#: builtin/init-db.c:327 +#: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "ä¸èƒ½å¤„ç† %d 类型的文件" -#: builtin/init-db.c:330 +#: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s" -#: builtin/init-db.c:347 builtin/init-db.c:350 +#: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "%s å·²ç»å˜åœ¨" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "é‡æ–°åˆå§‹åŒ–å·²å˜åœ¨çš„共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "é‡æ–°åˆå§‹åŒ–å·²å˜åœ¨çš„ Git 仓库于 %s%s\n" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "å·²åˆå§‹åŒ–空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "å·²åˆå§‹åŒ–空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:457 +#: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -9194,32 +9292,32 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模æ¿ç›®å½•>] [--shared[=<æƒé™>]] " "[<目录>]" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 msgid "permissions" msgstr "æƒé™" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:515 builtin/init-db.c:520 +#: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• %s" -#: builtin/init-db.c:524 +#: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° %s" -#: builtin/init-db.c:545 +#: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "ä¸å…许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" -#: builtin/init-db.c:573 +#: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "ä¸èƒ½è®¿é—®å·¥ä½œåŒº '%s'" @@ -9252,112 +9350,112 @@ msgstr "è¦æ·»åŠ çš„ç¾å" msgid "no input file given for in-place editing" msgstr "没有给出è¦åŽŸä½ç¼–辑的文件" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" -#: builtin/log.c:45 +#: builtin/log.c:46 msgid "git show [<options>] <object>..." msgstr "git show [<选项>] <对象>..." -#: builtin/log.c:89 +#: builtin/log.c:90 #, c-format msgid "invalid --decorate option: %s" msgstr "æ— æ•ˆçš„ --decorate 选项：%s" -#: builtin/log.c:144 +#: builtin/log.c:147 msgid "suppress diff output" msgstr "ä¸æ˜¾ç¤ºå·®å¼‚输出" -#: builtin/log.c:145 +#: builtin/log.c:148 msgid "show source" msgstr "显示æº" -#: builtin/log.c:146 +#: builtin/log.c:149 msgid "Use mail map file" msgstr "ä½¿ç”¨é‚®ä»¶æ˜ å°„æ–‡ä»¶" -#: builtin/log.c:147 +#: builtin/log.c:150 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Process line range n,m in file, counting from 1" msgstr "处ç†æ–‡ä»¶ä¸ç¬¬ n 到 m 之间的行，从 1 开始" -#: builtin/log.c:246 +#: builtin/log.c:249 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:493 +#: builtin/log.c:497 #, c-format msgid "git show %s: bad file" msgstr "git show %s: æŸå的文件" -#: builtin/log.c:507 builtin/log.c:601 +#: builtin/log.c:512 builtin/log.c:606 #, c-format msgid "Could not read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" -#: builtin/log.c:625 +#: builtin/log.c:630 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:746 +#: builtin/log.c:751 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:846 +#: builtin/log.c:852 msgid "name of output directory is too long" msgstr "输出目录å太长" -#: builtin/log.c:861 +#: builtin/log.c:868 #, c-format msgid "Cannot open patch file %s" msgstr "æ— æ³•æ‰“å¼€è¡¥ä¸æ–‡ä»¶ %s" -#: builtin/log.c:875 +#: builtin/log.c:885 msgid "Need exactly one range." msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚" -#: builtin/log.c:885 +#: builtin/log.c:895 msgid "Not a range." msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚" -#: builtin/log.c:991 +#: builtin/log.c:1001 msgid "Cover letter needs email format" msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼" -#: builtin/log.c:1071 +#: builtin/log.c:1081 #, c-format msgid "insane in-reply-to: %s" msgstr "ä¸æ£å¸¸çš„ in-reply-to：%s" -#: builtin/log.c:1098 +#: builtin/log.c:1108 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1148 +#: builtin/log.c:1158 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 +#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922 #, c-format msgid "Unknown commit %s" msgstr "未知æ交 %s" -#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 +#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。" -#: builtin/log.c:1270 +#: builtin/log.c:1280 msgid "Could not find exact merge base." msgstr "ä¸èƒ½æ‰¾åˆ°å‡†ç¡®çš„åˆå¹¶åŸºçº¿ã€‚" -#: builtin/log.c:1274 +#: builtin/log.c:1284 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" @@ -9367,213 +9465,218 @@ msgstr "" "git branch --set-upstream-to æ¥è·Ÿè¸ªä¸€ä¸ªè¿œç¨‹åˆ†æ”¯ã€‚æˆ–è€…ä½ å¯ä»¥é€šè¿‡\n" "å‚æ•° --base=<base-commit-id> 手动指定一个基线æ交。" -#: builtin/log.c:1294 +#: builtin/log.c:1304 msgid "Failed to find exact merge base" msgstr "æ— æ³•æ‰¾åˆ°å‡†ç¡®çš„åˆå¹¶åŸºçº¿" -#: builtin/log.c:1305 +#: builtin/log.c:1315 msgid "base commit should be the ancestor of revision list" msgstr "基线æ交应该是版本列表的祖先" -#: builtin/log.c:1309 +#: builtin/log.c:1319 msgid "base commit shouldn't be in revision list" msgstr "基线æ交ä¸åº”该出现在版本列表ä¸" -#: builtin/log.c:1358 +#: builtin/log.c:1368 msgid "cannot get patch id" msgstr "æ— æ³•å¾—åˆ°è¡¥ä¸ id" -#: builtin/log.c:1415 +#: builtin/log.c:1425 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，å³ä½¿åªæœ‰ä¸€ä¸ªè¡¥ä¸" -#: builtin/log.c:1418 +#: builtin/log.c:1428 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，å³ä½¿æœ‰å¤šä¸ªè¡¥ä¸" -#: builtin/log.c:1422 +#: builtin/log.c:1432 msgid "print patches to standard out" msgstr "打å°è¡¥ä¸åˆ°æ ‡å‡†è¾“出" -#: builtin/log.c:1424 +#: builtin/log.c:1434 msgid "generate a cover letter" msgstr "生æˆä¸€å°é™„ä¿¡" -#: builtin/log.c:1426 +#: builtin/log.c:1436 msgid "use simple number sequence for output file names" msgstr "使用简å•çš„æ•°å—åºåˆ—作为输出文件å" -#: builtin/log.c:1427 +#: builtin/log.c:1437 msgid "sfx" msgstr "åŽç¼€" -#: builtin/log.c:1428 +#: builtin/log.c:1438 msgid "use <sfx> instead of '.patch'" msgstr "使用 <åŽç¼€> 代替 '.patch'" -#: builtin/log.c:1430 +#: builtin/log.c:1440 msgid "start numbering patches at <n> instead of 1" msgstr "è¡¥ä¸ä»¥ <n> 开始编å·ï¼Œè€Œä¸æ˜¯1" -#: builtin/log.c:1432 +#: builtin/log.c:1442 msgid "mark the series as Nth re-roll" msgstr "æ ‡è®°è¡¥ä¸ç³»åˆ—æ˜¯ç¬¬å‡ æ¬¡é‡åˆ¶" -#: builtin/log.c:1434 +#: builtin/log.c:1444 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1437 +#: builtin/log.c:1447 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<å‰ç¼€>] 代替 [PATCH]" -#: builtin/log.c:1440 +#: builtin/log.c:1450 msgid "store resulting files in <dir>" msgstr "把结果文件å˜å‚¨åœ¨ <目录>" -#: builtin/log.c:1443 +#: builtin/log.c:1453 msgid "don't strip/add [PATCH]" msgstr "ä¸åˆ 除/æ·»åŠ [PATCH]" -#: builtin/log.c:1446 +#: builtin/log.c:1456 msgid "don't output binary diffs" msgstr "ä¸è¾“出二进制差异" -#: builtin/log.c:1448 +#: builtin/log.c:1458 msgid "output all-zero hash in From header" msgstr "在 From 头信æ¯ä¸è¾“出全为零的哈希值" -#: builtin/log.c:1450 +#: builtin/log.c:1460 msgid "don't include a patch matching a commit upstream" msgstr "ä¸åŒ…å«å·²åœ¨ä¸Šæ¸¸æ交ä¸çš„è¡¥ä¸" -#: builtin/log.c:1452 +#: builtin/log.c:1462 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补ä¸æ ¼å¼è€Œéžé»˜è®¤çš„（补ä¸+状æ€ï¼‰" -#: builtin/log.c:1454 +#: builtin/log.c:1464 msgid "Messaging" msgstr "邮件å‘é€" -#: builtin/log.c:1455 +#: builtin/log.c:1465 msgid "header" msgstr "header" -#: builtin/log.c:1456 +#: builtin/log.c:1466 msgid "add email header" msgstr "æ·»åŠ é‚®ä»¶å¤´" -#: builtin/log.c:1457 builtin/log.c:1459 +#: builtin/log.c:1467 builtin/log.c:1469 msgid "email" msgstr "邮件地å€" -#: builtin/log.c:1457 +#: builtin/log.c:1467 msgid "add To: header" msgstr "æ·»åŠ æ”¶ä»¶äºº" -#: builtin/log.c:1459 +#: builtin/log.c:1469 msgid "add Cc: header" msgstr "æ·»åŠ æŠ„é€" -#: builtin/log.c:1461 +#: builtin/log.c:1471 msgid "ident" msgstr "æ ‡è¯†" -#: builtin/log.c:1462 +#: builtin/log.c:1472 msgid "set From address to <ident> (or committer ident if absent)" msgstr "å°† From 地å€è®¾ç½®ä¸º <æ ‡è¯†>（如若ä¸æ供，则用æ交者 ID åšä¸ºåœ°å€ï¼‰" -#: builtin/log.c:1464 +#: builtin/log.c:1474 msgid "message-id" msgstr "é‚®ä»¶æ ‡è¯†" -#: builtin/log.c:1465 +#: builtin/log.c:1475 msgid "make first mail a reply to <message-id>" msgstr "使第一å°é‚®ä»¶ä½œä¸ºå¯¹ <é‚®ä»¶æ ‡è¯†> 的回å¤" -#: builtin/log.c:1466 builtin/log.c:1469 +#: builtin/log.c:1476 builtin/log.c:1479 msgid "boundary" msgstr "边界" -#: builtin/log.c:1467 +#: builtin/log.c:1477 msgid "attach the patch" msgstr "附件方å¼æ·»åŠ è¡¥ä¸" -#: builtin/log.c:1470 +#: builtin/log.c:1480 msgid "inline the patch" msgstr "内è”显示补ä¸" -#: builtin/log.c:1474 +#: builtin/log.c:1484 msgid "enable message threading, styles: shallow, deep" msgstr "å¯ç”¨é‚®ä»¶çº¿ç´¢ï¼Œé£Žæ ¼ï¼šæµ…，深" -#: builtin/log.c:1476 +#: builtin/log.c:1486 msgid "signature" msgstr "ç¾å" -#: builtin/log.c:1477 +#: builtin/log.c:1487 msgid "add a signature" msgstr "æ·»åŠ ä¸€ä¸ªç¾å" -#: builtin/log.c:1478 +#: builtin/log.c:1488 msgid "base-commit" msgstr "基线æ交" -#: builtin/log.c:1479 +#: builtin/log.c:1489 msgid "add prerequisite tree info to the patch series" msgstr "为补ä¸åˆ—è¡¨æ·»åŠ å‰ç½®æ ‘ä¿¡æ¯" -#: builtin/log.c:1481 +#: builtin/log.c:1491 msgid "add a signature from a file" msgstr "ä»Žæ–‡ä»¶æ·»åŠ ä¸€ä¸ªç¾å" -#: builtin/log.c:1482 +#: builtin/log.c:1492 msgid "don't print the patch filenames" msgstr "ä¸è¦æ‰“å°è¡¥ä¸æ–‡ä»¶å" -#: builtin/log.c:1572 +#: builtin/log.c:1567 +#, c-format +msgid "invalid ident line: %s" +msgstr "包å«æ— æ•ˆçš„èº«ä»½æ ‡è¯†ï¼š%s" + +#: builtin/log.c:1582 msgid "-n and -k are mutually exclusive." msgstr "-n å’Œ -k 互斥。" -#: builtin/log.c:1574 +#: builtin/log.c:1584 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc å’Œ -k 互斥。" -#: builtin/log.c:1582 +#: builtin/log.c:1592 msgid "--name-only does not make sense" msgstr "--name-only æ— æ„义" -#: builtin/log.c:1584 +#: builtin/log.c:1594 msgid "--name-status does not make sense" msgstr "--name-status æ— æ„义" -#: builtin/log.c:1586 +#: builtin/log.c:1596 msgid "--check does not make sense" msgstr "--check æ— æ„义" -#: builtin/log.c:1616 +#: builtin/log.c:1626 msgid "standard output, or directory, which one?" msgstr "æ ‡å‡†è¾“å‡ºæˆ–ç›®å½•ï¼Œå“ªä¸€ä¸ªï¼Ÿ" -#: builtin/log.c:1618 +#: builtin/log.c:1628 #, c-format msgid "Could not create directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" -#: builtin/log.c:1712 +#: builtin/log.c:1722 #, c-format msgid "unable to read signature file '%s'" msgstr "æ— æ³•è¯»å–ç¾å文件 '%s'" -#: builtin/log.c:1784 +#: builtin/log.c:1794 msgid "Failed to create output files" msgstr "æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶" -#: builtin/log.c:1833 +#: builtin/log.c:1843 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<é™åˆ¶>]]]" -#: builtin/log.c:1887 +#: builtin/log.c:1897 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9725,213 +9828,218 @@ msgstr "若未找到匹é…的引用则以退出ç 2退出" msgid "show underlying ref in addition to the object pointed by it" msgstr "除了显示指å‘的对象外，显示指å‘的引用å" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<选项>] <æ ‘æˆ–æ交> [<路径>...]" -#: builtin/ls-tree.c:126 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "åªæ˜¾ç¤ºæ ‘" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "递归到åæ ‘" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "å½“é€’å½’æ—¶æ˜¾ç¤ºæ ‘" -#: builtin/ls-tree.c:133 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "æ¡ç›®ä»¥ NUL å—符终æ¢" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "包括对象大å°" -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "åªåˆ—出文件å" -#: builtin/ls-tree.c:141 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "使用文件的全路径" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "åˆ—å‡ºæ•´ä¸ªæ ‘ï¼›ä¸ä»…仅当å‰ç›®å½•ï¼ˆéšå« --full-name）" -#: builtin/merge.c:46 +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "空的 mbox：'%s'" + +#: builtin/merge.c:47 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<æ交>...]" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:48 +#: builtin/merge.c:49 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:103 +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "开关 `m' 需è¦ä¸€ä¸ªå€¼" -#: builtin/merge.c:140 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ä¸èƒ½æ‰¾åˆ°åˆå¹¶ç–ç•¥ '%s'。\n" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "å¯ç”¨çš„ç–略有：" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "å¯ç”¨çš„自定义ç–略有：" -#: builtin/merge.c:196 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "在åˆå¹¶çš„最åŽä¸æ˜¾ç¤ºå·®å¼‚统计" -#: builtin/merge.c:199 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "在åˆå¹¶çš„最åŽæ˜¾ç¤ºå·®å¼‚统计" -#: builtin/merge.c:200 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "（和 --stat åŒä¹‰ï¼‰" -#: builtin/merge.c:202 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在åˆå¹¶æ交信æ¯ä¸æ·»åŠ （最多 <n> æ¡ï¼‰ç²¾ç®€æ交记录" -#: builtin/merge.c:205 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "create a single commit instead of doing a merge" msgstr "创建一个å•ç‹¬çš„æ交而ä¸æ˜¯åšä¸€æ¬¡åˆå¹¶" -#: builtin/merge.c:207 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:149 msgid "perform a commit if the merge succeeds (default)" msgstr "如果åˆå¹¶æˆåŠŸï¼Œæ‰§è¡Œä¸€æ¬¡æ交（默认）" -#: builtin/merge.c:209 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:152 msgid "edit message before committing" msgstr "在æ交å‰ç¼–辑æ交说明" -#: builtin/merge.c:210 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "å…许快进（默认）" -#: builtin/merge.c:212 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "abort if fast-forward is not possible" msgstr "如果ä¸èƒ½å¿«è¿›å°±æ”¾å¼ƒåˆå¹¶" -#: builtin/merge.c:216 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "verify that the named commit has a valid GPG signature" msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç¾å" -#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 -#: builtin/revert.c:108 +#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165 +#: builtin/revert.c:109 msgid "strategy" msgstr "ç–ç•¥" -#: builtin/merge.c:218 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:166 msgid "merge strategy to use" msgstr "è¦ä½¿ç”¨çš„åˆå¹¶ç–ç•¥" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:169 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:220 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:170 msgid "option for selected merge strategy" msgstr "所选的åˆå¹¶ç–略的选项" -#: builtin/merge.c:222 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "åˆå¹¶çš„æ交说明（针对éžå¿«è¿›å¼åˆå¹¶ï¼‰" -#: builtin/merge.c:226 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "放弃当å‰æ£åœ¨è¿›è¡Œçš„åˆå¹¶" -#: builtin/merge.c:228 +#: builtin/merge.c:229 msgid "continue the current in-progress merge" msgstr "继ç»å½“å‰æ£åœ¨è¿›è¡Œçš„åˆå¹¶" -#: builtin/merge.c:230 builtin/pull.c:170 +#: builtin/merge.c:231 builtin/pull.c:177 msgid "allow merging unrelated histories" msgstr "å…许åˆå¹¶ä¸ç›¸å…³çš„历å²" -#: builtin/merge.c:258 +#: builtin/merge.c:259 msgid "could not run stash." -msgstr "ä¸èƒ½è¿›è¡Œè¿›åº¦ä¿å˜ã€‚" +msgstr "ä¸èƒ½è¿è¡Œè´®è—。" -#: builtin/merge.c:263 +#: builtin/merge.c:264 msgid "stash failed" -msgstr "进度ä¿å˜å¤±è´¥" +msgstr "è´®è—失败" -#: builtin/merge.c:268 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s" -#: builtin/merge.c:287 builtin/merge.c:304 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "读å–æ ‘å¤±è´¥" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: builtin/merge.c:334 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " ï¼ˆæ— å¯åŽ‹ç¼©ï¼‰" -#: builtin/merge.c:345 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩æ交 -- 未更新 HEAD\n" -#: builtin/merge.c:395 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "æ— åˆå¹¶ä¿¡æ¯ -- 未更新 HEAD\n" -#: builtin/merge.c:446 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指å‘一个æ交" -#: builtin/merge.c:536 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "åçš„ branch.%s.mergeoptions å—符串：%s" -#: builtin/merge.c:656 +#: builtin/merge.c:657 msgid "Not handling anything other than two heads merge." msgstr "未处ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。" -#: builtin/merge.c:670 +#: builtin/merge.c:671 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:685 +#: builtin/merge.c:686 #, c-format msgid "unable to write %s" msgstr "ä¸èƒ½å†™ %s" -#: builtin/merge.c:737 +#: builtin/merge.c:738 #, c-format msgid "Could not read from '%s'" msgstr "ä¸èƒ½ä»Ž '%s' 读å–" -#: builtin/merge.c:746 +#: builtin/merge.c:747 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未æ交åˆå¹¶ï¼Œä½¿ç”¨ 'git commit' 完æˆæ¤æ¬¡åˆå¹¶ã€‚\n" -#: builtin/merge.c:752 +#: builtin/merge.c:753 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9945,73 +10053,68 @@ msgstr "" "\n" "以 '%c' 开头的行将被忽略，而且空æ交说明将会终æ¢æ交。\n" -#: builtin/merge.c:776 +#: builtin/merge.c:777 msgid "Empty commit message." msgstr "空æ交信æ¯ã€‚" -#: builtin/merge.c:796 +#: builtin/merge.c:797 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:851 +#: builtin/merge.c:850 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动åˆå¹¶å¤±è´¥ï¼Œä¿®æ£å†²çªç„¶åŽæ交修æ£çš„结果。\n" -#: builtin/merge.c:890 +#: builtin/merge.c:889 msgid "No current branch." msgstr "没有当å‰åˆ†æ”¯ã€‚" -#: builtin/merge.c:892 +#: builtin/merge.c:891 msgid "No remote for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å¯¹åº”的远程仓库。" -#: builtin/merge.c:894 +#: builtin/merge.c:893 msgid "No default upstream defined for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。" -#: builtin/merge.c:899 +#: builtin/merge.c:898 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有æ¥è‡ª %s 的远程跟踪分支" -#: builtin/merge.c:946 +#: builtin/merge.c:945 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' ä¸å˜åœ¨åçš„å–值 '%1$s'" -#: builtin/merge.c:1020 -#, c-format -msgid "could not close '%s'" -msgstr "ä¸èƒ½å…³é— '%s'" - -#: builtin/merge.c:1047 +#: builtin/merge.c:1046 #, c-format msgid "not something we can merge in %s: %s" msgstr "ä¸èƒ½åœ¨ %s ä¸åˆå¹¶ï¼š%s" -#: builtin/merge.c:1081 +#: builtin/merge.c:1080 msgid "not something we can merge" msgstr "ä¸èƒ½åˆå¹¶" -#: builtin/merge.c:1146 +#: builtin/merge.c:1145 msgid "--abort expects no arguments" msgstr "--abort ä¸å¸¦å‚æ•°" -#: builtin/merge.c:1150 +#: builtin/merge.c:1149 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有è¦ç»ˆæ¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失）。" -#: builtin/merge.c:1162 +#: builtin/merge.c:1161 msgid "--continue expects no arguments" msgstr "--continue ä¸å¸¦å‚æ•°" -#: builtin/merge.c:1166 +#: builtin/merge.c:1165 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行ä¸çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失）。" -#: builtin/merge.c:1182 +#: builtin/merge.c:1181 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10019,7 +10122,7 @@ msgstr "" "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD）。\n" "请在åˆå¹¶å‰å…ˆæ交您的修改。" -#: builtin/merge.c:1189 +#: builtin/merge.c:1188 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10027,157 +10130,157 @@ msgstr "" "您尚未结æŸæ‚¨çš„拣选（å˜åœ¨ CHERRY_PICK_HEAD）。\n" "请在åˆå¹¶å‰å…ˆæ交您的修改。" -#: builtin/merge.c:1192 +#: builtin/merge.c:1191 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„拣选（å˜åœ¨ CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1201 +#: builtin/merge.c:1200 msgid "You cannot combine --squash with --no-ff." msgstr "您ä¸èƒ½å°† --squash 与 --no-ff åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/merge.c:1209 +#: builtin/merge.c:1208 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1226 +#: builtin/merge.c:1225 msgid "Squash commit into empty head not supported yet" msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交" -#: builtin/merge.c:1228 +#: builtin/merge.c:1227 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义" -#: builtin/merge.c:1233 +#: builtin/merge.c:1232 #, c-format msgid "%s - not something we can merge" msgstr "%s - ä¸èƒ½è¢«åˆå¹¶" -#: builtin/merge.c:1235 +#: builtin/merge.c:1234 msgid "Can merge only exactly one commit into empty head" msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š" -#: builtin/merge.c:1269 +#: builtin/merge.c:1268 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "æ交 %s 有一个éžå¯ä¿¡çš„声称æ¥è‡ª %s çš„ GPG ç¾å。" -#: builtin/merge.c:1272 +#: builtin/merge.c:1271 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "æ交 %s 有一个错误的声称æ¥è‡ª %s çš„ GPG ç¾å。" -#: builtin/merge.c:1275 +#: builtin/merge.c:1274 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "æ交 %s 没有一个 GPG ç¾å。" -#: builtin/merge.c:1278 +#: builtin/merge.c:1277 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "æ交 %s 有一个æ¥è‡ª %s 的好的 GPG ç¾å。\n" -#: builtin/merge.c:1340 +#: builtin/merge.c:1339 msgid "refusing to merge unrelated histories" msgstr "æ‹’ç»åˆå¹¶æ— 关的历å²" -#: builtin/merge.c:1349 +#: builtin/merge.c:1348 msgid "Already up-to-date." msgstr "å·²ç»æ˜¯æœ€æ–°çš„。" -#: builtin/merge.c:1359 +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "æ›´æ–° %s..%s\n" -#: builtin/merge.c:1400 +#: builtin/merge.c:1399 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "å°è¯•éžå¸¸å°çš„索引内åˆå¹¶...\n" -#: builtin/merge.c:1407 +#: builtin/merge.c:1406 #, c-format msgid "Nope.\n" msgstr "æ— ã€‚\n" -#: builtin/merge.c:1432 +#: builtin/merge.c:1431 msgid "Already up-to-date. Yeeah!" msgstr "å·²ç»æ˜¯æœ€æ–°çš„。耶ï¼" -#: builtin/merge.c:1438 +#: builtin/merge.c:1437 msgid "Not possible to fast-forward, aborting." msgstr "æ— æ³•å¿«è¿›ï¼Œç»ˆæ¢ã€‚" -#: builtin/merge.c:1461 builtin/merge.c:1540 +#: builtin/merge.c:1460 builtin/merge.c:1539 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "å°†æ ‘å›žæ»šè‡³åŽŸå§‹çŠ¶æ€...\n" -#: builtin/merge.c:1465 +#: builtin/merge.c:1464 #, c-format msgid "Trying merge strategy %s...\n" msgstr "å°è¯•åˆå¹¶ç–ç•¥ %s...\n" -#: builtin/merge.c:1531 +#: builtin/merge.c:1530 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有åˆå¹¶ç–略处ç†æ¤åˆå¹¶ã€‚\n" -#: builtin/merge.c:1533 +#: builtin/merge.c:1532 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用ç–ç•¥ %s åˆå¹¶å¤±è´¥ã€‚\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1541 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1554 +#: builtin/merge.c:1553 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ¢\n" -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <æ交> <æ交>..." -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <æ交>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <æ交>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <æ交> <æ交>" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<æ交>]" -#: builtin/merge-base.c:217 +#: builtin/merge-base.c:218 msgid "output all common ancestors" msgstr "输出所有共åŒçš„祖先" -#: builtin/merge-base.c:219 +#: builtin/merge-base.c:220 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路åˆå¹¶çš„祖先æ交" -#: builtin/merge-base.c:221 +#: builtin/merge-base.c:222 msgid "list revs not reachable from others" msgstr "显示ä¸èƒ½è¢«å…¶ä»–访问到的版本" -#: builtin/merge-base.c:223 +#: builtin/merge-base.c:224 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先æ交么？" -#: builtin/merge-base.c:225 +#: builtin/merge-base.c:226 msgid "find where <commit> forked from reflog of <ref>" msgstr "æ ¹æ® <引用> 的引用日志查找 <æ交> 的派生处" -#: builtin/merge-file.c:8 +#: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" @@ -10185,35 +10288,35 @@ msgstr "" "git merge-file [<选项>] [-L <文件1> [-L <åˆå§‹> [-L <åå—2>]]] <文件1> <åˆå§‹æ–‡" "件> <文件2>" -#: builtin/merge-file.c:32 +#: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "将结果å‘é€åˆ°æ ‡å‡†è¾“出" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "使用基于 diff3 çš„åˆå¹¶" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "如果冲çªï¼Œä½¿ç”¨æˆ‘们的版本" -#: builtin/merge-file.c:36 +#: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "如果冲çªï¼Œä½¿ç”¨ä»–们的版本" -#: builtin/merge-file.c:38 +#: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "如果冲çªï¼Œä½¿ç”¨è”åˆç‰ˆæœ¬" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "如果冲çªï¼Œä½¿ç”¨æŒ‡å®šé•¿åº¦çš„æ ‡è®°" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "ä¸è¦è¦å‘Šå†²çª" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:45 msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/åˆå§‹æ–‡ä»¶/文件2 è®¾ç½®æ ‡ç¾" @@ -10252,159 +10355,159 @@ msgstr "åˆå¹¶ %s å’Œ %s\n" msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:152 +#: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "输入以 NUL å—符终æ¢" -#: builtin/mktree.c:153 builtin/write-tree.c:24 +#: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "å…许丢失的对象" -#: builtin/mktree.c:154 +#: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "å…è®¸åˆ›å»ºä¸€ä¸ªä»¥ä¸Šçš„æ ‘" -#: builtin/mv.c:16 +#: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<选项>] <æº>... <ç›®æ ‡>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引ä¸å¹¶ä¸”ä¸æ˜¯å模组？" -#: builtin/mv.c:84 builtin/rm.c:290 +#: builtin/mv.c:85 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "请将您的修改暂å˜åˆ° .gitmodules ä¸æˆ–ä¿å˜è¿›åº¦åŽå†ç»§ç»" +msgstr "请将您的修改暂å˜åˆ° .gitmodules ä¸æˆ–è´®è—åŽå†ç»§ç»" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引ä¸" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "强制移动/é‡å‘½ä»¤ï¼Œå³ä½¿ç›®æ ‡å˜åœ¨" -#: builtin/mv.c:125 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "跳过移动/é‡å‘½å错误" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "ç›®æ ‡ '%s' ä¸æ˜¯ä¸€ä¸ªç›®å½•" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' çš„é‡å‘½å\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "åçš„æº" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "ä¸èƒ½å°†ç›®å½•ç§»åŠ¨åˆ°è‡ªèº«" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "ä¸èƒ½å°†ç›®å½•ç§»åŠ¨åˆ°æ–‡ä»¶" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "æºç›®å½•ä¸ºç©º" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "ä¸åœ¨ç‰ˆæœ¬æŽ§åˆ¶ä¹‹ä¸‹" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "ç›®æ ‡å·²å˜åœ¨" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "ä¸èƒ½è¦†ç›–" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "åŒä¸€ç›®æ ‡å…·æœ‰å¤šä¸ªæº" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "ç›®æ ‡ç›®å½•ä¸å˜åœ¨" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，æº=%sï¼Œç›®æ ‡=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "é‡å‘½å %s 至 %s\n" -#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 +#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390 #, c-format msgid "renaming '%s' failed" msgstr "é‡å‘½å '%s' 失败" -#: builtin/name-rev.c:289 +#: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <æ交>..." -#: builtin/name-rev.c:290 +#: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" -#: builtin/name-rev.c:291 +#: builtin/name-rev.c:340 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" -#: builtin/name-rev.c:346 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "åªæ‰“å°åç§°ï¼ˆæ— SHA-1）" -#: builtin/name-rev.c:347 +#: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "åªä½¿ç”¨æ ‡ç¾æ¥å‘½åæ交" -#: builtin/name-rev.c:349 +#: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" msgstr "åªä½¿ç”¨å’Œ <模å¼> 相匹é…的引用" -#: builtin/name-rev.c:351 +#: builtin/name-rev.c:400 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模å¼> 相匹é…的引用" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "列出å¯ä»¥ä»Žæ‰€æœ‰å¼•ç”¨è®¿é—®çš„æ交" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:403 msgid "read from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "å…è®¸æ‰“å° `未定义` çš„å称（默认）" -#: builtin/name-rev.c:361 +#: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "åå‘解æžè¾“å…¥ä¸çš„æ ‡ç¾ï¼ˆå†…部使用）" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -10412,11 +10515,11 @@ msgstr "" "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " "| (-c | -C) <对象>] [<对象>]" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <注解引用>] copy [-f] <æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -10424,243 +10527,244 @@ msgstr "" "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " "(-c | -C) <对象>] [<对象>]" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <注解引用>] show [<对象>]" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <ç–ç•¥> ] <注解引用>" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <注解引用>] prune [-n | -v]" -#: builtin/notes.c:36 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" -#: builtin/notes.c:41 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" msgstr "git notes [list [<对象>]]" -#: builtin/notes.c:46 +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<选项>] [<对象>]" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<选项>] <æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>" -#: builtin/notes.c:52 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>]..." -#: builtin/notes.c:57 +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<选项>] [<对象>]" -#: builtin/notes.c:62 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" msgstr "git notes edit [<对象>]" -#: builtin/notes.c:67 +#: builtin/notes.c:68 msgid "git notes show [<object>]" msgstr "git notes show [<对象>]" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<选项>] <注解引用>" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<选项>]" -#: builtin/notes.c:74 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<选项>]" -#: builtin/notes.c:79 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" msgstr "git notes remove [<对象>]" -#: builtin/notes.c:84 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" msgstr "git notes prune [<选项>]" -#: builtin/notes.c:89 +#: builtin/notes.c:90 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:94 +#: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "为下é¢çš„对象写/编辑说明：" -#: builtin/notes.c:147 +#: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "ä¸èƒ½ä¸ºå¯¹è±¡ '%s' 开始 'show'" -#: builtin/notes.c:151 +#: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "ä¸èƒ½è¯»å– 'show' 的输出" -#: builtin/notes.c:159 +#: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "æ— æ³•ä¸ºå¯¹è±¡ '%s' å®Œæˆ 'show'" -#: builtin/notes.c:194 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解æ供内容" -#: builtin/notes.c:203 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "ä¸èƒ½å†™æ³¨è§£å¯¹è±¡" -#: builtin/notes.c:205 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s ä¸" -#: builtin/notes.c:233 builtin/tag.c:516 +#: builtin/notes.c:234 builtin/tag.c:517 #, c-format msgid "cannot read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" -#: builtin/notes.c:235 builtin/tag.c:519 +#: builtin/notes.c:236 builtin/tag.c:520 #, c-format msgid "could not open or read '%s'" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– '%s'" -#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 -#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516 +#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。" -#: builtin/notes.c:257 +#: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "æ— æ³•è¯»å–对象 '%s'。" -#: builtin/notes.c:261 +#: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "ä¸èƒ½ä»Žéžæ•°æ®å¯¹è±¡ '%s' ä¸è¯»å–注解数æ®ã€‚" -#: builtin/notes.c:301 +#: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "éžæ³•çš„输入行：'%s'。" -#: builtin/notes.c:316 +#: builtin/notes.c:317 #, 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. -#: builtin/notes.c:345 +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. +#: builtin/notes.c:348 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "æ‹’ç»å‘ %2$s（在 refs/notes/ 之外）%1$s注解" -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 -#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 +#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499 +#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654 +#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972 msgid "too many parameters" msgstr "å‚数太多" -#: builtin/notes.c:378 builtin/notes.c:664 +#: builtin/notes.c:381 builtin/notes.c:667 #, c-format msgid "no note found for object %s." msgstr "未å‘现对象 %s 的注解。" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents as a string" msgstr "注解内容作为一个å—符串" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents in a file" msgstr "注解内容到一个文件ä¸" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse and edit specified note object" msgstr "é‡ç”¨å’Œç¼–辑指定的注解对象" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse specified note object" msgstr "é‡ç”¨æŒ‡å®šçš„注解对象" -#: builtin/notes.c:411 builtin/notes.c:574 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "allow storing empty note" msgstr "å…许ä¿å˜ç©ºç™½æ³¨é‡Š" -#: builtin/notes.c:412 builtin/notes.c:483 +#: builtin/notes.c:415 builtin/notes.c:486 msgid "replace existing notes" msgstr "替æ¢å·²å˜åœ¨çš„注解" -#: builtin/notes.c:437 +#: builtin/notes.c:440 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸èƒ½æ·»åŠ 注解。å‘现对象 %s å·²å˜åœ¨æ³¨è§£ã€‚使用 '-f' 覆盖现å˜æ³¨è§£" -#: builtin/notes.c:452 builtin/notes.c:531 +#: builtin/notes.c:455 builtin/notes.c:534 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现å˜æ³¨è§£\n" -#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 +#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891 #, c-format msgid "Removing note for object %s\n" msgstr "åˆ é™¤å¯¹è±¡ %s 的注解\n" -#: builtin/notes.c:484 +#: builtin/notes.c:487 msgid "read objects from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象" -#: builtin/notes.c:486 +#: builtin/notes.c:489 msgid "load rewriting config for <command> (implies --stdin)" msgstr "é‡æ–°åŠ è½½ <命令> çš„é…置（éšå« --stdin）" -#: builtin/notes.c:504 +#: builtin/notes.c:507 msgid "too few parameters" msgstr "å‚数太少" -#: builtin/notes.c:525 +#: builtin/notes.c:528 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸èƒ½æ‹·è´æ³¨è§£ã€‚å‘现对象 %s å·²å˜åœ¨æ³¨è§£ã€‚使用 '-f' 覆盖现å˜æ³¨è§£" -#: builtin/notes.c:537 +#: builtin/notes.c:540 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "æºå¯¹è±¡ %s 缺少注解。ä¸èƒ½æ‹·è´ã€‚" -#: builtin/notes.c:589 +#: builtin/notes.c:592 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -10669,97 +10773,97 @@ msgstr "" "å命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请æ¢ç”¨ 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:684 +#: builtin/notes.c:687 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ NOTES_MERGE_PARTIAL" -#: builtin/notes.c:686 +#: builtin/notes.c:689 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ NOTES_MERGE_REF" -#: builtin/notes.c:688 +#: builtin/notes.c:691 msgid "failed to remove 'git notes merge' worktree" msgstr "æ— æ³•åˆ é™¤ 'git notes merge' 工作区" -#: builtin/notes.c:708 +#: builtin/notes.c:711 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "æ— æ³•è¯»å–引用 NOTES_MERGE_PARTIAL" -#: builtin/notes.c:710 +#: builtin/notes.c:713 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "æ— æ³•ä»Ž NOTES_MERGE_PARTIAL ä¸æ‰¾åˆ°æ交。" -#: builtin/notes.c:712 +#: builtin/notes.c:715 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "æ— æ³•ä»Ž NOTES_MERGE_PARTIAL ä¸è§£æžæ交。" -#: builtin/notes.c:725 +#: builtin/notes.c:728 msgid "failed to resolve NOTES_MERGE_REF" msgstr "æ— æ³•è§£æž NOTES_MERGE_REF" -#: builtin/notes.c:728 +#: builtin/notes.c:731 msgid "failed to finalize notes merge" msgstr "æ— æ³•å®Œæˆæ³¨è§£åˆå¹¶" -#: builtin/notes.c:754 +#: builtin/notes.c:757 #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的注解åˆå¹¶ç–ç•¥ %s" -#: builtin/notes.c:770 +#: builtin/notes.c:773 msgid "General options" msgstr "通用选项" -#: builtin/notes.c:772 +#: builtin/notes.c:775 msgid "Merge options" msgstr "åˆå¹¶é€‰é¡¹" -#: builtin/notes.c:774 +#: builtin/notes.c:777 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的ç–ç•¥è§£å†³æ³¨è§£å†²çª (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:776 +#: builtin/notes.c:779 msgid "Committing unmerged notes" msgstr "æ交未åˆå¹¶çš„注解" -#: builtin/notes.c:778 +#: builtin/notes.c:781 msgid "finalize notes merge by committing unmerged notes" msgstr "通过æ交未åˆå¹¶çš„注解æ¥å®Œæˆæ³¨è§£åˆå¹¶" -#: builtin/notes.c:780 +#: builtin/notes.c:783 msgid "Aborting notes merge resolution" msgstr "ä¸æ¢æ³¨è§£åˆå¹¶çš„方案" -#: builtin/notes.c:782 +#: builtin/notes.c:785 msgid "abort notes merge" msgstr "ä¸æ¢æ³¨è§£åˆå¹¶" -#: builtin/notes.c:793 +#: builtin/notes.c:796 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "ä¸èƒ½æ··ç”¨ --commitã€--abort 或 -s/--strategy" -#: builtin/notes.c:798 +#: builtin/notes.c:801 msgid "must specify a notes ref to merge" msgstr "必须指定一个注解引用æ¥åˆå¹¶" -#: builtin/notes.c:822 +#: builtin/notes.c:825 #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" -#: builtin/notes.c:859 +#: builtin/notes.c:862 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "ä½äºŽ %2$s 的一个到 %1$s ä¸çš„注解åˆå¹¶æ£åœ¨æ‰§è¡Œä¸" -#: builtin/notes.c:862 +#: builtin/notes.c:865 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "æ— æ³•å˜å‚¨é“¾æŽ¥åˆ°å½“å‰çš„注解引用（%s）" -#: builtin/notes.c:864 +#: builtin/notes.c:867 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10769,218 +10873,218 @@ msgstr "" "自动åˆå¹¶è¯´æ˜Žå¤±è´¥ã€‚修改 %s ä¸çš„冲çªå¹¶ä¸”使用命令 'git notes merge --commit' æ" "交结果，或者使用命令 'git notes merge --abort' 终æ¢åˆå¹¶ã€‚\n" -#: builtin/notes.c:886 +#: builtin/notes.c:889 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:898 +#: builtin/notes.c:901 msgid "attempt to remove non-existent note is not an error" msgstr "å°è¯•åˆ 除ä¸å˜åœ¨çš„注解ä¸æ˜¯ä¸€ä¸ªé”™è¯¯" -#: builtin/notes.c:901 +#: builtin/notes.c:904 msgid "read object names from the standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象å称" -#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128 msgid "do not remove, show only" msgstr "ä¸åˆ 除，åªæ˜¾ç¤º" -#: builtin/notes.c:940 +#: builtin/notes.c:943 msgid "report pruned notes" msgstr "报告清除的注解" -#: builtin/notes.c:982 +#: builtin/notes.c:985 msgid "notes-ref" msgstr "注解引用" -#: builtin/notes.c:983 +#: builtin/notes.c:986 msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1018 +#: builtin/notes.c:1021 #, c-format msgid "unknown subcommand: %s" msgstr "未知å命令：%s" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:30 +#: builtin/pack-objects.c:31 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:180 builtin/pack-objects.c:183 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:770 +#: builtin/pack-objects.c:776 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "ç¦ç”¨ bitmap å†™å…¥ï¼Œå› ä¸º pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:789 msgid "Writing objects" msgstr "写入对象ä¸" -#: builtin/pack-objects.c:1063 +#: builtin/pack-objects.c:1069 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "ç¦ç”¨ bitmap å†™å…¥ï¼Œå› ä¸ºä¸€äº›å¯¹è±¡å°†ä¸ä¼šè¢«æ‰“包" -#: builtin/pack-objects.c:2426 +#: builtin/pack-objects.c:2434 msgid "Compressing objects" msgstr "压缩对象ä¸" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2843 #, c-format msgid "unsupported index version %s" msgstr "ä¸æ”¯æŒçš„索引版本 %s" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2847 #, c-format msgid "bad index version '%s'" msgstr "å的索引版本 '%s'" -#: builtin/pack-objects.c:2863 +#: builtin/pack-objects.c:2877 msgid "do not show progress meter" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨" -#: builtin/pack-objects.c:2865 +#: builtin/pack-objects.c:2879 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:2867 +#: builtin/pack-objects.c:2881 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2870 +#: builtin/pack-objects.c:2884 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2871 +#: builtin/pack-objects.c:2885 msgid "version[,offset]" msgstr "版本[,å移]" -#: builtin/pack-objects.c:2872 +#: builtin/pack-objects.c:2886 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx æ ¼å¼ç‰ˆæœ¬æ¥å†™åŒ…索引文件" -#: builtin/pack-objects.c:2875 +#: builtin/pack-objects.c:2889 msgid "maximum size of each output pack file" msgstr "æ¯ä¸ªè¾“出包的最大尺寸" -#: builtin/pack-objects.c:2877 +#: builtin/pack-objects.c:2891 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象å˜å‚¨é‡Œå€Ÿç”¨å¯¹è±¡" -#: builtin/pack-objects.c:2879 +#: builtin/pack-objects.c:2893 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:2881 +#: builtin/pack-objects.c:2895 msgid "limit pack window by objects" msgstr "é™åˆ¶æ‰“包窗å£çš„对象数" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2897 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数é‡é™åˆ¶å¤–设置打包窗å£çš„内å˜é™åˆ¶" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2899 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包å…许的 delta 链的最大长度" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2901 msgid "reuse existing deltas" msgstr "é‡ç”¨å·²å˜åœ¨çš„ deltas" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2903 msgid "reuse existing objects" msgstr "é‡ç”¨å·²å˜åœ¨çš„对象" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2905 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2893 +#: builtin/pack-objects.c:2907 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹é…" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2909 msgid "do not create an empty pack output" msgstr "ä¸åˆ›å»ºç©ºçš„包输出" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2911 msgid "read revision arguments from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–版本å·å‚æ•°" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2913 msgid "limit the objects to those that are not yet packed" msgstr "é™åˆ¶é‚£äº›å°šæœªæ‰“包的对象" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:2916 msgid "include objects reachable from any reference" msgstr "包括å¯ä»¥ä»Žä»»ä½•å¼•ç”¨è®¿é—®åˆ°çš„对象" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2919 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2908 +#: builtin/pack-objects.c:2922 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2925 msgid "output pack to stdout" msgstr "è¾“å‡ºåŒ…åˆ°æ ‡å‡†è¾“å‡º" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2927 msgid "include tag objects that refer to objects to be packed" msgstr "åŒ…æ‹¬é‚£äº›å¼•ç”¨äº†å¾…æ‰“åŒ…å¯¹è±¡çš„æ ‡ç¾å¯¹è±¡" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2929 msgid "keep unreachable objects" msgstr "ç»´æŒä¸å¯è¾¾çš„对象" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2931 msgid "pack loose unreachable objects" msgstr "打包æ¾æ•£çš„ä¸å¯è¾¾å¯¹è±¡" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2933 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> æ–°çš„æ— æ³•è®¿é—®çš„å¯¹è±¡è§£åŒ…" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2936 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:2924 +#: builtin/pack-objects.c:2938 msgid "create packs suitable for shallow fetches" msgstr "创建适åˆæµ…克隆仓库获å–的包" -#: builtin/pack-objects.c:2926 +#: builtin/pack-objects.c:2940 msgid "ignore packs that have companion .keep file" msgstr "忽略é…有 .keep 文件的包" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2942 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:2930 +#: builtin/pack-objects.c:2944 msgid "do not hide commits by grafts" msgstr "显示被å«æŽ¥éšè—çš„æ交" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2946 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的è¯ï¼‰ä»¥æ高对象计数时的速度" -#: builtin/pack-objects.c:2934 +#: builtin/pack-objects.c:2948 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的åŒæ—¶åˆ›å»º bitmap 索引" -#: builtin/pack-objects.c:3061 +#: builtin/pack-objects.c:3075 msgid "Counting objects" msgstr "对象计数ä¸" @@ -11020,62 +11124,66 @@ msgstr "使早于给定时间的对象过期" msgid "cannot prune in a precious-objects repo" msgstr "ä¸èƒ½åœ¨çå“仓库ä¸æ‰§è¡Œæ¸…ç†æ“作" -#: builtin/pull.c:51 builtin/pull.c:53 +#: builtin/pull.c:54 builtin/pull.c:56 #, c-format msgid "Invalid value for %s: %s" msgstr "%s çš„å€¼æ— æ•ˆï¼š%s" -#: builtin/pull.c:73 +#: builtin/pull.c:76 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" -#: builtin/pull.c:121 +#: builtin/pull.c:124 +msgid "control for recursive fetching of submodules" +msgstr "控制å模组的递归获å–" + +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "å’Œåˆå¹¶ç›¸å…³çš„选项" -#: builtin/pull.c:124 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" msgstr "使用å˜åŸºæ“作å–代åˆå¹¶æ“作以åˆå…¥ä¿®æ”¹" -#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 +#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121 msgid "allow fast-forward" msgstr "å…许快进å¼" -#: builtin/pull.c:157 +#: builtin/pull.c:164 msgid "automatically stash/stash pop before and after rebase" -msgstr "自动在å˜åŸºæ“作å‰åŽæ‰§è¡Œ stash/stash pop" +msgstr "å˜åŸºæ“作å‰åŽæ‰§è¡Œè‡ªåŠ¨è´®è—和弹出贮è—" -#: builtin/pull.c:173 +#: builtin/pull.c:180 msgid "Options related to fetching" msgstr "和获å–相关的å‚æ•°" -#: builtin/pull.c:195 +#: builtin/pull.c:198 msgid "number of submodules pulled in parallel" msgstr "并å‘拉å–çš„å模组的数é‡" -#: builtin/pull.c:284 +#: builtin/pull.c:287 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff çš„å–å€¼æ— æ•ˆï¼š%s" -#: builtin/pull.c:397 +#: builtin/pull.c:399 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获å–到的引用ä¸æ²¡æœ‰å˜åŸºæ“作的候选。" -#: builtin/pull.c:399 +#: builtin/pull.c:401 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获å–到的引用ä¸æ²¡æœ‰åˆå¹¶æ“作的候选。" -#: builtin/pull.c:400 +#: builtin/pull.c:402 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这æ„味ç€æ‚¨æ供了一个通é…ç¬¦å¼•ç”¨è§„æ ¼ä½†æœªèƒ½å’Œè¿œç«¯åŒ¹é…。" -#: builtin/pull.c:403 +#: builtin/pull.c:405 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11085,42 +11193,42 @@ msgstr "" "您è¦æ±‚从远程 '%s' 拉å–ï¼Œä½†æ˜¯æœªæŒ‡å®šä¸€ä¸ªåˆ†æ”¯ã€‚å› ä¸ºè¿™ä¸æ˜¯å½“å‰\n" "分支默认的远程仓库，您必须在命令行ä¸æŒ‡å®šä¸€ä¸ªåˆ†æ”¯å。" -#: builtin/pull.c:408 git-parse-remote.sh:73 +#: builtin/pull.c:410 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当å‰ä¸åœ¨ä¸€ä¸ªåˆ†æ”¯ä¸Šã€‚" -#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 +#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您è¦å˜åŸºåˆ°å“ªä¸€ä¸ªåˆ†æ”¯ã€‚" -#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 +#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您è¦åˆå¹¶å“ªä¸€ä¸ªåˆ†æ”¯ã€‚" -#: builtin/pull.c:413 builtin/pull.c:428 +#: builtin/pull.c:415 builtin/pull.c:430 msgid "See git-pull(1) for details." msgstr "è¯¦è§ git-pull(1)。" -#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 +#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 +#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:423 git-parse-remote.sh:75 +#: builtin/pull.c:425 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰è·Ÿè¸ªä¿¡æ¯ã€‚" -#: builtin/pull.c:432 git-parse-remote.sh:95 +#: builtin/pull.c:434 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想è¦ä¸ºæ¤åˆ†æ”¯åˆ›å»ºè·Ÿè¸ªä¿¡æ¯ï¼Œæ‚¨å¯ä»¥æ‰§è¡Œï¼š" -#: builtin/pull.c:437 +#: builtin/pull.c:439 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11129,27 +11237,27 @@ msgstr "" "您的é…ç½®ä¸æŒ‡å®šè¦åˆå¹¶è¿œç¨‹çš„引用 '%s'，\n" "但是没有获å–到这个引用。" -#: builtin/pull.c:754 +#: builtin/pull.c:792 msgid "ignoring --verify-signatures for rebase" msgstr "为å˜åŸºæ“作忽略 --verify-signatures" -#: builtin/pull.c:801 +#: builtin/pull.c:840 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 选项åªåœ¨ä½¿ç”¨ --rebase 时有效。" -#: builtin/pull.c:809 +#: builtin/pull.c:848 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，å˜æ›´æ·»åŠ 至索引。" -#: builtin/pull.c:812 +#: builtin/pull.c:851 msgid "pull with rebase" msgstr "å˜åŸºå¼æ‹‰å–" -#: builtin/pull.c:813 +#: builtin/pull.c:852 msgid "please commit or stash them." -msgstr "请æ交或为它们ä¿å˜è¿›åº¦ã€‚" +msgstr "请æ交或贮è—它们。" -#: builtin/pull.c:838 +#: builtin/pull.c:877 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11159,7 +11267,7 @@ msgstr "" "fetch 更新了当å‰çš„分支。快进您的工作区\n" "至æ交 %s。" -#: builtin/pull.c:843 +#: builtin/pull.c:882 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11176,27 +11284,31 @@ msgstr "" "$ git reset --hard\n" "æ¢å¤ä¹‹å‰çš„状æ€ã€‚" -#: builtin/pull.c:858 +#: builtin/pull.c:897 msgid "Cannot merge multiple branches into empty head." msgstr "æ— æ³•å°†å¤šä¸ªåˆ†æ”¯åˆå¹¶åˆ°ç©ºåˆ†æ”¯ã€‚" -#: builtin/pull.c:862 +#: builtin/pull.c:901 msgid "Cannot rebase onto multiple branches." msgstr "æ— æ³•å˜åŸºåˆ°å¤šä¸ªåˆ†æ”¯ã€‚" -#: builtin/push.c:16 +#: builtin/pull.c:908 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "本地å模组ä¸æœ‰ä¿®æ”¹ï¼Œæ— 法å˜åŸº" + +#: builtin/push.c:17 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" -#: builtin/push.c:89 +#: builtin/push.c:90 msgid "tag shorthand without <tag>" msgstr "æ ‡ç¾åŽé¢æœªæä¾› <æ ‡ç¾> å‚æ•°" -#: builtin/push.c:99 +#: builtin/push.c:100 msgid "--delete only accepts plain target ref names" msgstr "--delete åªæŽ¥å—简å•çš„ç›®æ ‡å¼•ç”¨å" -#: builtin/push.c:143 +#: builtin/push.c:144 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11204,7 +11316,7 @@ msgstr "" "\n" "为了永久地选择任一选项，å‚è§ 'git help config' ä¸çš„ push.default。" -#: builtin/push.c:146 +#: builtin/push.c:147 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11228,7 +11340,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:161 +#: builtin/push.c:162 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11242,7 +11354,7 @@ msgstr "" "\n" " git push %s HEAD:<远程分支åå—>\n" -#: builtin/push.c:175 +#: builtin/push.c:176 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11255,12 +11367,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:183 +#: builtin/push.c:184 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当å‰åˆ†æ”¯ %s 有多个上游分支，拒ç»æŽ¨é€ã€‚" -#: builtin/push.c:186 +#: builtin/push.c:187 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11270,12 +11382,12 @@ msgstr "" "您æ£æŽ¨é€è‡³è¿œç¨‹ '%s'（其并éžå½“å‰åˆ†æ”¯ '%s' 的上游），\n" "而没有告诉我è¦æŽ¨é€ä»€ä¹ˆã€æ›´æ–°å“ªä¸ªè¿œç¨‹åˆ†æ”¯ã€‚" -#: builtin/push.c:245 +#: builtin/push.c:246 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推é€æŒ‡å®šä»»ä½•å¼•ç”¨è§„æ ¼ï¼Œå¹¶ä¸” push.default 为 \"nothing\"。" -#: builtin/push.c:252 +#: builtin/push.c:253 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11286,7 +11398,7 @@ msgstr "" "å†æ¬¡æŽ¨é€å‰ï¼Œå…ˆä¸Žè¿œç¨‹å˜æ›´åˆå¹¶ï¼ˆå¦‚ 'git pull ...'）。详è§\n" "'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" -#: builtin/push.c:258 +#: builtin/push.c:259 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" @@ -11297,7 +11409,7 @@ msgstr "" "检出该分支并整åˆè¿œç¨‹å˜æ›´ï¼ˆå¦‚ 'git pull ...'），然åŽå†æŽ¨é€ã€‚详è§\n" "'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" -#: builtin/push.c:264 +#: builtin/push.c:265 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" @@ -11310,11 +11422,11 @@ msgstr "" "（如 'git pull ...'）。\n" "è¯¦è§ 'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" -#: builtin/push.c:271 +#: builtin/push.c:272 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒ç»ï¼Œå› ä¸ºè¯¥æ ‡ç¾åœ¨è¿œç¨‹å·²ç»å˜åœ¨ã€‚" -#: builtin/push.c:274 +#: builtin/push.c:275 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" @@ -11323,22 +11435,22 @@ msgstr "" "如果ä¸ä½¿ç”¨ '--force' å‚数，您ä¸èƒ½æ›´æ–°ä¸€ä¸ªæŒ‡å‘éžæ交对象的远程引用，\n" "也ä¸èƒ½æ›´æ–°è¿œç¨‹å¼•ç”¨è®©å…¶æŒ‡å‘一个éžæ交对象。\n" -#: builtin/push.c:334 +#: builtin/push.c:335 #, c-format msgid "Pushing to %s\n" msgstr "推é€åˆ° %s\n" -#: builtin/push.c:338 +#: builtin/push.c:339 #, c-format msgid "failed to push some refs to '%s'" msgstr "æ— æ³•æŽ¨é€ä¸€äº›å¼•ç”¨åˆ° '%s'" -#: builtin/push.c:369 +#: builtin/push.c:370 #, c-format msgid "bad repository '%s'" msgstr "å的仓库 '%s'" -#: builtin/push.c:370 +#: builtin/push.c:371 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11359,112 +11471,112 @@ msgstr "" "\n" " git push <å称>\n" -#: builtin/push.c:388 +#: builtin/push.c:389 msgid "--all and --tags are incompatible" msgstr "--all å’Œ --tags ä¸å…¼å®¹" -#: builtin/push.c:389 +#: builtin/push.c:390 msgid "--all can't be combined with refspecs" msgstr "--all ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨" -#: builtin/push.c:394 +#: builtin/push.c:395 msgid "--mirror and --tags are incompatible" msgstr "--mirror å’Œ --tags ä¸å…¼å®¹" -#: builtin/push.c:395 +#: builtin/push.c:396 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨" -#: builtin/push.c:400 +#: builtin/push.c:401 msgid "--all and --mirror are incompatible" msgstr "--all å’Œ --mirror ä¸å…¼å®¹" -#: builtin/push.c:518 +#: builtin/push.c:523 msgid "repository" msgstr "仓库" -#: builtin/push.c:519 builtin/send-pack.c:162 +#: builtin/push.c:524 builtin/send-pack.c:163 msgid "push all refs" msgstr "推é€æ‰€æœ‰å¼•ç”¨" -#: builtin/push.c:520 builtin/send-pack.c:164 +#: builtin/push.c:525 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "é•œåƒæ‰€æœ‰å¼•ç”¨" -#: builtin/push.c:522 +#: builtin/push.c:527 msgid "delete refs" msgstr "åˆ é™¤å¼•ç”¨" -#: builtin/push.c:523 +#: builtin/push.c:528 msgid "push tags (can't be used with --all or --mirror)" msgstr "推é€æ ‡ç¾ï¼ˆä¸èƒ½ä½¿ç”¨ --all or --mirror）" -#: builtin/push.c:526 builtin/send-pack.c:165 +#: builtin/push.c:531 builtin/send-pack.c:166 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:528 builtin/send-pack.c:179 +#: builtin/push.c:533 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "引用å>:<期望值" -#: builtin/push.c:529 builtin/send-pack.c:180 +#: builtin/push.c:534 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "è¦æ±‚引用旧的å–值为设定值" -#: builtin/push.c:532 +#: builtin/push.c:537 msgid "control recursive pushing of submodules" msgstr "控制å模组的递归推é€" -#: builtin/push.c:534 builtin/send-pack.c:173 +#: builtin/push.c:539 builtin/send-pack.c:174 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 -#: builtin/send-pack.c:160 +#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "receive pack program" msgstr "接收包程åº" -#: builtin/push.c:537 +#: builtin/push.c:542 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:540 +#: builtin/push.c:545 msgid "prune locally removed refs" msgstr "æ¸…é™¤æœ¬åœ°åˆ é™¤çš„å¼•ç”¨" -#: builtin/push.c:542 +#: builtin/push.c:547 msgid "bypass pre-push hook" msgstr "绕过 pre-push é’©å" -#: builtin/push.c:543 +#: builtin/push.c:548 msgid "push missing but relevant tags" msgstr "推é€ç¼ºå¤±ä½†æœ‰å…³çš„æ ‡ç¾" -#: builtin/push.c:546 builtin/send-pack.c:167 +#: builtin/push.c:551 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "用 GPG 为推é€ç¾å" -#: builtin/push.c:548 builtin/send-pack.c:174 +#: builtin/push.c:553 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "需è¦è¿œç«¯æ”¯æŒåŽŸå事务" -#: builtin/push.c:549 builtin/send-pack.c:170 +#: builtin/push.c:554 builtin/send-pack.c:171 msgid "server-specific" msgstr "server-specific" -#: builtin/push.c:549 builtin/send-pack.c:171 +#: builtin/push.c:554 builtin/send-pack.c:172 msgid "option to transmit" msgstr "ä¼ è¾“é€‰é¡¹" -#: builtin/push.c:563 +#: builtin/push.c:568 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹" -#: builtin/push.c:565 +#: builtin/push.c:570 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有æ„义" -#: builtin/push.c:584 +#: builtin/push.c:589 msgid "push options must not have new line characters" msgstr "推é€é€‰é¡¹ä¸èƒ½æœ‰æ¢è¡Œç¬¦" @@ -11478,87 +11590,87 @@ msgstr "" "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<文件>] (--empty | <æ ‘å¯¹è±¡1> [<æ ‘å¯¹è±¡2> [<æ ‘å¯¹è±¡3>]])" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:121 msgid "write resulting index to <file>" msgstr "将索引结果写入 <文件>" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:124 msgid "only empty the index" msgstr "åªæ˜¯æ¸…空索引" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:126 msgid "Merging" msgstr "åˆå¹¶" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:128 msgid "perform a merge in addition to a read" msgstr "读å–之余å†æ‰§è¡Œä¸€ä¸ªåˆå¹¶" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:130 msgid "3-way merge if no file level merging required" msgstr "如果没有文件级åˆå¹¶éœ€è¦ï¼Œæ‰§è¡Œä¸‰æ–¹åˆå¹¶" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:132 msgid "3-way merge in presence of adds and removes" msgstr "å˜åœ¨æ·»åŠ å’Œåˆ é™¤æ—¶ï¼Œä¹Ÿæ‰§è¡Œä¸‰æ–¹åˆå¹¶" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c:134 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m，但丢弃未åˆå¹¶çš„æ¡ç›®" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:135 msgid "<subdirectory>/" msgstr "<å目录>/" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:136 msgid "read the tree into the index under <subdirectory>/" msgstr "读å–æ ‘å¯¹è±¡åˆ°ç´¢å¼•çš„ <å目录>/ 下" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:139 msgid "update working tree with merge result" msgstr "用åˆå¹¶çš„结果更新工作区" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:141 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:151 +#: builtin/read-tree.c:142 msgid "allow explicitly ignored files to be overwritten" msgstr "å…许忽略文件ä¸è®¾å®šçš„文件å¯ä»¥è¢«è¦†ç›–" -#: builtin/read-tree.c:154 +#: builtin/read-tree.c:145 msgid "don't check the working tree after merging" msgstr "åˆå¹¶åŽä¸æ£€æŸ¥å·¥ä½œåŒº" -#: builtin/read-tree.c:155 +#: builtin/read-tree.c:146 msgid "don't update the index or the work tree" msgstr "ä¸æ›´æ–°ç´¢å¼•åŒºå’Œå·¥ä½œåŒº" -#: builtin/read-tree.c:157 +#: builtin/read-tree.c:148 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀ç–检出过滤器" -#: builtin/read-tree.c:159 +#: builtin/read-tree.c:150 msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/rebase--helper.c:7 +#: builtin/rebase--helper.c:8 msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<选项>]" -#: builtin/rebase--helper.c:19 +#: builtin/rebase--helper.c:20 msgid "continue rebase" msgstr "继ç»å˜åŸº" -#: builtin/rebase--helper.c:21 +#: builtin/rebase--helper.c:22 msgid "abort rebase" msgstr "ä¸æ¢å˜åŸº" -#: builtin/receive-pack.c:27 +#: builtin/receive-pack.c:28 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:795 +#: builtin/receive-pack.c:838 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" @@ -11584,7 +11696,7 @@ msgstr "" "è‹¥è¦å±è”½æ¤ä¿¡æ¯ä¸”ä¿æŒé»˜è®¤è¡Œä¸ºï¼Œè®¾ç½® 'receive.denyCurrentBranch'\n" "é…ç½®å˜é‡ä¸º 'refuse'。" -#: builtin/receive-pack.c:815 +#: builtin/receive-pack.c:858 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" @@ -11603,29 +11715,29 @@ msgstr "" "\n" "è‹¥è¦å±è”½æ¤ä¿¡æ¯ï¼Œæ‚¨å¯ä»¥è®¾ç½®å®ƒä¸º 'refuse'。" -#: builtin/receive-pack.c:1888 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "é™é»˜æ¨¡å¼" -#: builtin/receive-pack.c:1902 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "您必须指定一个目录。" -#: builtin/reflog.c:423 +#: builtin/reflog.c:424 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳" -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:541 builtin/reflog.c:546 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11633,81 +11745,81 @@ msgstr "" "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <å称> <地å€>" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:15 builtin/remote.c:35 msgid "git remote rename <old> <new>" msgstr "git remote rename <æ—§å称> <æ–°å称>" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:16 builtin/remote.c:40 msgid "git remote remove <name>" msgstr "git remote remove <å称>" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:17 builtin/remote.c:45 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <å称> (-a | --auto | -d | --delete | <分支>)" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <å称>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <å称>" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <å称> <分支>..." -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:22 builtin/remote.c:71 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <å称>" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <å称> <新的地å€> [<旧的地å€>]" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <å称> <新的地å€>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <å称> <地å€>" -#: builtin/remote.c:29 +#: builtin/remote.c:30 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <å称> <地å€>" -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <å称> <分支>..." -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <å称> <分支>..." -#: builtin/remote.c:55 +#: builtin/remote.c:56 msgid "git remote show [<options>] <name>" msgstr "git remote show [<选项>] <å称>" -#: builtin/remote.c:60 +#: builtin/remote.c:61 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<选项>] <å称>" -#: builtin/remote.c:65 +#: builtin/remote.c:66 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<选项>] [<组> | <远程>]..." -#: builtin/remote.c:94 +#: builtin/remote.c:95 #, c-format msgid "Updating %s" msgstr "æ›´æ–° %s ä¸" -#: builtin/remote.c:126 +#: builtin/remote.c:127 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -11715,86 +11827,86 @@ msgstr "" "--mirror 选项å±é™©ä¸”过时，请使用 --mirror=fetch\n" "\t 或 --mirror=push" -#: builtin/remote.c:143 +#: builtin/remote.c:144 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜åƒå‚数：%s" -#: builtin/remote.c:159 +#: builtin/remote.c:160 msgid "fetch the remote branches" msgstr "抓å–远程的分支" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "import all tags and associated objects when fetching" msgstr "抓å–æ—¶å¯¼å…¥æ‰€æœ‰çš„æ ‡ç¾å’Œå…³è”对象" -#: builtin/remote.c:164 +#: builtin/remote.c:165 msgid "or do not fetch any tag at all (--no-tags)" msgstr "或ä¸æŠ“å–ä»»ä½•æ ‡ç¾ï¼ˆ--no-tags）" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "branch(es) to track" msgstr "跟踪的分支" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "master branch" msgstr "主线分支" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "set up remote as a mirror to push to or fetch from" msgstr "把远程设置为用以推é€æˆ–抓å–çš„é•œåƒ" -#: builtin/remote.c:181 +#: builtin/remote.c:182 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有æ„义" -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定è¦è·Ÿè¸ªçš„分支åªåœ¨ä¸ŽèŽ·å–é•œåƒåŒæ—¶ä½¿ç”¨æ‰æœ‰æ„义" -#: builtin/remote.c:190 builtin/remote.c:629 +#: builtin/remote.c:191 builtin/remote.c:630 #, c-format msgid "remote %s already exists." msgstr "远程 %s å·²ç»å˜åœ¨ã€‚" -#: builtin/remote.c:194 builtin/remote.c:633 +#: builtin/remote.c:195 builtin/remote.c:634 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„远程å称" -#: builtin/remote.c:234 +#: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "æ— æ³•è®¾ç½® master '%s'" -#: builtin/remote.c:336 +#: builtin/remote.c:337 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "æ— æ³•å¾—åˆ°å¼•ç”¨è§„æ ¼ %s 的获å–列表" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:438 builtin/remote.c:446 msgid "(matching)" msgstr "（匹é…）" -#: builtin/remote.c:449 +#: builtin/remote.c:450 msgid "(delete)" msgstr "ï¼ˆåˆ é™¤ï¼‰" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 +#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857 #, c-format msgid "No such remote: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹ï¼š%s" -#: builtin/remote.c:639 +#: builtin/remote.c:640 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "ä¸èƒ½é‡å‘½åé…ç½®å°èŠ‚ '%s' 到 '%s'" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11805,17 +11917,17 @@ msgstr "" "\t%s\n" "\t如果必è¦è¯·æ‰‹åŠ¨æ›´æ–°é…置。" -#: builtin/remote.c:695 +#: builtin/remote.c:696 #, c-format msgid "deleting '%s' failed" msgstr "åˆ é™¤ '%s' 失败" -#: builtin/remote.c:729 +#: builtin/remote.c:730 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" -#: builtin/remote.c:794 +#: builtin/remote.c:795 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11825,144 +11937,146 @@ msgid_plural "" msgstr[0] "注æ„：ref/remotes 层级之外的一个分支未被移除。è¦åˆ 除它，使用：" msgstr[1] "注æ„：ref/remotes 层级之外的一些分支未被移除。è¦åˆ 除它们，使用：" -#: builtin/remote.c:808 +#: builtin/remote.c:809 #, c-format msgid "Could not remove config section '%s'" msgstr "ä¸èƒ½ç§»é™¤é…ç½®å°èŠ‚ '%s'" -#: builtin/remote.c:909 +#: builtin/remote.c:910 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次获å–å°†å˜å‚¨äºŽ remotes/%s）" -#: builtin/remote.c:912 +#: builtin/remote.c:913 msgid " tracked" msgstr " 已跟踪" -#: builtin/remote.c:914 +#: builtin/remote.c:915 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' æ¥ç§»é™¤ï¼‰" -#: builtin/remote.c:916 +#: builtin/remote.c:917 msgid " ???" msgstr " ???" -#: builtin/remote.c:957 +#: builtin/remote.c:958 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "æ— æ•ˆçš„ branch.%s.merge，ä¸èƒ½å˜åŸºåˆ°ä¸€ä¸ªä»¥ä¸Šçš„分支" -#: builtin/remote.c:965 +#: builtin/remote.c:966 #, c-format msgid "rebases interactively onto remote %s" msgstr "交互å¼å˜åŸºåˆ°è¿œç¨‹ %s" -#: builtin/remote.c:966 +#: builtin/remote.c:967 #, c-format msgid "rebases onto remote %s" msgstr "å˜åŸºåˆ°è¿œç¨‹ %s" -#: builtin/remote.c:969 +#: builtin/remote.c:970 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s åˆå¹¶" -#: builtin/remote.c:972 +#: builtin/remote.c:973 #, c-format msgid "merges with remote %s" msgstr "与远程 %s åˆå¹¶" -#: builtin/remote.c:975 +#: builtin/remote.c:976 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以åŠå’Œè¿œç¨‹ %s\n" -#: builtin/remote.c:1018 +#: builtin/remote.c:1019 msgid "create" msgstr "创建" -#: builtin/remote.c:1021 +#: builtin/remote.c:1022 msgid "delete" msgstr "åˆ é™¤" -#: builtin/remote.c:1025 +#: builtin/remote.c:1026 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1028 +#: builtin/remote.c:1029 msgid "fast-forwardable" msgstr "å¯å¿«è¿›" -#: builtin/remote.c:1031 +#: builtin/remote.c:1032 msgid "local out of date" msgstr "本地已过时" -#: builtin/remote.c:1038 +#: builtin/remote.c:1039 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推é€è‡³ %-*s (%s)" -#: builtin/remote.c:1041 +#: builtin/remote.c:1042 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推é€è‡³ %-*s (%s)" -#: builtin/remote.c:1045 +#: builtin/remote.c:1046 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推é€è‡³ %s" -#: builtin/remote.c:1048 +#: builtin/remote.c:1049 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推é€è‡³ %s" -#: builtin/remote.c:1116 +#: builtin/remote.c:1117 msgid "do not query remotes" msgstr "ä¸æŸ¥è¯¢è¿œç¨‹" -#: builtin/remote.c:1143 +#: builtin/remote.c:1144 #, c-format msgid "* remote %s" msgstr "* 远程 %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1145 #, c-format msgid " Fetch URL: %s" msgstr " 获å–地å€ï¼š%s" -#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 +#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301 msgid "(no URL)" msgstr "(æ— URL)" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1156 builtin/remote.c:1158 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " Push URL: %s" msgstr " 推é€åœ°å€ï¼š%s" -#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 +#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: builtin/remote.c:1160 +#: builtin/remote.c:1164 msgid "(not queried)" msgstr "（未查询）" -#: builtin/remote.c:1162 +#: builtin/remote.c:1166 msgid "(unknown)" msgstr "（未知）" -#: builtin/remote.c:1166 +#: builtin/remote.c:1170 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，å¯èƒ½æ˜¯ä¸‹åˆ—ä¸çš„一个）：\n" -#: builtin/remote.c:1178 +#: builtin/remote.c:1182 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -11970,164 +12084,164 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：ä¸æ–‡å—符串拼接，å¯åˆ 除å‰å¯¼ç©ºæ ¼ -#: builtin/remote.c:1181 builtin/remote.c:1207 +#: builtin/remote.c:1185 builtin/remote.c:1211 msgid " (status not queried)" msgstr "（状æ€æœªæŸ¥è¯¢ï¼‰" -#: builtin/remote.c:1190 +#: builtin/remote.c:1194 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 为 'git pull' é…置的本地分支：" msgstr[1] " 为 'git pull' é…置的本地分支：" -#: builtin/remote.c:1198 +#: builtin/remote.c:1202 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜åƒ" -#: builtin/remote.c:1204 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' é…置的本地引用%s：" msgstr[1] " 为 'git push' é…置的本地引用%s：" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "æ ¹æ®è¿œç¨‹è®¾ç½® refs/remotes/<å称>/HEAD" -#: builtin/remote.c:1227 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "åˆ é™¤ refs/remotes/<å称>/HEAD" -#: builtin/remote.c:1242 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "æ— æ³•ç¡®å®šè¿œç¨‹ HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1254 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "æ— æ³•åˆ é™¤ %s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¼•ç”¨ï¼š%s" -#: builtin/remote.c:1264 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "ä¸èƒ½è®¾ç½® %s" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: builtin/remote.c:1282 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: builtin/remote.c:1283 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼" -#: builtin/remote.c:1293 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1294 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [å°†åˆ é™¤] %s" -#: builtin/remote.c:1313 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [å·²åˆ é™¤] %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "抓å–åŽæ¸…除远程" -#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "没有æ¤è¿œç¨‹ '%s'" -#: builtin/remote.c:1437 +#: builtin/remote.c:1441 msgid "add branch" msgstr "æ·»åŠ åˆ†æ”¯" -#: builtin/remote.c:1444 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1461 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "æŸ¥è¯¢æŽ¨é€ URL 地å€ï¼Œè€ŒéžèŽ·å– URL 地å€" -#: builtin/remote.c:1463 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "返回所有 URL 地å€" -#: builtin/remote.c:1491 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "没有给远程仓库 '%s' 设定 URL" -#: builtin/remote.c:1517 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "æ“ä½œæŽ¨é€ URLS" -#: builtin/remote.c:1519 +#: builtin/remote.c:1523 msgid "add URL" msgstr "æ·»åŠ URL" -#: builtin/remote.c:1521 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "åˆ é™¤ URLS" -#: builtin/remote.c:1528 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete æ— æ„义" -#: builtin/remote.c:1569 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "æ— æ•ˆçš„æ—§ URL 匹é…模版：%s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "æœªæ‰¾åˆ°æ¤ URL：%s" -#: builtin/remote.c:1579 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "å°†ä¸ä¼šåˆ 除所有éžæŽ¨é€ URL 地å€" -#: builtin/remote.c:1593 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出；必须置于å命令之å‰" -#: builtin/remote.c:1624 +#: builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "未知å命令：%s" -#: builtin/repack.c:17 +#: builtin/repack.c:18 msgid "git repack [<options>]" msgstr "git repack [<选项>]" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -12135,328 +12249,332 @@ msgstr "" "å¢žé‡ repack å’Œ bitmap 索引ä¸å…¼å®¹ã€‚ 使用 --no-write-bitmap-index\n" "或ç¦ç”¨ pack.writebitmaps é…置。" -#: builtin/repack.c:166 +#: builtin/repack.c:168 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件ä¸" -#: builtin/repack.c:168 +#: builtin/repack.c:170 msgid "same as -a, and turn unreachable objects loose" msgstr "å’Œ -a 相åŒï¼Œå¹¶å°†ä¸å¯è¾¾çš„对象设为æ¾æ•£å¯¹è±¡" -#: builtin/repack.c:171 +#: builtin/repack.c:173 msgid "remove redundant packs, and run git-prune-packed" msgstr "åˆ é™¤å¤šä½™çš„åŒ…ï¼Œè¿è¡Œ git-prune-packed" -#: builtin/repack.c:173 +#: builtin/repack.c:175 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --no-reuse-delta" -#: builtin/repack.c:175 +#: builtin/repack.c:177 msgid "pass --no-reuse-object to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --no-reuse-object" -#: builtin/repack.c:177 +#: builtin/repack.c:179 msgid "do not run git-update-server-info" msgstr "ä¸è¿è¡Œ git-update-server-info" -#: builtin/repack.c:180 +#: builtin/repack.c:182 msgid "pass --local to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --local" -#: builtin/repack.c:182 +#: builtin/repack.c:184 msgid "write bitmap index" msgstr "写 bitmap 索引" -#: builtin/repack.c:183 +#: builtin/repack.c:185 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:184 +#: builtin/repack.c:186 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，ä¸è¦å°†æ—©äºŽç»™å®šæ—¶é—´çš„对象过期" -#: builtin/repack.c:186 +#: builtin/repack.c:188 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，é‡æ–°å¯¹ä¸å¯è¾¾å¯¹è±¡æ‰“包" -#: builtin/repack.c:188 +#: builtin/repack.c:190 msgid "size of the window used for delta compression" msgstr "用于增é‡åŽ‹ç¼©çš„窗å£å€¼" -#: builtin/repack.c:189 builtin/repack.c:193 +#: builtin/repack.c:191 builtin/repack.c:197 msgid "bytes" msgstr "å—节" -#: builtin/repack.c:190 +#: builtin/repack.c:192 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上é¢çš„相似，但é™åˆ¶å†…å˜å¤§å°è€Œéžæ¡ç›®æ•°" -#: builtin/repack.c:192 +#: builtin/repack.c:194 msgid "limits the maximum delta depth" msgstr "é™åˆ¶æœ€å¤§å¢žé‡æ·±åº¦" -#: builtin/repack.c:194 +#: builtin/repack.c:196 +msgid "limits the maximum number of threads" +msgstr "é™åˆ¶æœ€å¤§çº¿ç¨‹æ•°" + +#: builtin/repack.c:198 msgid "maximum size of each packfile" msgstr "æ¯ä¸ªåŒ…文件的最大尺寸" -#: builtin/repack.c:196 +#: builtin/repack.c:200 msgid "repack objects in packs marked with .keep" msgstr "å¯¹æ ‡è®°ä¸º .keep 的包ä¸çš„对象é‡æ–°æ‰“包" -#: builtin/repack.c:206 +#: builtin/repack.c:210 msgid "cannot delete packs in a precious-objects repo" msgstr "ä¸èƒ½åˆ 除çå“仓库ä¸çš„打包文件" -#: builtin/repack.c:210 +#: builtin/repack.c:214 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable å’Œ -A ä¸å…¼å®¹" -#: builtin/repack.c:400 builtin/worktree.c:115 +#: builtin/repack.c:406 builtin/worktree.c:116 #, c-format msgid "failed to remove '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" -#: builtin/replace.c:19 +#: builtin/replace.c:20 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <对象> <替æ¢ç‰©>" -#: builtin/replace.c:20 +#: builtin/replace.c:21 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <对象>" -#: builtin/replace.c:21 +#: builtin/replace.c:22 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <æ交> [<父æ交>...]" -#: builtin/replace.c:22 +#: builtin/replace.c:23 msgid "git replace -d <object>..." msgstr "git replace -d <对象>..." -#: builtin/replace.c:23 +#: builtin/replace.c:24 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<æ ¼å¼>] [-l [<模å¼>]]" -#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 +#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 #, c-format msgid "Not a valid object name: '%s'" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å：'%s'" -#: builtin/replace.c:360 +#: builtin/replace.c:361 #, c-format msgid "bad mergetag in commit '%s'" msgstr "æ交 '%s' ä¸å«æœ‰æŸåçš„åˆå¹¶æ ‡ç¾" -#: builtin/replace.c:362 +#: builtin/replace.c:363 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "æ交 '%s' ä¸å«æœ‰éžæ³•çš„åˆå¹¶æ ‡ç¾" -#: builtin/replace.c:373 +#: builtin/replace.c:374 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始æ交 '%s' 包å«å·²ç»ä¸¢å¼ƒçš„åˆå¹¶æ ‡ç¾ '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:406 +#: builtin/replace.c:407 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "原始æ交 '%s' ä¸åŒ…å«ä¸€ä¸ª GPG ç¾å" -#: builtin/replace.c:407 +#: builtin/replace.c:408 msgid "the signature will be removed in the replacement commit!" msgstr "在替æ¢çš„æ交ä¸ç¾å将被移除ï¼" -#: builtin/replace.c:413 +#: builtin/replace.c:414 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "ä¸èƒ½ä¸º '%s' 写替æ¢æ交" -#: builtin/replace.c:437 +#: builtin/replace.c:438 msgid "list replace refs" msgstr "列出替æ¢çš„引用" -#: builtin/replace.c:438 +#: builtin/replace.c:439 msgid "delete replace refs" msgstr "åˆ é™¤æ›¿æ¢çš„引用" -#: builtin/replace.c:439 +#: builtin/replace.c:440 msgid "edit existing object" msgstr "编辑现å˜çš„对象" -#: builtin/replace.c:440 +#: builtin/replace.c:441 msgid "change a commit's parents" msgstr "修改一个æ交的父æ交" -#: builtin/replace.c:441 +#: builtin/replace.c:442 msgid "replace the ref if it exists" msgstr "如果å˜åœ¨åˆ™æ›¿æ¢å¼•ç”¨" -#: builtin/replace.c:442 +#: builtin/replace.c:443 msgid "do not pretty-print contents for --edit" msgstr "ä¸è¦ä¸º --edit æ“作美观显示内容" -#: builtin/replace.c:443 +#: builtin/replace.c:444 msgid "use this format" msgstr "使用æ¤æ ¼å¼" -#: builtin/rerere.c:12 +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "在索引ä¸æ³¨å†Œå¹²å‡€çš„解决方案" -#: builtin/reset.c:26 +#: builtin/reset.c:29 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<æ交>]" -#: builtin/reset.c:27 +#: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<æ ‘æˆ–æ交>] [--] <路径>..." -#: builtin/reset.c:28 +#: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<æ ‘æˆ–æ交>] [--] [<路径>...]" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "mixed" msgstr "æ··æ‚" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "soft" msgstr "软性" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "hard" msgstr "硬性" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "merge" msgstr "åˆå¹¶" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "keep" msgstr "ä¿æŒ" -#: builtin/reset.c:74 +#: builtin/reset.c:77 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:76 +#: builtin/reset.c:79 msgid "Failed to find tree of HEAD." msgstr "æ— æ³•æ‰¾åˆ° HEAD 指å‘çš„æ ‘ã€‚" -#: builtin/reset.c:82 +#: builtin/reset.c:85 #, c-format msgid "Failed to find tree of %s." msgstr "æ— æ³•æ‰¾åˆ° %s 指å‘çš„æ ‘ã€‚" -#: builtin/reset.c:100 +#: builtin/reset.c:103 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在ä½äºŽ %s" # 译者：汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ -#: builtin/reset.c:183 +#: builtin/reset.c:186 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åš%sé‡ç½®æ“作。" -#: builtin/reset.c:276 +#: builtin/reset.c:286 msgid "be quiet, only report errors" msgstr "安é™æ¨¡å¼ï¼ŒåªæŠ¥å‘Šé”™è¯¯" -#: builtin/reset.c:278 +#: builtin/reset.c:288 msgid "reset HEAD and index" msgstr "é‡ç½® HEAD 和索引" -#: builtin/reset.c:279 +#: builtin/reset.c:289 msgid "reset only HEAD" msgstr "åªé‡ç½® HEAD" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:291 builtin/reset.c:293 msgid "reset HEAD, index and working tree" msgstr "é‡ç½® HEADã€ç´¢å¼•å’Œå·¥ä½œåŒº" -#: builtin/reset.c:285 +#: builtin/reset.c:295 msgid "reset HEAD but keep local changes" msgstr "é‡ç½® HEAD 但ä¿å˜æœ¬åœ°å˜æ›´" -#: builtin/reset.c:288 +#: builtin/reset.c:301 msgid "record only the fact that removed paths will be added later" msgstr "å°†åˆ é™¤çš„è·¯å¾„æ ‡è®°ä¸ºç¨åŽæ·»åŠ " -#: builtin/reset.c:305 +#: builtin/reset.c:320 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "æ— æ³•å°† '%s' 解æžä¸ºä¸€ä¸ªæœ‰æ•ˆçš„版本。" -#: builtin/reset.c:313 +#: builtin/reset.c:328 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "æ— æ³•å°† '%s' 解æžä¸ºä¸€ä¸ªæœ‰æ•ˆçš„æ ‘å¯¹è±¡ã€‚" -#: builtin/reset.c:322 +#: builtin/reset.c:337 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hardã€mixedã€soft} 选项ä¸å…¼å®¹" -#: builtin/reset.c:331 +#: builtin/reset.c:346 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。" # 译者：汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ -#: builtin/reset.c:333 +#: builtin/reset.c:348 #, c-format msgid "Cannot do %s reset with paths." msgstr "ä¸èƒ½å¸¦è·¯å¾„进行%sé‡ç½®ã€‚" # 译者：汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ -#: builtin/reset.c:343 +#: builtin/reset.c:358 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "ä¸èƒ½å¯¹çº¯ä»“库进行%sé‡ç½®" -#: builtin/reset.c:347 +#: builtin/reset.c:362 msgid "-N can only be used with --mixed" msgstr "-N åªèƒ½å’Œ --mixed åŒæ—¶ä½¿ç”¨" -#: builtin/reset.c:364 +#: builtin/reset.c:379 msgid "Unstaged changes after reset:" msgstr "é‡ç½®åŽå–消暂å˜çš„å˜æ›´ï¼š" -#: builtin/reset.c:370 +#: builtin/reset.c:385 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "ä¸èƒ½é‡ç½®ç´¢å¼•æ–‡ä»¶è‡³ç‰ˆæœ¬ '%s'。" -#: builtin/reset.c:374 +#: builtin/reset.c:389 msgid "Could not write new index file." msgstr "ä¸èƒ½å†™å…¥æ–°çš„索引文件。" -#: builtin/rev-list.c:354 +#: builtin/rev-list.c:358 msgid "rev-list does not support display of notes" msgstr "rev-list ä¸æ”¯æŒæ˜¾ç¤ºæ³¨è§£" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:394 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<选项>] -- [<å‚æ•°>...]" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:399 msgid "keep the `--` passed as an arg" msgstr "ä¿æŒ `--` 作为一个å‚æ•°ä¼ é€’" -#: builtin/rev-parse.c:400 +#: builtin/rev-parse.c:401 msgid "stop parsing after the first non-option argument" msgstr "é‡åˆ°ç¬¬ä¸€ä¸ªéžé€‰é¡¹å‚æ•°åŽåœæ¢è§£æž" -#: builtin/rev-parse.c:403 +#: builtin/rev-parse.c:404 msgid "output in stuck long form" msgstr "ä»¥å›ºå®šé•¿æ ¼å¼è¾“出" -#: builtin/rev-parse.c:534 +#: builtin/rev-parse.c:535 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12470,96 +12588,96 @@ msgstr "" "\n" "åˆæ¬¡ä½¿ç”¨æ—¶æ‰§è¡Œ \"git rev-parse --parseopt -h\" æ¥èŽ·å¾—更多信æ¯ã€‚" -#: builtin/revert.c:22 +#: builtin/revert.c:23 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<选项>] <æ交å·>..." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert <subcommand>" msgstr "git revert <å命令>" -#: builtin/revert.c:28 +#: builtin/revert.c:29 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<选项>] <æ交å·>..." -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <å命令>" -#: builtin/revert.c:89 +#: builtin/revert.c:90 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s：%s ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨" -#: builtin/revert.c:98 +#: builtin/revert.c:99 msgid "end revert or cherry-pick sequence" msgstr "终æ¢å转或拣选æ“作" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "resume revert or cherry-pick sequence" msgstr "继ç»å转或拣选æ“作" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "cancel revert or cherry-pick sequence" msgstr "å–消å转或拣选æ“作" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "don't automatically commit" msgstr "ä¸è¦è‡ªåŠ¨æ交" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "edit the commit message" msgstr "编辑æ交说明" -#: builtin/revert.c:105 +#: builtin/revert.c:106 msgid "parent-number" msgstr "父编å·" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "select mainline parent" msgstr "选择主干父æ交编å·" -#: builtin/revert.c:108 +#: builtin/revert.c:109 msgid "merge strategy" msgstr "åˆå¹¶ç–ç•¥" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "option" msgstr "选项" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option for merge strategy" msgstr "åˆå¹¶ç–略的选项" -#: builtin/revert.c:119 +#: builtin/revert.c:120 msgid "append commit name" msgstr "è¿½åŠ æ交å称" -#: builtin/revert.c:121 +#: builtin/revert.c:122 msgid "preserve initially empty commits" msgstr "ä¿ç•™åˆå§‹åŒ–的空æ交" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "allow commits with empty messages" msgstr "å…许æ交说明为空" -#: builtin/revert.c:123 +#: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "ä¿æŒå¤šä½™çš„ã€ç©ºçš„æ交" -#: builtin/revert.c:211 +#: builtin/revert.c:212 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:224 +#: builtin/revert.c:225 msgid "cherry-pick failed" msgstr "拣选失败" -#: builtin/rm.c:17 +#: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<选项>] [--] <文件>..." -#: builtin/rm.c:205 +#: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -12569,7 +12687,7 @@ msgid_plural "" msgstr[0] "如下文件其暂å˜çš„å†…å®¹å’Œå·¥ä½œåŒºåŠ HEAD ä¸çš„都ä¸ä¸€æ ·ï¼š" msgstr[1] "如下文件其暂å˜çš„å†…å®¹å’Œå·¥ä½œåŒºåŠ HEAD ä¸çš„都ä¸ä¸€æ ·ï¼š" -#: builtin/rm.c:210 +#: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" @@ -12577,13 +12695,13 @@ msgstr "" "\n" "（使用 -f å¼ºåˆ¶åˆ é™¤ï¼‰" -#: builtin/rm.c:214 +#: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "下列文件索引ä¸æœ‰å˜æ›´" msgstr[1] "下列文件索引ä¸æœ‰å˜æ›´" -#: builtin/rm.c:218 builtin/rm.c:227 +#: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -12591,29 +12709,29 @@ msgstr "" "\n" "（使用 --cached ä¿ç•™æœ¬åœ°æ–‡ä»¶ï¼Œæˆ–用 -f å¼ºåˆ¶åˆ é™¤ï¼‰" -#: builtin/rm.c:224 +#: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下文件有本地修改：" msgstr[1] "如下文件有本地修改：" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "ä¸åˆ—å‡ºåˆ é™¤çš„æ–‡ä»¶" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "åªä»Žç´¢å¼•åŒºåˆ 除" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "忽略文件更新状æ€æ£€æŸ¥" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "å…è®¸é€’å½’åˆ é™¤" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "å³ä½¿æ²¡æœ‰åŒ¹é…，也以零状æ€é€€å‡º" @@ -12632,7 +12750,7 @@ msgstr "git rm：ä¸èƒ½åˆ 除 %s" msgid "could not remove '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" -#: builtin/send-pack.c:18 +#: builtin/send-pack.c:19 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -12643,51 +12761,51 @@ msgstr "" "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" " --all 和明确的 <引用> 互斥。" -#: builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "remote name" msgstr "远程å称" -#: builtin/send-pack.c:175 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "ä½¿ç”¨æ— çŠ¶æ€çš„ RPC åè®®" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–引用" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "打å°æ¥è‡ªè¿œç¨‹ helper 的状æ€" -#: builtin/shortlog.c:13 +#: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:249 msgid "Group by committer rather than author" msgstr "按照æ交者分组而ä¸æ˜¯ä½œè€…" -#: builtin/shortlog.c:250 +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "æ ¹æ®æ¯ä¸ªä½œè€…çš„æ交数é‡æŽ’åº" -#: builtin/shortlog.c:252 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "éšè—æ交说明，åªæä¾›æ交数é‡" -#: builtin/shortlog.c:254 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "显示æ¯ä¸ªä½œè€…的电å邮件地å€" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "折行输出" -#: builtin/show-branch.c:10 +#: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -12699,124 +12817,124 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通é…符>)...]" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" -#: builtin/show-branch.c:374 +#: builtin/show-branch.c:376 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "忽略 %sï¼Œæ— æ³•å¤„ç† %d 个以上的引用" msgstr[1] "忽略 %sï¼Œæ— æ³•å¤„ç† %d 个以上的引用" -#: builtin/show-branch.c:536 +#: builtin/show-branch.c:530 #, c-format msgid "no matching refs with %s" msgstr "没有和 %s 匹é…的引用" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:626 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:628 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" -#: builtin/show-branch.c:636 +#: builtin/show-branch.c:630 msgid "color '*!+-' corresponding to the branch" msgstr "ç€è‰² '*!+-' 到相应的分支" -#: builtin/show-branch.c:638 +#: builtin/show-branch.c:632 msgid "show <n> more commits after the common ancestor" msgstr "显示共åŒç¥–å…ˆåŽçš„ <n> 个æ交" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:634 msgid "synonym to more=-1" msgstr "å’Œ more=-1 åŒä¹‰" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:635 msgid "suppress naming strings" msgstr "ä¸æ˜¾ç¤ºå—符串命å" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:637 msgid "include the current branch" msgstr "包括当å‰åˆ†æ”¯" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:639 msgid "name commits with their object names" msgstr "以对象åå—命åæ交" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:641 msgid "show possible merge bases" msgstr "显示å¯èƒ½åˆå¹¶çš„基线" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:643 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:645 msgid "show commits in topological order" msgstr "以拓扑顺åºæ˜¾ç¤ºæ交" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:648 msgid "show only commits not on the first branch" msgstr "åªæ˜¾ç¤ºä¸åœ¨ç¬¬ä¸€ä¸ªåˆ†æ”¯ä¸Šçš„æ交" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:650 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支å¯è®¿é—®çš„åˆå¹¶æ交" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:652 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方å¼æŽ’åºï¼Œå¹¶å°½å¯èƒ½åœ°ä¿æŒæ—¥æœŸé¡ºåº" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:655 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> æ¡æœ€è¿‘的引用日志记录" -#: builtin/show-branch.c:696 +#: builtin/show-branch.c:690 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "--reflog å’Œ --allã€--remotesã€--independent 或 --merge-base ä¸å…¼å®¹" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" msgstr "未æ供分支，且 HEAD æ— æ•ˆ" -#: builtin/show-branch.c:723 +#: builtin/show-branch.c:717 msgid "--reflog option needs one branch name" msgstr "选项 --reflog 需è¦ä¸€ä¸ªåˆ†æ”¯å" -#: builtin/show-branch.c:726 +#: builtin/show-branch.c:720 #, 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] "一次åªèƒ½æ˜¾ç¤º %d 个æ¡ç›®ã€‚" msgstr[1] "一次åªèƒ½æ˜¾ç¤º %d 个æ¡ç›®ã€‚" -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:724 #, c-format msgid "no such ref %s" msgstr "æ— æ¤å¼•ç”¨ %s" -#: builtin/show-branch.c:814 +#: builtin/show-branch.c:808 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "ä¸èƒ½å¤„ç† %d 个以上的版本。" msgstr[1] "ä¸èƒ½å¤„ç† %d 个以上的版本。" -#: builtin/show-branch.c:818 +#: builtin/show-branch.c:812 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„引用。" -#: builtin/show-branch.c:821 +#: builtin/show-branch.c:815 #, c-format msgid "cannot find commit %s (%s)" msgstr "ä¸èƒ½æ‰¾åˆ°æ交 %s（%s）" @@ -12865,33 +12983,33 @@ msgstr "ä¸æ‰“å°ç»“æžœåˆ°æ ‡å‡†è¾“å‡ºï¼ˆä¾‹å¦‚ä¸Ž --verify å‚数共用）" msgid "show refs from stdin that aren't in local repository" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å…¥çš„ä¸åœ¨æœ¬åœ°ä»“库ä¸çš„引用" -#: builtin/stripspace.c:17 +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "跳过和移除所有的注释行" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "为æ¯ä¸€è¡Œçš„è¡Œé¦–æ·»åŠ æ³¨é‡Šç¬¦å’Œç©ºæ ¼" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 +#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„å¼•ç”¨ï¼š%s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 +#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用å称，å´å¾—到 %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:72 #, c-format msgid "cannot strip one component off url '%s'" msgstr "æ— æ³•ä»Ž url '%s' 剥离一个组件" @@ -13087,60 +13205,56 @@ msgstr "在å模组ä¸é€’å½’" msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<路径>...]" -#: builtin/submodule--helper.c:1226 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "submodule-helper å命令必须由å¦å¤–çš„å命令调用" - -#: builtin/submodule--helper.c:1233 +#: builtin/submodule--helper.c:1232 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ä¸æ”¯æŒ --super-prefix" -#: builtin/submodule--helper.c:1239 +#: builtin/submodule--helper.c:1238 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ submodule--helper å命令" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<选项>] <å称> [<引用>]" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <å称>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:41 msgid "suppress error message for non-symbolic (detached) refs" msgstr "ä¸æ˜¾ç¤ºéžç¬¦å·ï¼ˆåˆ†ç¦»çš„）引用的错误信æ¯" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:42 msgid "delete symbolic ref" msgstr "åˆ é™¤ç¬¦å·å¼•ç”¨" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:43 msgid "shorten ref output" msgstr "简çŸçš„引用输出" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason" msgstr "åŽŸå› " -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363 msgid "reason of the update" msgstr "æ›´æ–°çš„åŽŸå› " -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "" "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <æ ‡ç¾å> [<头>]" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "git tag -d <tagname>..." msgstr "git tag -d <æ ‡ç¾å>..." -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -13150,21 +13264,21 @@ msgstr "" "at <对象>]\n" "\t\t[--format=<æ ¼å¼>] [--[no-]merged [<æ交>]] [<模å¼>...]" -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<æ ¼å¼>] <æ ‡ç¾å>..." -#: builtin/tag.c:83 +#: builtin/tag.c:84 #, c-format msgid "tag '%s' not found." msgstr "未å‘çŽ°æ ‡ç¾ '%s'。" -#: builtin/tag.c:99 +#: builtin/tag.c:100 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "å·²åˆ é™¤æ ‡ç¾ '%s'（曾为 %s）\n" -#: builtin/tag.c:128 +#: builtin/tag.c:129 #, c-format msgid "" "\n" @@ -13177,7 +13291,7 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:132 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -13191,343 +13305,343 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被ä¿ç•™ï¼Œå¦‚果您愿æ„也å¯ä»¥åˆ 除它们。\n" -#: builtin/tag.c:210 +#: builtin/tag.c:211 msgid "unable to sign the tag" msgstr "æ— æ³•ç¾ç½²æ ‡ç¾" -#: builtin/tag.c:212 +#: builtin/tag.c:213 msgid "unable to write tag file" msgstr "æ— æ³•å†™æ ‡ç¾æ–‡ä»¶" -#: builtin/tag.c:236 +#: builtin/tag.c:237 msgid "bad object type." msgstr "å的对象类型。" -#: builtin/tag.c:282 +#: builtin/tag.c:283 msgid "no tag message?" msgstr "æ— æ ‡ç¾è¯´æ˜Žï¼Ÿ" -#: builtin/tag.c:289 +#: builtin/tag.c:290 #, c-format msgid "The tag message has been left in %s\n" msgstr "æ ‡ç¾è¯´æ˜Žè¢«ä¿ç•™åœ¨ %s\n" -#: builtin/tag.c:397 +#: builtin/tag.c:398 msgid "list tag names" msgstr "åˆ—å‡ºæ ‡ç¾å称" -#: builtin/tag.c:399 +#: builtin/tag.c:400 msgid "print <n> lines of each tag message" msgstr "æ¯ä¸ªæ ‡ç¾ä¿¡æ¯æ‰“å° <n> è¡Œ" -#: builtin/tag.c:401 +#: builtin/tag.c:402 msgid "delete tags" msgstr "åˆ é™¤æ ‡ç¾" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "verify tags" msgstr "验è¯æ ‡ç¾" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "Tag creation options" msgstr "æ ‡ç¾åˆ›å»ºé€‰é¡¹" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "annotated tag, needs a message" msgstr "é™„æ³¨æ ‡ç¾ï¼Œéœ€è¦ä¸€ä¸ªè¯´æ˜Ž" -#: builtin/tag.c:408 +#: builtin/tag.c:409 msgid "tag message" msgstr "æ ‡ç¾è¯´æ˜Ž" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "annotated and GPG-signed tag" msgstr "é™„æ³¨å¹¶é™„åŠ GPG ç¾åçš„æ ‡ç¾" -#: builtin/tag.c:414 +#: builtin/tag.c:415 msgid "use another key to sign the tag" msgstr "使用å¦å¤–çš„ç§é’¥ç¾åè¯¥æ ‡ç¾" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "replace the tag if exists" msgstr "如果å˜åœ¨ï¼Œæ›¿æ¢çŽ°æœ‰çš„æ ‡ç¾" -#: builtin/tag.c:416 builtin/update-ref.c:368 +#: builtin/tag.c:417 builtin/update-ref.c:369 msgid "create a reflog" msgstr "创建引用日志" -#: builtin/tag.c:418 +#: builtin/tag.c:419 msgid "Tag listing options" msgstr "æ ‡ç¾åˆ—表选项" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "show tag list in columns" msgstr "以列的方å¼æ˜¾ç¤ºæ ‡ç¾åˆ—表" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:421 builtin/tag.c:423 msgid "print only tags that contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æäº¤çš„æ ‡ç¾" -#: builtin/tag.c:421 builtin/tag.c:423 +#: builtin/tag.c:422 builtin/tag.c:424 msgid "print only tags that don't contain the commit" msgstr "åªæ‰“å°ä¸åŒ…å«è¯¥æäº¤çš„æ ‡ç¾" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "print only tags that are merged" msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„æ ‡ç¾" -#: builtin/tag.c:425 +#: builtin/tag.c:426 msgid "print only tags that are not merged" msgstr "åªæ‰“å°å°šæœªåˆå¹¶çš„æ ‡ç¾" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags of the object" msgstr "åªæ‰“å°æŒ‡å‘è¯¥å¯¹è±¡çš„æ ‡ç¾" -#: builtin/tag.c:469 +#: builtin/tag.c:470 msgid "--column and -n are incompatible" msgstr "--column å’Œ -n ä¸å…¼å®¹" -#: builtin/tag.c:491 +#: builtin/tag.c:492 msgid "-n option is only allowed in list mode" msgstr "-n 选项åªå…许用在列表显示模å¼" -#: builtin/tag.c:493 +#: builtin/tag.c:494 msgid "--contains option is only allowed in list mode" msgstr "--contains 选项åªå…许用在列表显示模å¼" -#: builtin/tag.c:495 +#: builtin/tag.c:496 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains 选项åªå…许用在列表显示模å¼" -#: builtin/tag.c:497 +#: builtin/tag.c:498 msgid "--points-at option is only allowed in list mode" msgstr "--points-at 选项åªå…许用在列表显示模å¼" -#: builtin/tag.c:499 +#: builtin/tag.c:500 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "--merged å’Œ --no-merged 选项åªå…许用在列表显示模å¼" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "only one -F or -m option is allowed." msgstr "åªå…许一个 -F 或 -m 选项。" -#: builtin/tag.c:529 +#: builtin/tag.c:530 msgid "too many params" msgstr "太多å‚æ•°" -#: builtin/tag.c:535 +#: builtin/tag.c:536 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ ‡ç¾å称。" -#: builtin/tag.c:540 +#: builtin/tag.c:541 #, c-format msgid "tag '%s' already exists" msgstr "æ ‡ç¾ '%s' å·²å˜åœ¨" -#: builtin/tag.c:570 +#: builtin/tag.c:571 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "å·²æ›´æ–°æ ‡ç¾ '%s'（曾为 %s）\n" -#: builtin/unpack-objects.c:493 +#: builtin/unpack-objects.c:494 msgid "Unpacking objects" msgstr "展开对象ä¸" -#: builtin/update-index.c:79 +#: builtin/update-index.c:80 #, c-format msgid "failed to create directory %s" msgstr "æ— æ³•åˆ›å»ºç›®å½• %s" -#: builtin/update-index.c:85 +#: builtin/update-index.c:86 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" -#: builtin/update-index.c:95 +#: builtin/update-index.c:96 #, c-format msgid "failed to create file %s" msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ %s" -#: builtin/update-index.c:103 +#: builtin/update-index.c:104 #, c-format msgid "failed to delete file %s" msgstr "æ— æ³•åˆ é™¤æ–‡ä»¶ %s" -#: builtin/update-index.c:110 builtin/update-index.c:216 +#: builtin/update-index.c:111 builtin/update-index.c:217 #, c-format msgid "failed to delete directory %s" msgstr "æ— æ³•åˆ é™¤ç›®å½• %s" -#: builtin/update-index.c:135 +#: builtin/update-index.c:136 #, c-format msgid "Testing mtime in '%s' " msgstr "在 '%s' ä¸æµ‹è¯• mtime " -#: builtin/update-index.c:149 +#: builtin/update-index.c:150 msgid "directory stat info does not change after adding a new file" msgstr "æ·»åŠ ä¸€ä¸ªæ–°æ–‡ä»¶åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" -#: builtin/update-index.c:162 +#: builtin/update-index.c:163 msgid "directory stat info does not change after adding a new directory" msgstr "æ·»åŠ ä¸€ä¸ªæ–°ç›®å½•åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" -#: builtin/update-index.c:175 +#: builtin/update-index.c:176 msgid "directory stat info changes after updating a file" msgstr "更新一个文件åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯è¢«ä¿®æ”¹" -#: builtin/update-index.c:186 +#: builtin/update-index.c:187 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "在å目录ä¸æ·»åŠ 文件åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯è¢«ä¿®æ”¹" -#: builtin/update-index.c:197 +#: builtin/update-index.c:198 msgid "directory stat info does not change after deleting a file" msgstr "åˆ é™¤ä¸€ä¸ªæ–‡ä»¶åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" -#: builtin/update-index.c:210 +#: builtin/update-index.c:211 msgid "directory stat info does not change after deleting a directory" msgstr "åˆ é™¤ä¸€ä¸ªç›®å½•åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" -#: builtin/update-index.c:217 +#: builtin/update-index.c:218 msgid " OK" msgstr " OK" -#: builtin/update-index.c:568 +#: builtin/update-index.c:569 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<选项>] [--] [<文件>...]" -#: builtin/update-index.c:923 +#: builtin/update-index.c:924 msgid "continue refresh even when index needs update" msgstr "当索引需è¦æ›´æ–°æ—¶ç»§ç»åˆ·æ–°" -#: builtin/update-index.c:926 +#: builtin/update-index.c:927 msgid "refresh: ignore submodules" msgstr "刷新：忽略å模组" -#: builtin/update-index.c:929 +#: builtin/update-index.c:930 msgid "do not ignore new files" msgstr "ä¸å¿½ç•¥æ–°çš„文件" -#: builtin/update-index.c:931 +#: builtin/update-index.c:932 msgid "let files replace directories and vice-versa" msgstr "让文件替æ¢ç›®å½•ï¼ˆå之亦然）" -#: builtin/update-index.c:933 +#: builtin/update-index.c:934 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:935 +#: builtin/update-index.c:936 msgid "refresh even if index contains unmerged entries" msgstr "å³ä½¿ç´¢å¼•åŒºåŒ…å«æœªåˆå¹¶çš„æ¡ç›®ä¹Ÿæ‰§è¡Œåˆ·æ–°" -#: builtin/update-index.c:938 +#: builtin/update-index.c:939 msgid "refresh stat information" msgstr "刷新统计信æ¯" -#: builtin/update-index.c:942 +#: builtin/update-index.c:943 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:946 +#: builtin/update-index.c:947 msgid "<mode>,<object>,<path>" msgstr "<å˜å–模å¼>,<对象>,<路径>" -#: builtin/update-index.c:947 +#: builtin/update-index.c:948 msgid "add the specified entry to the index" msgstr "æ·»åŠ æŒ‡å®šçš„æ¡ç›®åˆ°ç´¢å¼•åŒº" -#: builtin/update-index.c:956 +#: builtin/update-index.c:957 msgid "mark files as \"not changing\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"没有å˜æ›´\"" -#: builtin/update-index.c:959 +#: builtin/update-index.c:960 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged ä½" -#: builtin/update-index.c:962 +#: builtin/update-index.c:963 msgid "mark files as \"index-only\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"仅索引\"" -#: builtin/update-index.c:965 +#: builtin/update-index.c:966 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree ä½" -#: builtin/update-index.c:968 +#: builtin/update-index.c:969 msgid "add to index only; do not add content to object database" msgstr "åªæ·»åŠ 到索引区；ä¸æ·»åŠ 对象到对象库" -#: builtin/update-index.c:970 +#: builtin/update-index.c:971 msgid "remove named paths even if present in worktree" msgstr "å³ä½¿å˜åœ¨å·¥ä½œåŒºé‡Œï¼Œä¹Ÿåˆ 除路径" -#: builtin/update-index.c:972 +#: builtin/update-index.c:973 msgid "with --stdin: input lines are terminated by null bytes" msgstr "æºå¸¦ --stdin：输入的行以 null å—符终æ¢" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "read list of paths to be updated from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–需è¦æ›´æ–°çš„路径列表" -#: builtin/update-index.c:978 +#: builtin/update-index.c:979 msgid "add entries from standard input to the index" msgstr "ä»Žæ ‡å‡†è¾“å…¥æ·»åŠ æ¡ç›®åˆ°ç´¢å¼•åŒº" -#: builtin/update-index.c:982 +#: builtin/update-index.c:983 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件é‡æ–°ç”Ÿæˆç¬¬2和第3æš‚å˜åŒº" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "only update entries that differ from HEAD" msgstr "åªæ›´æ–°ä¸Ž HEAD ä¸åŒçš„æ¡ç›®" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:993 +#: builtin/update-index.c:994 msgid "report actions to standard output" msgstr "åœ¨æ ‡å‡†è¾“å‡ºæ˜¾ç¤ºæ“作" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记ä¿å˜çš„未解决的冲çª" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1000 msgid "write index in this format" msgstr "以这ç§æ ¼å¼å†™å…¥ç´¢å¼•åŒº" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1002 msgid "enable or disable split index" msgstr "å¯ç”¨æˆ–ç¦ç”¨ç´¢å¼•æ‹†åˆ†" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1004 msgid "enable/disable untracked cache" msgstr "å¯ç”¨/ç¦ç”¨å¯¹æœªè·Ÿè¸ªæ–‡ä»¶çš„缓å˜" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "test if the filesystem supports untracked cache" msgstr "测试文件系统是å¦æ”¯æŒæœªè·Ÿè¸ªæ–‡ä»¶ç¼“å˜" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1008 msgid "enable untracked cache without testing the filesystem" msgstr "æ— éœ€æ£€æµ‹æ–‡ä»¶ç³»ç»Ÿï¼Œå¯ç”¨å¯¹æœªè·Ÿè¸ªæ–‡ä»¶çš„缓å˜" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1108 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" "core.splitIndex 被设置为 false。如果您确实è¦å¯ç”¨ç´¢å¼•æ‹†åˆ†ï¼Œè¯·åˆ 除或修改它。" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1117 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" "core.splitIndex 被设置为 true。如果您确实è¦ç¦ç”¨ç´¢å¼•æ‹†åˆ†ï¼Œè¯·åˆ 除或修改它。" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1128 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13535,11 +13649,11 @@ msgstr "" "core.untrackedCache 被设置为 true。如果您确实è¦ç¦ç”¨æœªè·Ÿè¸ªæ–‡ä»¶ç¼“å˜ï¼Œè¯·åˆ 除或修" "改它。" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "Untracked cache disabled" msgstr "缓å˜æœªè·Ÿè¸ªæ–‡ä»¶è¢«ç¦ç”¨" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1140 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13547,236 +13661,236 @@ msgstr "" "core.untrackedCache 被设置为 false。如果您确实è¦å¯ç”¨æœªè·Ÿè¸ªæ–‡ä»¶ç¼“å˜ï¼Œè¯·åˆ 除或" "修改它。" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1144 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "缓å˜æœªè·Ÿè¸ªæ–‡ä»¶åœ¨ '%s' å¯ç”¨" -#: builtin/update-ref.c:9 +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<选项>] -d <引用å> [<旧值>]" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "git update-ref [<选项>] <引用å> <新值> [<旧值>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<选项>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "åˆ é™¤å¼•ç”¨" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "æ›´æ–° <引用å> 本身而ä¸æ˜¯å®ƒæŒ‡å‘的引用" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "æ ‡å‡†è¾“å…¥æœ‰ä»¥ NUL å—符终æ¢çš„å‚æ•°" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–æ›´æ–°" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "从头开始更新文件信æ¯" -#: builtin/verify-commit.c:17 +#: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <æ交>..." -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:73 msgid "print commit contents" msgstr "打å°æ交内容" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "打å°åŽŸå§‹ gpg 状æ€è¾“出" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "冗长输出" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "åªæ˜¾ç¤ºç»Ÿè®¡" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<æ ¼å¼>] <æ ‡ç¾>..." -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "打å°æ ‡ç¾å†…容" -#: builtin/worktree.c:15 +#: builtin/worktree.c:16 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<选项>] <路径> [<分支>]" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree list [<options>]" msgstr "git worktree list [<选项>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<选项>] <路径>" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<选项>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:43 +#: builtin/worktree.c:44 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "åˆ é™¤å·¥ä½œåŒº/%s：ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„目录" -#: builtin/worktree.c:49 +#: builtin/worktree.c:50 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "åˆ é™¤ worktrees/%s：gitdir 文件ä¸å˜åœ¨" -#: builtin/worktree.c:54 +#: builtin/worktree.c:55 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "åˆ é™¤ worktrees/%sï¼šæ— æ³•è¯»å– gitdir 文件 (%s)" -#: builtin/worktree.c:65 +#: builtin/worktree.c:66 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "åˆ é™¤ worktrees/%sï¼šæ— æ•ˆçš„ gitdir 文件" -#: builtin/worktree.c:81 +#: builtin/worktree.c:82 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "åˆ é™¤ worktrees/%s：gitdir 文件的指å‘ä¸å˜åœ¨" -#: builtin/worktree.c:128 +#: builtin/worktree.c:129 msgid "report pruned working trees" msgstr "报告清除的工作区" -#: builtin/worktree.c:130 +#: builtin/worktree.c:131 msgid "expire working trees older than <time>" msgstr "将早于 <time> 的工作区过期" -#: builtin/worktree.c:204 +#: builtin/worktree.c:205 #, c-format msgid "'%s' already exists" msgstr "'%s' å·²ç»å˜åœ¨" -#: builtin/worktree.c:235 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" -#: builtin/worktree.c:274 +#: builtin/worktree.c:275 #, c-format msgid "Preparing %s (identifier %s)" msgstr "准备 %sï¼ˆæ ‡è¯†ç¬¦ %s）" -#: builtin/worktree.c:328 +#: builtin/worktree.c:327 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出分支 <branch> å³ä½¿å·²ç»è¢«æ£€å‡ºåˆ°å…¶å®ƒå·¥ä½œåŒº" -#: builtin/worktree.c:330 +#: builtin/worktree.c:329 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:332 +#: builtin/worktree.c:331 msgid "create or reset a branch" msgstr "创建或é‡ç½®ä¸€ä¸ªåˆ†æ”¯" -#: builtin/worktree.c:334 +#: builtin/worktree.c:333 msgid "populate the new working tree" msgstr "生æˆæ–°çš„工作区" -#: builtin/worktree.c:335 +#: builtin/worktree.c:334 msgid "keep the new working tree locked" msgstr "é”定新工作区" -#: builtin/worktree.c:343 +#: builtin/worktree.c:342 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-bã€-B å’Œ --detach 是互斥的" -#: builtin/worktree.c:478 +#: builtin/worktree.c:479 msgid "reason for locking" msgstr "é”å®šåŽŸå› " -#: builtin/worktree.c:490 builtin/worktree.c:523 +#: builtin/worktree.c:491 builtin/worktree.c:524 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªå·¥ä½œåŒº" -#: builtin/worktree.c:492 builtin/worktree.c:525 +#: builtin/worktree.c:493 builtin/worktree.c:526 msgid "The main working tree cannot be locked or unlocked" msgstr "ä¸»å·¥ä½œåŒºæ— æ³•è¢«åŠ é”或解é”" -#: builtin/worktree.c:497 +#: builtin/worktree.c:498 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被é”å®šï¼ŒåŽŸå› ï¼š%s" -#: builtin/worktree.c:499 +#: builtin/worktree.c:500 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被é”定" -#: builtin/worktree.c:527 +#: builtin/worktree.c:528 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被é”定" -#: builtin/write-tree.c:13 +#: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<å‰ç¼€>/]" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "<å‰ç¼€>/" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "å°† <å‰ç¼€> åç›®å½•å†…å®¹å†™åˆ°ä¸€ä¸ªæ ‘å¯¹è±¡" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "åªå¯¹è°ƒè¯•æœ‰ç”¨" -#: upload-pack.c:22 +#: upload-pack.c:23 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<选项>] <目录>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "在一次å•ç‹¬çš„请求/å“应（request/response）交æ¢åŽé€€å‡º" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "在åˆå§‹çš„引用广告åŽç«‹å³é€€å‡º" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "ä¸è¦å°è¯• <directory>/.git/ 如果 <directory> ä¸æ˜¯ä¸€ä¸ª Git 目录" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "ä¸æ´»åŠ¨ <n> 秒钟åŽç»ˆæ¢ä¼ 输" -#: credential-cache--daemon.c:223 +#: credential-cache--daemon.c:224 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13789,11 +13903,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "调试信æ¯è¾“å‡ºåˆ°æ ‡å‡†é”™è¯¯" -#: git.c:14 +#: git.c:15 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" @@ -13803,20 +13917,20 @@ msgstr "" "查看 'git help <命令>' 或 'git help <概念>' 以获å–给定å命令或概念的\n" "帮助。" -#: http.c:336 +#: http.c:337 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer 为负值，默认为 %d" -#: http.c:357 +#: http.c:358 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "当 cURL < 7.22.0 时，ä¸æ”¯æŒå§”托控制" -#: http.c:366 +#: http.c:367 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "ä¸æ”¯æŒå…¬é’¥æ–‡ä»¶é”å®šï¼Œå› ä¸º cURL < 7.44.0" -#: http.c:1766 +#: http.c:1764 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13827,7 +13941,7 @@ msgstr "" " 请求：%s\n" " é‡å®šå‘：%s" -#: remote-curl.c:323 +#: remote-curl.c:324 #, c-format msgid "redirecting to %s" msgstr "é‡å®šå‘到 %s" @@ -14211,6 +14325,10 @@ msgstr "" msgid "Could not move back to $head_name" msgstr "æ— æ³•ç§»å›ž $head_name" +#: git-rebase.sh:169 +msgid "Applied autostash." +msgstr "æˆåŠŸåº”用 autostash。" + #: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" @@ -14299,7 +14417,7 @@ msgstr "创建了 autostash: $stash_abbrev" #: git-rebase.sh:571 msgid "Please commit or stash them." -msgstr "请æ交或为它们ä¿å˜è¿›åº¦ã€‚" +msgstr "请æ交或贮è—修改。" #: git-rebase.sh:591 #, sh-format @@ -14325,39 +14443,39 @@ msgstr "首先，回退分支以便在上é¢é‡æ”¾æ‚¨çš„工作..." msgid "Fast-forwarded $branch_name to $onto_name." msgstr "å¿«è¿› $branch_name 至 $onto_name。" -#: git-stash.sh:53 +#: git-stash.sh:54 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear ä¸æ”¯æŒå‚æ•°" -#: git-stash.sh:94 +#: git-stash.sh:95 msgid "You do not have the initial commit yet" msgstr "您尚未建立åˆå§‹æ交" -#: git-stash.sh:109 +#: git-stash.sh:110 msgid "Cannot save the current index state" msgstr "æ— æ³•ä¿å˜å½“å‰ç´¢å¼•çŠ¶æ€" -#: git-stash.sh:124 +#: git-stash.sh:125 msgid "Cannot save the untracked files" msgstr "æ— æ³•ä¿å˜æœªè·Ÿè¸ªæ–‡ä»¶" -#: git-stash.sh:144 git-stash.sh:157 +#: git-stash.sh:145 git-stash.sh:158 msgid "Cannot save the current worktree state" msgstr "æ— æ³•ä¿å˜å½“å‰å·¥ä½œåŒºçŠ¶æ€" -#: git-stash.sh:161 +#: git-stash.sh:162 msgid "No changes selected" msgstr "没有选择å˜æ›´" -#: git-stash.sh:164 +#: git-stash.sh:165 msgid "Cannot remove temporary index (can't happen)" msgstr "æ— æ³•åˆ é™¤ä¸´æ—¶ç´¢å¼•ï¼ˆä¸åº”å‘生）" -#: git-stash.sh:177 +#: git-stash.sh:178 msgid "Cannot record working tree state" msgstr "ä¸èƒ½è®°å½•å·¥ä½œåŒºçŠ¶æ€" -#: git-stash.sh:209 +#: git-stash.sh:210 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "æ— æ³•ç”¨ $w_commit æ›´æ–° $ref_stash" @@ -14372,7 +14490,7 @@ msgstr "æ— æ³•ç”¨ $w_commit æ›´æ–° $ref_stash" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:265 +#: git-stash.sh:266 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14381,107 +14499,107 @@ msgstr "" "错误：'stash save' 的未知选项：$option\n" " è¦æ供一个æè¿°ä¿¡æ¯ï¼Œä½¿ç”¨ git stash save -- '$option'" -#: git-stash.sh:278 +#: git-stash.sh:281 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "ä¸èƒ½åŒæ—¶ä½¿ç”¨å‚æ•° --patch å’Œ --include-untracked 或 --all" -#: git-stash.sh:286 +#: git-stash.sh:289 msgid "No local changes to save" msgstr "没有è¦ä¿å˜çš„本地修改" -#: git-stash.sh:291 +#: git-stash.sh:294 msgid "Cannot initialize stash" -msgstr "æ— æ³•åˆå§‹åŒ– stash" +msgstr "æ— æ³•åˆå§‹åŒ–è´®è—" -#: git-stash.sh:295 +#: git-stash.sh:298 msgid "Cannot save the current status" msgstr "æ— æ³•ä¿å˜å½“å‰çŠ¶æ€" -#: git-stash.sh:296 +#: git-stash.sh:299 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "ä¿å˜å·¥ä½œç›®å½•å’Œç´¢å¼•çŠ¶æ€ $stash_msg" -#: git-stash.sh:323 +#: git-stash.sh:326 msgid "Cannot remove worktree changes" msgstr "æ— æ³•åˆ é™¤å·¥ä½œåŒºå˜æ›´" -#: git-stash.sh:471 +#: git-stash.sh:474 #, sh-format msgid "unknown option: $opt" msgstr "未知选项: $opt" -#: git-stash.sh:484 -msgid "No stash found." -msgstr "未å‘现 stash。" +#: git-stash.sh:487 +msgid "No stash entries found." +msgstr "未å‘现贮è—æ¡ç›®ã€‚" -#: git-stash.sh:491 +#: git-stash.sh:494 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-stash.sh:506 +#: git-stash.sh:509 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„引用" -#: git-stash.sh:534 +#: git-stash.sh:537 #, sh-format msgid "'$args' is not a stash-like commit" -msgstr "'$args' ä¸æ˜¯ stash æ ·æ交" +msgstr "'$args' ä¸æ˜¯è´®è—å¼æ交" -#: git-stash.sh:545 +#: git-stash.sh:548 #, sh-format msgid "'$args' is not a stash reference" -msgstr "'$args' ä¸æ˜¯ä¸€ä¸ª stash 引用" +msgstr "'$args' ä¸æ˜¯ä¸€ä¸ªè´®è—引用" -#: git-stash.sh:553 +#: git-stash.sh:556 msgid "unable to refresh index" msgstr "æ— æ³•åˆ·æ–°ç´¢å¼•" -#: git-stash.sh:557 +#: git-stash.sh:560 msgid "Cannot apply a stash in the middle of a merge" -msgstr "æ— æ³•åœ¨åˆå¹¶è¿‡ç¨‹ä¸æ¢å¤è¿›åº¦" +msgstr "æ— æ³•åœ¨åˆå¹¶è¿‡ç¨‹åº”用贮è—" -#: git-stash.sh:565 +#: git-stash.sh:568 msgid "Conflicts in index. Try without --index." msgstr "索引ä¸æœ‰å†²çªã€‚å°è¯•ä¸ä½¿ç”¨ --index。" -#: git-stash.sh:567 +#: git-stash.sh:570 msgid "Could not save index tree" msgstr "ä¸èƒ½ä¿å˜ç´¢å¼•æ ‘" -#: git-stash.sh:576 -msgid "Could not restore untracked files from stash" -msgstr "æ— æ³•ä»Žè¿›åº¦ä¿å˜ä¸æ¢å¤æœªè·Ÿè¸ªæ–‡ä»¶" +#: git-stash.sh:579 +msgid "Could not restore untracked files from stash entry" +msgstr "æ— æ³•ä»Žè´®è—æ¡ç›®ä¸æ¢å¤æœªè·Ÿè¸ªæ–‡ä»¶" -#: git-stash.sh:601 +#: git-stash.sh:604 msgid "Cannot unstage modified files" msgstr "æ— æ³•å°†ä¿®æ”¹çš„æ–‡ä»¶å–消暂å˜" -#: git-stash.sh:616 +#: git-stash.sh:619 msgid "Index was not unstashed." -msgstr "索引的进度没有被æ¢å¤ã€‚" +msgstr "索引未从贮è—ä¸æ¢å¤ã€‚" -#: git-stash.sh:630 -msgid "The stash is kept in case you need it again." -msgstr "æš‚å˜è¢«ä¿ç•™ä»¥å¤‡æ‚¨å†æ¬¡éœ€è¦ã€‚" +#: git-stash.sh:633 +msgid "The stash entry is kept in case you need it again." +msgstr "è´®è—æ¡ç›®è¢«ä¿ç•™ä»¥å¤‡æ‚¨å†æ¬¡éœ€è¦ã€‚" -#: git-stash.sh:639 +#: git-stash.sh:642 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:640 +#: git-stash.sh:643 #, sh-format msgid "${REV}: Could not drop stash entry" -msgstr "${REV}：ä¸èƒ½ä¸¢å¼ƒè¿›åº¦æ¡ç›®" +msgstr "${REV}ï¼šæ— æ³•ä¸¢å¼ƒè´®è—æ¡ç›®" -#: git-stash.sh:648 +#: git-stash.sh:651 msgid "No branch name specified" msgstr "未指定分支å" -#: git-stash.sh:727 +#: git-stash.sh:730 msgid "(To restore them type \"git stash apply\")" msgstr "（为æ¢å¤æ•°æ®è¾“å…¥ \"git stash apply\"）" @@ -14504,7 +14622,7 @@ msgstr "'$sm_path' å·²ç»å˜åœ¨äºŽç´¢å¼•ä¸" msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' å·²ç»å˜åœ¨äºŽç´¢å¼•ä¸ä¸”ä¸æ˜¯ä¸€ä¸ªå模组" -#: git-submodule.sh:218 +#: git-submodule.sh:219 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -14515,22 +14633,22 @@ msgstr "" "$sm_path\n" "å¦‚æžœæ‚¨ç¡®å®žæƒ³æ·»åŠ å®ƒï¼Œä½¿ç”¨ -f å‚数。" -#: git-submodule.sh:236 +#: git-submodule.sh:237 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "æ·»åŠ ä½äºŽ '$sm_path' 的现å˜ä»“库到索引" -#: git-submodule.sh:238 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' å·²å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 仓库" -#: git-submodule.sh:246 +#: git-submodule.sh:247 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地å‘现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -14545,47 +14663,47 @@ msgstr "" "使用 '--force' 选项。如果本地 git 目录ä¸æ˜¯æ£ç¡®çš„仓库\n" "或者您ä¸ç¡®å®šè¿™é‡Œçš„å«ä¹‰ï¼Œä½¿ç”¨ '--name' 选项选择å¦å¤–çš„å称。" -#: git-submodule.sh:254 +#: git-submodule.sh:255 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到å模组 '$sm_name'。" -#: git-submodule.sh:266 +#: git-submodule.sh:267 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ä¸èƒ½æ£€å‡ºå模组 '$sm_path'" -#: git-submodule.sh:271 +#: git-submodule.sh:272 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "æ— æ³•æ·»åŠ å模组 '$sm_path'" -#: git-submodule.sh:280 +#: git-submodule.sh:281 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "æ— æ³•æ³¨å†Œå模组 '$sm_path'" -#: git-submodule.sh:341 +#: git-submodule.sh:342 #, sh-format msgid "Entering '$displaypath'" msgstr "æ£åœ¨è¿›å…¥ '$displaypath'" -#: git-submodule.sh:361 +#: git-submodule.sh:362 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "åœæ¢äºŽ '$displaypath'；脚本返回éžé›¶å€¼ã€‚" -#: git-submodule.sh:432 +#: git-submodule.sh:433 #, sh-format msgid "pathspec and --all are incompatible" msgstr "pathspec å’Œ --all ä¸å…¼å®¹" -#: git-submodule.sh:437 +#: git-submodule.sh:438 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想è¦å¯¹æ‰€æœ‰å模组执行å–消åˆå§‹åŒ–，请使用 '--all'" -#: git-submodule.sh:457 +#: git-submodule.sh:458 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14594,56 +14712,56 @@ msgstr "" "å模组工作区 '$displaypath' 包å«ä¸€ä¸ª .git 目录\n" "ï¼ˆå¦‚æžœæ‚¨çœŸçš„æƒ³åˆ é™¤å®ƒåŠå…¶å…¨éƒ¨åŽ†å²ï¼Œä½¿ç”¨ 'rm -rf' 命令）" -#: git-submodule.sh:465 +#: git-submodule.sh:466 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "å模组工作区 '$displaypath' 包å«æœ¬åœ°ä¿®æ”¹ï¼›ä½¿ç”¨ '-f' 丢弃它们" -#: git-submodule.sh:468 +#: git-submodule.sh:469 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "已清除目录 '$displaypath'" -#: git-submodule.sh:469 +#: git-submodule.sh:470 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "æ— æ³•ç§»é™¤å模组工作区 '$displaypath'" -#: git-submodule.sh:472 +#: git-submodule.sh:473 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "ä¸èƒ½åˆ›å»ºç©ºçš„å模组目录 '$displaypath'" -#: git-submodule.sh:481 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "å模组 '$name' ($url) 未对路径 '$displaypath' 注册" -#: git-submodule.sh:637 +#: git-submodule.sh:638 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸æ‰¾åˆ°å½“å‰ç‰ˆæœ¬" -#: git-submodule.sh:647 +#: git-submodule.sh:648 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸èŽ·å–" -#: git-submodule.sh:652 +#: git-submodule.sh:653 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸æ‰¾åˆ°å½“å‰ç‰ˆæœ¬ ${remote_name}/${branch}" -#: git-submodule.sh:670 +#: git-submodule.sh:671 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸èŽ·å–" -#: git-submodule.sh:676 +#: git-submodule.sh:677 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14651,84 +14769,84 @@ msgid "" msgstr "" "获å–了å模组路径 '$displaypath'ï¼Œä½†æ˜¯å®ƒæ²¡æœ‰åŒ…å« $sha1。直接获å–该æ交失败。" -#: git-submodule.sh:683 +#: git-submodule.sh:684 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸æ£€å‡º '$sha1'" -#: git-submodule.sh:684 +#: git-submodule.sh:685 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "å模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:688 +#: git-submodule.sh:689 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸å˜åŸº '$sha1'" -#: git-submodule.sh:689 +#: git-submodule.sh:690 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "å模组路径 '$displaypath'：å˜åŸºè‡³ '$sha1'" -#: git-submodule.sh:694 +#: git-submodule.sh:695 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åˆå¹¶ '$sha1' 到å模组路径 '$displaypath' ä¸" -#: git-submodule.sh:695 +#: git-submodule.sh:696 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "å模组路径 '$displaypath'：已åˆå¹¶å…¥ '$sha1'" -#: git-submodule.sh:700 +#: git-submodule.sh:701 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在å模组 '$displaypath' ä¸æ‰§è¡Œ '$command $sha1' 失败" -#: git-submodule.sh:701 +#: git-submodule.sh:702 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "å模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:732 +#: git-submodule.sh:733 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$displaypath'" -#: git-submodule.sh:840 +#: git-submodule.sh:841 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached ä¸èƒ½å’Œé€‰é¡¹ --files åŒæ—¶ä½¿ç”¨" -#: git-submodule.sh:892 +#: git-submodule.sh:893 #, sh-format msgid "unexpected mode $mod_dst" msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: git-submodule.sh:912 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_src" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: git-submodule.sh:915 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_dst" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: git-submodule.sh:918 +#: git-submodule.sh:919 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_src å’Œ $sha1_dst" -#: git-submodule.sh:1064 +#: git-submodule.sh:1065 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$sm_path'" -#: git-submodule.sh:1136 +#: git-submodule.sh:1137 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' åŒæ¥å模组 url" @@ -14940,7 +15058,7 @@ msgid "" "\tgit rebase --continue" msgstr "" "执行æˆåŠŸï¼š$rest\n" -"但是在索引和/或工作区ä¸å˜åœ¨å˜æ›´ã€‚æ交或暂å˜ä¿®æ”¹ï¼Œç„¶åŽè¿è¡Œ\n" +"但是在索引和/或工作区ä¸å˜åœ¨å˜æ›´ã€‚æ交或贮è—修改，然åŽè¿è¡Œ\n" "\n" "\tgit rebase --continue" @@ -15188,120 +15306,120 @@ 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:238 +#: git-add--interactive.perl:196 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "staged" msgstr "缓å˜" -#: git-add--interactive.perl:239 +#: git-add--interactive.perl:197 msgid "unstaged" msgstr "未缓å˜" -#: git-add--interactive.perl:288 git-add--interactive.perl:313 +#: git-add--interactive.perl:246 git-add--interactive.perl:271 msgid "binary" msgstr "二进制" -#: git-add--interactive.perl:297 git-add--interactive.perl:351 +#: git-add--interactive.perl:255 git-add--interactive.perl:309 msgid "nothing" msgstr "æ— " -#: git-add--interactive.perl:333 git-add--interactive.perl:348 +#: git-add--interactive.perl:291 git-add--interactive.perl:306 msgid "unchanged" msgstr "没有修改" -#: git-add--interactive.perl:644 +#: git-add--interactive.perl:602 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "å¢žåŠ äº† %d 个路径\n" msgstr[1] "å¢žåŠ äº† %d 个路径\n" -#: git-add--interactive.perl:647 +#: git-add--interactive.perl:605 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" -#: git-add--interactive.perl:650 +#: git-add--interactive.perl:608 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:611 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "触碰了 %d 个路径\n" msgstr[1] "触碰了 %d 个路径\n" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:620 msgid "Update" msgstr "æ›´æ–°" -#: git-add--interactive.perl:674 +#: git-add--interactive.perl:632 msgid "Revert" msgstr "还原" -#: git-add--interactive.perl:697 +#: git-add--interactive.perl:655 #, perl-format msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已æˆä¸ºæœªè·Ÿè¸ªçš„。\n" -#: git-add--interactive.perl:708 +#: git-add--interactive.perl:666 msgid "Add untracked" msgstr "æ·»åŠ æœªè·Ÿè¸ªçš„" -#: git-add--interactive.perl:714 +#: git-add--interactive.perl:672 msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" -#: git-add--interactive.perl:1030 +#: git-add--interactive.perl:985 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºæš‚å˜ã€‚" -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:988 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." -msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºä¿å˜è¿›åº¦ã€‚" +msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºè´®è—。" -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:991 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºæœªæš‚å˜ã€‚" -#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 +#: git-add--interactive.perl:994 git-add--interactive.perl:1003 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºåº”用。" -#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 +#: git-add--interactive.perl:997 git-add--interactive.perl:1000 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºä¸¢å¼ƒã€‚" -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1013 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "æ— æ³•å†™å…¥å—编辑文件：%s" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1014 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动å—ç¼–è¾‘æ¨¡å¼ -- 查看底部的快速指å—。\n" -#: git-add--interactive.perl:1065 +#: git-add--interactive.perl:1020 #, perl-format msgid "" "---\n" @@ -15315,7 +15433,7 @@ msgstr "" "以 %s å¼€å§‹çš„è¡Œå°†è¢«åˆ é™¤ã€‚\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1073 +#: git-add--interactive.perl:1028 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" @@ -15324,7 +15442,7 @@ msgstr "" "如果ä¸èƒ½å¹²å‡€åœ°åº”用，您将有机会é‡æ–°ç¼–辑。如果该å—çš„å…¨éƒ¨å†…å®¹åˆ é™¤ï¼Œåˆ™\n" "æ¤æ¬¡ç¼–辑被终æ¢ï¼Œè¯¥å—ä¸ä¼šè¢«ä¿®æ”¹ã€‚\n" -#: git-add--interactive.perl:1087 +#: git-add--interactive.perl:1042 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "æ— æ³•è¯»å–å—编辑文件：%s" @@ -15335,12 +15453,12 @@ msgstr "æ— æ³•è¯»å–å—编辑文件：%s" #. 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:1178 +#: git-add--interactive.perl:1134 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑å—ä¸èƒ½è¢«åº”用。é‡æ–°ç¼–辑（选择 \"no\" 丢弃ï¼ï¼‰ [y/n]? " -#: git-add--interactive.perl:1187 +#: git-add--interactive.perl:1143 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15354,7 +15472,7 @@ msgstr "" "a - æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—" -#: git-add--interactive.perl:1193 +#: git-add--interactive.perl:1149 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15368,7 +15486,7 @@ msgstr "" "a - è´®è—该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è´®è—该å—和本文件ä¸åŽé¢çš„全部å—" -#: git-add--interactive.perl:1199 +#: git-add--interactive.perl:1155 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15382,7 +15500,7 @@ msgstr "" "a - ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—" -#: git-add--interactive.perl:1205 +#: git-add--interactive.perl:1161 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15396,7 +15514,7 @@ msgstr "" "a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—" -#: git-add--interactive.perl:1211 +#: git-add--interactive.perl:1167 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15410,7 +15528,7 @@ msgstr "" "a - 丢弃该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦ä¸¢å¼ƒè¯¥å—和本文件ä¸åŽé¢çš„全部å—" -#: git-add--interactive.perl:1217 +#: git-add--interactive.perl:1173 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15424,7 +15542,7 @@ msgstr "" "a - 丢弃该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦ä¸¢å¼ƒè¯¥å—和本文件ä¸åŽé¢çš„全部å—" -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15438,7 +15556,7 @@ msgstr "" "a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—" -#: git-add--interactive.perl:1232 +#: git-add--interactive.perl:1188 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15460,195 +15578,195 @@ msgstr "" "e - 手动编辑当å‰å—\n" "? - 显示帮助\n" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1219 msgid "The selected hunks do not apply to the index!\n" msgstr "选ä¸çš„å—ä¸èƒ½åº”用到索引ï¼\n" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1220 msgid "Apply them to the worktree anyway? " msgstr "æ— è®ºå¦‚ä½•éƒ½è¦åº”用到工作区么？" -#: git-add--interactive.perl:1267 +#: git-add--interactive.perl:1223 msgid "Nothing was applied.\n" msgstr "未应用。\n" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1234 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未åˆå…¥çš„：%s\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1243 msgid "Only binary files changed.\n" msgstr "åªæœ‰äºŒè¿›åˆ¶æ–‡ä»¶è¢«ä¿®æ”¹ã€‚\n" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl:1245 msgid "No changes.\n" msgstr "没有修改。\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1253 msgid "Patch update" msgstr "è¡¥ä¸æ›´æ–°" -#: git-add--interactive.perl:1349 +#: git-add--interactive.perl:1305 #, perl-format msgid "Stage mode change [y,n,q,a,d,/%s,?]? " msgstr "æš‚å˜çŠ¶æ€ä¿®æ”¹ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1350 +#: git-add--interactive.perl:1306 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "æš‚å˜çŠ¶æ€åˆ 除 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1351 +#: git-add--interactive.perl:1307 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "æš‚å˜è¯¥å— [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1354 +#: git-add--interactive.perl:1310 #, perl-format msgid "Stash mode change [y,n,q,a,d,/%s,?]? " msgstr "è´®è—状æ€ä¿®æ”¹ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1311 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "è´®è—状æ€åˆ 除 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1356 +#: git-add--interactive.perl:1312 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "è´®è—è¯¥å— [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1315 #, perl-format msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " msgstr "未暂å˜çŠ¶æ€ä¿®æ”¹ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1316 #, perl-format msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " msgstr "未暂å˜çŠ¶æ€åˆ 除 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1361 +#: git-add--interactive.perl:1317 #, perl-format msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " msgstr "ä¸æš‚å˜è¯¥å— [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1364 +#: git-add--interactive.perl:1320 #, perl-format msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " msgstr "修改索引ä¸çš„åº”ç”¨çŠ¶æ€ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1321 #, perl-format msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " msgstr "从索引ä¸åˆ é™¤åº”ç”¨çŠ¶æ€ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1366 +#: git-add--interactive.perl:1322 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " msgstr "å°†æ¤å—应用到索引 [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1325 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " msgstr "修改工作区ä¸çš„ä¸¢å¼ƒçŠ¶æ€ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1326 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " msgstr "从工作区ä¸åˆ é™¤ä¸¢å¼ƒçŠ¶æ€ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1371 +#: git-add--interactive.perl:1327 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " msgstr "从工作区ä¸ä¸¢å¼ƒè¯¥å— [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1330 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "修改索引和工作区ä¸çš„ä¸¢å¼ƒçŠ¶æ€ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1375 +#: git-add--interactive.perl:1331 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "从索引和工作区ä¸åˆ é™¤ä¸¢å¼ƒçŠ¶æ€ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1376 +#: git-add--interactive.perl:1332 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " msgstr "从索引和工作区ä¸ä¸¢å¼ƒè¯¥å— [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1335 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "修改索引和工作区ä¸çš„åº”ç”¨çŠ¶æ€ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1336 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "从索引和工作区ä¸åˆ é™¤åº”ç”¨çŠ¶æ€ [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1381 +#: git-add--interactive.perl:1337 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " msgstr "在索引和工作区ä¸åº”ç”¨è¯¥å— [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl:1440 msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个å—（<回车> 查看更多）？ " -#: git-add--interactive.perl:1486 +#: git-add--interactive.perl:1442 msgid "go to which hunk? " msgstr "跳转到哪个å—？" -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1451 #, perl-format msgid "Invalid number: '%s'\n" msgstr "æ— æ•ˆæ•°å—：'%s'\n" -#: git-add--interactive.perl:1500 +#: git-add--interactive.perl:1456 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "对ä¸èµ·ï¼Œåªæœ‰ %d 个å¯ç”¨å—。\n" msgstr[1] "对ä¸èµ·ï¼Œåªæœ‰ %d 个å¯ç”¨å—。\n" -#: git-add--interactive.perl:1526 +#: git-add--interactive.perl:1482 msgid "search for regex? " msgstr "使用æ£åˆ™è¡¨è¾¾å¼æœç´¢ï¼Ÿ" -#: git-add--interactive.perl:1539 +#: git-add--interactive.perl:1495 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "错误的æ£åˆ™è¡¨è¾¾å¼ %s：%s\n" -#: git-add--interactive.perl:1549 +#: git-add--interactive.perl:1505 msgid "No hunk matches the given pattern\n" msgstr "没有和给定模å¼ç›¸åŒ¹é…çš„å¿«\n" -#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 +#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 msgid "No previous hunk\n" msgstr "没有å‰ä¸€ä¸ªå—\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 +#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 msgid "No next hunk\n" msgstr "没有下一个å—\n" -#: git-add--interactive.perl:1597 +#: git-add--interactive.perl:1553 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "拆分为 %d å—。\n" msgstr[1] "拆分为 %d å—。\n" -#: git-add--interactive.perl:1649 +#: git-add--interactive.perl:1605 msgid "Review diff" msgstr "检视 diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1668 +#: git-add--interactive.perl:1624 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -15665,84 +15783,84 @@ msgstr "" "diff - 显示 HEAD 和索引间差异\n" "add untracked - æ·»åŠ æœªè·Ÿè¸ªæ–‡ä»¶çš„å†…å®¹è‡³æš‚å˜åˆ—表\n" -#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 -#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 -#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 +#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 +#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 +#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 msgid "missing --" msgstr "缺失 --" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1662 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模å¼ï¼š%s" -#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 #, perl-format msgid "invalid argument %s, expecting --" msgstr "æ— æ•ˆçš„å‚æ•° %s，期望是 --" -#: git-send-email.perl:121 +#: git-send-email.perl:126 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本地时间和 GMT 有ä¸åˆ°ä¸€åˆ†é’Ÿé—´éš”\n" -#: git-send-email.perl:128 git-send-email.perl:134 +#: git-send-email.perl:133 git-send-email.perl:139 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本地时间å移é‡å¤§äºŽç‰äºŽ 24 å°æ—¶\n" -#: git-send-email.perl:202 git-send-email.perl:208 +#: git-send-email.perl:208 git-send-email.perl:214 msgid "the editor exited uncleanly, aborting everything" msgstr "编辑器éžæ£å¸¸é€€å‡ºï¼Œç»ˆæ¢æ‰€æœ‰æ“作" -#: git-send-email.perl:282 +#: git-send-email.perl:291 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包å«æ‚¨æ£åœ¨ç¼–写的一个ä¸é—´ç‰ˆæœ¬çš„邮件。\n" -#: git-send-email.perl:287 +#: git-send-email.perl:296 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包å«ç¼–辑的邮件。\n" -#: git-send-email.perl:305 +#: git-send-email.perl:314 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它选项ä¸å…¼å®¹\n" -#: git-send-email.perl:368 git-send-email.perl:623 +#: git-send-email.perl:379 git-send-email.perl:634 msgid "Cannot run git format-patch from outside a repository\n" msgstr "ä¸èƒ½åœ¨ä»“库之外è¿è¡Œ git format-patch\n" -#: git-send-email.perl:437 +#: git-send-email.perl:448 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc å—段：'%s'\n" -#: git-send-email.perl:466 +#: git-send-email.perl:477 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 设置：'%s'\n" -#: git-send-email.perl:498 +#: git-send-email.perl:509 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "è¦å‘Šï¼šä¸æ”¯æŒå¸¦å¼•å·çš„ sendmail 别å：%s\n" -#: git-send-email.perl:500 +#: git-send-email.perl:511 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "è¦å‘Šï¼šä¸æ”¯æŒ `:include:`：%s\n" -#: git-send-email.perl:502 +#: git-send-email.perl:513 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "è¦å‘Šï¼šä¸æ”¯æŒ `/file` 或 `|pipe` é‡å®šå‘：%s\n" -#: git-send-email.perl:507 +#: git-send-email.perl:518 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "è¦å‘Šï¼šä¸èƒ½è¯†åˆ«çš„ sendmail 行：%s\n" -#: git-send-email.perl:589 +#: git-send-email.perl:600 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15757,12 +15875,12 @@ msgstr "" " * 如果å«ä¹‰ä¸ºä¸€ä¸ªæ–‡ä»¶ï¼Œä½¿ç”¨ \"./%s\"，或者\n" " * 如果å«ä¹‰ä¸ºä¸€ä¸ªèŒƒå›´ï¼Œä½¿ç”¨ --format-patch 选项。\n" -#: git-send-email.perl:610 +#: git-send-email.perl:621 #, perl-format msgid "Failed to opendir %s: %s" msgstr "æ— æ³•æ‰“å¼€ç›®å½• %s: %s" -#: git-send-email.perl:634 +#: git-send-email.perl:645 #, perl-format msgid "" "fatal: %s: %s\n" @@ -15771,7 +15889,7 @@ msgstr "" "严é‡ï¼š%s：%s\n" "è¦å‘Šï¼šè¡¥ä¸æœªèƒ½å‘é€\n" -#: git-send-email.perl:645 +#: git-send-email.perl:656 msgid "" "\n" "No patch files specified!\n" @@ -15781,17 +15899,17 @@ msgstr "" "未指定补ä¸æ–‡ä»¶ï¼\n" "\n" -#: git-send-email.perl:658 +#: git-send-email.perl:669 #, perl-format msgid "No subject line in %s?" msgstr "在 %s ä¸æ²¡æœ‰æ ‡é¢˜è¡Œï¼Ÿ" -#: git-send-email.perl:668 +#: git-send-email.perl:679 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "æ— æ³•å†™å…¥ %s: %s" -#: git-send-email.perl:678 +#: git-send-email.perl:689 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15804,41 +15922,41 @@ msgstr "" "\n" "如果您ä¸æƒ³å‘é€æ‘˜è¦ï¼Œæ¸…除内容。\n" -#: git-send-email.perl:701 +#: git-send-email.perl:712 #, perl-format msgid "Failed to open %s.final: %s" msgstr "æ— æ³•æ‰“å¼€ %s.final: %s" -#: git-send-email.perl:704 +#: git-send-email.perl:715 #, perl-format msgid "Failed to open %s: %s" msgstr "æ— æ³•æ‰“å¼€ %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:750 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" msgstr "To/Cc/Bcc å—段ä¸è§£æžï¼Œå®ƒä»¬è¢«å¿½ç•¥\n" -#: git-send-email.perl:748 +#: git-send-email.perl:759 msgid "Summary email is empty, skipping it\n" msgstr "摘è¦é‚®ä»¶ä¸ºç©ºï¼Œè·³è¿‡\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:780 +#: git-send-email.perl:791 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您确认è¦ä½¿ç”¨ <%s> [y/N]？" -#: git-send-email.perl:809 +#: git-send-email.perl:820 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "å¦‚ä¸‹æ–‡ä»¶å« 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n" -#: git-send-email.perl:814 +#: git-send-email.perl:825 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "è¦å£°æ˜Ž 8bit ä¸ºä»€ä¹ˆæ ·çš„ç¼–ç æ ¼å¼ [UTF-8]？" -#: git-send-email.perl:822 +#: git-send-email.perl:833 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -15850,20 +15968,20 @@ msgstr "" "\t%s\n" "包å«æ¨¡ç‰ˆæ ‡é¢˜ '*** SUBJECT HERE ***'。如果确实想è¦å‘é€ï¼Œä½¿ç”¨å‚æ•° --force。\n" -#: git-send-email.perl:841 +#: git-send-email.perl:852 msgid "To whom should the emails be sent (if anyone)?" msgstr "邮件将è¦å‘é€ç»™è°ï¼Ÿ" -#: git-send-email.perl:859 +#: git-send-email.perl:870 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "严é‡ï¼šåˆ«å '%s' 扩展为它自己\n" -#: git-send-email.perl:871 +#: git-send-email.perl:882 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID 被用作第一å°é‚®ä»¶çš„ In-Reply-To ？" -#: git-send-email.perl:921 git-send-email.perl:929 +#: git-send-email.perl:932 git-send-email.perl:940 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "错误：ä¸èƒ½ä»Ž %s ä¸æå–一个有效的邮件地å€\n" @@ -15871,16 +15989,16 @@ msgstr "错误：ä¸èƒ½ä»Ž %s ä¸æå–一个有效的邮件地å€\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:933 +#: git-send-email.perl:944 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何处ç†è¿™ä¸ªåœ°å€ï¼Ÿ([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1234 +#: git-send-email.perl:1245 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路径 \"%s\" ä¸å˜åœ¨" -#: git-send-email.perl:1309 +#: git-send-email.perl:1320 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15905,263 +16023,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1324 +#: git-send-email.perl:1335 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "å‘é€é‚®ä»¶ï¼Ÿ([y]es|[n]o|[q]uit|[a]ll)：" -#: git-send-email.perl:1327 +#: git-send-email.perl:1338 msgid "Send this email reply required" msgstr "å‘é€è¦æ±‚的邮件回å¤" -#: git-send-email.perl:1353 +#: git-send-email.perl:1364 msgid "The required SMTP server is not properly defined." msgstr "è¦æ±‚çš„ SMTP æœåŠ¡å™¨æœªè¢«æ£ç¡®å®šä¹‰ã€‚" -#: git-send-email.perl:1397 +#: git-send-email.perl:1411 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ STARTTLSï¼%s" -#: git-send-email.perl:1403 +#: git-send-email.perl:1416 git-send-email.perl:1420 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "STARTTLS 失败ï¼%s" + +#: git-send-email.perl:1430 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "æ— æ³•æ£ç¡®åœ°åˆå§‹åŒ– SMTP。检查é…置并使用 --smtp-debug。" -#: git-send-email.perl:1421 +#: git-send-email.perl:1448 #, perl-format msgid "Failed to send %s\n" msgstr "æ— æ³•å‘é€ %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Dry-Sent %s\n" msgstr "æ¼”ä¹ å‘é€ %s\n" -#: git-send-email.perl:1424 +#: git-send-email.perl:1451 #, perl-format msgid "Sent %s\n" msgstr "æ£å‘é€ %s\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "Dry-OK. Log says:\n" msgstr "æ¼”ä¹ æˆåŠŸã€‚日志说：\n" -#: git-send-email.perl:1426 +#: git-send-email.perl:1453 msgid "OK. Log says:\n" msgstr "OK。日志说：\n" -#: git-send-email.perl:1438 +#: git-send-email.perl:1465 msgid "Result: " msgstr "结果：" -#: git-send-email.perl:1441 +#: git-send-email.perl:1468 msgid "Result: OK\n" msgstr "结果：OK\n" -#: git-send-email.perl:1454 +#: git-send-email.perl:1481 #, perl-format msgid "can't open file %s" msgstr "æ— æ³•æ‰“å¼€æ–‡ä»¶ %s" -#: git-send-email.perl:1501 git-send-email.perl:1521 +#: git-send-email.perl:1528 git-send-email.perl:1548 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) æ·»åŠ cc：%s 自行 '%s'\n" -#: git-send-email.perl:1507 +#: git-send-email.perl:1534 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) æ·»åŠ to：%s 自行 '%s'\n" -#: git-send-email.perl:1555 +#: git-send-email.perl:1582 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) æ·»åŠ cc：%s 自行 '%s'\n" -#: git-send-email.perl:1578 +#: git-send-email.perl:1605 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) æ·»åŠ cc: %s 自行 '%s'\n" -#: git-send-email.perl:1676 +#: git-send-email.perl:1711 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) ä¸èƒ½æ‰§è¡Œ '%s'" -#: git-send-email.perl:1683 +#: git-send-email.perl:1718 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) æ·»åŠ %s: %s 自：'%s'\n" -#: git-send-email.perl:1687 +#: git-send-email.perl:1722 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) æ— æ³•å…³é—管é“至 '%s'" -#: git-send-email.perl:1714 +#: git-send-email.perl:1749 msgid "cannot send message as 7bit" msgstr "ä¸èƒ½ä»¥ 7bit å½¢å¼å‘é€ä¿¡æ¯" -#: git-send-email.perl:1722 +#: git-send-email.perl:1757 msgid "invalid transfer encoding" msgstr "æ— æ•ˆçš„ä¼ é€ç¼–ç " -#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856 #, perl-format msgid "unable to open %s: %s\n" msgstr "ä¸èƒ½æ‰“å¼€ %s：%s\n" -#: git-send-email.perl:1744 +#: git-send-email.perl:1798 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s：补ä¸åŒ…å«ä¸€ä¸ªè¶…过 998 å—符的行" -#: git-send-email.perl:1760 +#: git-send-email.perl:1814 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略过 %s å«å¤‡ä»½åŽç¼€ '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1764 +#: git-send-email.perl:1818 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的è¦å‘é€ %s？[y|N]：" - -#~ msgid "tag: tagging " -#~ msgstr "tag: tagging " - -#~ msgid "object of unknown type" -#~ msgstr "未知类型的对象" - -#~ msgid "commit object" -#~ msgstr "æ交对象" - -#~ msgid "tree object" -#~ msgstr "æ ‘å¯¹è±¡" - -#~ msgid "blob object" -#~ msgstr "æ•°æ®å¯¹è±¡" - -#~ msgid "other tag object" -#~ msgstr "å…¶å®ƒæ ‡ç¾å¯¹è±¡" - -#~ msgid "" -#~ "There is nothing to exclude from by :(exclude) patterns.\n" -#~ "Perhaps you forgot to add either ':/' or '.' ?" -#~ msgstr "" -#~ "没有为 :(exclude) 模å¼æä¾›è¦å¿½ç•¥çš„内容。也许您忘记了\n" -#~ "æ·»åŠ ':/' 或 '.' ？" - -#~ msgid "unrecognized format: %%(%s)" -#~ msgstr "æœªèƒ½è¯†åˆ«çš„æ ¼å¼ï¼š%%(%s)" - -#~ msgid ":strip= requires a positive integer argument" -#~ msgstr ":strip= 需è¦ä¸€ä¸ªæ£æ•´åž‹å‚æ•°" - -#~ msgid "ref '%s' does not have %ld components to :strip" -#~ msgstr "引用 '%s' 未æ供用于 :strip çš„ %ld 个组件" - -#~ msgid "unknown %.*s format %s" -#~ msgstr "未知的 %.*s æ ¼å¼ %s" - -#~ msgid "[%s: gone]" -#~ msgstr "[%s: 丢失]" - -#~ msgid "[%s]" -#~ msgstr "[%s]" - -#~ msgid "[%s: behind %d]" -#~ msgstr "[%s：è½åŽ %d]" - -#~ msgid "[%s: ahead %d]" -#~ msgstr "[%s：领先 %d]" - -#~ msgid "[%s: ahead %d, behind %d]" -#~ msgstr "[%s：领先 %d，è½åŽ %d]" - -#~ msgid " **** invalid ref ****" -#~ msgstr " **** æ— æ•ˆå¼•ç”¨ ****" - -#~ msgid "insanely long object directory %.*s" -#~ msgstr "ä¸æ£å¸¸çš„长对象目录 %.*s" - -#~ msgid "git merge [<options>] <msg> HEAD <commit>" -#~ msgstr "git merge [<选项>] <说明> HEAD <æ交>" - -#~ msgid "'%s' is not a commit" -#~ msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交" - -#~ msgid "cannot open file '%s'" -#~ msgstr "æ— æ³•æ‰“å¼€æ–‡ä»¶ '%s'" - -#~ msgid "could not close file %s" -#~ msgstr "æ— æ³•å…³é—文件 %s" - -#~ msgid "tag name too long: %.*s..." -#~ msgstr "æ ‡ç¾å称太长：%.*s..." - -#~ msgid "tag header too big." -#~ msgstr "æ ‡ç¾å¤´ä¿¡æ¯å¤ªå¤§ã€‚" - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for discarding" -#~ msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºä¸¢å¼ƒ" - -#~ msgid "Use an experimental blank-line-based heuristic to improve diffs" -#~ msgstr "使用一个试验性的基于空行的å¯å‘å¼ç®—法改进差异显示" - -#~ msgid "Clever... amending the last one with dirty index." -#~ msgstr "èªæ˜Ž... 用è„索引修补最åŽä¸€ä¸ªæ交。" - -#~ msgid "" -#~ "the following submodule (or one of its nested submodules)\n" -#~ "uses a .git directory:" -#~ msgid_plural "" -#~ "the following submodules (or one of their nested submodules)\n" -#~ "use a .git directory:" -#~ msgstr[0] "以下å模组（或一个其嵌套å模组）使用了一个 .git 目录：" -#~ msgstr[1] "以下å模组（或一个其嵌套å模组）使用了一个 .git 目录：" - -#~ msgid "" -#~ "\n" -#~ "(use 'rm -rf' if you really want to remove it including all of its " -#~ "history)" -#~ msgstr "" -#~ "\n" -#~ "（使用 'rm -rf' å‘½ä»¤å¦‚æžœæ‚¨çœŸçš„æƒ³åˆ é™¤å®ƒåŠå…¶å…¨éƒ¨åŽ†å²ï¼‰" - -#~ msgid "Could not write to %s" -#~ msgstr "ä¸èƒ½å†™å…¥ %s" - -#~ msgid "Error wrapping up %s." -#~ msgstr "错误收尾 %s。" - -#~ msgid "Your local changes would be overwritten by cherry-pick." -#~ msgstr "您的本地修改将被拣选æ“作覆盖。" - -#~ msgid "Cannot revert during another revert." -#~ msgstr "ä¸èƒ½åœ¨å›žé€€ä¸æ‰§è¡Œå¦ä¸€å›žé€€ã€‚" - -#~ msgid "Cannot cherry-pick during another cherry-pick." -#~ msgstr "ä¸èƒ½åœ¨æ‹£é€‰è¿‡ç¨‹ä¸æ‰§è¡Œå¦ä¸€æ‹£é€‰ã€‚" - -#~ msgid "Could not parse line %d." -#~ msgstr "ä¸èƒ½è§£æžç¬¬ %d 行。" - -#~ msgid "Could not open %s" -#~ msgstr "ä¸èƒ½æ‰“å¼€ %s" - -#~ msgid "Could not read %s." -#~ msgstr "ä¸èƒ½è¯»å– %s。" - -#~ msgid "Could not format %s." -#~ msgstr "ä¸èƒ½æ ¼å¼åŒ– %s。" - -#~ msgid "%s: %s" -#~ msgstr "%s：%s" - -#~ msgid "cannot open %s: %s" -#~ msgstr "ä¸èƒ½æ‰“å¼€ %s：%s" - -#~ msgid "You need to set your committer info first" -#~ msgstr "您需è¦å…ˆè®¾ç½®æ‚¨çš„æ交者信æ¯" @@ -947,6 +947,7 @@ static size_t parse_color(struct strbuf *sb, /* in UTF-8 */ struct format_commit_context *c) { const char *rest = placeholder; + const char *basic_color = NULL; if (placeholder[1] == '(') { const char *begin = placeholder + 2; @@ -955,23 +956,41 @@ static size_t parse_color(struct strbuf *sb, /* in UTF-8 */ if (!end) return 0; + if (skip_prefix(begin, "auto,", &begin)) { if (!want_color(c->pretty_ctx->color)) return end - placeholder + 1; + } else if (skip_prefix(begin, "always,", &begin)) { + /* nothing to do; we do not respect want_color at all */ + } else { + /* the default is the same as "auto" */ + if (!want_color(c->pretty_ctx->color)) + return end - placeholder + 1; } + if (color_parse_mem(begin, end - begin, color) < 0) die(_("unable to parse --pretty format")); strbuf_addstr(sb, color); return end - placeholder + 1; } + + /* + * We handle things like "%C(red)" above; for historical reasons, there + * are a few colors that can be specified without parentheses (and + * they cannot support things like "auto" or "always" at all). + */ if (skip_prefix(placeholder + 1, "red", &rest)) - strbuf_addstr(sb, GIT_COLOR_RED); + basic_color = GIT_COLOR_RED; else if (skip_prefix(placeholder + 1, "green", &rest)) - strbuf_addstr(sb, GIT_COLOR_GREEN); + basic_color = GIT_COLOR_GREEN; else if (skip_prefix(placeholder + 1, "blue", &rest)) - strbuf_addstr(sb, GIT_COLOR_BLUE); + basic_color = GIT_COLOR_BLUE; else if (skip_prefix(placeholder + 1, "reset", &rest)) - strbuf_addstr(sb, GIT_COLOR_RESET); + basic_color = GIT_COLOR_RESET; + + if (basic_color && want_color(c->pretty_ctx->color)) + strbuf_addstr(sb, basic_color); + return rest - placeholder; } diff --git a/read-cache.c b/read-cache.c index 2121b6e7b..acfb028f4 100644 --- a/read-cache.c +++ b/read-cache.c @@ -515,9 +515,8 @@ int remove_index_entry_at(struct index_state *istate, int pos) istate->cache_nr--; if (pos >= istate->cache_nr) return 0; - memmove(istate->cache + pos, - istate->cache + pos + 1, - (istate->cache_nr - pos) * sizeof(struct cache_entry *)); + MOVE_ARRAY(istate->cache + pos, istate->cache + pos + 1, + istate->cache_nr - pos); return 1; } diff --git a/ref-filter.c b/ref-filter.c index ae6ecbd1c..bc591f4f3 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -97,14 +97,19 @@ static struct used_atom { } u; } *used_atom; static int used_atom_cnt, need_tagged, need_symref; -static int need_color_reset_at_eol; -static void color_atom_parser(struct used_atom *atom, const char *color_value) +static void color_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *color_value) { if (!color_value) die(_("expected format: %%(color:<color>)")); if (color_parse(color_value, atom->u.color) < 0) die(_("unrecognized color: %%(color:%s)"), color_value); + /* + * We check this after we've parsed the color, which lets us complain + * about syntactically bogus color names even if they won't be used. + */ + if (!want_color(format->use_color)) + color_parse("", atom->u.color); } static void refname_atom_parser_internal(struct refname_atom *atom, @@ -127,7 +132,7 @@ static void refname_atom_parser_internal(struct refname_atom *atom, die(_("unrecognized %%(%s) argument: %s"), name, arg); } -static void remote_ref_atom_parser(struct used_atom *atom, const char *arg) +static void remote_ref_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { struct string_list params = STRING_LIST_INIT_DUP; int i; @@ -161,28 +166,28 @@ static void remote_ref_atom_parser(struct used_atom *atom, const char *arg) string_list_clear(¶ms, 0); } -static void body_atom_parser(struct used_atom *atom, const char *arg) +static void body_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (arg) die(_("%%(body) does not take arguments")); atom->u.contents.option = C_BODY_DEP; } -static void subject_atom_parser(struct used_atom *atom, const char *arg) +static void subject_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (arg) die(_("%%(subject) does not take arguments")); atom->u.contents.option = C_SUB; } -static void trailers_atom_parser(struct used_atom *atom, const char *arg) +static void trailers_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (arg) die(_("%%(trailers) does not take arguments")); atom->u.contents.option = C_TRAILERS; } -static void contents_atom_parser(struct used_atom *atom, const char *arg) +static void contents_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (!arg) atom->u.contents.option = C_BARE; @@ -202,7 +207,7 @@ static void contents_atom_parser(struct used_atom *atom, const char *arg) die(_("unrecognized %%(contents) argument: %s"), arg); } -static void objectname_atom_parser(struct used_atom *atom, const char *arg) +static void objectname_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (!arg) atom->u.objectname.option = O_FULL; @@ -219,7 +224,7 @@ static void objectname_atom_parser(struct used_atom *atom, const char *arg) die(_("unrecognized %%(objectname) argument: %s"), arg); } -static void refname_atom_parser(struct used_atom *atom, const char *arg) +static void refname_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { refname_atom_parser_internal(&atom->u.refname, arg, atom->name); } @@ -235,7 +240,7 @@ static align_type parse_align_position(const char *s) return -1; } -static void align_atom_parser(struct used_atom *atom, const char *arg) +static void align_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { struct align *align = &atom->u.align; struct string_list params = STRING_LIST_INIT_DUP; @@ -274,7 +279,7 @@ static void align_atom_parser(struct used_atom *atom, const char *arg) string_list_clear(¶ms, 0); } -static void if_atom_parser(struct used_atom *atom, const char *arg) +static void if_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { if (!arg) { atom->u.if_then_else.cmp_status = COMPARE_NONE; @@ -288,7 +293,7 @@ static void if_atom_parser(struct used_atom *atom, const char *arg) } } -static void head_atom_parser(struct used_atom *atom, const char *arg) +static void head_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { struct object_id unused; @@ -298,7 +303,7 @@ static void head_atom_parser(struct used_atom *atom, const char *arg) static struct { const char *name; cmp_type cmp_type; - void (*parser)(struct used_atom *atom, const char *arg); + void (*parser)(const struct ref_format *format, struct used_atom *atom, const char *arg); } valid_atom[] = { { "refname" , FIELD_STR, refname_atom_parser }, { "objecttype" }, @@ -365,7 +370,8 @@ struct atom_value { /* * Used to parse format string and sort specifiers */ -int parse_ref_filter_atom(const char *atom, const char *ep) +static int parse_ref_filter_atom(const struct ref_format *format, + const char *atom, const char *ep) { const char *sp; const char *arg; @@ -413,7 +419,7 @@ int parse_ref_filter_atom(const char *atom, const char *ep) arg = used_atom[at].name + (arg - atom) + 1; memset(&used_atom[at].u, 0, sizeof(used_atom[at].u)); if (valid_atom[i].parser) - valid_atom[i].parser(&used_atom[at], arg); + valid_atom[i].parser(format, &used_atom[at], arg); if (*atom == '*') need_tagged = 1; if (!strcmp(valid_atom[i].name, "symref")) @@ -657,24 +663,26 @@ static const char *find_next(const char *cp) * Make sure the format string is well formed, and parse out * the used atoms. */ -int verify_ref_format(const char *format) +int verify_ref_format(struct ref_format *format) { const char *cp, *sp; - need_color_reset_at_eol = 0; - for (cp = format; *cp && (sp = find_next(cp)); ) { + format->need_color_reset_at_eol = 0; + for (cp = format->format; *cp && (sp = find_next(cp)); ) { const char *color, *ep = strchr(sp, ')'); int at; if (!ep) return error(_("malformed format string %s"), sp); /* sp points at "%(" and ep points at the closing ")" */ - at = parse_ref_filter_atom(sp + 2, ep); + at = parse_ref_filter_atom(format, sp + 2, ep); cp = ep + 1; if (skip_prefix(used_atom[at].name, "color:", &color)) - need_color_reset_at_eol = !!strcmp(color, "reset"); + format->need_color_reset_at_eol = !!strcmp(color, "reset"); } + if (format->need_color_reset_at_eol && !want_color(format->use_color)) + format->need_color_reset_at_eol = 0; return 0; } @@ -2060,35 +2068,34 @@ static void append_literal(const char *cp, const char *ep, struct ref_formatting } } -void format_ref_array_item(struct ref_array_item *info, const char *format, - int quote_style, struct strbuf *final_buf) +void format_ref_array_item(struct ref_array_item *info, + const struct ref_format *format, + struct strbuf *final_buf) { const char *cp, *sp, *ep; struct ref_formatting_state state = REF_FORMATTING_STATE_INIT; - state.quote_style = quote_style; + state.quote_style = format->quote_style; push_stack_element(&state.stack); - for (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) { + for (cp = format->format; *cp && (sp = find_next(cp)); cp = ep + 1) { struct atom_value *atomv; ep = strchr(sp, ')'); if (cp < sp) append_literal(cp, sp, &state); - get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv); + get_ref_atom_value(info, + parse_ref_filter_atom(format, sp + 2, ep), + &atomv); atomv->handler(atomv, &state); } if (*cp) { sp = cp + strlen(cp); append_literal(cp, sp, &state); } - if (need_color_reset_at_eol) { + if (format->need_color_reset_at_eol) { struct atom_value resetv; - char color[COLOR_MAXLEN] = ""; - - if (color_parse("reset", color) < 0) - die("BUG: couldn't parse 'reset' as a color"); - resetv.s = color; + resetv.s = GIT_COLOR_RESET; append_atom(&resetv, &state); } if (state.stack->prev) @@ -2097,26 +2104,38 @@ void format_ref_array_item(struct ref_array_item *info, const char *format, pop_stack_element(&state.stack); } -void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style) +void show_ref_array_item(struct ref_array_item *info, + const struct ref_format *format) { struct strbuf final_buf = STRBUF_INIT; - format_ref_array_item(info, format, quote_style, &final_buf); + format_ref_array_item(info, format, &final_buf); fwrite(final_buf.buf, 1, final_buf.len, stdout); strbuf_release(&final_buf); putchar('\n'); } void pretty_print_ref(const char *name, const unsigned char *sha1, - const char *format) + const struct ref_format *format) { struct ref_array_item *ref_item; ref_item = new_ref_array_item(name, sha1, 0); ref_item->kind = ref_kind_from_refname(name); - show_ref_array_item(ref_item, format, 0); + show_ref_array_item(ref_item, format); free_array_item(ref_item); } +static int parse_sorting_atom(const char *atom) +{ + /* + * This parses an atom using a dummy ref_format, since we don't + * actually care about the formatting details. + */ + struct ref_format dummy = REF_FORMAT_INIT; + const char *end = atom + strlen(atom); + return parse_ref_filter_atom(&dummy, atom, end); +} + /* If no sorting option is given, use refname to sort as default */ struct ref_sorting *ref_default_sorting(void) { @@ -2125,18 +2144,13 @@ struct ref_sorting *ref_default_sorting(void) struct ref_sorting *sorting = xcalloc(1, sizeof(*sorting)); sorting->next = NULL; - sorting->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name)); + sorting->atom = parse_sorting_atom(cstr_name); return sorting; } -int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) +void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg) { - struct ref_sorting **sorting_tail = opt->value; struct ref_sorting *s; - int len; - - if (!arg) /* should --no-sort void the list ? */ - return -1; s = xcalloc(1, sizeof(*s)); s->next = *sorting_tail; @@ -2149,8 +2163,14 @@ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) if (skip_prefix(arg, "version:", &arg) || skip_prefix(arg, "v:", &arg)) s->version = 1; - len = strlen(arg); - s->atom = parse_ref_filter_atom(arg, arg+len); + s->atom = parse_sorting_atom(arg); +} + +int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) +{ + if (!arg) /* should --no-sort void the list ? */ + return -1; + parse_ref_sorting(opt->value, arg); return 0; } diff --git a/ref-filter.h b/ref-filter.h index 6552024f0..0d98342b3 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -72,6 +72,21 @@ struct ref_filter { verbose; }; +struct ref_format { + /* + * Set these to define the format; make sure you call + * verify_ref_format() afterwards to finalize. + */ + const char *format; + int quote_style; + int use_color; + + /* Internal state to ref-filter */ + int need_color_reset_at_eol; +}; + +#define REF_FORMAT_INIT { NULL, 0, -1 } + /* Macros for checking --merged and --no-merged options */ #define _OPT_MERGED_NO_MERGED(option, filter, h) \ { OPTION_CALLBACK, 0, option, (filter), N_("commit"), (h), \ @@ -90,17 +105,18 @@ struct ref_filter { int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type); /* Clear all memory allocated to ref_array */ void ref_array_clear(struct ref_array *array); -/* Parse format string and sort specifiers */ -int parse_ref_filter_atom(const char *atom, const char *ep); /* Used to verify if the given format is correct and to parse out the used atoms */ -int verify_ref_format(const char *format); +int verify_ref_format(struct ref_format *format); /* Sort the given ref_array as per the ref_sorting provided */ void ref_array_sort(struct ref_sorting *sort, struct ref_array *array); /* Based on the given format and quote_style, fill the strbuf */ -void format_ref_array_item(struct ref_array_item *info, const char *format, - int quote_style, struct strbuf *final_buf); +void format_ref_array_item(struct ref_array_item *info, + const struct ref_format *format, + struct strbuf *final_buf); /* Print the ref using the given format and quote_style */ -void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style); +void show_ref_array_item(struct ref_array_item *info, const struct ref_format *format); +/* Parse a single sort specifier and add it to the list */ +void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *atom); /* Callback function for parsing the sort option */ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset); /* Default sort option based on refname */ @@ -117,6 +133,6 @@ void setup_ref_filter_porcelain_msg(void); * name must be a fully qualified refname. */ void pretty_print_ref(const char *name, const unsigned char *sha1, - const char *format); + const struct ref_format *format); #endif /* REF_FILTER_H */ diff --git a/reflog-walk.c b/reflog-walk.c index 081f89b70..74ebe5148 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -94,45 +94,6 @@ static int get_reflog_recno_by_time(struct complete_reflogs *array, return -1; } -struct commit_info_lifo { - struct commit_info { - struct commit *commit; - void *util; - } *items; - int nr, alloc; -}; - -static struct commit_info *get_commit_info(struct commit *commit, - struct commit_info_lifo *lifo, int pop) -{ - int i; - for (i = 0; i < lifo->nr; i++) - if (lifo->items[i].commit == commit) { - struct commit_info *result = &lifo->items[i]; - if (pop) { - if (i + 1 < lifo->nr) - memmove(lifo->items + i, - lifo->items + i + 1, - (lifo->nr - i) * - sizeof(struct commit_info)); - lifo->nr--; - } - return result; - } - return NULL; -} - -static void add_commit_info(struct commit *commit, void *util, - struct commit_info_lifo *lifo) -{ - struct commit_info *info; - ALLOC_GROW(lifo->items, lifo->nr + 1, lifo->alloc); - info = lifo->items + lifo->nr; - info->commit = commit; - info->util = util; - lifo->nr++; -} - struct commit_reflog { int recno; enum selector_type { @@ -144,7 +105,8 @@ struct commit_reflog { }; struct reflog_walk_info { - struct commit_info_lifo reflogs; + struct commit_reflog **logs; + size_t nr, alloc; struct string_list complete_reflogs; struct commit_reflog *last_commit_reflog; }; @@ -233,52 +195,10 @@ int add_reflog_for_walk(struct reflog_walk_info *info, commit_reflog->selector = selector; commit_reflog->reflogs = reflogs; - add_commit_info(commit, commit_reflog, &info->reflogs); - return 0; -} + ALLOC_GROW(info->logs, info->nr + 1, info->alloc); + info->logs[info->nr++] = commit_reflog; -void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit) -{ - struct commit_info *commit_info = - get_commit_info(commit, &info->reflogs, 0); - struct commit_reflog *commit_reflog; - struct object *logobj; - struct reflog_info *reflog; - - info->last_commit_reflog = NULL; - if (!commit_info) - return; - - commit_reflog = commit_info->util; - if (commit_reflog->recno < 0) { - commit->parents = NULL; - return; - } - info->last_commit_reflog = commit_reflog; - - do { - reflog = &commit_reflog->reflogs->items[commit_reflog->recno]; - commit_reflog->recno--; - logobj = parse_object(&reflog->ooid); - } while (commit_reflog->recno && (logobj && logobj->type != OBJ_COMMIT)); - - if (!logobj && commit_reflog->recno >= 0 && is_null_oid(&reflog->ooid)) { - /* a root commit, but there are still more entries to show */ - reflog = &commit_reflog->reflogs->items[commit_reflog->recno]; - logobj = parse_object(&reflog->noid); - if (!logobj) - logobj = parse_object(&reflog->ooid); - } - - if (!logobj || logobj->type != OBJ_COMMIT) { - commit_info->commit = NULL; - commit->parents = NULL; - return; - } - commit_info->commit = (struct commit *)logobj; - - commit->parents = xcalloc(1, sizeof(struct commit_list)); - commit->parents->item = commit_info->commit; + return 0; } void get_reflog_selector(struct strbuf *sb, @@ -344,6 +264,18 @@ const char *get_reflog_ident(struct reflog_walk_info *reflog_info) return info->email; } +timestamp_t get_reflog_timestamp(struct reflog_walk_info *reflog_info) +{ + struct commit_reflog *commit_reflog = reflog_info->last_commit_reflog; + struct reflog_info *info; + + if (!commit_reflog) + return 0; + + info = &commit_reflog->reflogs->items[commit_reflog->recno+1]; + return info->timestamp; +} + void show_reflog_message(struct reflog_walk_info *reflog_info, int oneline, const struct date_mode *dmode, int force_date) { @@ -365,3 +297,53 @@ void show_reflog_message(struct reflog_walk_info *reflog_info, int oneline, strbuf_release(&selector); } } + +int reflog_walk_empty(struct reflog_walk_info *info) +{ + return !info || !info->nr; +} + +static struct commit *next_reflog_commit(struct commit_reflog *log) +{ + for (; log->recno >= 0; log->recno--) { + struct reflog_info *entry = &log->reflogs->items[log->recno]; + struct object *obj = parse_object(&entry->noid); + + if (obj && obj->type == OBJ_COMMIT) + return (struct commit *)obj; + } + return NULL; +} + +static timestamp_t log_timestamp(struct commit_reflog *log) +{ + return log->reflogs->items[log->recno].timestamp; +} + +struct commit *next_reflog_entry(struct reflog_walk_info *walk) +{ + struct commit_reflog *best = NULL; + struct commit *best_commit = NULL; + size_t i; + + for (i = 0; i < walk->nr; i++) { + struct commit_reflog *log = walk->logs[i]; + struct commit *commit = next_reflog_commit(log); + + if (!commit) + continue; + + if (!best || log_timestamp(log) > log_timestamp(best)) { + best = log; + best_commit = commit; + } + } + + if (best) { + best->recno--; + walk->last_commit_reflog = best; + return best_commit; + } + + return NULL; +} diff --git a/reflog-walk.h b/reflog-walk.h index 27886f793..7553c448f 100644 --- a/reflog-walk.h +++ b/reflog-walk.h @@ -8,16 +8,19 @@ struct reflog_walk_info; extern void init_reflog_walk(struct reflog_walk_info **info); extern int add_reflog_for_walk(struct reflog_walk_info *info, struct commit *commit, const char *name); -extern void fake_reflog_parent(struct reflog_walk_info *info, - struct commit *commit); extern void show_reflog_message(struct reflog_walk_info *info, int, const struct date_mode *, int force_date); extern void get_reflog_message(struct strbuf *sb, struct reflog_walk_info *reflog_info); extern const char *get_reflog_ident(struct reflog_walk_info *reflog_info); +extern timestamp_t get_reflog_timestamp(struct reflog_walk_info *reflog_info); extern void get_reflog_selector(struct strbuf *sb, struct reflog_walk_info *reflog_info, const struct date_mode *dmode, int force_date, int shorten); +extern int reflog_walk_empty(struct reflog_walk_info *walk); + +struct commit *next_reflog_entry(struct reflog_walk_info *reflog_info); + #endif @@ -1160,7 +1160,7 @@ int ref_is_hidden(const char *refname, const char *refname_full) const char *match = hide_refs->items[i].string; const char *subject; int neg = 0; - int len; + const char *p; if (*match == '!') { neg = 1; @@ -1175,10 +1175,9 @@ int ref_is_hidden(const char *refname, const char *refname_full) } /* refname can be NULL when namespaces are used. */ - if (!subject || !starts_with(subject, match)) - continue; - len = strlen(match); - if (!subject[len] || subject[len] == '/') + if (subject && + skip_prefix(subject, match, &p) && + (!*p || *p == '/')) return !neg; } return 0; diff --git a/revision.c b/revision.c index 6603af944..2631b013a 100644 --- a/revision.c +++ b/revision.c @@ -148,16 +148,14 @@ static void add_pending_object_with_path(struct rev_info *revs, if (revs->reflog_info && obj->type == OBJ_COMMIT) { struct strbuf buf = STRBUF_INIT; int len = interpret_branch_name(name, 0, &buf, 0); - int st; if (0 < len && name[len] && buf.len) strbuf_addstr(&buf, name + len); - st = add_reflog_for_walk(revs->reflog_info, - (struct commit *)obj, - buf.buf[0] ? buf.buf: name); + add_reflog_for_walk(revs->reflog_info, + (struct commit *)obj, + buf.buf[0] ? buf.buf: name); strbuf_release(&buf); - if (st) - return; + return; /* do not add the commit itself */ } add_object_array_with_path(obj, name, &revs->pending, mode, path); } @@ -2364,6 +2362,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->reverse && revs->reflog_info) die("cannot combine --reverse with --walk-reflogs"); + if (revs->reflog_info && revs->limited) + die("cannot combine --walk-reflogs with history-limiting options"); if (revs->rewrite_parents && revs->children.name) die("cannot combine --parents and --children"); @@ -2963,6 +2963,18 @@ static inline int want_ancestry(const struct rev_info *revs) return (revs->rewrite_parents || revs->children.name); } +/* + * Return a timestamp to be used for --since/--until comparisons for this + * commit, based on the revision options. + */ +static timestamp_t comparison_date(const struct rev_info *revs, + struct commit *commit) +{ + return revs->reflog_info ? + get_reflog_timestamp(revs->reflog_info) : + commit->date; +} + enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit) { if (commit->object.flags & SHOWN) @@ -2973,8 +2985,9 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi return commit_show; if (commit->object.flags & UNINTERESTING) return commit_ignore; - if (revs->min_age != -1 && (commit->date > revs->min_age)) - return commit_ignore; + if (revs->min_age != -1 && + comparison_date(revs, commit) > revs->min_age) + return commit_ignore; if (revs->min_parents || (revs->max_parents >= 0)) { int n = commit_list_count(commit->parents); if ((n < revs->min_parents) || @@ -3107,17 +3120,19 @@ static void track_linear(struct rev_info *revs, struct commit *commit) static struct commit *get_revision_1(struct rev_info *revs) { - if (!revs->commits) - return NULL; + while (1) { + struct commit *commit; - do { - struct commit *commit = pop_commit(&revs->commits); + if (revs->reflog_info) + commit = next_reflog_entry(revs->reflog_info); + else + commit = pop_commit(&revs->commits); - if (revs->reflog_info) { - save_parents(revs, commit); - fake_reflog_parent(revs->reflog_info, commit); + if (!commit) + return NULL; + + if (revs->reflog_info) commit->object.flags &= ~(ADDED | SEEN | SHOWN); - } /* * If we haven't done the list limiting, we need to look at @@ -3126,9 +3141,12 @@ static struct commit *get_revision_1(struct rev_info *revs) */ if (!revs->limited) { if (revs->max_age != -1 && - (commit->date < revs->max_age)) + comparison_date(revs, commit) < revs->max_age) continue; - if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) { + + if (revs->reflog_info) + try_to_simplify_commit(revs, commit); + else if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) { if (!revs->ignore_missing_links) die("Failed to traverse parents of commit %s", oid_to_hex(&commit->object.oid)); @@ -3146,8 +3164,7 @@ static struct commit *get_revision_1(struct rev_info *revs) track_linear(revs, commit); return commit; } - } while (revs->commits); - return NULL; + } } /* diff --git a/run-command.c b/run-command.c index 9e36151bf..b5e6eb37c 100644 --- a/run-command.c +++ b/run-command.c @@ -1533,7 +1533,7 @@ static int pp_start_one(struct parallel_processes *pp) if (start_command(&pp->children[i].process)) { code = pp->start_failure(&pp->children[i].err, pp->data, - &pp->children[i].data); + pp->children[i].data); strbuf_addbuf(&pp->buffered_output, &pp->children[i].err); strbuf_reset(&pp->children[i].err); if (code) @@ -1601,7 +1601,7 @@ static int pp_collect_finished(struct parallel_processes *pp) code = pp->task_finished(code, &pp->children[i].err, pp->data, - &pp->children[i].data); + pp->children[i].data); if (code) result = code; diff --git a/string-list.c b/string-list.c index c650500c6..806b4c872 100644 --- a/string-list.c +++ b/string-list.c @@ -43,9 +43,8 @@ static int add_entry(int insert_at, struct string_list *list, const char *string ALLOC_GROW(list->items, list->nr+1, list->alloc); if (index < list->nr) - memmove(list->items + index + 1, list->items + index, - (list->nr - index) - * sizeof(struct string_list_item)); + MOVE_ARRAY(list->items + index + 1, list->items + index, + list->nr - index); list->items[index].string = list->strdup_strings ? xstrdup(string) : (char *)string; list->items[index].util = NULL; @@ -77,8 +76,7 @@ void string_list_remove(struct string_list *list, const char *string, free(list->items[i].util); list->nr--; - memmove(list->items + i, list->items + i + 1, - (list->nr - i) * sizeof(struct string_list_item)); + MOVE_ARRAY(list->items + i, list->items + i + 1, list->nr - i); } } diff --git a/sub-process.c b/sub-process.c index a3cfab1a9..86de8d7bf 100644 --- a/sub-process.c +++ b/sub-process.c @@ -105,3 +105,107 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co hashmap_add(hashmap, entry); return 0; } + +static int handshake_version(struct child_process *process, + const char *welcome_prefix, int *versions, + int *chosen_version) +{ + int version_scratch; + int i; + char *line; + const char *p; + + if (!chosen_version) + chosen_version = &version_scratch; + + if (packet_write_fmt_gently(process->in, "%s-client\n", + welcome_prefix)) + return error("Could not write client identification"); + for (i = 0; versions[i]; i++) { + if (packet_write_fmt_gently(process->in, "version=%d\n", + versions[i])) + return error("Could not write requested version"); + } + if (packet_flush_gently(process->in)) + return error("Could not write flush packet"); + + if (!(line = packet_read_line(process->out, NULL)) || + !skip_prefix(line, welcome_prefix, &p) || + strcmp(p, "-server")) + return error("Unexpected line '%s', expected %s-server", + line ? line : "<flush packet>", welcome_prefix); + if (!(line = packet_read_line(process->out, NULL)) || + !skip_prefix(line, "version=", &p) || + strtol_i(p, 10, chosen_version)) + return error("Unexpected line '%s', expected version", + line ? line : "<flush packet>"); + if ((line = packet_read_line(process->out, NULL))) + return error("Unexpected line '%s', expected flush", line); + + /* Check to make sure that the version received is supported */ + for (i = 0; versions[i]; i++) { + if (versions[i] == *chosen_version) + break; + } + if (!versions[i]) + return error("Version %d not supported", *chosen_version); + + return 0; +} + +static int handshake_capabilities(struct child_process *process, + struct subprocess_capability *capabilities, + unsigned int *supported_capabilities) +{ + int i; + char *line; + + for (i = 0; capabilities[i].name; i++) { + if (packet_write_fmt_gently(process->in, "capability=%s\n", + capabilities[i].name)) + return error("Could not write requested capability"); + } + if (packet_flush_gently(process->in)) + return error("Could not write flush packet"); + + while ((line = packet_read_line(process->out, NULL))) { + const char *p; + if (!skip_prefix(line, "capability=", &p)) + continue; + + for (i = 0; + capabilities[i].name && strcmp(p, capabilities[i].name); + i++) + ; + if (capabilities[i].name) { + if (supported_capabilities) + *supported_capabilities |= capabilities[i].flag; + } else { + warning("external filter requested unsupported filter capability '%s'", + p); + } + } + + return 0; +} + +int subprocess_handshake(struct subprocess_entry *entry, + const char *welcome_prefix, + int *versions, + int *chosen_version, + struct subprocess_capability *capabilities, + unsigned int *supported_capabilities) +{ + int retval; + struct child_process *process = &entry->process; + + sigchain_push(SIGPIPE, SIG_IGN); + + retval = handshake_version(process, welcome_prefix, versions, + chosen_version) || + handshake_capabilities(process, capabilities, + supported_capabilities); + + sigchain_pop(SIGPIPE); + return retval; +} diff --git a/sub-process.h b/sub-process.h index 96a2cca36..caa91a9b9 100644 --- a/sub-process.h +++ b/sub-process.h @@ -6,35 +6,66 @@ #include "run-command.h" /* - * Generic implementation of background process infrastructure. - * See: Documentation/technical/api-sub-process.txt + * The sub-process API makes it possible to run background sub-processes + * for the entire lifetime of a Git invocation. If Git needs to communicate + * with an external process multiple times, then this can reduces the process + * invocation overhead. Git and the sub-process communicate through stdin and + * stdout. + * + * The sub-processes are kept in a hashmap by command name and looked up + * via the subprocess_find_entry function. If an existing instance can not + * be found then a new process should be created and started. When the + * parent git command terminates, all sub-processes are also terminated. + * + * This API is based on the run-command API. */ /* data structures */ +/* Members should not be accessed directly. */ struct subprocess_entry { struct hashmap_entry ent; /* must be the first member! */ const char *cmd; struct child_process process; }; +struct subprocess_capability { + const char *name; + + /* + * subprocess_handshake will "|=" this value to supported_capabilities + * if the server reports that it supports this capability. + */ + unsigned int flag; +}; + /* subprocess functions */ +/* Function to test two subprocess hashmap entries for equality. */ extern int cmd2process_cmp(const void *unused_cmp_data, const struct subprocess_entry *e1, const struct subprocess_entry *e2, const void *unused_keydata); +/* + * User-supplied function to initialize the sub-process. This is + * typically used to negotiate the interface version and capabilities. + */ typedef int(*subprocess_start_fn)(struct subprocess_entry *entry); + +/* Start a subprocess and add it to the subprocess hashmap. */ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, const char *cmd, subprocess_start_fn startfn); +/* Kill a subprocess and remove it from the subprocess hashmap. */ void subprocess_stop(struct hashmap *hashmap, struct subprocess_entry *entry); +/* Find a subprocess in the subprocess hashmap. */ struct subprocess_entry *subprocess_find_entry(struct hashmap *hashmap, const char *cmd); /* subprocess helper functions */ +/* Get the underlying `struct child_process` from a subprocess. */ static inline struct child_process *subprocess_get_child_process( struct subprocess_entry *entry) { @@ -42,6 +73,22 @@ static inline struct child_process *subprocess_get_child_process( } /* + * Perform the version and capability negotiation as described in the "Long + * Running Filter Process" section of the gitattributes documentation using the + * given requested versions and capabilities. The "versions" and "capabilities" + * parameters are arrays terminated by a 0 or blank struct. + * + * This function is typically called when a subprocess is started (as part of + * the "startfn" passed to subprocess_start). + */ +int subprocess_handshake(struct subprocess_entry *entry, + const char *welcome_prefix, + int *versions, + int *chosen_version, + struct subprocess_capability *capabilities, + unsigned int *supported_capabilities); + +/* * Helper function that will read packets looking for "status=<foo>" * key/value pairs and return the value from the last "status" packet */ diff --git a/t/lib-proto-disable.sh b/t/lib-proto-disable.sh index 02f49cb40..83babe57d 100644 --- a/t/lib-proto-disable.sh +++ b/t/lib-proto-disable.sh @@ -147,29 +147,33 @@ test_config () { # Test clone/fetch/push with protocol.allow user defined default test_expect_success "clone $desc (enabled)" ' rm -rf tmp.git && - git config --global protocol.allow always && + test_config_global protocol.allow always && git clone --bare "$url" tmp.git ' test_expect_success "fetch $desc (enabled)" ' + test_config_global protocol.allow always && git -C tmp.git fetch ' test_expect_success "push $desc (enabled)" ' + test_config_global protocol.allow always && git -C tmp.git push origin HEAD:pushed ' test_expect_success "push $desc (disabled)" ' - git config --global protocol.allow never && + test_config_global protocol.allow never && test_must_fail git -C tmp.git push origin HEAD:pushed ' test_expect_success "fetch $desc (disabled)" ' + test_config_global protocol.allow never && test_must_fail git -C tmp.git fetch ' test_expect_success "clone $desc (disabled)" ' rm -rf tmp.git && + test_config_global protocol.allow never && test_must_fail git clone --bare "$url" tmp.git ' } diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 161f56044..46f8e583c 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -28,7 +28,7 @@ file_size () { } filter_git () { - rm -f rot13-filter.log && + rm -f *.log && git "$@" } @@ -42,10 +42,10 @@ test_cmp_count () { for FILE in "$expect" "$actual" do sort "$FILE" | uniq -c | - sed -e "s/^ *[0-9][0-9]*[ ]*IN: /x IN: /" >"$FILE.tmp" && - mv "$FILE.tmp" "$FILE" || return + sed -e "s/^ *[0-9][0-9]*[ ]*IN: /x IN: /" >"$FILE.tmp" done && - test_cmp "$expect" "$actual" + test_cmp "$expect.tmp" "$actual.tmp" && + rm "$expect.tmp" "$actual.tmp" } # Compare two files but exclude all `clean` invocations because Git can @@ -56,10 +56,10 @@ test_cmp_exclude_clean () { actual=$2 for FILE in "$expect" "$actual" do - grep -v "IN: clean" "$FILE" >"$FILE.tmp" && - mv "$FILE.tmp" "$FILE" + grep -v "IN: clean" "$FILE" >"$FILE.tmp" done && - test_cmp "$expect" "$actual" + test_cmp "$expect.tmp" "$actual.tmp" && + rm "$expect.tmp" "$actual.tmp" } # Check that the contents of two files are equal and that their rot13 version @@ -342,7 +342,7 @@ test_expect_success 'diff does not reuse worktree files that need cleaning' ' ' test_expect_success PERL 'required process filter should filter data' ' - test_config_global filter.protocol.process "rot13-filter.pl clean smudge" && + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean smudge" && test_config_global filter.protocol.required true && rm -rf repo && mkdir repo && @@ -375,7 +375,7 @@ test_expect_success PERL 'required process filter should filter data' ' IN: clean testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] STOP EOF - test_cmp_count expected.log rot13-filter.log && + test_cmp_count expected.log debug.log && git commit -m "test commit 2" && rm -f test2.r "testsubdir/test3 '\''sq'\'',\$x=.r" && @@ -388,7 +388,7 @@ test_expect_success PERL 'required process filter should filter data' ' IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] STOP EOF - test_cmp_exclude_clean expected.log rot13-filter.log && + test_cmp_exclude_clean expected.log debug.log && filter_git checkout --quiet --no-progress empty-branch && cat >expected.log <<-EOF && @@ -397,7 +397,7 @@ test_expect_success PERL 'required process filter should filter data' ' IN: clean test.r $S [OK] -- OUT: $S . [OK] STOP EOF - test_cmp_exclude_clean expected.log rot13-filter.log && + test_cmp_exclude_clean expected.log debug.log && filter_git checkout --quiet --no-progress master && cat >expected.log <<-EOF && @@ -409,7 +409,7 @@ test_expect_success PERL 'required process filter should filter data' ' IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] STOP EOF - test_cmp_exclude_clean expected.log rot13-filter.log && + test_cmp_exclude_clean expected.log debug.log && test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r && test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r && @@ -419,7 +419,7 @@ test_expect_success PERL 'required process filter should filter data' ' test_expect_success PERL 'required process filter takes precedence' ' test_config_global filter.protocol.clean false && - test_config_global filter.protocol.process "rot13-filter.pl clean" && + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean" && test_config_global filter.protocol.required true && rm -rf repo && mkdir repo && @@ -439,12 +439,12 @@ test_expect_success PERL 'required process filter takes precedence' ' IN: clean test.r $S [OK] -- OUT: $S . [OK] STOP EOF - test_cmp_count expected.log rot13-filter.log + test_cmp_count expected.log debug.log ) ' test_expect_success PERL 'required process filter should be used only for "clean" operation only' ' - test_config_global filter.protocol.process "rot13-filter.pl clean" && + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean" && rm -rf repo && mkdir repo && ( @@ -462,7 +462,7 @@ test_expect_success PERL 'required process filter should be used only for "clean IN: clean test.r $S [OK] -- OUT: $S . [OK] STOP EOF - test_cmp_count expected.log rot13-filter.log && + test_cmp_count expected.log debug.log && rm test.r && @@ -474,12 +474,12 @@ test_expect_success PERL 'required process filter should be used only for "clean init handshake complete STOP EOF - test_cmp_exclude_clean expected.log rot13-filter.log + test_cmp_exclude_clean expected.log debug.log ) ' test_expect_success PERL 'required process filter should process multiple packets' ' - test_config_global filter.protocol.process "rot13-filter.pl clean smudge" && + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean smudge" && test_config_global filter.protocol.required true && rm -rf repo && @@ -514,7 +514,7 @@ test_expect_success PERL 'required process filter should process multiple packet IN: clean 3pkt_2+1.file $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK] STOP EOF - test_cmp_count expected.log rot13-filter.log && + test_cmp_count expected.log debug.log && rm -f *.file && @@ -529,7 +529,7 @@ test_expect_success PERL 'required process filter should process multiple packet IN: smudge 3pkt_2+1.file $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK] STOP EOF - test_cmp_exclude_clean expected.log rot13-filter.log && + test_cmp_exclude_clean expected.log debug.log && for FILE in *.file do @@ -539,7 +539,7 @@ test_expect_success PERL 'required process filter should process multiple packet ' test_expect_success PERL 'required process filter with clean error should fail' ' - test_config_global filter.protocol.process "rot13-filter.pl clean smudge" && + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean smudge" && test_config_global filter.protocol.required true && rm -rf repo && mkdir repo && @@ -558,7 +558,7 @@ test_expect_success PERL 'required process filter with clean error should fail' ' test_expect_success PERL 'process filter should restart after unexpected write failure' ' - test_config_global filter.protocol.process "rot13-filter.pl clean smudge" && + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean smudge" && rm -rf repo && mkdir repo && ( @@ -579,7 +579,7 @@ test_expect_success PERL 'process filter should restart after unexpected write f git add . && rm -f *.r && - rm -f rot13-filter.log && + rm -f debug.log && git checkout --quiet --no-progress . 2>git-stderr.log && grep "smudge write error at" git-stderr.log && @@ -588,14 +588,14 @@ test_expect_success PERL 'process filter should restart after unexpected write f cat >expected.log <<-EOF && START init handshake complete - IN: smudge smudge-write-fail.r $SF [OK] -- OUT: $SF [WRITE FAIL] + IN: smudge smudge-write-fail.r $SF [OK] -- [WRITE FAIL] START init handshake complete IN: smudge test.r $S [OK] -- OUT: $S . [OK] IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] STOP EOF - test_cmp_exclude_clean expected.log rot13-filter.log && + test_cmp_exclude_clean expected.log debug.log && test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r && test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r && @@ -609,7 +609,7 @@ test_expect_success PERL 'process filter should restart after unexpected write f ' test_expect_success PERL 'process filter should not be restarted if it signals an error' ' - test_config_global filter.protocol.process "rot13-filter.pl clean smudge" && + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean smudge" && rm -rf repo && mkdir repo && ( @@ -634,12 +634,12 @@ test_expect_success PERL 'process filter should not be restarted if it signals a cat >expected.log <<-EOF && START init handshake complete - IN: smudge error.r $SE [OK] -- OUT: 0 [ERROR] + IN: smudge error.r $SE [OK] -- [ERROR] IN: smudge test.r $S [OK] -- OUT: $S . [OK] IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK] STOP EOF - test_cmp_exclude_clean expected.log rot13-filter.log && + test_cmp_exclude_clean expected.log debug.log && test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r && test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r && @@ -648,7 +648,7 @@ test_expect_success PERL 'process filter should not be restarted if it signals a ' test_expect_success PERL 'process filter abort stops processing of all further files' ' - test_config_global filter.protocol.process "rot13-filter.pl clean smudge" && + test_config_global filter.protocol.process "rot13-filter.pl debug.log clean smudge" && rm -rf repo && mkdir repo && ( @@ -673,10 +673,10 @@ test_expect_success PERL 'process filter abort stops processing of all further f cat >expected.log <<-EOF && START init handshake complete - IN: smudge abort.r $SA [OK] -- OUT: 0 [ABORT] + IN: smudge abort.r $SA [OK] -- [ABORT] STOP EOF - test_cmp_exclude_clean expected.log rot13-filter.log && + test_cmp_exclude_clean expected.log debug.log && test_cmp "$TEST_ROOT/test.o" test.r && test_cmp "$TEST_ROOT/test2.o" test2.r && @@ -697,8 +697,124 @@ test_expect_success PERL 'invalid process filter must fail (and not hang!)' ' cp "$TEST_ROOT/test.o" test.r && test_must_fail git add . 2>git-stderr.log && - grep "does not support filter protocol version" git-stderr.log + grep "expected git-filter-server" git-stderr.log ) ' +test_expect_success PERL 'delayed checkout in process filter' ' + test_config_global filter.a.process "rot13-filter.pl a.log clean smudge delay" && + test_config_global filter.a.required true && + test_config_global filter.b.process "rot13-filter.pl b.log clean smudge delay" && + test_config_global filter.b.required true && + + rm -rf repo && + mkdir repo && + ( + cd repo && + git init && + echo "*.a filter=a" >.gitattributes && + echo "*.b filter=b" >>.gitattributes && + cp "$TEST_ROOT/test.o" test.a && + cp "$TEST_ROOT/test.o" test-delay10.a && + cp "$TEST_ROOT/test.o" test-delay11.a && + cp "$TEST_ROOT/test.o" test-delay20.a && + cp "$TEST_ROOT/test.o" test-delay10.b && + git add . && + git commit -m "test commit" + ) && + + S=$(file_size "$TEST_ROOT/test.o") && + cat >a.exp <<-EOF && + START + init handshake complete + IN: smudge test.a $S [OK] -- OUT: $S . [OK] + IN: smudge test-delay10.a $S [OK] -- [DELAYED] + IN: smudge test-delay11.a $S [OK] -- [DELAYED] + IN: smudge test-delay20.a $S [OK] -- [DELAYED] + IN: list_available_blobs test-delay10.a test-delay11.a [OK] + IN: smudge test-delay10.a 0 [OK] -- OUT: $S . [OK] + IN: smudge test-delay11.a 0 [OK] -- OUT: $S . [OK] + IN: list_available_blobs test-delay20.a [OK] + IN: smudge test-delay20.a 0 [OK] -- OUT: $S . [OK] + IN: list_available_blobs [OK] + STOP + EOF + cat >b.exp <<-EOF && + START + init handshake complete + IN: smudge test-delay10.b $S [OK] -- [DELAYED] + IN: list_available_blobs test-delay10.b [OK] + IN: smudge test-delay10.b 0 [OK] -- OUT: $S . [OK] + IN: list_available_blobs [OK] + STOP + EOF + + rm -rf repo-cloned && + filter_git clone repo repo-cloned && + test_cmp_count a.exp repo-cloned/a.log && + test_cmp_count b.exp repo-cloned/b.log && + + ( + cd repo-cloned && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b && + + rm *.a *.b && + filter_git checkout . && + test_cmp_count ../a.exp a.log && + test_cmp_count ../b.exp b.log && + + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a && + test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b + ) +' + +test_expect_success PERL 'missing file in delayed checkout' ' + test_config_global filter.bug.process "rot13-filter.pl bug.log clean smudge delay" && + test_config_global filter.bug.required true && + + rm -rf repo && + mkdir repo && + ( + cd repo && + git init && + echo "*.a filter=bug" >.gitattributes && + cp "$TEST_ROOT/test.o" missing-delay.a + git add . && + git commit -m "test commit" + ) && + + rm -rf repo-cloned && + test_must_fail git clone repo repo-cloned 2>git-stderr.log && + cat git-stderr.log && + grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log +' + +test_expect_success PERL 'invalid file in delayed checkout' ' + test_config_global filter.bug.process "rot13-filter.pl bug.log clean smudge delay" && + test_config_global filter.bug.required true && + + rm -rf repo && + mkdir repo && + ( + cd repo && + git init && + echo "*.a filter=bug" >.gitattributes && + cp "$TEST_ROOT/test.o" invalid-delay.a && + cp "$TEST_ROOT/test.o" unfiltered + git add . && + git commit -m "test commit" + ) && + + rm -rf repo-cloned && + test_must_fail git clone repo repo-cloned 2>git-stderr.log && + grep "error: external filter .* signaled that .unfiltered. is now available although it has not been delayed earlier" git-stderr.log +' + test_done diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl index 617f581e5..ad685d92f 100644 --- a/t/t0021/rot13-filter.pl +++ b/t/t0021/rot13-filter.pl @@ -2,8 +2,9 @@ # Example implementation for the Git filter protocol version 2 # See Documentation/gitattributes.txt, section "Filter Protocol" # -# The script takes the list of supported protocol capabilities as -# arguments ("clean", "smudge", etc). +# The first argument defines a debug log file that the script write to. +# All remaining arguments define a list of supported protocol +# capabilities ("clean", "smudge", etc). # # This implementation supports special test cases: # (1) If data with the pathname "clean-write-fail.r" is processed with @@ -17,6 +18,16 @@ # operation then the filter signals that it cannot or does not want # to process the file and any file after that is processed with the # same command. +# (5) If data with a pathname that is a key in the DELAY hash is +# requested (e.g. "test-delay10.a") then the filter responds with +# a "delay" status and sets the "requested" field in the DELAY hash. +# The filter will signal the availability of this object after +# "count" (field in DELAY hash) "list_available_blobs" commands. +# (6) If data with the pathname "missing-delay.a" is processed that the +# filter will drop the path from the "list_available_blobs" response. +# (7) If data with the pathname "invalid-delay.a" is processed that the +# filter will add the path "unfiltered" which was not delayed before +# to the "list_available_blobs" response. # use strict; @@ -24,9 +35,19 @@ use warnings; use IO::File; my $MAX_PACKET_CONTENT_SIZE = 65516; +my $log_file = shift @ARGV; my @capabilities = @ARGV; -open my $debug, ">>", "rot13-filter.log" or die "cannot open log file: $!"; +open my $debug, ">>", $log_file or die "cannot open log file: $!"; + +my %DELAY = ( + 'test-delay10.a' => { "requested" => 0, "count" => 1 }, + 'test-delay11.a' => { "requested" => 0, "count" => 1 }, + 'test-delay20.a' => { "requested" => 0, "count" => 2 }, + 'test-delay10.b' => { "requested" => 0, "count" => 1 }, + 'missing-delay.a' => { "requested" => 0, "count" => 1 }, + 'invalid-delay.a' => { "requested" => 0, "count" => 1 }, +); sub rot13 { my $str = shift; @@ -64,7 +85,7 @@ sub packet_bin_read { sub packet_txt_read { my ( $res, $buf ) = packet_bin_read(); - unless ( $buf =~ s/\n$// ) { + unless ( $buf eq '' or $buf =~ s/\n$// ) { die "A non-binary line MUST be terminated by an LF."; } return ( $res, $buf ); @@ -99,6 +120,7 @@ packet_flush(); ( packet_txt_read() eq ( 0, "capability=clean" ) ) || die "bad capability"; ( packet_txt_read() eq ( 0, "capability=smudge" ) ) || die "bad capability"; +( packet_txt_read() eq ( 0, "capability=delay" ) ) || die "bad capability"; ( packet_bin_read() eq ( 1, "" ) ) || die "bad capability end"; foreach (@capabilities) { @@ -109,88 +131,142 @@ print $debug "init handshake complete\n"; $debug->flush(); while (1) { - my ($command) = packet_txt_read() =~ /^command=(.+)$/; + my ( $command ) = packet_txt_read() =~ /^command=(.+)$/; print $debug "IN: $command"; $debug->flush(); - my ($pathname) = packet_txt_read() =~ /^pathname=(.+)$/; - print $debug " $pathname"; - $debug->flush(); - - if ( $pathname eq "" ) { - die "bad pathname '$pathname'"; - } + if ( $command eq "list_available_blobs" ) { + # Flush + packet_bin_read(); - # Flush - packet_bin_read(); - - my $input = ""; - { - binmode(STDIN); - my $buffer; - my $done = 0; - while ( !$done ) { - ( $done, $buffer ) = packet_bin_read(); - $input .= $buffer; + foreach my $pathname ( sort keys %DELAY ) { + if ( $DELAY{$pathname}{"requested"} >= 1 ) { + $DELAY{$pathname}{"count"} = $DELAY{$pathname}{"count"} - 1; + if ( $pathname eq "invalid-delay.a" ) { + # Send Git a pathname that was not delayed earlier + packet_txt_write("pathname=unfiltered"); + } + if ( $pathname eq "missing-delay.a" ) { + # Do not signal Git that this file is available + } elsif ( $DELAY{$pathname}{"count"} == 0 ) { + print $debug " $pathname"; + packet_txt_write("pathname=$pathname"); + } + } } - print $debug " " . length($input) . " [OK] -- "; - $debug->flush(); - } - - my $output; - if ( $pathname eq "error.r" or $pathname eq "abort.r" ) { - $output = ""; - } - elsif ( $command eq "clean" and grep( /^clean$/, @capabilities ) ) { - $output = rot13($input); - } - elsif ( $command eq "smudge" and grep( /^smudge$/, @capabilities ) ) { - $output = rot13($input); - } - else { - die "bad command '$command'"; - } - print $debug "OUT: " . length($output) . " "; - $debug->flush(); - - if ( $pathname eq "error.r" ) { - print $debug "[ERROR]\n"; - $debug->flush(); - packet_txt_write("status=error"); packet_flush(); - } - elsif ( $pathname eq "abort.r" ) { - print $debug "[ABORT]\n"; + + print $debug " [OK]\n"; $debug->flush(); - packet_txt_write("status=abort"); + packet_txt_write("status=success"); packet_flush(); } else { - packet_txt_write("status=success"); - packet_flush(); + my ( $pathname ) = packet_txt_read() =~ /^pathname=(.+)$/; + print $debug " $pathname"; + $debug->flush(); - if ( $pathname eq "${command}-write-fail.r" ) { - print $debug "[WRITE FAIL]\n"; + if ( $pathname eq "" ) { + die "bad pathname '$pathname'"; + } + + # Read until flush + my ( $done, $buffer ) = packet_txt_read(); + while ( $buffer ne '' ) { + if ( $buffer eq "can-delay=1" ) { + if ( exists $DELAY{$pathname} and $DELAY{$pathname}{"requested"} == 0 ) { + $DELAY{$pathname}{"requested"} = 1; + } + } else { + die "Unknown message '$buffer'"; + } + + ( $done, $buffer ) = packet_txt_read(); + } + + my $input = ""; + { + binmode(STDIN); + my $buffer; + my $done = 0; + while ( !$done ) { + ( $done, $buffer ) = packet_bin_read(); + $input .= $buffer; + } + print $debug " " . length($input) . " [OK] -- "; $debug->flush(); - die "${command} write error"; } - while ( length($output) > 0 ) { - my $packet = substr( $output, 0, $MAX_PACKET_CONTENT_SIZE ); - packet_bin_write($packet); - # dots represent the number of packets - print $debug "."; - if ( length($output) > $MAX_PACKET_CONTENT_SIZE ) { - $output = substr( $output, $MAX_PACKET_CONTENT_SIZE ); + my $output; + if ( exists $DELAY{$pathname} and exists $DELAY{$pathname}{"output"} ) { + $output = $DELAY{$pathname}{"output"} + } + elsif ( $pathname eq "error.r" or $pathname eq "abort.r" ) { + $output = ""; + } + elsif ( $command eq "clean" and grep( /^clean$/, @capabilities ) ) { + $output = rot13($input); + } + elsif ( $command eq "smudge" and grep( /^smudge$/, @capabilities ) ) { + $output = rot13($input); + } + else { + die "bad command '$command'"; + } + + if ( $pathname eq "error.r" ) { + print $debug "[ERROR]\n"; + $debug->flush(); + packet_txt_write("status=error"); + packet_flush(); + } + elsif ( $pathname eq "abort.r" ) { + print $debug "[ABORT]\n"; + $debug->flush(); + packet_txt_write("status=abort"); + packet_flush(); + } + elsif ( $command eq "smudge" and + exists $DELAY{$pathname} and + $DELAY{$pathname}{"requested"} == 1 + ) { + print $debug "[DELAYED]\n"; + $debug->flush(); + packet_txt_write("status=delayed"); + packet_flush(); + $DELAY{$pathname}{"requested"} = 2; + $DELAY{$pathname}{"output"} = $output; + } + else { + packet_txt_write("status=success"); + packet_flush(); + + if ( $pathname eq "${command}-write-fail.r" ) { + print $debug "[WRITE FAIL]\n"; + $debug->flush(); + die "${command} write error"; } - else { - $output = ""; + + print $debug "OUT: " . length($output) . " "; + $debug->flush(); + + while ( length($output) > 0 ) { + my $packet = substr( $output, 0, $MAX_PACKET_CONTENT_SIZE ); + packet_bin_write($packet); + # dots represent the number of packets + print $debug "."; + if ( length($output) > $MAX_PACKET_CONTENT_SIZE ) { + $output = substr( $output, $MAX_PACKET_CONTENT_SIZE ); + } + else { + $output = ""; + } } + packet_flush(); + print $debug " [OK]\n"; + $debug->flush(); + packet_flush(); } - packet_flush(); - print $debug " [OK]\n"; - $debug->flush(); - packet_flush(); } } diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh index b9cb76654..6ac7734d7 100755 --- a/t/t1411-reflog-show.sh +++ b/t/t1411-reflog-show.sh @@ -171,14 +171,4 @@ test_expect_success 'reflog exists works' ' ! git reflog exists refs/heads/nonexistent ' -# The behavior with two reflogs is buggy and the output is in flux; for now -# we're just checking that the program works at all without segfaulting. -test_expect_success 'showing multiple reflogs works' ' - git log -g HEAD HEAD >actual -' - -test_expect_success 'showing multiple reflogs with an old date' ' - git log -g HEAD@{1979-01-01} HEAD >actual -' - test_done diff --git a/t/t1414-reflog-walk.sh b/t/t1414-reflog-walk.sh new file mode 100755 index 000000000..feb1efd8f --- /dev/null +++ b/t/t1414-reflog-walk.sh @@ -0,0 +1,135 @@ +#!/bin/sh + +test_description='various tests of reflog walk (log -g) behavior' +. ./test-lib.sh + +test_expect_success 'set up some reflog entries' ' + test_commit one && + test_commit two && + git checkout -b side HEAD^ && + test_commit three && + git merge --no-commit master && + echo evil-merge-content >>one.t && + test_tick && + git commit --no-edit -a +' + +do_walk () { + git log -g --format="%gd %gs" "$@" +} + +sq="'" +test_expect_success 'set up expected reflog' ' + cat >expect.all <<-EOF + HEAD@{0} commit (merge): Merge branch ${sq}master${sq} into side + HEAD@{1} commit: three + HEAD@{2} checkout: moving from master to side + HEAD@{3} commit: two + HEAD@{4} commit (initial): one + EOF +' + +test_expect_success 'reflog walk shows expected logs' ' + do_walk >actual && + test_cmp expect.all actual +' + +test_expect_success 'reflog can limit with --no-merges' ' + grep -v merge expect.all >expect && + do_walk --no-merges >actual && + test_cmp expect actual +' + +test_expect_success 'reflog can limit with pathspecs' ' + grep two expect.all >expect && + do_walk -- two.t >actual && + test_cmp expect actual +' + +test_expect_success 'pathspec limiting handles merges' ' + # we pick up: + # - the initial commit of one + # - the checkout back to commit one + # - the evil merge which touched one + sed -n "1p;3p;5p" expect.all >expect && + do_walk -- one.t >actual && + test_cmp expect actual +' + +test_expect_success '--parents shows true parents' ' + # convert newlines to spaces + echo $(git rev-parse HEAD HEAD^1 HEAD^2) >expect && + git rev-list -g --parents -1 HEAD >actual && + test_cmp expect actual +' + +test_expect_success 'walking multiple reflogs shows all' ' + # We expect to see all entries for all reflogs, but interleaved by + # date, with order on the command line breaking ties. We + # can use "sort" on the separate lists to generate this, + # but note two tricks: + # + # 1. We use "{" as the delimiter, which lets us skip to the reflog + # date specifier as our second field, and then our "-n" numeric + # sort ignores the bits after the timestamp. + # + # 2. POSIX leaves undefined whether this is a stable sort or not. So + # we use "-k 1" to ensure that we see HEAD before master before + # side when breaking ties. + { + do_walk --date=unix HEAD && + do_walk --date=unix side && + do_walk --date=unix master + } >expect.raw && + sort -t "{" -k 2nr -k 1 <expect.raw >expect && + do_walk --date=unix HEAD master side >actual && + test_cmp expect actual +' + +test_expect_success 'date-limiting does not interfere with other logs' ' + do_walk HEAD@{1979-01-01} HEAD >actual && + test_cmp expect.all actual +' + +test_expect_success 'min/max age uses entry date to limit' ' + # Flip between commits one and two so each ref update actually + # does something (and does not get optimized out). We know + # that the timestamps of those commits will be before our "min". + + git update-ref -m before refs/heads/minmax one && + + test_tick && + min=$test_tick && + git update-ref -m min refs/heads/minmax two && + + test_tick && + max=$test_tick && + git update-ref -m max refs/heads/minmax one && + + test_tick && + git update-ref -m after refs/heads/minmax two && + + cat >expect <<-\EOF && + max + min + EOF + git log -g --since=$min --until=$max --format=%gs minmax >actual && + test_cmp expect actual +' + +test_expect_success 'walk prefers reflog to ref tip' ' + head=$(git rev-parse HEAD) && + one=$(git rev-parse one) && + ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" && + echo "$head $one $ident broken reflog entry" >>.git/logs/HEAD && + + echo $one >expect && + git log -g --format=%H -1 >actual && + test_cmp expect actual +' + +test_expect_success 'rev-list -g complains when there are no reflogs' ' + test_must_fail git rev-list -g +' + +test_done diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index dd37ac47c..9d707d2a4 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -166,10 +166,9 @@ test_expect_success 'resulting reflog can be shown by log -g' ' oid=$(git rev-parse HEAD) && cat >expect <<-EOF && HEAD@{0} $oid $msg - HEAD@{1} $oid $msg HEAD@{2} $oid checkout: moving from foo to baz EOF - git log -g --format="%gd %H %gs" -3 HEAD >actual && + git log -g --format="%gd %H %gs" -2 HEAD >actual && test_cmp expect actual ' diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index a428ae670..d2aec0f38 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -2,6 +2,7 @@ test_description='git branch display tests' . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-terminal.sh test_expect_success 'make commits' ' echo content >file && @@ -239,4 +240,34 @@ test_expect_success 'git branch --format option' ' test_i18ncmp expect actual ' +test_expect_success "set up color tests" ' + echo "<RED>master<RESET>" >expect.color && + echo "master" >expect.bare && + color_args="--format=%(color:red)%(refname:short) --list master" +' + +test_expect_success '%(color) omitted without tty' ' + TERM=vt100 git branch $color_args >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect.bare actual +' + +test_expect_success TTY '%(color) present with tty' ' + test_terminal env TERM=vt100 git branch $color_args >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect.color actual +' + +test_expect_success 'color.branch=always overrides auto-color' ' + git -c color.branch=always branch $color_args >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect.color actual +' + +test_expect_success '--color overrides auto-color' ' + git branch --color $color_args >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect.color actual +' + test_done diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh index b972296f0..60f040cab 100755 --- a/t/t4207-log-decoration-colors.sh +++ b/t/t4207-log-decoration-colors.sh @@ -7,11 +7,6 @@ test_description='Test for "git log --decorate" colors' . ./test-lib.sh -get_color () -{ - git config --get-color no.such.slot "$1" -} - test_expect_success setup ' git config diff.color.commit yellow && git config color.decorate.branch green && @@ -20,14 +15,14 @@ test_expect_success setup ' git config color.decorate.stash magenta && git config color.decorate.HEAD cyan && - c_reset=$(get_color reset) && + c_reset="<RESET>" && - c_commit=$(get_color yellow) && - c_branch=$(get_color green) && - c_remoteBranch=$(get_color red) && - c_tag=$(get_color "reverse bold yellow") && - c_stash=$(get_color magenta) && - c_HEAD=$(get_color cyan) && + c_commit="<YELLOW>" && + c_branch="<GREEN>" && + c_remoteBranch="<RED>" && + c_tag="<BOLD;REVERSE;YELLOW>" && + c_stash="<MAGENTA>" && + c_HEAD="<CYAN>" && test_commit A && git clone . other && @@ -59,7 +54,8 @@ EOF # to this test since it does not contain any decoration, hence --first-parent test_expect_success 'Commit Decorations Colored Correctly' ' git log --first-parent --abbrev=10 --all --decorate --oneline --color=always | - sed "s/[0-9a-f]\{10,10\}/COMMIT_ID/" >out && + sed "s/[0-9a-f]\{10,10\}/COMMIT_ID/" | + test_decode_color >out && test_cmp expected out ' diff --git a/t/t5532-fetch-proxy.sh b/t/t5532-fetch-proxy.sh index 51c966939..9c2798603 100755 --- a/t/t5532-fetch-proxy.sh +++ b/t/t5532-fetch-proxy.sh @@ -43,4 +43,9 @@ test_expect_success 'fetch through proxy works' ' test_cmp expect actual ' +test_expect_success 'funny hostnames are rejected before running proxy' ' + test_must_fail git fetch git://-remote/repo.git 2>stderr && + ! grep "proxying for" stderr +' + test_done diff --git a/t/t5810-proto-disable-local.sh b/t/t5810-proto-disable-local.sh index 563592d8a..c1ef99b85 100755 --- a/t/t5810-proto-disable-local.sh +++ b/t/t5810-proto-disable-local.sh @@ -11,4 +11,27 @@ test_expect_success 'setup repository to clone' ' test_proto "file://" file "file://$PWD" test_proto "path" file . +test_expect_success 'setup repo with dash' ' + git init --bare repo.git && + git push repo.git HEAD && + mv repo.git "$PWD/-repo.git" +' + +# This will fail even without our rejection because upload-pack will +# complain about the bogus option. So let's make sure that GIT_TRACE +# doesn't show us even running upload-pack. +# +# We must also be sure to use "fetch" and not "clone" here, as the latter +# actually canonicalizes our input into an absolute path (which is fine +# to allow). +test_expect_success 'repo names starting with dash are rejected' ' + rm -f trace.out && + test_must_fail env GIT_TRACE="$PWD/trace.out" git fetch -- -repo.git && + ! grep upload-pack trace.out +' + +test_expect_success 'full paths still work' ' + git fetch "$PWD/-repo.git" +' + test_done diff --git a/t/t5813-proto-disable-ssh.sh b/t/t5813-proto-disable-ssh.sh index a954ead8a..3f084ee30 100755 --- a/t/t5813-proto-disable-ssh.sh +++ b/t/t5813-proto-disable-ssh.sh @@ -17,4 +17,27 @@ test_proto "host:path" ssh "remote:repo.git" test_proto "ssh://" ssh "ssh://remote$PWD/remote/repo.git" test_proto "git+ssh://" ssh "git+ssh://remote$PWD/remote/repo.git" +# Don't even bother setting up a "-remote" directory, as ssh would generally +# complain about the bogus option rather than completing our request. Our +# fake wrapper actually _can_ handle this case, but it's more robust to +# simply confirm from its output that it did not run at all. +test_expect_success 'hostnames starting with dash are rejected' ' + test_must_fail git clone ssh://-remote/repo.git dash-host 2>stderr && + ! grep ^ssh: stderr +' + +test_expect_success 'setup repo with dash' ' + git init --bare remote/-repo.git && + git push remote/-repo.git HEAD +' + +test_expect_success 'repo names starting with dash are rejected' ' + test_must_fail git clone remote:-repo.git dash-path 2>stderr && + ! grep ^ssh: stderr +' + +test_expect_success 'full paths still work' ' + git clone "remote:$PWD/remote/-repo.git" dash-path +' + test_done diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index a1dcdb81d..b326d550f 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -59,10 +59,14 @@ test_format () { } # Feed to --format to provide predictable colored sequences. +BASIC_COLOR='%Credfoo%Creset' +COLOR='%C(red)foo%C(reset)' AUTO_COLOR='%C(auto,red)foo%C(auto,reset)' +ALWAYS_COLOR='%C(always,red)foo%C(always,reset)' has_color () { - printf '\033[31mfoo\033[m\n' >expect && - test_cmp expect "$1" + test_decode_color <"$1" >decoded && + echo "<RED>foo<RESET>" >expect && + test_cmp expect decoded } has_no_color () { @@ -170,62 +174,84 @@ $added EOF -test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<EOF -commit $head2 -[31mfoo[32mbar[34mbaz[mxyzzy -commit $head1 -[31mfoo[32mbar[34mbaz[mxyzzy -EOF - -test_format advanced-colors '%C(red yellow bold)foo%C(reset)' <<EOF -commit $head2 -[1;31;43mfoo[m -commit $head1 -[1;31;43mfoo[m -EOF - -test_expect_success '%C(auto,...) does not enable color by default' ' - git log --format=$AUTO_COLOR -1 >actual && - has_no_color actual +test_expect_success 'basic colors' ' + cat >expect <<-EOF && + commit $head2 + <RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy + EOF + format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" && + git rev-list --color --format="$format" -1 master >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect actual ' -test_expect_success '%C(auto,...) enables colors for color.diff' ' - git -c color.diff=always log --format=$AUTO_COLOR -1 >actual && - has_color actual +test_expect_success 'advanced colors' ' + cat >expect <<-EOF && + commit $head2 + <BOLD;RED;BYELLOW>foo<RESET> + EOF + format="%C(red yellow bold)foo%C(reset)" && + git rev-list --color --format="$format" -1 master >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect actual ' -test_expect_success '%C(auto,...) enables colors for color.ui' ' - git -c color.ui=always log --format=$AUTO_COLOR -1 >actual && - has_color actual -' +for spec in \ + "%Cred:$BASIC_COLOR" \ + "%C(...):$COLOR" \ + "%C(auto,...):$AUTO_COLOR" +do + desc=${spec%%:*} + color=${spec#*:} + test_expect_success "$desc does not enable color by default" ' + git log --format=$color -1 >actual && + has_no_color actual + ' -test_expect_success '%C(auto,...) respects --color' ' - git log --format=$AUTO_COLOR -1 --color >actual && - has_color actual -' + test_expect_success "$desc enables colors for color.diff" ' + git -c color.diff=always log --format=$color -1 >actual && + has_color actual + ' -test_expect_success '%C(auto,...) respects --no-color' ' - git -c color.ui=always log --format=$AUTO_COLOR -1 --no-color >actual && - has_no_color actual -' + test_expect_success "$desc enables colors for color.ui" ' + git -c color.ui=always log --format=$color -1 >actual && + has_color actual + ' -test_expect_success TTY '%C(auto,...) respects --color=auto (stdout is tty)' ' - test_terminal env TERM=vt100 \ - git log --format=$AUTO_COLOR -1 --color=auto >actual && - has_color actual -' + test_expect_success "$desc respects --color" ' + git log --format=$color -1 --color >actual && + has_color actual + ' -test_expect_success '%C(auto,...) respects --color=auto (stdout not tty)' ' - ( - TERM=vt100 && export TERM && - git log --format=$AUTO_COLOR -1 --color=auto >actual && + test_expect_success "$desc respects --no-color" ' + git -c color.ui=always log --format=$color -1 --no-color >actual && has_no_color actual - ) + ' + + test_expect_success TTY "$desc respects --color=auto (stdout is tty)" ' + test_terminal env TERM=vt100 \ + git log --format=$color -1 --color=auto >actual && + has_color actual + ' + + test_expect_success "$desc respects --color=auto (stdout not tty)" ' + ( + TERM=vt100 && export TERM && + git log --format=$color -1 --color=auto >actual && + has_no_color actual + ) + ' +done + +test_expect_success '%C(always,...) enables color even without tty' ' + git log --format=$ALWAYS_COLOR -1 >actual && + has_color actual ' test_expect_success '%C(auto) respects --color' ' - git log --color --format="%C(auto)%H" -1 >actual && - printf "\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect && + git log --color --format="%C(auto)%H" -1 >actual.raw && + test_decode_color <actual.raw >actual && + echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect && test_cmp expect actual ' @@ -235,6 +261,17 @@ test_expect_success '%C(auto) respects --no-color' ' test_cmp expect actual ' +test_expect_success 'rev-list %C(auto,...) respects --color' ' + git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \ + -1 HEAD >actual.raw && + test_decode_color <actual.raw >actual && + cat >expect <<-EOF && + commit $(git rev-parse HEAD) + <GREEN>foo<RESET> + EOF + test_cmp expect actual +' + iconv -f utf-8 -t $test_encoding > commit-msg <<EOF Test printing of complex bodies diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 834a9ed16..2274a4b73 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -7,6 +7,7 @@ test_description='for-each-ref test' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-gpg.sh +. "$TEST_DIRECTORY"/lib-terminal.sh # Mon Jul 3 23:18:43 2006 +0000 datestamp=1151968723 @@ -412,21 +413,33 @@ test_expect_success 'Check for invalid refname format' ' test_must_fail git for-each-ref --format="%(refname:INVALID)" ' -get_color () -{ - git config --get-color no.such.slot "$1" -} +test_expect_success 'set up color tests' ' + cat >expected.color <<-EOF && + $(git rev-parse --short refs/heads/master) <GREEN>master<RESET> + $(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET> + $(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET> + $(git rev-parse --short refs/tags/two) <GREEN>two<RESET> + EOF + sed "s/<[^>]*>//g" <expected.color >expected.bare && + color_format="%(objectname:short) %(color:green)%(refname:short)" +' -cat >expected <<EOF -$(git rev-parse --short refs/heads/master) $(get_color green)master$(get_color reset) -$(git rev-parse --short refs/remotes/origin/master) $(get_color green)origin/master$(get_color reset) -$(git rev-parse --short refs/tags/testtag) $(get_color green)testtag$(get_color reset) -$(git rev-parse --short refs/tags/two) $(get_color green)two$(get_color reset) -EOF +test_expect_success TTY '%(color) shows color with a tty' ' + test_terminal env TERM=vt100 \ + git for-each-ref --format="$color_format" >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expected.color actual +' -test_expect_success 'Check %(color:...) ' ' - git for-each-ref --format="%(objectname:short) %(color:green)%(refname:short)" >actual && - test_cmp expected actual +test_expect_success '%(color) does not show color without tty' ' + TERM=vt100 git for-each-ref --format="$color_format" >actual && + test_cmp expected.bare actual +' + +test_expect_success 'color.ui=always can override tty check' ' + git -c color.ui=always for-each-ref --format="$color_format" >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expected.color actual ' cat >expected <<\EOF diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 0ef7b9439..dd5ba450e 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -9,6 +9,7 @@ Tests for operations with tags.' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-gpg.sh +. "$TEST_DIRECTORY"/lib-terminal.sh # creating and listing lightweight tags: @@ -1900,6 +1901,30 @@ test_expect_success '--format should list tags as per format given' ' test_cmp expect actual ' +test_expect_success "set up color tests" ' + echo "<RED>v1.0<RESET>" >expect.color && + echo "v1.0" >expect.bare && + color_args="--format=%(color:red)%(refname:short) --list v1.0" +' + +test_expect_success '%(color) omitted without tty' ' + TERM=vt100 git tag $color_args >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect.bare actual +' + +test_expect_success TTY '%(color) present with tty' ' + test_terminal env TERM=vt100 git tag $color_args >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect.color actual +' + +test_expect_success 'color.ui=always overrides auto-color' ' + git -c color.ui=always tag $color_args >actual.raw && + test_decode_color <actual.raw >actual && + test_cmp expect.color actual +' + test_expect_success 'setup --merged test tags' ' git tag mergetest-1 HEAD~2 && git tag mergetest-2 HEAD~1 && diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 50a9a1d1c..1701fe2a0 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -42,6 +42,7 @@ test_decode_color () { function name(n) { if (n == 0) return "RESET"; if (n == 1) return "BOLD"; + if (n == 7) return "REVERSE"; if (n == 30) return "BLACK"; if (n == 31) return "RED"; if (n == 32) return "GREEN"; diff --git a/unpack-trees.c b/unpack-trees.c index dd535bc84..862cfce66 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -380,6 +380,7 @@ static int check_updates(struct unpack_trees_options *o) if (should_update_submodules() && o->update && !o->dry_run) reload_gitmodules_file(index, &state); + enable_delayed_checkout(&state); for (i = 0; i < index->cache_nr; i++) { struct cache_entry *ce = index->cache[i]; @@ -394,6 +395,7 @@ static int check_updates(struct unpack_trees_options *o) } } } + errs |= finish_delayed_checkout(&state); stop_progress(&progress); if (o->update) git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); |